阶段性修复bug，角色菜单同步、xx病激活时间

src/main/java/com/yunfeiyun/agmp/iots/device/mapper/IotDeviceMapper.java

@@ -24,6 +24,7 @@ public interface IotDeviceMapper {
      * @return 设备基础
      */
     public IotDevice selectIotDeviceByTypeFirmCode(IotDevice iotDevice);
+
     public IotDevice selectIotDeviceByTypeFirmCodeExt(IotDevice iotDevice);
 
 
@@ -60,16 +61,16 @@ public interface IotDeviceMapper {
     public int deleteIotDeviceByDevBids(String[] devBids);
 
     List<IotDevice> selectAllDeviceByDeviceServiceName(String devtypeServicename);
-    IotDevice selectDeviceByDeviceServiceNameAndDevCode(@Param("devtypeServicename") String devtypeServicename,@Param("devCode")String devCode);
 
-    void updateIotDeviceExtInfo(@Param("devBid") String devBid, @Param("extInfo") String extInfo);
+    IotDevice selectDeviceByDeviceServiceNameAndDevCode(@Param("devtypeServicename") String devtypeServicename, @Param("devCode") String devCode);
+
+    void updateIotDeviceExtInfo(@Param("devBid") String devBid, @Param("extInfo") String extInfo, @Param("updateDate") String updateDate);
 
     List<IotDevice> selectIotDeviceList(IotDevice iotDevice);
 
     public int updateIotDeviceStatusByDevBidList(List<String> devBidList);
 
-    public int updateIotDeviceStatusByDevCodeList(@Param("devStatus") String devStatus,@Param("list") List<String> devCodeList,@Param("firmBid") String firmBid,@Param("devtypeBid")String devtypeBid);
-
+    public int updateIotDeviceStatusByDevCodeList(@Param("devStatus") String devStatus, @Param("list") List<String> devCodeList, @Param("firmBid") String firmBid, @Param("devtypeBid") String devtypeBid);
 
 
     public void updateIotDeviceByDevCodeAndFirmDev(IotDevice iotDevice);
@@ -94,7 +95,7 @@ public interface IotDeviceMapper {
 
     List<IotDevice> selectIotDeviceByIotDeviceDTO(IotDeviceDto iotDeviceDto);
 
-    int updateIotDeviceStatusByType(@Param("devStatus") String devStatus,@Param("firmBid") String firmBid,@Param("devtypeBid")String devtypeBid);
+    int updateIotDeviceStatusByType(@Param("devStatus") String devStatus, @Param("firmBid") String firmBid, @Param("devtypeBid") String devtypeBid);
 
     List<String> getDeviceCodesByDevconnBid(@Param("devconnBid") String devconnBid);
 

src/main/java/com/yunfeiyun/agmp/iots/service/impl/IotDeviceServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunfeiyun.agmp.iots.service.impl;
 
+import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.web.system.service.ISysConfigService;
 import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
@@ -124,7 +125,7 @@ public class IotDeviceServiceImpl implements IIotDeviceService {
      */
     @Override
     public int updateIotDevice(IotDevice iotDevice) {
-        if(needFakeStatus(iotDevice.getDevBid())){
+        if (needFakeStatus(iotDevice.getDevBid())) {
             iotDevice.setDevStatus("1");
         }
         return iotDeviceMapper.updateIotDevice(iotDevice);
@@ -200,7 +201,7 @@ public class IotDeviceServiceImpl implements IIotDeviceService {
 
     @Override
     public IotDevice selectDeviceByDeviceServiceNameAndDevCode(String deviceServiceName, String devCode) {
-        return iotDeviceMapper.selectDeviceByDeviceServiceNameAndDevCode(deviceServiceName,devCode);
+        return iotDeviceMapper.selectDeviceByDeviceServiceNameAndDevCode(deviceServiceName, devCode);
     }
 
     /**
@@ -220,7 +221,7 @@ public class IotDeviceServiceImpl implements IIotDeviceService {
     public int updateIotDeviceStatusByDevBidList(List<String> devBidList) {
         List<String> devBidList2 = new ArrayList<>();
         for (String devBid : devBidList) {
-            if(!needFakeStatus(devBid)){
+            if (!needFakeStatus(devBid)) {
                 devBidList2.add(devBid);
             }
         }
@@ -229,31 +230,32 @@ public class IotDeviceServiceImpl implements IIotDeviceService {
 
     @Override
     public void updateIotDeviceExtInfo(String devBid, String extInfo) {
-        iotDeviceMapper.updateIotDeviceExtInfo(devBid, extInfo);
+        String updateDate = DateUtils.dateTimeNow();
+        iotDeviceMapper.updateIotDeviceExtInfo(devBid, extInfo,updateDate);
     }
 
     @Override
     public void updateIotDeviceByDevCodeAndFirmDev(IotDevice iotDevice) {
-        if(needFakeStatus(iotDevice.getDevBid())){
+        if (needFakeStatus(iotDevice.getDevBid())) {
             iotDevice.setDevStatus("1");
         }
         iotDeviceMapper.updateIotDeviceByDevCodeAndFirmDev(iotDevice);
     }
 
     @Override
-    public void updateIotDeviceStatusByDevCodeList(String devStatus,List<String> devCodeList,String devtypeBid,String firmBid) {
+    public void updateIotDeviceStatusByDevCodeList(String devStatus, List<String> devCodeList, String devtypeBid, String firmBid) {
         List<String> devCodeList2 = new ArrayList<>();
         for (String devBid : devCodeList) {
-            if(!needFakeStatus(devBid)){
+            if (!needFakeStatus(devBid)) {
                 devCodeList2.add(devBid);
             }
         }
-        iotDeviceMapper.updateIotDeviceStatusByDevCodeList(devStatus,devCodeList2,devtypeBid,firmBid);
+        iotDeviceMapper.updateIotDeviceStatusByDevCodeList(devStatus, devCodeList2, devtypeBid, firmBid);
     }
 
     @Override
-    public int updateIotDeviceStatusByType(String devStatus, String firmBid,String devtypeBid ) {
-        return iotDeviceMapper.updateIotDeviceStatusByType(devStatus,firmBid,devtypeBid);
+    public int updateIotDeviceStatusByType(String devStatus, String firmBid, String devtypeBid) {
+        return iotDeviceMapper.updateIotDeviceStatusByType(devStatus, firmBid, devtypeBid);
     }
 
     /**
@@ -292,9 +294,9 @@ public class IotDeviceServiceImpl implements IIotDeviceService {
     public Map<String, List<IotDevice>> getXphHttpDeviceMapByDevtypeBids(String firmBizId, List<String> devtypeBids) {
         List<IotDevice> iotDeviceList = getDeviceListByDevtypeBids(firmBizId, devtypeBids);
         Map<String, List<IotDevice>> iotDeviceMap = new HashMap<>();
-        for(IotDevice iotDevice: iotDeviceList){
+        for (IotDevice iotDevice : iotDeviceList) {
             String devCode = iotDevice.getDevCode();
-            if(!iotDeviceMap.containsKey(devCode)){
+            if (!iotDeviceMap.containsKey(devCode)) {
                 iotDeviceMap.put(devCode, new ArrayList<>());
             }
             iotDeviceMap.get(devCode).add(iotDevice);
@@ -309,7 +311,7 @@ public class IotDeviceServiceImpl implements IIotDeviceService {
     @Override
     public void updateIotDeviceBatch(List<IotDevice> iotDeviceList) {
         for (IotDevice iotDevice : iotDeviceList) {
-            if(needFakeStatus(iotDevice.getDevBid())){
+            if (needFakeStatus(iotDevice.getDevBid())) {
                 iotDevice.setDevStatus("1");
             }
         }
@@ -335,15 +337,16 @@ public class IotDeviceServiceImpl implements IIotDeviceService {
 
     /**
      * 是否是属于需要忽略状态的设备
+     *
      * @param devBid
      * @return
      */
-    private boolean needFakeStatus(String devBid){
+    private boolean needFakeStatus(String devBid) {
         String ignorStatusDeviceList = sysConfigService.selectConfigValueByCommonKey("iot_ignor_status_devicelist");
         String[] ignorStatusDevBids = ignorStatusDeviceList.split(",");
         //判断devbid是否在忽略状态设备列表中
-        for(String ignorDevBid : ignorStatusDevBids){
-            if(ignorDevBid.equals(devBid)){
+        for (String ignorDevBid : ignorStatusDevBids) {
+            if (ignorDevBid.equals(devBid)) {
                 return true;
             }
         }

src/main/java/com/yunfeiyun/agmp/iots/task/IotStatusService.java

@@ -40,7 +40,6 @@ public class IotStatusService {
     @Autowired
     private MqttManager mqttManager;
 
-
     @PostConstruct
     void init() {
         // 目前基于已经实现将最新数据放到DeviceConfig的设备，没有的将进行实现
@@ -64,7 +63,6 @@ public class IotStatusService {
         //validateDeviceType.add(IotDeviceDictConst.TYPE_BY_SFJ);// 云飞水肥机
         //validateDeviceType.add(IotDeviceDictConst.TYPE_HT_SFJ);// 宏泰水肥机
 
-        //validateDeviceType.add(IotDeviceDictConst.TYPE_YF_QXZ);//云飞气象站
         try {
             validateStatusByDevType();
         } catch (Exception e) {

src/main/java/com/yunfeiyun/agmp/iots/task/YbqScheduler.java

@@ -186,7 +186,7 @@ public class YbqScheduler {
         log.info("【开始】同步上报数据任务执行于 {}", endTime);
         for (YbqTypeConst ybqTypeConst : ybqTypeConsts) {
             try {
-                log.debug("正在处理设备类型: {}", ybqTypeConst.getMessage());
+                log.info("正在处理设备类型: {}", ybqTypeConst.getMessage());
                 // 同步各类设备预测数据
                 List<IotDevice> iotDevices = getDevListByServiceName(ybqTypeConst.getServiceName());
                 for (IotDevice iotDevice : iotDevices) {
@@ -316,10 +316,10 @@ public class YbqScheduler {
      * @return 设备列表
      */
     public List<IotDevice> getDevListByServiceName(String serviceName) {
-        log.debug("开始根据服务名称 [{}] 查询设备", serviceName);
+        log.info("开始根据服务名称 [{}] 查询设备", serviceName);
         List<String> devTypeBidList = Arrays.asList(serviceName);
         List<IotDevice> iotDevices = iIotDeviceService.selectIotDeviceByDevtypeBidList(devTypeBidList);
-        log.debug("根据服务名称 [{}] 查询到 {} 台设备", serviceName, iotDevices.size());
+        log.info("根据服务名称 [{}] 查询到 {} 台设备", serviceName, iotDevices.size());
         return iotDevices;
     }
 }