调试接口

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/DataRefreshTypeEum.java

@@ -17,11 +17,11 @@ public enum DataRefreshTypeEum {
     trouble("设备故障","trouble"),
     dutyChange("值班信息","dutyChange");
 
+	private String name;
+	
     private String code;
 
-    private String name;
-
-    DataRefreshTypeEum(String code,String name){
+    DataRefreshTypeEum(String name,String code){
         this.name = name;
         this.code = code;
     }

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

@@ -49,6 +49,9 @@ import org.typroject.tyboot.component.cache.Redis;
 import org.typroject.tyboot.component.cache.enumeration.CacheType;
 
 import javax.annotation.PostConstruct;
+
+import static org.hamcrest.CoreMatchers.nullValue;
+
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -1191,6 +1194,12 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             content.put("id",fireEquipmentData.getId());
             content.put("label",fireEquipmentData.getEqPointName());
             content.put("changeDate",fireEquipmentData.getCreateDate());
+            Optional<FireEquipment> fireEquipment = iFireEquipmentDao.findById(fireEquipmentPoint.getFireEquipmentId());
+            if(fireEquipment.isPresent()) {
+            	content.put("orgCode",fireEquipment.get().getOrgCode());
+            }else {
+            	log.info(fireEquipmentPoint.getFireEquipmentId() + "设备不存在！！！");
+            }
             iDataRefreshService.sendRefreshDataWithArea(DataRefreshTypeEum.monitor.getCode(),content);
         }