温湿度，删除改停用

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java

@@ -62,15 +62,26 @@ public class HumidDeviceController extends JeecgController<HumidDevice, IHumidDe
 		return service.updateDevice(humidDevice);
 	}
 
+//	/**
+//	 * 删除设备
+//	 *
+//	 * @param humidDevice
+//	 * @return
+//	 */
+//	@GetMapping(value = "/deleteDevice")
+//	public Result<String> deleteDevice(HumidDevice humidDevice) {
+//		return service.deleteDevice(humidDevice);
+//	}
+
 	/**
-	 * 删除设备
+	 * 启用/停用设备
 	 *
 	 * @param humidDevice
 	 * @return
 	 */
-	@GetMapping(value = "/deleteDevice")
+	@GetMapping(value = "/delFlagDevice")
-	public Result<String> deleteDevice(HumidDevice humidDevice) {
+	public Result<String> delFlagDevice(HumidDevice humidDevice) {
-		return service.deleteDevice(humidDevice);
+		return service.delFlagDevice(humidDevice);
 	}
 
 	/**

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java

@@ -115,4 +115,6 @@ public class HumidDevice implements Serializable {
 	private String oldDepartId;//原机构id
 	private String oldDepartName;//原机构名称
 
+	private String delFlag;//停用标识 0正常 1停用
+
 }

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/HumidDeviceMapper.java

@@ -11,7 +11,7 @@ public interface HumidDeviceMapper extends BaseMapper<HumidDevice> {
     HumidDevice getHumidDevice(HumidDevice humidDevice);
     int insertDevice(HumidDevice humidDevice);
     int updateDevice(HumidDevice humidDevice);
-    int deleteDevice(HumidDevice humidDevice);
+    int delFlagDevice(HumidDevice humidDevice);
     int updateValue(HumidDevice humidDevice);
     int insertLog(HumidDevice humidDevice);
     IPage<HumidDevice> findLogPage(Page<HumidDevice> page, @Param("params") HumidDevice humidDevice);

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml

@@ -34,6 +34,7 @@
 			depart_server_url as departServerUrl,
 			old_server_url ,
 			sync_type,
+		    del_flag as delFlag,
 		    (select count(*) from nu_iot_yiweilian_humid_alarm b where a.sn = b.sn and b.status = '0') as alarmCn
 		from nu_iot_yiweilian_humid_device a
 		<where>
@@ -84,6 +85,7 @@
 			depart_server_url as departServerUrl,
 			old_server_url ,
 			sync_type,
+			del_flag as delFlag,
 			(select count(*) from nu_iot_yiweilian_humid_alarm b where a.sn = b.sn and b.status = '0') as alarmCn
 		from nu_iot_yiweilian_humid_device
 		<where>
@@ -101,12 +103,14 @@
 			sn,
 			time_code,
 			device_name,
+			del_flag,
 			create_time
 		)
 		values(
 			#{sn},
 			#{timeCode},
 			#{deviceName},
+		    '0',
 			now()
 		)
 	</insert>
@@ -134,9 +138,9 @@
 		where sn = #{sn}
 	</update>
 
-	<delete id="deleteDevice" parameterType="com.nu.modules.yiweilian.humid.entity.HumidDevice">
+	<update id="delFlagDevice" parameterType="com.nu.modules.yiweilian.humid.entity.HumidDevice">
-		delete from nu_iot_yiweilian_humid_device where sn = #{sn}
+		update nu_iot_yiweilian_humid_device set del_flag = #{delFlag} where sn = #{sn}
-	</delete>
+	</update>
 
 	<update id="updateValue" parameterType="com.nu.modules.yiweilian.humid.entity.HumidDevice">
 		update nu_iot_yiweilian_humid_device
@@ -147,6 +151,7 @@
 			reporting_time = #{reportingTime},
 			electricity = #{electricity}
 		where sn = #{sn}
+		and del_flag = '0'
 	</update>
 
 	<insert id="insertLog" parameterType="com.nu.modules.yiweilian.humid.entity.HumidDevice">

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java

@@ -12,7 +12,7 @@ public interface IHumidDeviceService extends IService<HumidDevice> {
     String updateDeviceParameters(HumidDevice humidDevice,String type);
     String updateDeviceRealTime(HumidDevice humidDevice);
     Result<String> updateDevice(HumidDevice humidDevice);
-    Result<String> deleteDevice(HumidDevice humidDevice);
+    Result<String> delFlagDevice(HumidDevice humidDevice);
     Result getDeviceParameters(HumidDevice humidDevice);
     IPage<HumidDevice> findLogPage(Page<HumidDevice> page, HumidDevice humidDevice);
 

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java

@@ -332,26 +332,33 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
     }
 
     /**
-     * 删除
+     * 启用/停用设备
      */
     @Override
-    public Result<String> deleteDevice(HumidDevice humidDevice){
+    public Result<String> delFlagDevice(HumidDevice humidDevice){
-        Map<String, Object> params = new HashMap<>();
+//        Map<String, Object> params = new HashMap<>();
-        params.put("sn", humidDevice.getSn());
+//        params.put("sn", humidDevice.getSn());
-        String responseStr = yiweilianApi.deleteDevice(params);
+//        String responseStr = yiweilianApi.deleteDevice(params);
-        JSONObject jsonObject = new JSONObject(responseStr);
+//        JSONObject jsonObject = new JSONObject(responseStr);
-        Integer responseCode = jsonObject.getInt("code");
+//        Integer responseCode = jsonObject.getInt("code");
-        if(responseCode.equals(0)){
+//        if(responseCode.equals(0)){
-            baseMapper.deleteDevice(humidDevice);
+        String option = "";
-            humidDevice.setOptType("delete");
+            baseMapper.delFlagDevice(humidDevice);
+            if(humidDevice.getDelFlag().equals("0")){
+                humidDevice.setOptType("activate");
+                option = "启用成功";
+            }else{
+                humidDevice.setOptType("deactivated");
+                option = "停用成功";
+            }
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             humidDevice.setOptBy(sysUser.getUsername());
             baseMapper.insertLog(humidDevice);
-            return Result.OK("删除成功");
+            return Result.OK(option);
-        }else{
+//        }else{
-            String error = "删除失败："+jsonObject.getStr("msg");
+//            String error = "删除失败："+jsonObject.getStr("msg");
-            return Result.error(error);
+//            return Result.error(error);
-        }
+//        }
     }
 
     /**