Merge branch 'dev_upgrade' into dev_upgrade-1225

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

@@ -647,6 +647,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

@@ -88,9 +88,10 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
     @Autowired
     private RedisTemplate redisTemplate;
-    
-//    @Autowired
-//    private IFmeaEquipmentPointDao iFmeaEquipmentPointDao;
+
+
+    @Autowired
+    private IFmeaEquipmentPointDao iFmeaEquipmentPointDao;
 
 //    @Autowired
 //    private MongoTemplate mongoTemplate;
@@ -103,7 +104,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
 	@Autowired
 	private RemoteSecurityService remoteSecurityService;
-    
+
     public Equipment save(Equipment equipment) {
         Long eqId = equipment.getId();
         equipment = iEquipmentDao.saveAndFlush(equipment);
@@ -133,7 +134,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
     		}
             if (equipment != null) {
             	List<EquipmentFireEquipment> eqFireEqs = equipmentFireEquipmentDao.findAllByEquipmentId(equipment.getId());
-            	
+
             	if(!eqFireEqs.isEmpty()){
             		equipmentFireEquipmentDao.deleteAll(eqFireEqs);
             	}
@@ -141,7 +142,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
             } else {
                 throw new Exception("找不到指定的对象:" + id);
             }
-            
+
             //删除重点设备关联关系
             equipmentFireEquipmentDao.deleteByEquipmentId(Long.valueOf(id));
         }
@@ -224,7 +225,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
         for (String id : fireEquipmentIds) {
             long result = 0;
             EquipmentFireEquipment equipmentFireEquipment = impAndFireEquipMapper.queryForOne(String.valueOf(id), String.valueOf(equipmentId));
-           
+
             if (equipmentFireEquipment != null) {
                 result = equipmentFireEquipment.getId();
                 this.equipmentFireEquipmentDao.deleteById(equipmentFireEquipment.getId());
@@ -348,25 +349,25 @@ public class EquipmentServiceImpl implements IEquipmentService {
         if (imgs == null || imgs.length < 1) {
             equipment = save(equipment);
             if (equipment.getCreateDate() == null) {
-            	
+
             	Optional<Equipment>  date=iEquipmentDao.findById(equipment.getId());
             	Equipment  equipment2=null;
         		if(date.isPresent()){
         			equipment2=date.get();
         		}
-            	
+
                 equipment.setCreateDate(equipment2.getCreateDate() == null ? new Date() : equipment2.getCreateDate());
             }
         } else {
             equipment = save(equipment);
             if (equipment.getCreateDate() == null) {
-            	
+
             	Optional<Equipment>  date=iEquipmentDao.findById(equipment.getId());
             	Equipment  equipment2=null;
         		if(date.isPresent()){
         			equipment2=date.get();
         		}
-            	
+
                 equipment.setCreateDate(equipment2.getCreateDate() == null ? new Date() : equipment2.getCreateDate());
             }
             Long equipmentId = Long.valueOf(equipment.getId());
@@ -450,7 +451,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
     	EquipDetailsResponse equipDetailsResponse =  fireEquipMapper.findEquipDetailsById(id);
     	AgencyUserModel user = remoteSecurityService.getUserById(toke, product, appKey, equipDetailsResponse.getUserId());
     	equipDetailsResponse.setUsername(user.getRealName());
-    	equipDetailsResponse.setTel(user.getMobile());    	
+    	equipDetailsResponse.setTel(user.getMobile());
     	if(user.getCompanys().get(0)!=null)
     	{
     		CompanyModel companyModel = user.getCompanys().get(0);
@@ -462,7 +463,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
     				equipDetailsResponse.setDepName(departList.get(0).getDepartmentName());
     			}
     		}
-    	}   	
+    	}
         return equipDetailsResponse;
     }
 
@@ -510,6 +511,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

@@ -118,6 +118,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

@@ -945,6 +945,45 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         return "SUCCESS";
     }
 
+
+    @Override
+    @Transactional
+    public ReserveEnum startEquipReserve(Long id, String typeCode) {
+
+
+        int count = equipmentService.countByStatus(NumberEnum.ONE.getValue());
+        if (count > NumberEnum.ZERO.getValue()) {
+            return ReserveEnum.RUNNING;
+        } else {
+            List<Object> list = equipmentService.getReserveEquipById(id, typeCode);
+            if (!CollectionUtils.isEmpty(list)) {
+                EquipmentSpecificIndexVo equipmentSpecificIndexVo = new EquipmentSpecificIndexVo();
+                equipmentSpecificIndexVo.setEquipmentSpecificId(Long.parseLong(list.get(NumberEnum.ZERO.getValue()).toString()));
+                equipmentSpecificIndexVo.setType(typeCode);
+
+                TopicEntityVo topicEntity = new TopicEntityVo();
+                topicEntity.setMessage(JSON.toJSONString(equipmentSpecificIndexVo));
+
+                String data = JSON.toJSONString(topicEntity);
+                System.out.println(data);
+                iEquipmentHandlerService.handlerMqttMessage("",data );
+
+                Equipment equipment = equipmentService.queryOne(id);
+                if (equipment != null) {
+                    equipment.setStartTime(DateUtil.getDateNow());
+                    equipment.setEndTime(null);
+                    equipment.setReserveSource(NumberEnum.ONE.getValue());
+                    equipment.setStatus(NumberEnum.ONE.getValue());
+                    equipmentService.save(equipment);
+                    return ReserveEnum.RUN;
+                }
+                return ReserveEnum.NOEQUIP;
+            } else {
+                return ReserveEnum.NOFIRE;
+            }
+        }
+    }
+
     /**
      * webSocket向前台推送消防设备数据
      *
@@ -1876,10 +1915,5 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         return null;
     }
 
-	@Override
-	public ReserveEnum startEquipReserve(Long id, String typeCode) {
-		// TODO Auto-generated method stub
-		return null;
-	}
 }