bug修改提交

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -347,13 +347,13 @@ public class ContingencyAction implements CustomerAction {
         SafteyPlanResult result = new SafteyPlanResult();
         Map<String, Object> tempmap1 = new HashMap<>();
         try {
-        	SimpleDateFormat sdf = new SimpleDateFormat("YYYY/MM/DD HH:mm:ss");
+        	SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         	List<ContingencyPlanInstance> list = iContingencyInstance.queryForTimeLine(contingencyRo.getBatchNo(), "MESSAGE");
         	ArrayList records = new ArrayList<>();
         	if (!ObjectUtils.isEmpty(list)) {
         		list.forEach(action -> {
         			HashMap map = new HashMap();
-            		map.put("time", sdf.format(action.getCreateDate()));
+            		map.put("time", sdf1.format(action.getCreateDate().getTime()));
             		map.put("stepName", action.getContent());
             		records.add(map);
             	});
@@ -554,13 +554,14 @@ public class ContingencyAction implements CustomerAction {
         SafteyPlanResult result = new SafteyPlanResult();
         Map<String, Object> tempmap1 = new HashMap<>();
         try {
-        	SimpleDateFormat sdf = new SimpleDateFormat("YYYY/MM/DD HH:mm:ss");
+        	SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         	List<ContingencyPlanInstance> list = iContingencyInstance.queryForTimeLine(contingencyRo.getBatchNo(), "MESSAGE");
         	ArrayList records = new ArrayList<>();
         	if (!ObjectUtils.isEmpty(list)) {
         		list.forEach(action -> {
         			HashMap map = new HashMap();
-            		map.put("time", sdf.format(action.getCreateDate()));
+//            		map.put("time", sdf.format(action.getCreateDate()));
+                    map.put("time", sdf1.format(action.getCreateDate().getTime()));
             		map.put("stepName", action.getContent());
             		records.add(map);
             	});

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/ContingencyRo.java

@@ -16,7 +16,7 @@ public class ContingencyRo implements Serializable {
     /**
 	 *
 	 */
-	private static final long serialVersionUID = 1863437780244849215L;
+	private static final long serialVersionUID =  -6721135143373410586L;
 	@Label("消防设备名称")
 	private String fireEquipmentName;//消防设备名称
 	@Label("消防设备id")

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

@@ -412,6 +412,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
         }
         PlanDetail planEntity = new PlanDetail();
         BeanUtils.copyProperties(planDetail, planEntity);
+        planEntity.setOrgCode(oldPlan.getOrgCode());
+        planEntity.setCreator(oldPlan.getCreator());
         planDetailDao.saveAndFlush(planEntity);
 
         planDoc.setPlanId(planId);

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

@@ -433,9 +433,9 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         }
         contingencyRo.setTelemetryMap(telemetryMap);
 
-        log.debug("开始调用规则 参数 contingencyRo{},reservePlan{},equipmentNames"+contingencyRo.toString()+","+equipment.getReservePlan()+","+ ArrayUtils.toArray(equipment.getName()));
+        log.info("开始调用规则 参数 contingencyRo{},reservePlan{},equipmentNames"+contingencyRo.toString()+","+equipment.getReservePlan()+","+ ArrayUtils.toArray(equipment.getName()));
         Object result = ruleTrigger.publish(contingencyRo, equipment.getReservePlan(), ArrayUtils.toArray(equipment.getName()));
-        log.debug("规则调用返回==",result);
+        log.info("规则调用返回==",result);
 
         ContingencyOriginalData contingencyOriginalData = new ContingencyOriginalData();
         BeanUtils.copyProperties(contingencyRo, contingencyOriginalData);