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

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

@@ -269,13 +269,13 @@ public class AlertSubmittedController extends BaseController {
         definitions.put("$type",alertCalled.getAlertType());
         definitions.put("$callTime", DateUtils.convertDateToString(alertCalled.getCallTime(),DateUtils.DATE_TIME_PATTERN));
         definitions.put("$replaceContent",replaceContent);
-        definitions.put("$address",alertCalled.getAddress());
+        definitions.put("$address",ValidationUtil.isEmpty(alertCalled.getAddress()) ? "" : alertCalled.getAddress());
         definitions.put("$recDate",DateUtils.convertDateToString(alertCalled.getRecDate(),DateUtils.DATE_TIME_PATTERN));
 
-        definitions.put("$contactUser",ValidationUtil.isEmpty(alertCalled.getContactUser()) ? "无" : alertCalled.getContactUser());
-        definitions.put("$trappedNum",ValidationUtil.isEmpty(alertCalledRo.getTrappedNum()) ? "无" : String.valueOf(alertCalled.getTrappedNum()));
-        definitions.put("$casualtiesNum",ValidationUtil.isEmpty(alertCalled.getCasualtiesNum()) ? "无" : String.valueOf(alertCalled.getCasualtiesNum()));
-        definitions.put("$contactPhone",ValidationUtil.isEmpty(alertCalled.getContactPhone()) ? "无" :  alertCalled.getContactPhone());
+        definitions.put("$contactUser",ValidationUtil.isEmpty(alertCalled.getContactUser()) ? "" : alertCalled.getContactUser());
+        definitions.put("$trappedNum",ValidationUtil.isEmpty(alertCalledRo.getTrappedNum()) ? "" : String.valueOf(alertCalled.getTrappedNum()));
+        definitions.put("$casualtiesNum",ValidationUtil.isEmpty(alertCalled.getCasualtiesNum()) ? "" : String.valueOf(alertCalled.getCasualtiesNum()));
+        definitions.put("$contactPhone",ValidationUtil.isEmpty(alertCalled.getContactPhone()) ? "" :  alertCalled.getContactPhone());
 
         String  companyName = JSONObject.parseObject(schedulingContent.getSubmissionContent()).getString("companyName") ;
 

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

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -1157,7 +1159,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 //	}
 
 	private Object getIdsList1(String type  ,String condition1, String condition2, String condition3)throws Exception {
-		List<Object> resultList = new ArrayList<Object>();
+		List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
 		
 		ResponseModel<Object> responseForcondition1Name = knowledgebaseFeignClient
 				.queryListByTagName(condition1.split(",")[0]);
@@ -1254,7 +1256,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				if (ObjectUtils.isNotEmpty(SimpleDetailResponse.getResult()) && priority != 0) {
 					JSONArray detailJsonArray =	JSONArray.parseArray(JSONArray.toJSONString(SimpleDetailResponse.getResult()));
 					JSONObject detailJsonObject= detailJsonArray.getJSONObject(0);
-					map.put("recDate",detailJsonObject.getString("REC_DATE"));
+					map.put("recDate",DateUtils.dateToString(detailJsonObject.getString("REC_DATE")));
 					map.put("sequenceNbr", detailJsonObject.getString("SEQUENCE_NBR"));
 					map.put("docTitle", detailJsonObject.getString("DOC_TITLE"));
 					map.put("priority", priority);
@@ -1262,6 +1264,45 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				}
 			}
 		}
+	sort(resultList);
 		return resultList;
 	}
+	public  void sort(List<Map<String, Object>> list) {
+		Collections.sort(list, new Comparator<Map<String, Object>>() {
+			public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+				return (Integer) o1.get("priority") < (Integer) o2
+						.get("priority") ? ((Integer) o1.get("priority") == (Integer) o2
+						.get("priority") ? 0 : -1) : 1;
+			}
+		});
+	}
+
+//	
+//	public static void main(String[] args) {
+//		List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
+//		Map<String, Object> map = new HashMap<String, Object>();
+//		map.put("docTitle", "21313213");
+//		map.put("priority", 21);
+//		resultList.add(map);
+//		Map<String, Object> map1 = new HashMap<String, Object>();
+//		map1.put("docTitle", "21313213");
+//		map1.put("priority", 12);
+//		resultList.add(map1);
+//		Map<String, Object> map2 = new HashMap<String, Object>();
+//		map2.put("docTitle", "21313213");
+//		map2.put("priority", 1);
+//		resultList.add(map2);
+//		Map<String, Object> map3 = new HashMap<String, Object>();
+//		map3.put("docTitle", "21313213");
+//		map3.put("priority", 31);
+//		resultList.add(map3);
+//		Map<String, Object> map4 = new HashMap<String, Object>();
+//		map4.put("docTitle", "21313213");
+//		map4.put("priority", 18);
+//		resultList.add(map4);
+//		sort(resultList);
+//		for (Map<String, Object> map6 : resultList) {
+//			System.out.println(map6.get("priority"));
+//		}
+//	}
 }