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
if("1".equals( purchaseContractVO.getStatus() )){
//发送信息
String roleId = configService.queryValueByKey("TGHT_SP_ROLE_ID");
smsService.pushMsgNoProcessByRoleId("统购合同审批","有统购合同["+purchaseContractVO.getContractName()+"]需要审批审批",roleId,"PurchaseContract","13");
smsService.pushMsgNoProcessByRoleId("统购合同审批","有统购合同["+purchaseContractVO.getContractName()+"]需要审批审批",roleId,"PurchaseContract","13","H");
}
}
......@@ -180,7 +180,7 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
if("1".equals( purchaseContractVO.getStatus() )){
//发送信息
String roleId = configService.queryValueByKey("TGHT_SP_ROLE_ID");
smsService.pushMsgNoProcessByRoleId("统购合同审批","有统购合同["+purchaseContractVO.getContractName()+"]需要审批审批",roleId,"PurchaseContract","13");
smsService.pushMsgNoProcessByRoleId("统购合同审批","有统购合同["+purchaseContractVO.getContractName()+"]需要审批审批",roleId,"PurchaseContract","13","H");
}
return count > 0 ? true :false;
}
......@@ -323,7 +323,7 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
this.baseMapper.updateById(purchaseContract);
//发送信息
String roleId = configService.queryValueByKey("TGHT_SP_ROLE_ID");
smsService.pushMsgNoProcessByRoleId("统购合同审批","有统购合同["+purchaseContract.getContractName()+"]需要审批审批",roleId,"PurchaseContract","13");
smsService.pushMsgNoProcessByRoleId("统购合同审批","有统购合同["+purchaseContract.getContractName()+"]需要审批审批",roleId,"PurchaseContract","13","H");
}
/***
......
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
}
//发送信息
String roleId = configService.queryValueByKey("YJJS_YS_ROLE_ID");
smsService.pushMsgNoProcessByRoleId(msgTitle,msgTitle,roleId,"ErpSettlement",msgCategory);
smsService.pushMsgNoProcessByRoleId(msgTitle,msgTitle,roleId,"ErpSettlement",msgCategory,"H");
}
/**
......@@ -201,7 +201,7 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E
msgTitle = "水厂结算经理审批";
}
//发送信息
smsService.pushMsgNoProcessByRoleId(msgTitle,msgTitle,roleId,"ErpSettlement",msgCategory);
smsService.pushMsgNoProcessByRoleId(msgTitle,msgTitle,roleId,"ErpSettlement",msgCategory,"H");
return true;
}
......
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
//发送信息
String roleId = configService.queryValueByKey("YJRK_SP_ROLE_ID");
String msgCategory = "6";
smsService.pushMsgNoProcessByRoleId("药剂入库审批","有多个药剂入库需要审批审批",roleId,"MaterialIN",msgCategory);
smsService.pushMsgNoProcessByRoleId("药剂入库审批","有多个药剂入库需要审批审批",roleId,"MaterialIN",msgCategory,"H");
return this.baseMapper.batchSendAudit(ids,auditStatus);
}
/**
......@@ -115,7 +115,7 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
//发送信息
String roleId = configService.queryValueByKey("YJRK_SP_ROLE_ID");
String msgCategory = "6";
smsService.pushMsgNoProcessByRoleId("药剂入库审批","有药剂入库单["+materialIN.getProjectName()+"]需要审批审批",roleId,"MaterialIN",msgCategory);
smsService.pushMsgNoProcessByRoleId("药剂入库审批","有药剂入库单["+materialIN.getProjectName()+"]需要审批审批",roleId,"MaterialIN",msgCategory,"H");
}
/***
* 回退
......
sk-module-biz/src/main/java/com/skua/modules/report/job/OperationDailyJob.java
......@@ -44,6 +44,6 @@ public class OperationDailyJob implements Job {
String roleId = configService.queryValueByKey("YJJS_JLSP_ROLE_ID");
//发送信息
smsService.pushMsgNoProcessByRoleId(messageTitle,messageBody,roleId,"OperationDaily",msgCategory);
smsService.pushMsgNoProcessByRoleId(messageTitle,messageBody,roleId,"OperationDaily",msgCategory,"H");
}
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/app/APPDangerInspectionController.java
......@@ -109,8 +109,7 @@ public class APPDangerInspectionController {
Result< DangerInspectionRecord > result = new Result< DangerInspectionRecord >();
//开始巡检，将风险点下的检查内容（检查项目）插入到巡检、巡检项目，并创建巡检记录
DangerInspectionRecord dangerInspection = inspectionRecordService.startInspection(dangerId,"1",BaseContextHandler.getUserId());
dangerInspection.setInspectionType(inspectionType);
DangerInspectionRecord dangerInspection = inspectionRecordService.startInspection(dangerId,inspectionType,"1",BaseContextHandler.getUserId());
if(dangerInspection==null) {
result.error500("未找到对应实体");
}else {
......
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/DangerLevelManageMapper.java
......@@ -31,7 +31,7 @@ public interface DangerLevelManageMapper extends BaseMapper<DangerLevelManage> {
" 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 " +
" 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" +
" 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 " +
" where t2.status = 0 and DATE_FORMAT(t.report_date,'%Y-%m-%d') >= #{startTime} and DATE_FORMAT(t.report_date,'%Y-%m-%d') <= #{endTime} "+
" 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} "+
" )eee group by eee.danger_id " +
" )bbb on bbb.danger_id = t.id " +
" 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
* @param userId 用户编号
* @return
*/
public DangerInspectionRecord startInspection(String dangerId, String status , String userId);
public DangerInspectionRecord startInspection(String dangerId,String inspectionType, String status , String userId);
/***
* 查询巡查集合
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/DangerInspectionRecordServiceImpl.java
......@@ -65,7 +65,7 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect
* @return
*/
@Transactional
public DangerInspectionRecord startInspection(String dangerId,String status , String userId){
public DangerInspectionRecord startInspection(String dangerId,String inspectionType,String status , String userId){
DangerInspectionRecord dangerInspectionRecord = queryOneByDangerId(dangerId ,status ,userId );
if(dangerInspectionRecord == null ){
......@@ -78,6 +78,7 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect
dangerInspectionRecord.setEquipInfoId( dangerLevelManage.getEquipInfoId());
dangerInspectionRecord.setStatus( status);
dangerInspectionRecord.setReportUser( userId );
dangerInspectionRecord.setInspectionType(inspectionType);
dangerInspectionRecord.setReportDate(DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"));
this.baseMapper.insert( dangerInspectionRecord ) ;
......
sk-module-datafill/src/main/java/com/skua/modules/report/controller/MajorIssuesProcessController.java
......@@ -179,7 +179,7 @@ public class MajorIssuesProcessController {
String roleId = sysConfigService.queryValueByKey("YXBG_ROLE_ID");
if(StringUtils.isNotEmpty(roleId)){
smsService.pushMsgNoProcessByRoleId("请及时查看重点事项推进进展" ,message ,roleId,"MajorIssuesProcess","5");
smsService.pushMsgNoProcessByRoleId("请及时查看重点事项推进进展" ,message ,roleId,"MajorIssuesProcess","5","H");
result.setResult(majorIssuesProcess);
result.setSuccess(true);
}else{
......
sk-module-system/src/main/java/com/skua/modules/system/service/SmsService.java
......@@ -24,11 +24,11 @@ public class SmsService {
@Autowired
private WebNoticePushServiceExt webNoticePushServiceExt;
public void pushMsgNoProcessByRoleId(String messageTitle ,String messageBody ,String roleId,String forwardTag,String msgCategory){
public void pushMsgNoProcessByRoleId(String messageTitle ,String messageBody ,String roleId,String forwardTag,String msgCategory,String priority){
if(StringUtils.isNotEmpty(roleId)){
List<SysUser> sysUserList = userService.queryUserByRoleId(roleId);
if(sysUserList != null && !sysUserList.isEmpty()){
pushMessage(sysUserList,messageTitle , messageBody , forwardTag,msgCategory);
pushMessage(sysUserList,messageTitle , messageBody , forwardTag,msgCategory,priority);
}
}
}
......@@ -40,13 +40,13 @@ public class SmsService {
* @param userIds
* @param forwardTag
*/
public void pushMsgNoProcess(String messageTitle ,String messageBody ,String userIds,String forwardTag,String msgCategory){
public void pushMsgNoProcess(String messageTitle ,String messageBody ,String userIds,String forwardTag,String msgCategory,String priority){
if(StringUtils.isNotEmpty(userIds)){
List<SysUser> sysUserList = userService.getUserByUserIds(userIds);
pushMessage(sysUserList,messageTitle , messageBody , forwardTag,msgCategory);
pushMessage(sysUserList,messageTitle , messageBody , forwardTag,msgCategory,priority);
}
}
private void pushMessage(List<SysUser> sysUserList,String messageTitle ,String messageBody ,String forwardTag,String msgCategory){
private void pushMessage(List<SysUser> sysUserList,String messageTitle ,String messageBody ,String forwardTag,String msgCategory,String priority){
List<String> userCidList = sysUserList.stream().map(SysUser::getCid).filter(v -> StringUtils.isNotBlank(v)).collect(Collectors.toList());
List<String> userIdList = sysUserList.stream().map(SysUser::getId).collect(Collectors.toList());
......@@ -59,10 +59,10 @@ public class SmsService {
messageEntity.setForwardTag(forwardTag);//消息提醒类型 保持唯一
IPushService appPushService = PushMessageFactory.getPushService("MOB");
/* IPushService appPushService = PushMessageFactory.getPushService("MOB");
// IPushService webPushService = PushMessageFactory.getPushService("WEB");
appPushService.pushMessage(messageEntity);
webNoticePushServiceExt.pushMessage(messageEntity,msgCategory);
appPushService.pushMessage(messageEntity);*/
webNoticePushServiceExt.pushMessage(messageEntity,msgCategory,priority);
}
/***
......@@ -72,7 +72,7 @@ public class SmsService {
* @param userIds
* @param forwardTag
*/
public void appPushMsgNoProcess(String messageTitle ,String messageBody ,String userIds,String forwardTag){
public void appPushMsgNoProcess(String messageTitle ,String messageBody ,String userIds,String forwardTag,String priority){
if(StringUtils.isNotEmpty(userIds)){
List<SysUser> sysUserList = userService.getUserByUserIds(userIds);
if(sysUserList != null && !sysUserList.isEmpty()){
......@@ -98,7 +98,7 @@ public class SmsService {
* @param userIds
* @param forwardTag
*/
public void webPushMsgNoProcess(String messageTitle ,String messageBody ,String userIds,String forwardTag,String msgCategory){
public void webPushMsgNoProcess(String messageTitle ,String messageBody ,String userIds,String forwardTag,String msgCategory,String priority){
if(StringUtils.isNotEmpty(userIds)){
List<SysUser> sysUserList = userService.getUserByUserIds(userIds);
//List<String> userCidList = sysUserList.stream().map(SysUser::getCid).filter(v -> StringUtils.isNotBlank(v)).collect(Collectors.toList());
......@@ -111,7 +111,7 @@ public class SmsService {
messageEntity.setSendUser(BaseContextHandler.getUserName());
messageEntity.setForwardTag(forwardTag);//消息提醒类型 保持唯一
webNoticePushServiceExt.pushMessage(messageEntity,msgCategory);
webNoticePushServiceExt.pushMessage(messageEntity,msgCategory,priority);
}
}
......
sk-module-system/src/main/java/com/skua/modules/system/service/WebNoticePushServiceExt.java
......@@ -34,7 +34,13 @@ public class WebNoticePushServiceExt {
public WebNoticePushServiceExt() {
}
public void pushMessage(MessageEntity messageEntity,String msgCategory) {
/***
*
* @param messageEntity
* @param msgCategory
* @param priority 优先级
*/
public void pushMessage(MessageEntity messageEntity,String msgCategory,String priority) {
JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
List<String> userIds = messageEntity.getReceiveUser();
String sendUser = messageEntity.getSendUser();
......@@ -55,7 +61,7 @@ public class WebNoticePushServiceExt {
masterDB.update(alarmType);
}
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')";
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+"')";
if (extMapList != null && extMapList.size() > 0) {
System.out.println("报警业务逻辑插入");
Map<String, String> extMap = new HashMap();
......@@ -65,7 +71,7 @@ public class WebNoticePushServiceExt {
alarmType = (String)extMap.get("alarmType");
String id = (String)extMap.get("id");
if (StringUtils.isNotEmpty(alarmType) && StringUtils.isNotEmpty(id)) {
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 + "')";
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+"')";
}
}
......@@ -74,7 +80,7 @@ public class WebNoticePushServiceExt {
IWebSocketPushService webSocketPushService = (IWebSocketPushService)webSocketPushServiceObject;
JSONObject obj = new JSONObject();
obj.put("cmd", forwardTag);
obj.put("msgPriority", "M");
obj.put("msgPriority", priority);
obj.put("msgId", tzId);
obj.put("msgTxt", message);
obj.put("msgExt", extMapList);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!