Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
780fb479 由 康伟
选项

kangwei：信息推送添加优先级

1 个父辈 5c6e48f0
内嵌 并排
正在显示 11 个修改的文件 包含 35 行增加 和 29 行删除
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/ERPPurchaseContractServiceImpl.java
...@@ -145,7 +145,7 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr ...@@ -145,7 +145,7 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
145 if("1".equals( purchaseContractVO.getStatus() )){ 145 if("1".equals( purchaseContractVO.getStatus() )){
146 //发送信息 146 //发送信息
147 String roleId = configService.queryValueByKey("TGHT_SP_ROLE_ID"); 147 String roleId = configService.queryValueByKey("TGHT_SP_ROLE_ID");
148 smsService.pushMsgNoProcessByRoleId("统购合同审批","有统购合同["+purchaseContractVO.getContractName()+"]需要审批审批",roleId,"PurchaseContract","13"); 148 smsService.pushMsgNoProcessByRoleId("统购合同审批","有统购合同["+purchaseContractVO.getContractName()+"]需要审批审批",roleId,"PurchaseContract","13","H");
149 } 149 }
150 } 150 }
151 151
...@@ -180,7 +180,7 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr ...@@ -180,7 +180,7 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
180 if("1".equals( purchaseContractVO.getStatus() )){ 180 if("1".equals( purchaseContractVO.getStatus() )){
181 //发送信息 181 //发送信息
182 String roleId = configService.queryValueByKey("TGHT_SP_ROLE_ID"); 182 String roleId = configService.queryValueByKey("TGHT_SP_ROLE_ID");
183 smsService.pushMsgNoProcessByRoleId("统购合同审批","有统购合同["+purchaseContractVO.getContractName()+"]需要审批审批",roleId,"PurchaseContract","13"); 183 smsService.pushMsgNoProcessByRoleId("统购合同审批","有统购合同["+purchaseContractVO.getContractName()+"]需要审批审批",roleId,"PurchaseContract","13","H");
184 } 184 }
185 return count > 0 ? true :false; 185 return count > 0 ? true :false;
186 } 186 }
...@@ -323,7 +323,7 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr ...@@ -323,7 +323,7 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
323 this.baseMapper.updateById(purchaseContract); 323 this.baseMapper.updateById(purchaseContract);
324 //发送信息 324 //发送信息
325 String roleId = configService.queryValueByKey("TGHT_SP_ROLE_ID"); 325 String roleId = configService.queryValueByKey("TGHT_SP_ROLE_ID");
326 smsService.pushMsgNoProcessByRoleId("统购合同审批","有统购合同["+purchaseContract.getContractName()+"]需要审批审批",roleId,"PurchaseContract","13"); 326 smsService.pushMsgNoProcessByRoleId("统购合同审批","有统购合同["+purchaseContract.getContractName()+"]需要审批审批",roleId,"PurchaseContract","13","H");
327 } 327 }
328 328
329 /*** 329 /***
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/ErpSettlementServiceImpl.java
...@@ -83,7 +83,7 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E ...@@ -83,7 +83,7 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E
83 } 83 }
84 //发送信息 84 //发送信息
85 String roleId = configService.queryValueByKey("YJJS_YS_ROLE_ID"); 85 String roleId = configService.queryValueByKey("YJJS_YS_ROLE_ID");
86 smsService.pushMsgNoProcessByRoleId(msgTitle,msgTitle,roleId,"ErpSettlement",msgCategory); 86 smsService.pushMsgNoProcessByRoleId(msgTitle,msgTitle,roleId,"ErpSettlement",msgCategory,"H");
87 } 87 }
88 88
89 /** 89 /**
...@@ -201,7 +201,7 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E ...@@ -201,7 +201,7 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E
201 msgTitle = "水厂结算经理审批"; 201 msgTitle = "水厂结算经理审批";
202 } 202 }
203 //发送信息 203 //发送信息
204 smsService.pushMsgNoProcessByRoleId(msgTitle,msgTitle,roleId,"ErpSettlement",msgCategory); 204 smsService.pushMsgNoProcessByRoleId(msgTitle,msgTitle,roleId,"ErpSettlement",msgCategory,"H");
205 return true; 205 return true;
206 } 206 }
207 207
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java
...@@ -102,7 +102,7 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia ...@@ -102,7 +102,7 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
102 //发送信息 102 //发送信息
103 String roleId = configService.queryValueByKey("YJRK_SP_ROLE_ID"); 103 String roleId = configService.queryValueByKey("YJRK_SP_ROLE_ID");
104 String msgCategory = "6"; 104 String msgCategory = "6";
105 smsService.pushMsgNoProcessByRoleId("药剂入库审批","有多个药剂入库需要审批审批",roleId,"MaterialIN",msgCategory); 105 smsService.pushMsgNoProcessByRoleId("药剂入库审批","有多个药剂入库需要审批审批",roleId,"MaterialIN",msgCategory,"H");
106 return this.baseMapper.batchSendAudit(ids,auditStatus); 106 return this.baseMapper.batchSendAudit(ids,auditStatus);
107 } 107 }
108 /** 108 /**
...@@ -115,7 +115,7 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia ...@@ -115,7 +115,7 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
115 //发送信息 115 //发送信息
116 String roleId = configService.queryValueByKey("YJRK_SP_ROLE_ID"); 116 String roleId = configService.queryValueByKey("YJRK_SP_ROLE_ID");
117 String msgCategory = "6"; 117 String msgCategory = "6";
118 smsService.pushMsgNoProcessByRoleId("药剂入库审批","有药剂入库单["+materialIN.getProjectName()+"]需要审批审批",roleId,"MaterialIN",msgCategory); 118 smsService.pushMsgNoProcessByRoleId("药剂入库审批","有药剂入库单["+materialIN.getProjectName()+"]需要审批审批",roleId,"MaterialIN",msgCategory,"H");
119 } 119 }
120 /*** 120 /***
121 * 回退 121 * 回退
......
sk-module-biz/src/main/java/com/skua/modules/report/job/OperationDailyJob.java
...@@ -44,6 +44,6 @@ public class OperationDailyJob implements Job { ...@@ -44,6 +44,6 @@ public class OperationDailyJob implements Job {
44 44
45 String roleId = configService.queryValueByKey("YJJS_JLSP_ROLE_ID"); 45 String roleId = configService.queryValueByKey("YJJS_JLSP_ROLE_ID");
46 //发送信息 46 //发送信息
47 smsService.pushMsgNoProcessByRoleId(messageTitle,messageBody,roleId,"OperationDaily",msgCategory); 47 smsService.pushMsgNoProcessByRoleId(messageTitle,messageBody,roleId,"OperationDaily",msgCategory,"H");
48 } 48 }
49 } 49 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/app/APPDangerInspectionController.java
...@@ -109,8 +109,7 @@ public class APPDangerInspectionController { ...@@ -109,8 +109,7 @@ public class APPDangerInspectionController {
109 Result< DangerInspectionRecord > result = new Result< DangerInspectionRecord >(); 109 Result< DangerInspectionRecord > result = new Result< DangerInspectionRecord >();
110 110
111 //开始巡检，将风险点下的检查内容（检查项目）插入到巡检、巡检项目，并创建巡检记录 111 //开始巡检，将风险点下的检查内容（检查项目）插入到巡检、巡检项目，并创建巡检记录
112 DangerInspectionRecord dangerInspection = inspectionRecordService.startInspection(dangerId,"1",BaseContextHandler.getUserId()); 112 DangerInspectionRecord dangerInspection = inspectionRecordService.startInspection(dangerId,inspectionType,"1",BaseContextHandler.getUserId());
113 dangerInspection.setInspectionType(inspectionType);
114 if(dangerInspection==null) { 113 if(dangerInspection==null) {
115 result.error500("未找到对应实体"); 114 result.error500("未找到对应实体");
116 }else { 115 }else {
......
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/DangerLevelManageMapper.java
...@@ -31,7 +31,7 @@ public interface DangerLevelManageMapper extends BaseMapper<DangerLevelManage> { ...@@ -31,7 +31,7 @@ public interface DangerLevelManageMapper extends BaseMapper<DangerLevelManage> {
31 " left join (select danger_id ,GROUP_CONCAT(inspect_name SEPARATOR '@') 'inspect_content' from danger_inspect_info group by danger_id)aaa on aaa.danger_id = t.id " + 31 " left join (select danger_id ,GROUP_CONCAT(inspect_name SEPARATOR '@') 'inspect_content' from danger_inspect_info group by danger_id)aaa on aaa.danger_id = t.id " +
32 " left join (select eee.danger_id ,count(eee.record_id) 'rectification_num' from ( select DISTINCT t.id 'record_id' ,t1.danger_id from danger_inspection_record t" + 32 " left join (select eee.danger_id ,count(eee.record_id) 'rectification_num' from ( select DISTINCT t.id 'record_id' ,t1.danger_id from danger_inspection_record t" +
33 " left join danger_inspection_info t1 on t.id= t1.inspection_record_id left join danger_inspection_item t2 on t1.id = t2.inspection_info_id " + 33 " left join danger_inspection_info t1 on t.id= t1.inspection_record_id left join danger_inspection_item t2 on t1.id = t2.inspection_info_id " +
34 " where t2.status = 0 and DATE_FORMAT(t.report_date,'%Y-%m-%d') >= #{startTime} and DATE_FORMAT(t.report_date,'%Y-%m-%d') <= #{endTime} "+ 34 " where t2.status = 0 and t2.item_value =1 and DATE_FORMAT(t.report_date,'%Y-%m-%d') >= #{startTime} and DATE_FORMAT(t.report_date,'%Y-%m-%d') <= #{endTime} "+
35 " )eee group by eee.danger_id " + 35 " )eee group by eee.danger_id " +
36 " )bbb on bbb.danger_id = t.id " + 36 " )bbb on bbb.danger_id = t.id " +
37 " left join (select danger_id, count(id) 'inspection_num' from ajh_rectification_info" + 37 " left join (select danger_id, count(id) 'inspection_num' from ajh_rectification_info" +
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/IDangerInspectionRecordService.java
...@@ -28,7 +28,7 @@ public interface IDangerInspectionRecordService extends IService<DangerInspectio ...@@ -28,7 +28,7 @@ public interface IDangerInspectionRecordService extends IService<DangerInspectio
28 * @param userId 用户编号 28 * @param userId 用户编号
29 * @return 29 * @return
30 */ 30 */
31 public DangerInspectionRecord startInspection(String dangerId, String status , String userId); 31 public DangerInspectionRecord startInspection(String dangerId,String inspectionType, String status , String userId);
32 32
33 /*** 33 /***
34 * 查询巡查集合 34 * 查询巡查集合
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/DangerInspectionRecordServiceImpl.java
...@@ -65,7 +65,7 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect ...@@ -65,7 +65,7 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect
65 * @return 65 * @return
66 */ 66 */
67 @Transactional 67 @Transactional
68 public DangerInspectionRecord startInspection(String dangerId,String status , String userId){ 68 public DangerInspectionRecord startInspection(String dangerId,String inspectionType,String status , String userId){
69 69
70 DangerInspectionRecord dangerInspectionRecord = queryOneByDangerId(dangerId ,status ,userId ); 70 DangerInspectionRecord dangerInspectionRecord = queryOneByDangerId(dangerId ,status ,userId );
71 if(dangerInspectionRecord == null ){ 71 if(dangerInspectionRecord == null ){
...@@ -78,6 +78,7 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect ...@@ -78,6 +78,7 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect
78 dangerInspectionRecord.setEquipInfoId( dangerLevelManage.getEquipInfoId()); 78 dangerInspectionRecord.setEquipInfoId( dangerLevelManage.getEquipInfoId());
79 dangerInspectionRecord.setStatus( status); 79 dangerInspectionRecord.setStatus( status);
80 dangerInspectionRecord.setReportUser( userId ); 80 dangerInspectionRecord.setReportUser( userId );
81 dangerInspectionRecord.setInspectionType(inspectionType);
81 dangerInspectionRecord.setReportDate(DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss")); 82 dangerInspectionRecord.setReportDate(DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"));
82 83
83 this.baseMapper.insert( dangerInspectionRecord ) ; 84 this.baseMapper.insert( dangerInspectionRecord ) ;
......
sk-module-datafill/src/main/java/com/skua/modules/report/controller/MajorIssuesProcessController.java
...@@ -179,7 +179,7 @@ public class MajorIssuesProcessController { ...@@ -179,7 +179,7 @@ public class MajorIssuesProcessController {
179 179
180 String roleId = sysConfigService.queryValueByKey("YXBG_ROLE_ID"); 180 String roleId = sysConfigService.queryValueByKey("YXBG_ROLE_ID");
181 if(StringUtils.isNotEmpty(roleId)){ 181 if(StringUtils.isNotEmpty(roleId)){
182 smsService.pushMsgNoProcessByRoleId("请及时查看重点事项推进进展" ,message ,roleId,"MajorIssuesProcess","5"); 182 smsService.pushMsgNoProcessByRoleId("请及时查看重点事项推进进展" ,message ,roleId,"MajorIssuesProcess","5","H");
183 result.setResult(majorIssuesProcess); 183 result.setResult(majorIssuesProcess);
184 result.setSuccess(true); 184 result.setSuccess(true);
185 }else{ 185 }else{
......
sk-module-system/src/main/java/com/skua/modules/system/service/SmsService.java
...@@ -24,11 +24,11 @@ public class SmsService { ...@@ -24,11 +24,11 @@ public class SmsService {
24 @Autowired 24 @Autowired
25 private WebNoticePushServiceExt webNoticePushServiceExt; 25 private WebNoticePushServiceExt webNoticePushServiceExt;
26 26
27 public void pushMsgNoProcessByRoleId(String messageTitle ,String messageBody ,String roleId,String forwardTag,String msgCategory){ 27 public void pushMsgNoProcessByRoleId(String messageTitle ,String messageBody ,String roleId,String forwardTag,String msgCategory,String priority){
28 if(StringUtils.isNotEmpty(roleId)){ 28 if(StringUtils.isNotEmpty(roleId)){
29 List<SysUser> sysUserList = userService.queryUserByRoleId(roleId); 29 List<SysUser> sysUserList = userService.queryUserByRoleId(roleId);
30 if(sysUserList != null && !sysUserList.isEmpty()){ 30 if(sysUserList != null && !sysUserList.isEmpty()){
31 pushMessage(sysUserList,messageTitle , messageBody , forwardTag,msgCategory); 31 pushMessage(sysUserList,messageTitle , messageBody , forwardTag,msgCategory,priority);
32 } 32 }
33 } 33 }
34 } 34 }
...@@ -40,13 +40,13 @@ public class SmsService { ...@@ -40,13 +40,13 @@ public class SmsService {
40 * @param userIds 40 * @param userIds
41 * @param forwardTag 41 * @param forwardTag
42 */ 42 */
43 public void pushMsgNoProcess(String messageTitle ,String messageBody ,String userIds,String forwardTag,String msgCategory){ 43 public void pushMsgNoProcess(String messageTitle ,String messageBody ,String userIds,String forwardTag,String msgCategory,String priority){
44 if(StringUtils.isNotEmpty(userIds)){ 44 if(StringUtils.isNotEmpty(userIds)){
45 List<SysUser> sysUserList = userService.getUserByUserIds(userIds); 45 List<SysUser> sysUserList = userService.getUserByUserIds(userIds);
46 pushMessage(sysUserList,messageTitle , messageBody , forwardTag,msgCategory); 46 pushMessage(sysUserList,messageTitle , messageBody , forwardTag,msgCategory,priority);
47 } 47 }
48 } 48 }
49 private void pushMessage(List<SysUser> sysUserList,String messageTitle ,String messageBody ,String forwardTag,String msgCategory){ 49 private void pushMessage(List<SysUser> sysUserList,String messageTitle ,String messageBody ,String forwardTag,String msgCategory,String priority){
50 List<String> userCidList = sysUserList.stream().map(SysUser::getCid).filter(v -> StringUtils.isNotBlank(v)).collect(Collectors.toList()); 50 List<String> userCidList = sysUserList.stream().map(SysUser::getCid).filter(v -> StringUtils.isNotBlank(v)).collect(Collectors.toList());
51 List<String> userIdList = sysUserList.stream().map(SysUser::getId).collect(Collectors.toList()); 51 List<String> userIdList = sysUserList.stream().map(SysUser::getId).collect(Collectors.toList());
52 52
...@@ -59,10 +59,10 @@ public class SmsService { ...@@ -59,10 +59,10 @@ public class SmsService {
59 messageEntity.setForwardTag(forwardTag);//消息提醒类型 保持唯一 59 messageEntity.setForwardTag(forwardTag);//消息提醒类型 保持唯一
60 60
61 61
62 IPushService appPushService = PushMessageFactory.getPushService("MOB"); 62 /* IPushService appPushService = PushMessageFactory.getPushService("MOB");
63 // IPushService webPushService = PushMessageFactory.getPushService("WEB"); 63 // IPushService webPushService = PushMessageFactory.getPushService("WEB");
64 appPushService.pushMessage(messageEntity); 64 appPushService.pushMessage(messageEntity);*/
65 webNoticePushServiceExt.pushMessage(messageEntity,msgCategory); 65 webNoticePushServiceExt.pushMessage(messageEntity,msgCategory,priority);
66 } 66 }
67 67
68 /*** 68 /***
...@@ -72,7 +72,7 @@ public class SmsService { ...@@ -72,7 +72,7 @@ public class SmsService {
72 * @param userIds 72 * @param userIds
73 * @param forwardTag 73 * @param forwardTag
74 */ 74 */
75 public void appPushMsgNoProcess(String messageTitle ,String messageBody ,String userIds,String forwardTag){ 75 public void appPushMsgNoProcess(String messageTitle ,String messageBody ,String userIds,String forwardTag,String priority){
76 if(StringUtils.isNotEmpty(userIds)){ 76 if(StringUtils.isNotEmpty(userIds)){
77 List<SysUser> sysUserList = userService.getUserByUserIds(userIds); 77 List<SysUser> sysUserList = userService.getUserByUserIds(userIds);
78 if(sysUserList != null && !sysUserList.isEmpty()){ 78 if(sysUserList != null && !sysUserList.isEmpty()){
...@@ -98,7 +98,7 @@ public class SmsService { ...@@ -98,7 +98,7 @@ public class SmsService {
98 * @param userIds 98 * @param userIds
99 * @param forwardTag 99 * @param forwardTag
100 */ 100 */
101 public void webPushMsgNoProcess(String messageTitle ,String messageBody ,String userIds,String forwardTag,String msgCategory){ 101 public void webPushMsgNoProcess(String messageTitle ,String messageBody ,String userIds,String forwardTag,String msgCategory,String priority){
102 if(StringUtils.isNotEmpty(userIds)){ 102 if(StringUtils.isNotEmpty(userIds)){
103 List<SysUser> sysUserList = userService.getUserByUserIds(userIds); 103 List<SysUser> sysUserList = userService.getUserByUserIds(userIds);
104 //List<String> userCidList = sysUserList.stream().map(SysUser::getCid).filter(v -> StringUtils.isNotBlank(v)).collect(Collectors.toList()); 104 //List<String> userCidList = sysUserList.stream().map(SysUser::getCid).filter(v -> StringUtils.isNotBlank(v)).collect(Collectors.toList());
...@@ -111,7 +111,7 @@ public class SmsService { ...@@ -111,7 +111,7 @@ public class SmsService {
111 messageEntity.setSendUser(BaseContextHandler.getUserName()); 111 messageEntity.setSendUser(BaseContextHandler.getUserName());
112 messageEntity.setForwardTag(forwardTag);//消息提醒类型 保持唯一 112 messageEntity.setForwardTag(forwardTag);//消息提醒类型 保持唯一
113 113
114 webNoticePushServiceExt.pushMessage(messageEntity,msgCategory); 114 webNoticePushServiceExt.pushMessage(messageEntity,msgCategory,priority);
115 } 115 }
116 116
117 } 117 }
......
sk-module-system/src/main/java/com/skua/modules/system/service/WebNoticePushServiceExt.java
...@@ -34,7 +34,13 @@ public class WebNoticePushServiceExt { ...@@ -34,7 +34,13 @@ public class WebNoticePushServiceExt {
34 public WebNoticePushServiceExt() { 34 public WebNoticePushServiceExt() {
35 } 35 }
36 36
37 public void pushMessage(MessageEntity messageEntity,String msgCategory) { 37 /***
38 *
39 * @param messageEntity
40 * @param msgCategory
41 * @param priority 优先级
42 */
43 public void pushMessage(MessageEntity messageEntity,String msgCategory,String priority) {
38 JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master"); 44 JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
39 List<String> userIds = messageEntity.getReceiveUser(); 45 List<String> userIds = messageEntity.getReceiveUser();
40 String sendUser = messageEntity.getSendUser(); 46 String sendUser = messageEntity.getSendUser();
...@@ -55,7 +61,7 @@ public class WebNoticePushServiceExt { ...@@ -55,7 +61,7 @@ public class WebNoticePushServiceExt {
55 masterDB.update(alarmType); 61 masterDB.update(alarmType);
56 } 62 }
57 63
58 String insertTzSql = "INSERT INTO sys_announcement (id,titile,msg_content,sender,msg_category,msg_type,send_status,send_time,del_flag,create_by,create_time,user_ids,depart_id)VALUES('" + tzId + "','" + title + "','" + message + "','" + sendUser + "','"+msgCategory+"','USER','1','" + DateUtils.now() + "','0','" + sendUser + "','" + DateUtils.now() + "','" + userIdStr + "','A01')"; 64 String insertTzSql = "INSERT INTO sys_announcement (id,titile,msg_content,sender,msg_category,msg_type,send_status,send_time,del_flag,create_by,create_time,user_ids,depart_id,priority)VALUES('" + tzId + "','" + title + "','" + message + "','" + sendUser + "','"+msgCategory+"','USER','1','" + DateUtils.now() + "','0','" + sendUser + "','" + DateUtils.now() + "','" + userIdStr + "','A01','"+priority+"')";
59 if (extMapList != null && extMapList.size() > 0) { 65 if (extMapList != null && extMapList.size() > 0) {
60 System.out.println("报警业务逻辑插入"); 66 System.out.println("报警业务逻辑插入");
61 Map<String, String> extMap = new HashMap(); 67 Map<String, String> extMap = new HashMap();
...@@ -65,7 +71,7 @@ public class WebNoticePushServiceExt { ...@@ -65,7 +71,7 @@ public class WebNoticePushServiceExt {
65 alarmType = (String)extMap.get("alarmType"); 71 alarmType = (String)extMap.get("alarmType");
66 String id = (String)extMap.get("id"); 72 String id = (String)extMap.get("id");
67 if (StringUtils.isNotEmpty(alarmType) && StringUtils.isNotEmpty(id)) { 73 if (StringUtils.isNotEmpty(alarmType) && StringUtils.isNotEmpty(id)) {
68 insertTzSql = "INSERT INTO sys_announcement (id,titile,msg_content,sender,msg_category,msg_type,send_status,send_time,del_flag,create_by,create_time,user_ids,depart_id,alarm_type,alarm_record_id)VALUES('" + tzId + "','" + title + "','" + message + "','" + sendUser + "','3','ALARM','1','" + DateUtils.now() + "','0','" + sendUser + "','" + DateUtils.now() + "','" + userIdStr + "','A01','" + alarmType + "','" + id + "')"; 74 insertTzSql = "INSERT INTO sys_announcement (id,titile,msg_content,sender,msg_category,msg_type,send_status,send_time,del_flag,create_by,create_time,user_ids,depart_id,alarm_type,alarm_record_id,priority)VALUES('" + tzId + "','" + title + "','" + message + "','" + sendUser + "','3','ALARM','1','" + DateUtils.now() + "','0','" + sendUser + "','" + DateUtils.now() + "','" + userIdStr + "','A01','" + alarmType + "','" + id + "','"+priority+"')";
69 } 75 }
70 } 76 }
71 77
...@@ -74,7 +80,7 @@ public class WebNoticePushServiceExt { ...@@ -74,7 +80,7 @@ public class WebNoticePushServiceExt {
74 IWebSocketPushService webSocketPushService = (IWebSocketPushService)webSocketPushServiceObject; 80 IWebSocketPushService webSocketPushService = (IWebSocketPushService)webSocketPushServiceObject;
75 JSONObject obj = new JSONObject(); 81 JSONObject obj = new JSONObject();
76 obj.put("cmd", forwardTag); 82 obj.put("cmd", forwardTag);
77 obj.put("msgPriority", "M"); 83 obj.put("msgPriority", priority);
78 obj.put("msgId", tzId); 84 obj.put("msgId", tzId);
79 obj.put("msgTxt", message); 85 obj.put("msgTxt", message);
80 obj.put("msgExt", extMapList); 86 obj.put("msgExt", extMapList);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!