解决冲突

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertFormValueMapper.xml

@@ -32,7 +32,14 @@
 		i.alert_type_code groupCode,
 		i.rec_date recDate,
 		<foreach collection="fieldCodes" item="item" index="key" separator=",">
-			MAX(CASE WHEN i.FIELD_CODE = #{item} THEN i.FIELD_VALUE ELSE '' END) as ${item}
+		       <choose>
+				<when test="item == 'flightNumber'">
+					MAX(CASE WHEN i.FIELD_CODE = #{item} THEN i.FIELD_VALUE_CODE ELSE '' END) as ${item}
+				</when>
+		       	<otherwise>
+					MAX(CASE WHEN i.FIELD_CODE = #{item} THEN i.FIELD_VALUE ELSE '' END) as ${item}
+				</otherwise>
+			   </choose>
 		</foreach>
 		from
 		jc_alert_form_value i

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java

@@ -788,39 +788,42 @@ public class TopographyController extends AbstractBaseController {
                 for (int i = 0; i < timeList.size(); i++) {
                     TopographyIotVo iotVo = new TopographyIotVo();
                     List<TopographyIotDataVO> lists = new ArrayList<>();
+                    TopographyIotDataVO dataVO = new TopographyIotDataVO();
+
 //                    if (i == 0) {
 //                        map.put(iotDatalist.get(i).getKey(), iotDatalist.get(i).getValue());
 //                    }
 //                    if (map.containsKey(iotDatalist.get(i).getKey())) {
 //                        j++;
 //                    }
-                    for (EquipmentSpecificIndex x : indexes) {
-                        if (x.getNameKey().equals(iotDatalist.get(i).getKey())) {
-                            TopographyIotDataVO dataVO = new TopographyIotDataVO();
-                            dataVO.setId(x.getId());
-                            dataVO.setName(x.getIndexName());
-                            dataVO.setValue(x.getValue());
-                            dataVO.setUnit(x.getIndexUnitName());
-                            lists.add(dataVO);
-                            iotVo.setList(lists);
-                            try {
-                                //Date date = DateUtils.dateParse(String.valueOf(timeList.get(j-1).getValue()), DateUtils.DATE_TIME_T_PATTERN);
-
-                                String value = String.valueOf(timeList.get(i).getValue());
-                                String strDate = value.substring(0, 19);
-                                SimpleDateFormat sdf = new SimpleDateFormat(ISO8601_DATE_HOUR_MIN_SEC);
-                                SimpleDateFormat sdf1 = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
-                                sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
-                                Date date1 = sdf.parse(strDate);
-                                String time = DateTimeUtil.format(date1, DateTimeUtil.ISO_DATE_HOUR24_MIN_SEC);
-
-                                iotVo.setTime(sdf1.parse(time));
-                            } catch (Exception e) {
-                                e.printStackTrace();
+                    for (IotDataVO iotDataVO : iotDatalist) {
+                        for (EquipmentSpecificIndex x : indexes) {
+                            if (x.getNameKey().equals(iotDataVO.getKey())) {
+                                dataVO.setId(x.getId());
+                                dataVO.setName(x.getIndexName());
+                                dataVO.setValue(x.getValue());
+                                dataVO.setUnit(x.getIndexUnitName());
+                                try {
+                                    //Date date = DateUtils.dateParse(String.valueOf(timeList.get(j-1).getValue()), DateUtils.DATE_TIME_T_PATTERN);
+                                    String value = String.valueOf(timeList.get(i).getValue());
+                                    String strDate = value.substring(0, 19);
+                                    SimpleDateFormat sdf = new SimpleDateFormat(ISO8601_DATE_HOUR_MIN_SEC);
+                                    SimpleDateFormat sdf1 = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
+                                    sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+                                    Date date1 = sdf.parse(strDate);
+                                    String time = DateTimeUtil.format(date1, DateTimeUtil.ISO_DATE_HOUR24_MIN_SEC);
+
+                                    iotVo.setTime(sdf1.parse(time));
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+
                             }
-                            list.add(iotVo);
                         }
                     }
+                    lists.add(dataVO);
+                    iotVo.setList(lists);
+                    list.add(iotVo);
                 }
             }
             List<TopographyIotVo> result = list.stream().sorted(Comparator.comparing(TopographyIotVo::getTime).reversed()).collect(Collectors.toList());

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

@@ -751,7 +751,13 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				// 增加非空判断 cz 2021-10-08
 				if (calledMap.get(Long.parseLong(i.get("instanceId").toString())) != null) {
 					AlertCalled alertCalled = calledMap.get(Long.parseLong(i.get("instanceId").toString()));
-					i.putAll(Bean.BeantoMap(alertCalled));
+					Map<String, Object> map = Bean.BeantoMap(alertCalled);
+					map.remove("forcedLandingTrack");
+					map.remove("flightNumber");
+					map.remove("landingTime");
+					map.remove("taskTime");
+					map.remove("seat");
+					i.putAll(map);
 				}
 			});
 		}