bug修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -1520,7 +1520,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 EquipmentSpecificIndex data = getPressurePumpDateByType(indexKey,valueEnum, topicEntity, equipmentSpeIndexList, pressurePumpEnum);
                 Date newDate = new Date();
                 // 2. 校验
-                if (!ObjectUtils.isEmpty(data)) {
+                if (!ObjectUtils.isEmpty(data.getUpdateDate())) {
                     checkValueByDate(data, newDate, pressurePumpEnum);
                 }
             });
@@ -1530,7 +1530,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
     private EquipmentSpecificIndex getPressurePumpDateByType(String indexKey, PressurePumpValueEnum valueEnum, TopicEntityVo topicEntity, List<EquipmentSpecificIndex> equipmentSpeIndexList, PressurePumpEnum pressurePumpEnum) {
         String iotCode = topicEntity.getIotCode();
-        EquipmentSpecificIndex equipmentSpecificIndex = null;
+        EquipmentSpecificIndex equipmentSpecificIndex = new EquipmentSpecificIndex();
         String prefix = null;
         String suffix = null;
         if (iotCode.length() > 8) {
@@ -1600,7 +1600,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             String startTime = collect.get(0).get("time").substring(0, 19).replace("T", " ");
             Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTime), +8);
             listData.get(0).setUpdateDate(startDate);
-            equipmentSpecificIndex = listData.get(0);
+            BeanUtils.copyProperties(listData.get(0),equipmentSpecificIndex);
         }
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/HomeController.java

@@ -43,9 +43,7 @@ public class HomeController extends AbstractBaseController{
 	private IPlanTaskService planTaskService ;
 	/*@Autowired
 	private IUserService userService;*/
-	 @Autowired
-	    private RemoteSecurityService remoteSecurityService;
-	 
+
 	 @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "首页数据", notes = "首页数据")
 	@GetMapping(value="/overviewData")

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/SafetyController.java

@@ -51,9 +51,7 @@ public class SafetyController extends AbstractBaseController{
 	/*@Autowired
 	private AmosBankFeign pointService;*/
 
-	@Autowired
-    private RemoteSecurityService remoteSecurityService;
-	
+
 	 /**
      * 保存登陆用户选择公司信息
      */

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RouteServiceImpl.java

@@ -110,8 +110,7 @@ public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implement
 
     @Autowired
     private IRoutePointItemDao iRoutePointItemDao;
-    @Autowired
-    private RemoteSecurityService remoteSecurityService;
+
 
     @Override
     @Transactional