预案执行代码合并

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/RiskSourceController.java

@@ -635,6 +635,7 @@ public class RiskSourceController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "重点设备启动预案", notes = "重点设备启动预案")
     @RequestMapping(value = "/startEquipReserve", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public ResponseModel startEquipReserve(@RequestParam Long id, @RequestParam String typeCode) {
+
         ReserveEnum reserveEnum = riskSourceService.startEquipReserve(id, typeCode);
         Integer status = reserveEnum.getStatus();
         String text = reserveEnum.getText();

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/DataRefreshServiceImpl.java

@@ -41,6 +41,7 @@ public class DataRefreshServiceImpl implements IDataRefreshService {
 
     @Override
     public void sendRefreshDataWithArea(String areaType, Map content) {
+
         Map<String,Object> sendData = new HashMap<>(2);
         sendData.put("refreshType",areaType);
         sendData.put("content",content);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentServiceImpl.java

@@ -517,6 +517,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
     @Override
     public List<Object> getReserveEquipById(Long id, String typeCode) {
+
         return iEquipmentDao.getReserveEquipById(id, typeCode);
     }
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/HandlerMqttMessageImpl.java

@@ -145,6 +145,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
 
     @Override
     public void handlerMqttMessage(String topic, String data) {
+
         TopicEntityVo topicEntity = JSON.parseObject(data, TopicEntityVo.class);
         log.info("iotCode 性能指标属于： " + topicEntity.getType());
         EquipmentSpecificIndexVo equipmentSpecificIndex = JSONObject.parseObject(topicEntity.getMessage(), EquipmentSpecificIndexVo.class);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -1048,6 +1048,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Override
     @Transactional
     public ReserveEnum startEquipReserve(Long id, String typeCode) {
+
+
         int count = equipmentService.countByStatus(NumberEnum.ONE.getValue());
         if (count > NumberEnum.ZERO.getValue()) {
             return ReserveEnum.RUNNING;