Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/IotFeignClient.java

@@ -29,4 +29,6 @@ public interface IotFeignClient {
     @RequestMapping(value = "/v1/iot/DynamicFlightInfo/list", method = RequestMethod.GET)
     ResponseModel<List<Map<String, Object>>> findImgByFileCategory();
     
+    @RequestMapping(value = "/v1/iot/DynamicFlightInfo/detail/{dynamicFlightId}", method = RequestMethod.GET)
+    ResponseModel<Map<String, Object>> findImgByDynamicFlightId(@PathVariable String dynamicFlightId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/DictTypeEnum.java

@@ -17,11 +17,7 @@ public enum DictTypeEnum {
     EQUIPTYPE("设备类型","EQUIP_TYPE"),
     DANGERLEVEL("隐患等级", "DANGER_LEVEL"),
     OUTERPOINTTYPE("导入外部安全检查表分类", "OUTER_POINT_TYPE"),
-    MAINTENANCE_CLASSIFY("维保项分类","MAINTENANCE_CLASSIFY"),
-    CHECK_ITEM_CLASSIFY("消防监督检查项分类","CHECK_ITEM_CLASSIFY"),
-    CHECK_ITEM_TYPE("消防监督检查类别","CHECK_ITEM_TYPE"),
-    CHECK_ITEM_LEVEL("消防监督检查项等级","CHECK_ITEM_LEVEL"),
-    CHECK_ITEM_CONTENT("消防监督检查类型","CHECK_ITEM_CONTENT");
+    MAINTENANCE_CLASSIFY("维保项分类","MAINTENANCE_CLASSIFY");
 
     /**
      * 名称，描述

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/SupervisionDictEnum.java

+package com.yeejoin.amos.supervision.common.enums;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 消防监督枚举对象
+ * @author maoying
+ *
+ */
+public enum SupervisionDictEnum {
+
+    CHECK_ITEM_CLASSIFY("消防监督检查项分类","CHECK_ITEM_CLASSIFY"),
+    CHECK_ITEM_TYPE("消防监督检查类别","CHECK_ITEM_TYPE"),
+    CHECK_ITEM_LEVEL("消防监督检查项等级","CHECK_ITEM_LEVEL"),
+    CHECK_ITEM_CONTENT("消防监督检查类型","CHECK_ITEM_CONTENT");
+
+    /**
+     * 名称，描述
+     */
+    private String name;
+    /**
+     * 编码
+     */
+    private String code;
+
+    private SupervisionDictEnum(String name, String code){
+        this.name = name;
+        this.code = code;
+    }
+
+    public static SupervisionDictEnum getEnum(String code) {
+        SupervisionDictEnum instance = null;
+        for(SupervisionDictEnum type: SupervisionDictEnum.values()) {
+            if (type.getCode().equals(code)) {
+                instance = type;
+                break;
+            }
+        }
+
+        return instance;
+    }
+
+    public static List<Map<String,String>> getEnumList() {
+        List<Map<String,String>> list = new ArrayList<>();
+        for(SupervisionDictEnum e : SupervisionDictEnum.values()) {
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("code", e.getCode());
+            map.put("name", e.getName());
+            list.add(map);
+        }
+        return list;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AircraftController.java

@@ -194,6 +194,7 @@ public class AircraftController extends BaseController {
     		Map<String, Object> map= dataModel.getResult();
     		if(map!=null) {
     			  map1.put("aircraftModel", map.get("aircraftType"));
+    			  map1.put("dynamicFlightId", map.get("dynamicFlightId"));
     	          map1.put("landingTime", map.get("sta"));
 //    	          map1.put("fuelQuantity", map.get(""));
     	          map1.put("passengerCapacity", map.get("psgNumTotal"));  
@@ -227,7 +228,7 @@ public class AircraftController extends BaseController {
             }
         }
         Map<String, Object> map=new HashedMap();
-        ResponseModel<Map<String, Object>>  dataModel=   iotFeignClient.getDynamicFlightInfo(num);
+        ResponseModel<Map<String, Object>>  dataModel=   iotFeignClient.findImgByDynamicFlightId(num);
         if(dataModel!=null) {
            map= dataModel.getResult();
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -376,7 +376,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
         listdate.add(new KeyValueLabel("联系电话", "contactPhone", alertCalled.getContactPhone()));
         listdate.add(new KeyValueLabel("联系人电话", "contactPhone", alertCalled.getContactPhone()));
         list.stream().forEach(AlertFormValue -> {
-            listdate.add(new KeyValueLabel(AlertFormValue.getFieldName(), AlertFormValue.getFieldCode(), AlertFormValue.getFieldValue()));
+        	String valueCode = AlertFormValue.getFieldValueCode();
+        	if(null == valueCode) {
+        		valueCode = AlertFormValue.getFieldValue();
+        	}
+            listdate.add(new KeyValueLabel(AlertFormValue.getFieldName(), AlertFormValue.getFieldCode(),valueCode));
         });
         map.put("data", listdate);
         return map;

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/InputItemServiceImpl.java

@@ -15,6 +15,7 @@ import com.yeejoin.amos.supervision.business.vo.InputItemTemplateVo;
 import com.yeejoin.amos.supervision.business.vo.InputItemVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
 import com.yeejoin.amos.supervision.common.enums.DictTypeEnum;
+import com.yeejoin.amos.supervision.common.enums.SupervisionDictEnum;
 import com.yeejoin.amos.supervision.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.supervision.dao.entity.InputItem;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
@@ -98,7 +99,7 @@ public class InputItemServiceImpl implements IInputItemService {
     @Override
     public List<Map<String, Object>> generateDictionaryValue() {
         List<Map<String, Object>> list = new ArrayList<>();
-        for (Map<String, String> map : DictTypeEnum.getEnumList()) {
+        for (Map<String, String> map : SupervisionDictEnum.getEnumList()) {
             JSONArray jsonArray = remoteSecurityService.listDictionaryByDictCode(RequestContext.getToken(),
                     RequestContext.getProduct(), RequestContext.getAppKey(), map.get("code"));
             Map<String, Object> map1 = new HashMap<>();
@@ -110,20 +111,20 @@ public class InputItemServiceImpl implements IInputItemService {
                 m.put("name", jsonObject.get("dictDataValue").toString());
                 lists.add(m);
             }
-            if ("itemClassify".equals(map.get("code"))) {
-                map1.put("CHECK_ITEM_CLASSIFY", lists);
+            if ("CHECK_ITEM_CLASSIFY".equals(map.get("code"))) {
+                map1.put("itemClassify", lists);
                 list.add(map1);
             }
-            if ("itemType".equals(map.get("code"))) {
-                map1.put("CHECK_ITEM_TYPE", lists);
+            if ("CHECK_ITEM_TYPE".equals(map.get("code"))) {
+                map1.put("itemType", lists);
                 list.add(map1);
             }
-            if ("itemLevel".equals(map.get("code"))) {
-                map1.put("CHECK_ITEM_LEVEL", lists);
+            if ("CHECK_ITEM_LEVEL".equals(map.get("code"))) {
+                map1.put("itemLevel", lists);
                 list.add(map1);
             }
-            if ("checkType".equals(map.get("code"))) {
-                map1.put("CHECK_ITEM_CONTENT", lists);
+            if ("CHECK_ITEM_CONTENT".equals(map.get("code"))) {
+                map1.put("checkType", lists);
                 list.add(map1);
             }
         }

amos-boot-system-supervision/src/main/resources/application-dev.properties

 #DB properties:
-spring.datasource.url = jdbc:mysql://172.16.6.60:3306/amos-maintenance?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://172.16.11.20:3306/amos-supervision_v1.0?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username= root
 spring.datasource.password= root_123
 ## eureka properties: