skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
@@ -282,9 +282,9 @@ // 超汛限水位 if (s.equals("over_z")) { String is_danger_res = "is_danger_res"; if (jsonArray.getJSONObject(i).getString(is_danger_res).equals("true")) { if (null!= jsonArray.getJSONObject(i).getString(is_danger_res) && jsonArray.getJSONObject(i).getString(is_danger_res).equals("true")) { format = format + "控制运用水位" + jsonArray.getJSONObject(i).getString(s); } else if (jsonArray.getJSONObject(i).getString(is_danger_res).equals("false")) { } else if (null!= jsonArray.getJSONObject(i).getString(is_danger_res) && jsonArray.getJSONObject(i).getString(is_danger_res).equals("false")) { format = format + "汛限水位" + jsonArray.getJSONObject(i).getString(s); } else { format = format + jsonArray.getJSONObject(i).getString(s); skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java
@@ -15,6 +15,7 @@ import org.springframework.web.client.RestTemplate; import java.util.*; import java.util.concurrent.atomic.AtomicReference; @Service @AllArgsConstructor @@ -37,32 +38,27 @@ // 加入测试人员 addSendMsgTest(messageRecordList); List<String> cIdList = new ArrayList<>(); AtomicReference<Boolean> push = new AtomicReference<>(false); //相同的消息推送给多用户 messageRecordList.forEach(messageRecord -> { //获取用户cId String clientId = getClientIdByUserId(messageRecord.getRecipient()); cIdList.add(clientId); if (null!=clientId && !clientId.equals("")) { cIdList.add(clientId); PushVO pushVO = new PushVO(); pushVO.setCIds(cIdList); pushVO.setTitle(messageRecord.getTheme()); pushVO.setContent(messageRecord.getContent()); HashMap<String, Object> payload = new HashMap<>(); payload.put("title",messageRecord.getTheme()); payload.put("content", messageRecord.getContent()); payload.put("payload", "test"); pushVO.setPayload(payload); push.set(pushMessage(pushVO)); } }); //uni-push 一次推送最多500名用户，所以分批推送 List<List<String>> groupList = groupListByQuantity(cIdList, 400); Boolean push = false; for(List<String> cids :groupList){ PushVO pushVO = new PushVO(); pushVO.setCIds(cids); pushVO.setTitle(messageRecordList.get(0).getTheme()); pushVO.setContent(messageRecordList.get(0).getContent()); HashMap<String, Object> payload = new HashMap<>(); payload.put("title", messageRecordList.get(0).getTheme()); payload.put("content", messageRecordList.get(0).getContent()); payload.put("payload", "test"); pushVO.setPayload(payload); push = pushMessage(pushVO); } return push; return push.get(); } /** skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml
@@ -36,16 +36,21 @@ <select id="selectMyPage" resultMap="vo"> SELECT MM.*, arb."res_reg_code" as resRegCode,arb."eng_scal" as engScal, aab1."ad_name" cityName, aab2."ad_name" countyName, aab3."ad_name" townName, case when b."ad_grad" = 4 THEN b."ad_name" ELSE NULL END AS townName, case when b."ad_grad" = 3 THEN b."ad_name" when c."ad_grad" = 3 THEN c."ad_name" END AS countyName, case when b."ad_grad" = 2 THEN b."ad_name" when c."ad_grad" = 2 THEN c."ad_name" ELSE d."ad_name" END AS cityName, BDB.DICT_VALUE materialTypeName FROM SM_MATERIALS_MANAGE MM LEFT JOIN SJZT_MD."att_ad_base" aab1 ON aab1."guid" = MM.city LEFT JOIN SJZT_MD."att_ad_base" aab2 ON aab2."guid" = MM.county LEFT JOIN SJZT_MD."att_ad_base" aab3 ON aab3."guid" = MM.town LEFT JOIN BLADE_DICT_BIZ BDB ON MM.MATERIALS_TYPE = BDB.DICT_KEY LEFT JOIN SJZT_MD."att_res_base" arb ON MM.res_guid = arb."guid" LEFT JOIN SJZT_MD."att_ad_base" b ON arb."interior_ad_guid" = b."guid" LEFT JOIN SJZT_MD."att_ad_base" c ON b."p_ad_code" = c."guid" LEFT JOIN SJZT_MD."att_ad_base" d ON c."p_ad_code" = d."guid" LEFT JOIN BLADE_DICT_BIZ BDB ON MM.MATERIALS_TYPE = BDB.DICT_KEY WHERE MM.IS_DELETED = 0 AND BDB.CODE='MATERIALS_TYPE' <if test="vo.resName !=null and vo.resName !=''"> AND MM.RES_NAME LIKE CONCAT('%',#{vo.resName},'%') skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/RescueTeamManageMapper.xml
@@ -5,14 +5,19 @@ <select id="selectMyPage" resultType="cn.gistack.sm.materials.vo.RescueTeamManageVO"> SELECT RM.*, arb."res_reg_code" as resRegCode,arb."eng_scal" as engScal, aab1."ad_name" cityName, aab2."ad_name" countyName, aab3."ad_name" townName case when b."ad_grad" = 4 THEN b."ad_name" ELSE NULL END AS townName, case when b."ad_grad" = 3 THEN b."ad_name" when c."ad_grad" = 3 THEN c."ad_name" END AS countyName, case when b."ad_grad" = 2 THEN b."ad_name" when c."ad_grad" = 2 THEN c."ad_name" ELSE d."ad_name" END AS cityName FROM SM_RESCUETEAM_MANAGE RM LEFT JOIN SJZT_MD."att_ad_base" aab1 ON aab1."guid" = RM.city LEFT JOIN SJZT_MD."att_ad_base" aab2 ON aab2."guid" = RM.county LEFT JOIN SJZT_MD."att_ad_base" aab3 ON aab3."guid" = RM.town LEFT JOIN SJZT_MD."att_res_base" arb ON RM.res_guid = arb."guid" LEFT JOIN SJZT_MD."att_ad_base" b ON arb."interior_ad_guid" = b."guid" LEFT JOIN SJZT_MD."att_ad_base" c ON b."p_ad_code" = c."guid" LEFT JOIN SJZT_MD."att_ad_base" d ON c."p_ad_code" = d."guid" WHERE RM.IS_DELETED = 0 <if test="vo.resName !=null and vo.resName !=''"> AND RM.RES_NAME LIKE CONCAT('%',#{vo.resName},'%')
