物联设备BUG处理

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/IotAreaInfoMapper.xml

@@ -13,6 +13,7 @@
         from nu_base_info a
         inner join sys_depart b on a.sys_org_code = b.org_code
         where a.status != '5'
+        and a.del_flag = '0'
             <if test="params.sysOrgCode != null and params.sysOrgCode != ''">
                 AND a.sys_org_code = #{params.sysOrgCode}
             </if>
@@ -22,6 +23,7 @@
             <if test="params.areaFlag != null and params.areaFlag != ''">
                 AND a.area_flag = #{params.areaFlag}
             </if>
+            order by a.nu_id
     </select>
 
 </mapper>

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/IotDeviceInfoMapper.xml

@@ -510,6 +510,7 @@
         nu_name as nuName
         from nu_base_info
         where del_flag = '0'
+        and status != '5'
         <if test="orgCode != null and orgCode != ''">
             AND sys_org_code = #{orgCode}
         </if>

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/IotDeviceInfoServiceImpl.java

@@ -249,9 +249,11 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
             log.setOrgCode(idi.getOrgCode());
             log.setRemark(remark);
             log.setUpdateDate(new Date());
-            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            if(sysUser!=null){
-                log.setUpdateBy(sysUser.getUsername());
+            if(!remarks.equals("业务平台区域停用")){
+                LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+                if(sysUser!=null){
+                    log.setUpdateBy(sysUser.getUsername());
+                }
             }
             logService.addLog(log);
         }

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/impl/TqDeviceInfoServiceImpl.java

@@ -60,7 +60,7 @@ public class TqDeviceInfoServiceImpl extends ServiceImpl<TqDeviceInfoMapper, TqD
                 String deviceType = json.getStr("device_type");
                 String relayState = json.getStr("relay_state");
                 String remark = json.getStr("description");
-//                if(deviceType.equals("1")){
+                if(deviceType.equals("1")){
                     String batteryState = json.getStr("battery_state");
                     WaterMeter waterMeter = new WaterMeter();
                     waterMeter.setCid(cid);
@@ -76,7 +76,8 @@ public class TqDeviceInfoServiceImpl extends ServiceImpl<TqDeviceInfoMapper, TqD
                     }else{
                         waterMeterMapper.updateWater(waterMeter);
                     }
-//                }else{
+                }
+//                else{
 //                    ElectricityMeter electricityMeter = new ElectricityMeter();
 //                    electricityMeter.setCid(cid);
 //                    electricityMeter.setAddress(address);

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotDeviceMQListener.java

@@ -153,6 +153,7 @@ public class IotDeviceMQListener {
         IotDeviceInfo idi = new IotDeviceInfo();
         idi.setNuId(nuId);
         idi.setOrgCode(orgCode);
+        idi.setRemarks("业务平台区域停用");
         iotDeviceInfoService.releaseNu(idi);
     }