diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java index 2e4fe821..920660ad 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java @@ -486,11 +486,23 @@ public class AppHiddenController extends BaseController { return map; }else { userpd.put("USER_ID",departmentService.findById(userpd).getString("HEADMAN")); - if(Tools.notEmpty(usersService.findById(userpd).getString("USER_ID"))){ - pd.put("CONFIRM_USER",usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID - }else { + PageData byId = usersService.findById(userpd); + if (byId == null || Tools.isEmpty(byId.getString("USER_ID"))) { map.put("msg", "未查询到部门负责人"); + return map; + } else { + pd.put("CONFIRM_USER",usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID } + /** + * 下面代码如果findById(userpd)为空，那么getString("USER_ID")会报空指针异常 + * @date 2024年2月6日 + * @author limingyu + */ +// if(Tools.notEmpty(usersService.findById(userpd).getString("USER_ID"))){ +// pd.put("CONFIRM_USER",usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID +// }else { +// map.put("msg", "未查询到部门负责人"); +// } } }else{ if(Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人 diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java index 69df9042..70dabdd6 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -10,6 +10,7 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.logs.LogAnno; import com.zcloud.service.bus.ImgFilesService; +import com.zcloud.service.bus.NoticeCorpService; import com.zcloud.service.highriskwork.*; import com.zcloud.util.*; import com.zcloud.util.mq.MqSendUtil; @@ -53,6 +54,9 @@ public class AppHotworkCfdController extends BaseController { private MqSendUtil mqSendUtil; @Autowired private ImgFilesService imgFilesService; + @Autowired + private NoticeCorpService noticeCorpService; + /** * 获取编码 @@ -187,6 +191,7 @@ public class AppHotworkCfdController extends BaseController { throw new RuntimeException("系统异常"); } } + this.sendNotice(pd); map.put("HOTWORK_ID", pd.get("HOTWORK_ID")); map.put("result", errInfo); return map; @@ -216,6 +221,259 @@ public class AppHotworkCfdController extends BaseController { return map; } + /** + * 发送通知公告 + * @param pageData + */ + public void sendNotice(PageData pageData) { + try{ + PageData hotworkCfd = hotworkCfdService.findById(pageData); + String hotworkCfdState = hotworkCfd.getString("APPLY_STATUS"); //状态 + if(hotworkCfd != null){ + if(hotworkCfdState.equals("1")){ //作业负责人待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业待确认"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.get("CONFIRM_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "作业负责人意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //动火监护人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.get("GUARDIAN_USER_ID")); // 接收人员ID + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "监护人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //动火安全交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.get("CONFESS_USER_ID")); // 接收人员ID + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "安全交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //动火接收交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.get("ACCEPT_CONFESS_USER_ID")); // 接收人员ID + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "接受交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //动火气体分析发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业待进行气体检测"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.get("ANALYZE_USER_ID")); // 接收人员ID + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "气体分析"); + content.put("params3", "分析");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hotworkCfdState.equals("2")){ //所在单位待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.get("LEADER_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "所在单位意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hotworkCfdState.equals("4")){ //安全管理部门待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.get("AUDIT_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "安全管理部门意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hotworkCfdState.equals("5")){ //动火审批人待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.get("APPROVE_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "动火审批人意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hotworkCfdState.equals("6")){ //班长待验票 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业待验票"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.get("MONITOR_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "班长验票"); + content.put("params3", "验收");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hotworkCfdState.equals("7")){ //待验收 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业待验收"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.get("ACCEPT_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "完工验收"); + content.put("params3", "验收");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + } + + if(hotworkCfdState.equals("-2")){ //作业负责人审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "动火申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hotworkCfdState.equals("-4")){ //所在单位审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "动火申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hotworkCfdState.equals("-5")){ //安全管理部门审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "动火申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hotworkCfdState.equals("-6")){ //动火审批人审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "动火申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if (hotworkCfdState.equals("-7")) {//班长验票打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "动火申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if (hotworkCfdState.equals("-8")) {//验收打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动火作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", hotworkCfd.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hotworkCfd.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动火申请作业"); // 作业名称 + content.put("params2", "动火申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + }catch (Exception e){ +// FHLOG.save("动火审批", "发送站内信失败！"); + + } + + + } + /** * 删除 * @@ -1125,7 +1383,7 @@ public class AppHotworkCfdController extends BaseController { break; } hotworkLogCfdService.save(log); - + this.sendNotice(pd); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/bus/HiddenController.java b/src/main/java/com/zcloud/controller/bus/HiddenController.java index 925cd04c..fad1c03a 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenController.java @@ -303,20 +303,42 @@ public class HiddenController extends BaseController { } } pd.put("ISCONFIRM", "0"); - hiddenUserService.saveRectificationo(pd.getString("findCreator"), pd.getString("HIDDEN_ID"), "1"); +// hiddenUserService.saveRectificationo(pd.getString("findCreator"), pd.getString("HIDDEN_ID"), "1"); + hiddenUserService.saveRectificationoSingleFinder(pd.getString("findCreator"), pd.getString("HIDDEN_ID"), "1", pd.getString("hiddenFindCreator")); if (pd.getString("HIDDENLEVEL").equals("jdyh001") || pd.getString("HIDDENLEVEL").equals("hiddenLevel2002")) {//判断是否是重大隐患 PageData userpd = new PageData(); userpd.put("USER_ID", Jurisdiction.getUSER_ID()); userpd.put("DEPARTMENT_ID", usersService.findById(userpd).getString("DEPARTMENT_ID"));//获取登录人的部门ID if (departmentService.findById(userpd).getString("LEVEL").equals("departmentLevel0003")) {//判断部门级别是不是班组 userpd.put("DEPARTMENT_ID", departmentService.findById(userpd).getString("DEPARTMENT_ID")); - if (Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人 + String HEADMAN = departmentService.findById(userpd).getString("HEADMAN"); + if (Tools.isEmpty(HEADMAN)){ map.put("msg", "所在部门未维护部门负责人"); return map; } else { - userpd.put("USER_ID", departmentService.findById(userpd).getString("HEADMAN")); - pd.put("CONFIRM_USER", usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID + userpd.put("USER_ID", HEADMAN); + PageData data = usersService.findById(userpd); + if (Tools.isEmpty(data)) { + userpd.put("NAME", HEADMAN); + PageData byName = usersService.findByName(userpd); + if (Tools.isEmpty(byName)) { + map.put("msg", "所在部门未维护部门负责人"); + return map; + } + pd.put("CONFIRM_USER", byName.getString("USER_ID"));//通过名字查询用户获取出ID + } + pd.put("CONFIRM_USER", data.getString("USER_ID"));//通过名字查询用户获取出ID } + /** + * 下面语句usersService.findById(userpd)为空时，getString方法会报空指针异常 + */ +// if (Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人 +// map.put("msg", "所在部门未维护部门负责人"); +// return map; +// } else { +// userpd.put("USER_ID", departmentService.findById(userpd).getString("HEADMAN")); +// pd.put("CONFIRM_USER", usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID +// } } else { if (Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人 map.put("msg", "所在部门未维护部门负责人"); diff --git a/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java b/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java index dc99cabb..4625f747 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; import com.zcloud.entity.Page; import com.zcloud.service.hiddenApi.HiddenApiService; +import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.util.Strings; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -272,6 +273,12 @@ public class HiddenExcelController extends BaseController { if ("list".equals(pd.getString("hiddenVueType"))) { // 整改隐患 pd = Jurisdiction.getUserDataJurisdiction(pd); } + if (pd.getString("hiddenType") != null && Tools.notEmpty(pd.getString("hiddenType"))) { + String[] hiddenTypes = pd.getString("hiddenType").split(","); + // 将数组转为list + List hiddenTypeList = Arrays.asList(hiddenTypes); + pd.put("hiddenTypeList", hiddenTypeList); + } List getListAll = hiddenApiService.getListAll(pd); // 列出Hidden列表 return getListAll; diff --git a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java index 598e6913..3b437940 100644 --- a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java @@ -98,6 +98,8 @@ public class HotWorkApplicationController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + pd.put("OPERATOR", pd.get("loginUserId")); + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); hotworkapplicationService.delete(pd); map.put("result", errInfo); //返回结果 return map; diff --git a/src/main/java/com/zcloud/controller/bus/PromiseController.java b/src/main/java/com/zcloud/controller/bus/PromiseController.java index aa84702d..20f48509 100644 --- a/src/main/java/com/zcloud/controller/bus/PromiseController.java +++ b/src/main/java/com/zcloud/controller/bus/PromiseController.java @@ -56,6 +56,7 @@ public class PromiseController extends BaseController { pd.put("OPERATOR", "admin"); //创建人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //创建时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("IS_REGULATORY", 1); // 是否是监管端创建 0监管端 1企业端 promiseService.save(pd); List list = (List) JSON.parse(pd.getString("DETAIL")); if(list.size()>0){ diff --git a/src/main/java/com/zcloud/controller/bus/SysDateController.java b/src/main/java/com/zcloud/controller/bus/SysDateController.java index 04d1b76a..f61554d2 100644 --- a/src/main/java/com/zcloud/controller/bus/SysDateController.java +++ b/src/main/java/com/zcloud/controller/bus/SysDateController.java @@ -21,7 +21,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.SysDateService; -/** +/** * 说明：系统日期 * 作者：luoxiaobao * 时间：2021-05-07 @@ -30,10 +30,10 @@ import com.zcloud.service.bus.SysDateService; @Controller @RequestMapping("/sysdate") public class SysDateController extends BaseController { - + @Autowired private SysDateService sysdateService; - + /**新增 * @param * @throws Exception @@ -75,7 +75,7 @@ public class SysDateController extends BaseController { String HalfYearStartTime = DateUtil.getYear().toString(); String HalfYearEndTime = DateUtil.getYear().toString(); Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString()); - + if(bmonth <= 6) { HalfYearStartTime = HalfYearStartTime+"-01-01 00:00:00"; HalfYearEndTime = HalfYearEndTime+"-06-30 23:59:59"; @@ -87,11 +87,23 @@ public class SysDateController extends BaseController { pd.put("HALFYEAR_END", HalfYearEndTime); pd.put("YEAR_START", DateUtil.getCurrYearFirst()+" 00:00:00"); pd.put("YEAR_END", DateUtil.getCurrYearLast()+" 23:59:59"); + String halfMonthStartTime = DateUtil.getMonthFirstDay().toString(); + String halfMonthEndTime = DateUtil.getMonthEndDay().toString(); + Integer onlyDay = Integer.parseInt(DateUtil.getOnlyDay().toString()); + if (onlyDay <= 15) { + halfMonthStartTime = halfMonthStartTime + " 00:00:00"; + halfMonthEndTime = DateUtil.getMonthAnyDay(15).toString() + " 23:59:59"; + } else if (onlyDay > 15) { + halfMonthStartTime = DateUtil.getMonthAnyDay(16).toString() + " 00:00:00"; + halfMonthEndTime = halfMonthEndTime + " 23:59:59"; + } + pd.put("HALFMONTH_START", halfMonthStartTime); + pd.put("HALFMONTH_END", halfMonthEndTime); sysdateService.save(pd); map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -108,7 +120,7 @@ public class SysDateController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -125,7 +137,7 @@ public class SysDateController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -147,7 +159,7 @@ public class SysDateController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -164,8 +176,8 @@ public class SysDateController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -176,7 +188,7 @@ public class SysDateController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -189,7 +201,7 @@ public class SysDateController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception @@ -217,6 +229,8 @@ public class SysDateController extends BaseController { titles.add("半年-结束时间"); //13 titles.add("年-开始时间"); //14 titles.add("年-结束时间"); //15 + titles.add("半月-开始时间"); //16 + titles.add("半月-结束时间"); //17 dataMap.put("titles", titles); List varOList = sysdateService.listAll(pd); List varList = new ArrayList(); @@ -237,6 +251,8 @@ public class SysDateController extends BaseController { vpd.put("var13", varOList.get(i).getString("HALFYEAR_END")); //13 vpd.put("var14", varOList.get(i).getString("YEAR_START")); //14 vpd.put("var15", varOList.get(i).getString("YEAR_END")); //15 + vpd.put("var16", varOList.get(i).getString("HALFMONTH_START")); //16 + vpd.put("var17", varOList.get(i).getString("HALFMONTH_END")); //17 varList.add(vpd); } dataMap.put("varList", varList); @@ -244,5 +260,5 @@ public class SysDateController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/firemanager/FireCheckListController.java b/src/main/java/com/zcloud/controller/firemanager/FireCheckListController.java index eba1ef9c..00f83967 100644 --- a/src/main/java/com/zcloud/controller/firemanager/FireCheckListController.java +++ b/src/main/java/com/zcloud/controller/firemanager/FireCheckListController.java @@ -256,6 +256,11 @@ public class FireCheckListController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("OPERATTIME", DateUtil.date2Str(new Date())); + String[] departmentIds = pd.getString("DEPARTMENT_ID").split(","); + if (departmentIds.length > 1) { + pd.put("departmentIds", departmentIds); + pd.remove("DEPARTMENT_ID"); + } List res = fireCheckListService.getCheckList(pd); map.put("result", errInfo); map.put("varList", res); diff --git a/src/main/java/com/zcloud/controller/firemanager/FirePointController.java b/src/main/java/com/zcloud/controller/firemanager/FirePointController.java index 30b0bc03..6e2da6a4 100644 --- a/src/main/java/com/zcloud/controller/firemanager/FirePointController.java +++ b/src/main/java/com/zcloud/controller/firemanager/FirePointController.java @@ -288,4 +288,27 @@ public class FirePointController extends BaseController { return map; } + /** + * @Description: 批量修改消防点位负责人 + * @Author: limingyu + * @Date: 2024/03/12 09:36 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping(value = "/batchEditFirePointUser") + @ResponseBody + public Object batchEditFirePointUser() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String[] dataIds = pd.getString("DATA_IDS").split(","); + pd.put("dataIds", dataIds); + firePointService.batchEditFirePointUser(pd); + + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + } diff --git a/src/main/java/com/zcloud/controller/firemanager/FireRegionController.java b/src/main/java/com/zcloud/controller/firemanager/FireRegionController.java index 722da85b..20e6bf3e 100644 --- a/src/main/java/com/zcloud/controller/firemanager/FireRegionController.java +++ b/src/main/java/com/zcloud/controller/firemanager/FireRegionController.java @@ -222,4 +222,21 @@ public class FireRegionController extends BaseController { return map; } + /** + * @Description: 批量修改负责部门 + * @Author: dearLin + * @Date: 2023/3/8/008 17:24 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping("/batchEditDeptByIds") + @ResponseBody + public Object batchEditDeptByIds() { + Map map = new HashMap(); + PageData pd = getPageData(); + pd.put("OPERATOR", Jurisdiction.getUsername()); + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); + fireRegionService.editDeptByIds(map, pd); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java b/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java index 47c547dc..63bf00c3 100644 --- a/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java +++ b/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java @@ -591,4 +591,39 @@ public class AppFireRecordController extends BaseController { map.put("varList", varList); return map; } + + /** + * @Description: 获取检查照片上传方式 + * @Author: dearLin + * @Date: 2023/3/8/008 13:45 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping("/getPhotoUploadMethod") + private Object getPhotoUploadMethod() throws Exception { + String errInfo = "success"; + Map map = new HashMap(); + PageData pageData = getPageData(); + PageData data = fireRecordService.getPhotoUploadMethod(pageData); + map.put("result", errInfo); + map.put("data", data); + return map; + } + + /** + * 检查人id获取检查人所涉及的查询点位列表 + * @Author: limingyu + * @Date: 2024/3/18/008 09:11 + * @throws Exception + */ + @RequestMapping("/getPointListByUserId") + private Object getPointListByUserId() throws Exception { + String errInfo = "success"; + Map map = new HashMap(); + PageData pageData = getPageData(); + List varList = fireCheckStandardService.getPointListByUserId(pageData); + map.put("result", errInfo); + map.put("varList", varList); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java index 095bc093..3046d6f5 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java @@ -5,9 +5,9 @@ import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.bus.NoticeCorpService; import com.zcloud.service.gf.*; import com.zcloud.util.*; -import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -48,6 +48,8 @@ public class AppGFBlindBoardController extends BaseController { private GFBlindBoardToMeasuresService GFblindBoardToMeasuresService; @Autowired private Smb smb; + @Autowired + private NoticeCorpService noticeCorpService; /**获取编码 * @param * @throws Exception @@ -189,11 +191,161 @@ public class AppGFBlindBoardController extends BaseController { paramsList.add(params4); sendMessageUtil.sendMessages(mes, paramsList); } - + this.sendNotice(pd); map.put("result", errInfo); return map; } + /** + * 发送通知公告 + * @param pageData + */ + public void sendNotice(PageData pageData) { + try{ + PageData blindBoard = GFblindboardService.findById(pageData); + String blindBoardState = blindBoard.getString("APPLY_STATUS"); //状态 + if(blindBoard != null){ + if(blindBoardState.equals("1")){ //作业负责人待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条盲板抽堵作业待确认"); // 站内信标题 + mes.put("CORPINFO_ID", blindBoard.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", blindBoard.get("CONSTRUCTION_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", blindBoard.getString("CHECK_NO"));// 作业编号 + content.put("params1", "盲板抽堵申请作业"); // 作业名称 + content.put("params2", "作业负责人待审核"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //盲板抽堵监护人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条盲板抽堵作业待进行签字"); // 站内信标题 + mes.put("CORPINFO_ID", blindBoard.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", blindBoard.get("GUARDIAN_USER_ID")); // 接收人员ID + content.put("number", blindBoard.getString("CHECK_NO"));// 作业编号 + content.put("params1", "盲板抽堵申请作业"); // 作业名称 + content.put("params2", "监护人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //盲板抽堵安全交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条盲板抽堵作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", blindBoard.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", blindBoard.get("CONFESS_USER_ID")); // 接收人员ID + content.put("number", blindBoard.getString("CHECK_NO"));// 作业编号 + content.put("params1", "盲板抽堵申请作业"); // 作业名称 + content.put("params2", "安全交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //盲板抽堵接收交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条盲板抽堵作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", blindBoard.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", blindBoard.get("ACCEPT_CONFESS_USER_ID")); // 接收人员ID + content.put("number", blindBoard.getString("CHECK_NO"));// 作业编号 + content.put("params1", "盲板抽堵申请作业"); // 作业名称 + content.put("params2", "接受交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(blindBoardState.equals("4")){ //所在单位领导人待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条盲板抽堵作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", blindBoard.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", blindBoard.get("LEADER_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", blindBoard.getString("CHECK_NO"));// 作业编号 + content.put("params1", "盲板抽堵申请作业"); // 作业名称 + content.put("params2", "所在单位意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(blindBoardState.equals("5")){ //待验收 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条盲板抽堵作业待验收"); // 站内信标题 + mes.put("CORPINFO_ID", blindBoard.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", blindBoard.get("ACCEPT_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", blindBoard.getString("CHECK_NO"));// 作业编号 + content.put("params1", "盲板抽堵申请作业"); // 作业名称 + content.put("params2", "作业待验收"); + content.put("params3", "验收");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + } + + if(blindBoardState.equals("-2")){ //作业负责人审核打回发站内信 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条盲板抽堵作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", blindBoard.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", blindBoard.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", blindBoard.getString("CHECK_NO"));// 作业编号 + content.put("params1", "盲板抽堵申请作业"); // 作业名称 + content.put("params2", "盲板抽堵申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(blindBoardState.equals("-5")){ //所在单位审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条盲板抽堵作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", blindBoard.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", blindBoard.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", blindBoard.getString("CHECK_NO"));// 作业编号 + content.put("params1", "盲板抽堵申请作业"); // 作业名称 + content.put("params2", "盲板抽堵申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if (blindBoardState.equals("-6")) { + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条盲板抽堵作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", blindBoard.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", blindBoard.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", blindBoard.getString("CHECK_NO"));// 作业编号 + content.put("params1", "盲板抽堵申请作业"); // 作业名称 + content.put("params2", "盲板抽堵申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + }catch (Exception e){ +// FHLOG.save("动火审批", "发送站内信失败！"); + + } + + + } + /**上传图 * @param * @throws Exception diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java index 533dff14..f5ed0b87 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.bus.NoticeCorpService; import com.zcloud.service.gf.GFBreakGroundAcceptUserService; import com.zcloud.service.gf.GFBreakGroundLogService; import com.zcloud.service.gf.GFBreakGroundService; @@ -46,6 +47,8 @@ public class AppGFBreakGroundController extends BaseController { private SendMessageUtil sendMessageUtil; @Autowired private Smb smb; + @Autowired + private NoticeCorpService noticeCorpService; /**获取编码 * @param * @throws Exception @@ -155,7 +158,7 @@ public class AppGFBreakGroundController extends BaseController { paramsList.add(params4); sendMessageUtil.sendMessages(mes, paramsList); } - + this.sendNotice(pd); map.put("result", errInfo); return map; } @@ -500,6 +503,7 @@ public class AppGFBreakGroundController extends BaseController { break; } GFbreakGroundLogService.save(log); + this.sendNotice(pd); map.put("result", errInfo); return map; } @@ -761,6 +765,7 @@ public class AppGFBreakGroundController extends BaseController { break; } GFbreakGroundLogService.save(log); + this.sendNotice(pd); map.put("result", errInfo); return map; } @@ -1230,4 +1235,214 @@ public class AppGFBreakGroundController extends BaseController { return map; } + /** + * 发送通知公告 + * @param pageData + */ + public void sendNotice(PageData pageData) { + try{ + PageData breakGround = GFbreakGroundService.findById(pageData); + String breakGroundState = breakGround.getString("APPLY_STATUS"); //状态 + if(breakGround != null){ + if(breakGroundState.equals("1")){ //作业负责人待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动土作业待确认"); // 站内信标题 + mes.put("CORPINFO_ID", breakGround.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", breakGround.get("CONSTRUCTION_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", breakGround.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动土申请作业"); // 作业名称 + content.put("params2", "作业负责人待审核"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //动土监护人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动土作业待进行签字"); // 站内信标题 + mes.put("CORPINFO_ID", breakGround.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", breakGround.get("GUARDIAN_USER_ID")); // 接收人员ID + content.put("number", breakGround.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动土申请作业"); // 作业名称 + content.put("params2", "监护人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //动土安全交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动土作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", breakGround.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", breakGround.get("CONFESS_USER_ID")); // 接收人员ID + content.put("number", breakGround.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动土申请作业"); // 作业名称 + content.put("params2", "安全交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //动土接收交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动土作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", breakGround.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", breakGround.get("ACCEPT_CONFESS_USER_ID")); // 接收人员ID + content.put("number", breakGround.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动土申请作业"); // 作业名称 + content.put("params2", "接受交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(breakGroundState.equals("2")){ //所在单位待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动土作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", breakGround.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", breakGround.get("PRODUCTION_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", breakGround.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动土申请作业"); // 作业名称 + content.put("params2", "所在单位意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(breakGroundState.equals("3")){ //有关部门待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动土作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", breakGround.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", breakGround.get("SAFETY_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", breakGround.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动土申请作业"); // 作业名称 + content.put("params2", "有关部门待审核"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(breakGroundState.equals("4")){ //审批部门待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动土作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", breakGround.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", breakGround.get("LEADER_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", breakGround.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动土申请作业"); // 作业名称 + content.put("params2", "审批部门待审核"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(breakGroundState.equals("5")){ //待验收 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动土作业待验收"); // 站内信标题 + mes.put("CORPINFO_ID", breakGround.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", breakGround.get("ACCEPT_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", breakGround.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动土申请作业"); // 作业名称 + content.put("params2", "作业待验收"); + content.put("params3", "验收");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + } + + if(breakGroundState.equals("-2")){ //作业负责人审核打回发站内信 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动土作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", breakGround.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", breakGround.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", breakGround.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动土申请作业"); // 作业名称 + content.put("params2", "动土申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(breakGroundState.equals("-3")){ //所在单位审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动土作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", breakGround.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", breakGround.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", breakGround.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动土申请作业"); // 作业名称 + content.put("params2", "动土申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(breakGroundState.equals("-4")){ //有关部门审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动土作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", breakGround.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", breakGround.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", breakGround.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动土申请作业"); // 作业名称 + content.put("params2", "动土申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(breakGroundState.equals("-5")){ //审批部门审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动土作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", breakGround.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", breakGround.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", breakGround.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动土申请作业"); // 作业名称 + content.put("params2", "动土申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if (breakGroundState.equals("-6")) { //验收打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条动土作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", breakGround.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", breakGround.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", breakGround.getString("CHECK_NO"));// 作业编号 + content.put("params1", "动土申请作业"); // 作业名称 + content.put("params2", "动土申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + }catch (Exception e){ +// FHLOG.save("动火审批", "发送站内信失败！"); + + } + + + } + } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java index 76e94b66..d70ea087 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java @@ -7,6 +7,7 @@ import com.zcloud.dto.TenCorpConst; import com.zcloud.dto.TenCorpDto; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.bus.NoticeCorpService; import com.zcloud.service.gf.*; import com.zcloud.service.mq.SendMessageService; import com.zcloud.util.*; @@ -53,6 +54,8 @@ public class AppGFConfinedSpaceController extends BaseController { @Resource private SendMessageService mqClient; + @Autowired + private NoticeCorpService noticeCorpService; /**获取编码 * @param * @throws Exception @@ -174,10 +177,176 @@ public class AppGFConfinedSpaceController extends BaseController { tenCorpDto.setData(pd); tenCorpDto.setMark_name("CONFINEDSPACE_ID"); mqClient.SendDelayQueue(tenCorpDto); + this.sendNotice(pd); map.put("result", errInfo); return map; } + /** + * 发送通知公告 + * @param pageData + */ + public void sendNotice(PageData pageData) { + try{ + PageData confinedspace = GFconfinedspaceService.findById(pageData); + String confinedspaceState = confinedspace.getString("APPLY_STATUS"); //状态 + if(confinedspace != null){ + if(confinedspaceState.equals("1")){ //作业负责人待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条受限空间作业待确认"); // 站内信标题 + mes.put("CORPINFO_ID", confinedspace.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", confinedspace.get("CONFIRM_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", confinedspace.getString("CHECK_NO"));// 作业编号 + content.put("params1", "受限空间申请作业"); // 作业名称 + content.put("params2", "作业负责人确认"); + content.put("params3", "确认");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //受限空间气体分析发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条受限空间作业待进行气体分析"); // 站内信标题 + mes.put("CORPINFO_ID", confinedspace.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", confinedspace.get("ANALYZE_USER_ID")); // 接收人员ID + content.put("number", confinedspace.getString("CHECK_NO"));// 作业编号 + content.put("params1", "受限空间申请作业"); // 作业名称 + content.put("params2", "气体分析"); + content.put("params3", "进行气体分析");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //受限空间安全交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条受限空间作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", confinedspace.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", confinedspace.get("CONFESS_USER_ID")); // 接收人员ID + content.put("number", confinedspace.getString("CHECK_NO"));// 作业编号 + content.put("params1", "受限空间申请作业"); // 作业名称 + content.put("params2", "安全交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //受限空间接收交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条受限空间作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", confinedspace.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", confinedspace.get("ACCEPT_CONFESS_USER_ID")); // 接收人员ID + content.put("number", confinedspace.getString("CHECK_NO"));// 作业编号 + content.put("params1", "受限空间申请作业"); // 作业名称 + content.put("params2", "接受交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(confinedspaceState.equals("4")){ //所在单位待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条受限空间作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", confinedspace.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", confinedspace.get("APPROVE_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", confinedspace.getString("CHECK_NO"));// 作业编号 + content.put("params1", "有限空间申请作业"); // 作业名称 + content.put("params2", "所在单位待审核"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(confinedspaceState.equals("5")){ //待验收 + if (confinedspace.get("GUARDIAN_USER_SIGNER_PATH") == null) { + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条有限空间作业待验收"); // 站内信标题 + mes.put("CORPINFO_ID", confinedspace.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", confinedspace.get("ACCEPT_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", confinedspace.getString("CHECK_NO"));// 作业编号 + content.put("params1", "有限空间申请作业"); // 作业名称 + content.put("params2", "作业待验收"); + content.put("params3", "验收");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //受限空间监护人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条受限空间作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", confinedspace.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", confinedspace.get("GUARDIAN_USER_ID")); // 接收人员ID + content.put("number", confinedspace.getString("CHECK_NO"));// 作业编号 + content.put("params1", "受限空间申请作业"); // 作业名称 + content.put("params2", "监护人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + } + } + + if(confinedspaceState.equals("-4")){ //作业负责人审核打回发站内信 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条受限空间作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", confinedspace.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", confinedspace.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", confinedspace.getString("CHECK_NO"));// 作业编号 + content.put("params1", "受限空间申请作业"); // 作业名称 + content.put("params2", "受限空间申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(confinedspaceState.equals("-5")){ //所在单位审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条受限空间作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", confinedspace.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", confinedspace.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", confinedspace.getString("CHECK_NO"));// 作业编号 + content.put("params1", "受限空间申请作业"); // 作业名称 + content.put("params2", "受限空间申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if (confinedspaceState.equals("-6")) { + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条受限空间作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", confinedspace.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", confinedspace.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", confinedspace.getString("CHECK_NO"));// 作业编号 + content.put("params1", "受限空间申请作业"); // 作业名称 + content.put("params2", "受限空间申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + }catch (Exception e){ +// FHLOG.save("动火审批", "发送站内信失败！"); + + } + + + } + /**删除 * @param * @throws Exception @@ -463,6 +632,7 @@ public class AppGFConfinedSpaceController extends BaseController { // paramsList.add(params4); // sendMessageUtil.sendMessages(mes, paramsList); } + this.sendNotice(pd); map.put("result", errInfo); return map; } @@ -694,7 +864,7 @@ public class AppGFConfinedSpaceController extends BaseController { break; } GFconfinedspaceLogService.save(log); - + this.sendNotice(pd); map.put("result", errInfo); return map; } @@ -1229,6 +1399,7 @@ public class AppGFConfinedSpaceController extends BaseController { break; } GFconfinedspaceLogService.save(log); + this.sendNotice(pd); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java index 9b3f375f..1122ab23 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.bus.NoticeCorpService; import com.zcloud.service.gf.*; import com.zcloud.util.*; import org.apache.commons.lang.StringUtils; @@ -41,6 +42,8 @@ public class AppGFCutRoadController extends BaseController { private GFCutRoadAcceptUserService cutroadacceptuserService; @Autowired private SendMessageUtil sendMessageUtil; + @Autowired + private NoticeCorpService noticeCorpService; /**获取编码 * @param * @throws Exception @@ -154,6 +157,216 @@ public class AppGFCutRoadController extends BaseController { return map; } + /** + * 发送通知公告 + * @param pageData + */ + public void sendNotice(PageData pageData) { + try{ + PageData cutRoad = GFcutRoadService.findById(pageData); + String cutRoadState = cutRoad.getString("APPLY_STATUS"); //状态 + if(cutRoad != null){ + if(cutRoadState.equals("1")){ //作业负责人待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条断路安全作业待确认"); // 站内信标题 + mes.put("CORPINFO_ID", cutRoad.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", cutRoad.get("CONSTRUCTION_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", cutRoad.getString("CHECK_NO"));// 作业编号 + content.put("params1", "断路安全申请作业"); // 作业名称 + content.put("params2", "作业负责人意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //断路安全监护人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条断路安全作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", cutRoad.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", cutRoad.get("GUARDIAN_USER_ID")); // 接收人员ID + content.put("number", cutRoad.getString("CHECK_NO"));// 作业编号 + content.put("params1", "断路安全申请作业"); // 作业名称 + content.put("params2", "监护人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //断路安全安全交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条断路安全作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", cutRoad.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", cutRoad.get("CONFESS_USER_ID")); // 接收人员ID + content.put("number", cutRoad.getString("CHECK_NO"));// 作业编号 + content.put("params1", "断路安全申请作业"); // 作业名称 + content.put("params2", "安全交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //断路安全接收交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条断路安全作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", cutRoad.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", cutRoad.get("ACCEPT_CONFESS_USER_ID")); // 接收人员ID + content.put("number", cutRoad.getString("CHECK_NO"));// 作业编号 + content.put("params1", "断路安全申请作业"); // 作业名称 + content.put("params2", "接受交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(cutRoadState.equals("2")){ //所在单位待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条断路安全作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", cutRoad.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", cutRoad.get("PRODUCTION_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", cutRoad.getString("CHECK_NO"));// 作业编号 + content.put("params1", "断路安全申请作业"); // 作业名称 + content.put("params2", "所在单位意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(cutRoadState.equals("3")){ //消防、安全管理部门待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条断路安全作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", cutRoad.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", cutRoad.get("SAFETY_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", cutRoad.getString("CHECK_NO"));// 作业编号 + content.put("params1", "断路安全申请作业"); // 作业名称 + content.put("params2", "消防、安全管理部门意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(cutRoadState.equals("4")){ //审批部门待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条断路安全作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", cutRoad.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", cutRoad.get("LEADER_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", cutRoad.getString("CHECK_NO"));// 作业编号 + content.put("params1", "断路安全申请作业"); // 作业名称 + content.put("params2", "审批部门意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(cutRoadState.equals("5")){ //待验收 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条断路安全作业待验收"); // 站内信标题 + mes.put("CORPINFO_ID", cutRoad.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", cutRoad.get("ACCEPT_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", cutRoad.getString("CHECK_NO"));// 作业编号 + content.put("params1", "断路安全申请作业"); // 作业名称 + content.put("params2", "作业待验收"); + content.put("params3", "验收");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + } + + if(cutRoadState.equals("-2")){ //作业负责人审核打回发站内信 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条断路安全作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", cutRoad.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", cutRoad.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", cutRoad.getString("CHECK_NO"));// 作业编号 + content.put("params1", "断路安全申请作业"); // 作业名称 + content.put("params2", "断路安全申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(cutRoadState.equals("-3")){ //所在单位审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条断路安全作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", cutRoad.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", cutRoad.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", cutRoad.getString("CHECK_NO"));// 作业编号 + content.put("params1", "断路安全申请作业"); // 作业名称 + content.put("params2", "断路安全申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(cutRoadState.equals("-4")){ //消防、安全管理部门审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条断路安全作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", cutRoad.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", cutRoad.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", cutRoad.getString("CHECK_NO"));// 作业编号 + content.put("params1", "断路安全申请作业"); // 作业名称 + content.put("params2", "断路安全申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(cutRoadState.equals("-5")){ //审批部门审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条断路安全作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", cutRoad.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", cutRoad.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", cutRoad.getString("CHECK_NO"));// 作业编号 + content.put("params1", "断路安全申请作业"); // 作业名称 + content.put("params2", "断路安全申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if (cutRoadState.equals("-6")) {//验收打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条断路安全作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", cutRoad.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", cutRoad.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", cutRoad.getString("CHECK_NO"));// 作业编号 + content.put("params1", "断路安全申请作业"); // 作业名称 + content.put("params2", "断路安全申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + }catch (Exception e){ +// FHLOG.save("动火审批", "发送站内信失败！"); + + } + + + } + /**上传图 * @param * @throws Exception @@ -759,6 +972,7 @@ public class AppGFCutRoadController extends BaseController { break; } GFcutRoadLogService.save(log); + this.sendNotice(pd); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java index fc56ce84..dc83b16e 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java @@ -7,6 +7,7 @@ import com.zcloud.dto.TenCorpConst; import com.zcloud.dto.TenCorpDto; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.bus.NoticeCorpService; import com.zcloud.service.gf.*; import com.zcloud.service.mq.SendMessageService; import com.zcloud.util.*; @@ -51,6 +52,8 @@ public class AppGFElectricityController extends BaseController { @Resource private SendMessageService mqClient; + @Autowired + private NoticeCorpService noticeCorpService; /**获取编码 * @param @@ -176,10 +179,203 @@ public class AppGFElectricityController extends BaseController { paramsList1.add(params6); sendMessageUtil.sendMessages(mes1, paramsList1); } + this.sendNotice(pd); map.put("result", errInfo); return map; } + /** + * 发送通知公告 + * @param pageData + */ + public void sendNotice(PageData pageData) { + try { + PageData electricity = GFelectricityService.findById(pageData); + String electricityState = electricity.getString("APPLY_STATUS"); //状态 + if (electricity != null) { + if (electricityState.equals("1")) { //作业负责人待审核 + PageData mes = new PageData(); + mes.put("BIANMA", "PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条临时用电作业待确认"); // 站内信标题 + mes.put("CORPINFO_ID", electricity.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", electricity.get("CONFIRM_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", electricity.getString("CHECK_NO"));// 作业编号 + content.put("params1", "临时用电申请作业"); // 作业名称 + content.put("params2", "作业负责人待审核"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //临时用电监护人发站内信 + mes.put("BIANMA", "PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条临时用电作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", electricity.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", electricity.get("GUARDIAN_USER_ID")); // 接收人员ID + content.put("number", electricity.getString("CHECK_NO"));// 作业编号 + content.put("params1", "临时用电申请作业"); // 作业名称 + content.put("params2", "监护人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //临时用电安全交底人发站内信 + mes.put("BIANMA", "PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条临时用电作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", electricity.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", electricity.get("CONFESS_USER_ID")); // 接收人员ID + content.put("number", electricity.getString("CHECK_NO"));// 作业编号 + content.put("params1", "临时用电申请作业"); // 作业名称 + content.put("params2", "安全交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //临时用电接收交底人发站内信 + mes.put("BIANMA", "PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条临时用电作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", electricity.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", electricity.get("ACCEPT_CONFESS_USER_ID")); // 接收人员ID + content.put("number", electricity.getString("CHECK_NO"));// 作业编号 + content.put("params1", "临时用电申请作业"); // 作业名称 + content.put("params2", "接受交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + if (StringUtils.equals(electricity.get("ISANALYZE").toString(), "1")) { + //临时用电气体检测发站内信 + mes.put("BIANMA", "PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条临时用电作业待进行气体检测"); // 站内信标题 + mes.put("CORPINFO_ID", electricity.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", electricity.get("ANALYZE_USER_ID")); // 接收人员ID + content.put("number", electricity.getString("CHECK_NO"));// 作业编号 + content.put("params1", "临时用电申请作业"); // 作业名称 + content.put("params2", "气体检测"); + content.put("params3", "检测");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + } else if (electricityState.equals("2")) { //用电单位待审核 + PageData mes = new PageData(); + mes.put("BIANMA", "PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条临时用电作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", electricity.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", electricity.get("AUDIT_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", electricity.getString("CHECK_NO"));// 作业编号 + content.put("params1", "临时用电申请作业"); // 作业名称 + content.put("params2", "用电单位意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if (electricityState.equals("3")) { //配送电单位待审核 + PageData mes = new PageData(); + mes.put("BIANMA", "PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条临时用电作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", electricity.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", electricity.get("APPROVE_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", electricity.getString("CHECK_NO"));// 作业编号 + content.put("params1", "临时用电申请作业"); // 作业名称 + content.put("params2", "配送电单位意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if (electricityState.equals("4")) { //待验收 + PageData mes = new PageData(); + mes.put("BIANMA", "PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条临时用电作业待验收"); // 站内信标题 + mes.put("CORPINFO_ID", electricity.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", electricity.get("ACCEPT_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", electricity.getString("CHECK_NO"));// 作业编号 + content.put("params1", "临时用电申请作业"); // 作业名称 + content.put("params2", "完工验收"); + content.put("params3", "验收");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + + if (electricityState.equals("-2")) { //作业负责人审核打回发站内信 + PageData mes = new PageData(); + mes.put("BIANMA", "PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条临时用电作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", electricity.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", electricity.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", electricity.getString("CHECK_NO"));// 作业编号 + content.put("params1", "临时用电申请作业"); // 作业名称 + content.put("params2", "临时用电申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if (electricityState.equals("-3")) { //用电单位审核打回 + PageData mes = new PageData(); + mes.put("BIANMA", "PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条临时用电作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", electricity.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", electricity.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", electricity.getString("CHECK_NO"));// 作业编号 + content.put("params1", "临时用电申请作业"); // 作业名称 + content.put("params2", "临时用电申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if (electricityState.equals("-4")) { //配送电单位审核打回 + PageData mes = new PageData(); + mes.put("BIANMA", "PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条临时用电作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", electricity.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", electricity.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", electricity.getString("CHECK_NO"));// 作业编号 + content.put("params1", "临时用电申请作业"); // 作业名称 + content.put("params2", "临时用电申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if (electricityState.equals("-5")) { //验收打回 + PageData mes = new PageData(); + mes.put("BIANMA", "PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条临时用电作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", electricity.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", electricity.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", electricity.getString("CHECK_NO"));// 作业编号 + content.put("params1", "临时用电申请作业"); // 作业名称 + content.put("params2", "临时用电申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + } + }catch(Exception e){ +// FHLOG.save("动火审批", "发送站内信失败！"); + } + } + /**删除 */ @RequestMapping(value="/delete") @@ -891,6 +1087,7 @@ public class AppGFElectricityController extends BaseController { break; } GFelectricityLogService.save(log); + this.sendNotice(pd); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java index 0acf912e..1538eea4 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.bus.NoticeCorpService; import com.zcloud.service.gf.*; import com.zcloud.util.*; import org.apache.commons.io.FileUtils; @@ -45,6 +46,8 @@ public class AppGFHighWorkController extends BaseController { private SendMessageUtil sendMessageUtil; @Autowired private Smb smb; + @Autowired + private NoticeCorpService noticeCorpService; /**获取编码 * @param * @throws Exception @@ -139,9 +142,220 @@ public class AppGFHighWorkController extends BaseController { sendMessageUtil.sendMessages(mes, paramsList); } map.put("result", errInfo); + this.sendNotice(pd); return map; } + /** + * 发送通知公告 + * @param pageData + */ + public void sendNotice(PageData pageData) { + try{ + PageData highwork = GFhighworkService.findById(pageData); + String highworkState = highwork.getString("APPLY_STATUS"); //状态 + if(highwork != null){ + if(highworkState.equals("1")){ //作业负责人待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条高处作业待确认"); // 站内信标题 + mes.put("CORPINFO_ID", highwork.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", highwork.get("CONSTRUCTION_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", highwork.getString("CHECK_NO"));// 作业编号 + content.put("params1", "高处申请作业"); // 作业名称 + content.put("params2", "作业负责人待审核"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //高处监护人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条高处作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", highwork.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", highwork.get("GUARDIAN_USER_ID")); // 接收人员ID + content.put("number", highwork.getString("CHECK_NO"));// 作业编号 + content.put("params1", "高处申请作业"); // 作业名称 + content.put("params2", "监护人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //高处安全交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条高处作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", highwork.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", highwork.get("CONFESS_USER_ID")); // 接收人员ID + content.put("number", highwork.getString("CHECK_NO"));// 作业编号 + content.put("params1", "高处申请作业"); // 作业名称 + content.put("params2", "安全交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //高处接收交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条高处作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", highwork.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", highwork.get("ACCEPT_CONFESS_USER_ID")); // 接收人员ID + content.put("number", highwork.getString("CHECK_NO"));// 作业编号 + content.put("params1", "高处申请作业"); // 作业名称 + content.put("params2", "接受交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(highworkState.equals("2")){ //所在单位领导人待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条高处作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", highwork.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", highwork.get("LEADER_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", highwork.getString("CHECK_NO"));// 作业编号 + content.put("params1", "高处申请作业"); // 作业名称 + content.put("params2", "所在单位意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(highworkState.equals("3")){ //审核部门待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条高处作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", highwork.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", highwork.get("AUDIT_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", highwork.getString("CHECK_NO"));// 作业编号 + content.put("params1", "高处申请作业"); // 作业名称 + content.put("params2", "审核部门意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(highworkState.equals("4")){ //审批部门待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条高处作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", highwork.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", highwork.get("APPROVE_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", highwork.getString("CHECK_NO"));// 作业编号 + content.put("params1", "高处申请作业"); // 作业名称 + content.put("params2", "审批部门意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(highworkState.equals("5")){ //待验收 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条高处作业待验收"); // 站内信标题 + mes.put("CORPINFO_ID", highwork.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", highwork.get("ACCEPT_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", highwork.getString("CHECK_NO"));// 作业编号 + content.put("params1", "高处申请作业"); // 作业名称 + content.put("params2", "作业待验收"); + content.put("params3", "验收");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + } + + if(highworkState.equals("-2")){ //作业负责人审核打回发站内信 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条高处作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", highwork.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", highwork.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", highwork.getString("CHECK_NO"));// 作业编号 + content.put("params1", "高处申请作业"); // 作业名称 + content.put("params2", "高处申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(highworkState.equals("-3")){ //所在单位审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条高处作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", highwork.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", highwork.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", highwork.getString("CHECK_NO"));// 作业编号 + content.put("params1", "高处申请作业"); // 作业名称 + content.put("params2", "高处申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(highworkState.equals("-4")){ //审核部门审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条高处作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", highwork.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", highwork.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", highwork.getString("CHECK_NO"));// 作业编号 + content.put("params1", "高处申请作业"); // 作业名称 + content.put("params2", "高处申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(highworkState.equals("-5")){ //审批部门审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条高处作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", highwork.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", highwork.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", highwork.getString("CHECK_NO"));// 作业编号 + content.put("params1", "高处申请作业"); // 作业名称 + content.put("params2", "高处申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if (highworkState.equals("-6")) {//验收打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条高处作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", highwork.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", highwork.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", highwork.getString("CHECK_NO"));// 作业编号 + content.put("params1", "高处申请作业"); // 作业名称 + content.put("params2", "高处申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + }catch (Exception e){ +// FHLOG.save("动火审批", "发送站内信失败！"); + + } + + + } + /**删除 * @param * @throws Exception @@ -1026,6 +1240,7 @@ public class AppGFHighWorkController extends BaseController { break; } GFhighWorkLogService.save(log); + this.sendNotice(pd); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java index 32c52b33..8a2e7510 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.bus.NoticeCorpService; import com.zcloud.service.gf.*; import com.zcloud.util.*; import org.apache.commons.lang.StringUtils; @@ -41,6 +42,8 @@ public class AppGFHoistingController extends BaseController { private GFHoistingToMeasuresService GFhighWorkToMeasuresService; @Autowired private SendMessageUtil sendMessageUtil; + @Autowired + private NoticeCorpService noticeCorpService; /**获取编码 * @param * @throws Exception @@ -134,10 +137,221 @@ public class AppGFHoistingController extends BaseController { paramsList.add(params4); sendMessageUtil.sendMessages(mes, paramsList); } + this.sendNotice(pd); map.put("result", errInfo); return map; } + /** + * 发送通知公告 + * @param pageData + */ + public void sendNotice(PageData pageData) { + try{ + PageData hoisting = GFhoistingService.findById(pageData); + String hoistingState = hoisting.getString("APPLY_STATUS"); //状态 + if(hoisting != null){ + if(hoistingState.equals("1")){ //作业指挥待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条吊装作业待确认"); // 站内信标题 + mes.put("CORPINFO_ID", hoisting.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hoisting.get("LEADER_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hoisting.getString("CHECK_NO"));// 作业编号 + content.put("params1", "吊装申请作业"); // 作业名称 + content.put("params2", "作业指挥待审核"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //吊装监护人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条吊装作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", hoisting.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hoisting.get("GUARDIAN_USER_ID")); // 接收人员ID + content.put("number", hoisting.getString("CHECK_NO"));// 作业编号 + content.put("params1", "吊装申请作业"); // 作业名称 + content.put("params2", "监护人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //吊装安全交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条吊装作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", hoisting.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hoisting.get("CONFESS_USER_ID")); // 接收人员ID + content.put("number", hoisting.getString("CHECK_NO"));// 作业编号 + content.put("params1", "吊装申请作业"); // 作业名称 + content.put("params2", "安全交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + //吊装接收交底人发站内信 + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条吊装作业待签字"); // 站内信标题 + mes.put("CORPINFO_ID", hoisting.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hoisting.get("ACCEPT_CONFESS_USER_ID")); // 接收人员ID + content.put("number", hoisting.getString("CHECK_NO"));// 作业编号 + content.put("params1", "吊装申请作业"); // 作业名称 + content.put("params2", "接受交底人签字"); + content.put("params3", "签字");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hoistingState.equals("2")){ //所在单位待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条吊装作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", hoisting.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hoisting.get("CONSTRUCTION_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hoisting.getString("CHECK_NO"));// 作业编号 + content.put("params1", "吊装申请作业"); // 作业名称 + content.put("params2", "所在单位意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hoistingState.equals("3")){ //审核部门待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条吊装作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", hoisting.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hoisting.get("AUDIT_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hoisting.getString("CHECK_NO"));// 作业编号 + content.put("params1", "吊装申请作业"); // 作业名称 + content.put("params2", "审核部门意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hoistingState.equals("4")){ //审批部门待审核 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条吊装作业待审核"); // 站内信标题 + mes.put("CORPINFO_ID", hoisting.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hoisting.get("APPROVE_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hoisting.getString("CHECK_NO"));// 作业编号 + content.put("params1", "吊装申请作业"); // 作业名称 + content.put("params2", "审批部门意见"); + content.put("params3", "审核");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hoistingState.equals("5")){ //待验收 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条吊装作业待验收"); // 站内信标题 + mes.put("CORPINFO_ID", hoisting.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hoisting.get("ACCEPT_USER_ID")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hoisting.getString("CHECK_NO"));// 作业编号 + content.put("params1", "吊装申请作业"); // 作业名称 + content.put("params2", "作业待验收"); + content.put("params3", "验收");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + } + + if(hoistingState.equals("-2")){ //作业负责人审核打回发站内信 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条吊装作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", hoisting.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hoisting.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hoisting.getString("CHECK_NO"));// 作业编号 + content.put("params1", "吊装申请作业"); // 作业名称 + content.put("params2", "吊装申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hoistingState.equals("-3")){ //所在单位审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条吊装作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", hoisting.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hoisting.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hoisting.getString("CHECK_NO"));// 作业编号 + content.put("params1", "吊装申请作业"); // 作业名称 + content.put("params2", "吊装申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hoistingState.equals("-4")){ //审核部门审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条吊装作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", hoisting.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hoisting.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hoisting.getString("CHECK_NO"));// 作业编号 + content.put("params1", "吊装申请作业"); // 作业名称 + content.put("params2", "吊装申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if(hoistingState.equals("-5")){ //审批部门审核打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条吊装作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", hoisting.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hoisting.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hoisting.getString("CHECK_NO"));// 作业编号 + content.put("params1", "吊装申请作业"); // 作业名称 + content.put("params2", "吊装申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } else if (hoistingState.equals("-6")) {//验收打回 + PageData mes = new PageData(); + mes.put("BIANMA","PROCESS_WORK_001"); + mes.put("SENDER_ID", "系统管理员"); // 发送人员ID + mes.put("SENDER_NAME", "1"); // 发送人员姓名 + mes.put("SYNOPSIS", "友情提示：有一条吊装作业打回待处理"); // 站内信标题 + mes.put("CORPINFO_ID", hoisting.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", hoisting.getString("CREATOR")); // 接收人员ID + PageData content = new PageData(); + content.put("number", hoisting.getString("CHECK_NO"));// 作业编号 + content.put("params1", "吊装申请作业"); // 作业名称 + content.put("params2", "吊装申请管理"); + content.put("params3", "处理");// 作业操作 + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } + }catch (Exception e){ +// FHLOG.save("动火审批", "发送站内信失败！"); + + } + + + } + /**删除 * @throws Exception */ @@ -968,6 +1182,7 @@ public class AppGFHoistingController extends BaseController { break; } GFhighWorkLogService.save(log); + this.sendNotice(pd); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java index 5bd872b4..b93b92ef 100644 --- a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java +++ b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java @@ -166,7 +166,8 @@ public class HiddenApiController extends BaseController { pd.put("HIDDENPART", hiddenRegion.getString("HIDDENREGION_ID")); } /** 隐患的主要负责人 一条隐患 多个隐患发现人 ，把多个信息填入这个张表中 */ - hiddenUserApiService.saveRectificationo(pd.getString("findCreator"), pd.getString("HIDDEN_ID"), "1", Jurisdiction.getUSER_ID()); +// hiddenUserApiService.saveRectificationo(pd.getString("findCreator"), pd.getString("HIDDEN_ID"), "1", Jurisdiction.getUSER_ID()); + hiddenUserApiService.saveRectificationo(pd.getString("findCreator"), pd.getString("HIDDEN_ID"), "1", pd.getString("hiddenFindCreator")); /** 初始化隐患确认信息 记录隐患发现人的隐患等级等信息 */ hiddenExamineApiService.saveConfirm(pd, "0"); @@ -1275,4 +1276,32 @@ public class HiddenApiController extends BaseController { mv = new ModelAndView(erv2, dataMap); return mv; } + + /** + * 删除安全环保检查内的隐患 + * + * @throws Exception + */ + @RequestMapping(value = "/deleteHiddenForSafetyenvironmental") + @ResponseBody + public Object deleteHiddenForSafetyenvironmental() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + PageData hidden = hiddenApiService.findById(pd); + Integer deleteHidden = hiddenApiService.deleteApi(pd.getString("HIDDEN_ID")); //修改隐患的状态 + map.put("deleteHidden", deleteHidden); + /** 隐患相关人员 */ + Integer deleteHiddenUserType = hiddenUserApiService.deleteByHidden(pd.getString("HIDDEN_ID")); + map.put("deleteHiddenUserType", deleteHiddenUserType); + /** 删除隐患流程信息 */ + Integer deleteHiddenExaType = hiddenExamineApiService.deleteByHiddenId(pd); + map.put("deleteHiddenExaType", deleteHiddenExaType); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java index 309d9af1..1bed218e 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java @@ -12,6 +12,7 @@ import com.zcloud.service.keyProjects.KeyprojectHiddenService; import com.zcloud.util.DateUtil; import com.zcloud.util.Tools; import com.zcloud.util.UuidUtil; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -162,6 +163,40 @@ public class KeyprojectCheckController extends BaseController { if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); page.setPd(pd); List varList = keyprojectcheckService.list(page); //列出KeyprojectCheck列表 + if (varList.size() > 0) { + List foreignIdList = new ArrayList<>(); + for (PageData data : varList) { + foreignIdList.add(data.getString("KEYPROJECTCHECK_ID")); + } + // 查询列表中安全环保检查下所有的隐患 + List allKeyprojectHiddenList = keyprojectHiddenService.listByForeignIds(foreignIdList); + for (PageData data : varList) { + if (StringUtils.equals(data.getString("INSPECTION_STATUS"), "1")) { + boolean isCheck = true; // 安全环保检查是否验收 + List keyProjectHiddenList = new ArrayList<>(); + for (PageData pageData : allKeyprojectHiddenList) { + if (StringUtils.equals(pageData.getString("FOREIGN_ID"), data.getString("KEYPROJECTCHECK_ID"))) { + keyProjectHiddenList.add(pageData); + } + } + if (keyProjectHiddenList.size() > 0) { + for (PageData pageData : keyProjectHiddenList) { + if (!StringUtils.equals(pageData.getString("STATE"), "4")) { + isCheck = false; + } + } + } else { + if (!data.getString("INSPECTION_STATUS").equals("1")) { + isCheck = false; + } + } + if (isCheck) { + // 安全环保检查验收 + data.put("INSPECTION_STATUS", "2"); + } + } + } + } map.put("varList", varList); map.put("page", page); map.put("result", errInfo); @@ -266,4 +301,37 @@ public class KeyprojectCheckController extends BaseController { return map; } + /**删除安全环保检查及其对应隐患 + * @param + * @throws Exception + */ + @RequestMapping(value="/goDelete") + @ResponseBody + public Object goDelete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + // 删除安全环保检查下对应的隐患 + if (Tools.notEmpty(pd.getString("KEYPROJECTCHECK_ID"))) { + PageData hiddenPd = new PageData(); + hiddenPd.put("FOREIGN_ID", pd.getString("KEYPROJECTCHECK_ID")); + List hiddenList = keyprojectHiddenService.listAllInspection(hiddenPd); + if (hiddenList.size() > 0) { + List hiddenIds = new ArrayList<>(); + for (PageData hiddenData : hiddenList) { + hiddenIds.add(hiddenData.getString("HIDDEN_ID")); + } + // 将hiddenIds转为数组 + String[] hiddenIdArray = new String[hiddenIds.size()]; + hiddenIdArray = hiddenIds.toArray(hiddenIdArray); + keyprojectHiddenService.deleteByIds(hiddenIdArray); + } + } + keyprojectcheckService.delete(pd); + map.put("result", errInfo); + return map; + } + } diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java index 9b5ce3a1..4c50ff62 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java @@ -226,6 +226,43 @@ public class AppKeyprojectCheckController extends BaseController { if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); page.setPd(pd); List varList = keyprojectcheckService.list(page); //列出KeyprojectCheck列表 + if (varList.size() > 0) { + List foreignIdList = new ArrayList<>(); + for (PageData data : varList) { + foreignIdList.add(data.getString("KEYPROJECTCHECK_ID")); + } + // 查询列表中安全环保检查下所有的隐患 + List allKeyprojectHiddenList = keyprojectHiddenService.listByForeignIds(foreignIdList); + for (PageData data : varList) { + if (StringUtils.equals(data.getString("INSPECTION_STATUS"), "1")) { + boolean isCheck = true; // 安全环保检查是否验收 + List keyProjectHiddenList = new ArrayList<>(); // 单个安全环保检查下的隐患集合 + for (PageData pageData : allKeyprojectHiddenList) { + if (StringUtils.equals(pageData.getString("FOREIGN_ID"), data.getString("KEYPROJECTCHECK_ID"))) { + // 遍历所有的隐患,把对应安全环保检查下的隐患放到一个集合中 + keyProjectHiddenList.add(pageData); + } + } + if (keyProjectHiddenList.size() > 0) { + // 判断安全环保检查下是否有隐患 + for (PageData pageData : keyProjectHiddenList) { + if (!StringUtils.equals(pageData.getString("STATE"), "4")) { + // 如果隐患列表中存在未验收的隐患,则安全环保检查未验收 + isCheck = false; + } + } + } else { + if (!data.getString("INSPECTION_STATUS").equals("1")) { + isCheck = false; + } + } + if (isCheck) { + // 安全环保检查验收 + data.put("INSPECTION_STATUS", "2"); + } + } + } + } map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 098ad1d2..65116ec6 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -165,7 +165,13 @@ public class UsersController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - List userList = usersService.getDepartmentId(pd.getString("DEPARTMENT_ID")); //列出用户列表 + String[] departmentIds = pd.getString("DEPARTMENT_ID").split(","); + List userList = new ArrayList<>(); + if (departmentIds.length > 1) { + userList = usersService.getDepartmentIds(departmentIds); //列出用户列表 + } else { + userList = usersService.getDepartmentId(pd.getString("DEPARTMENT_ID")); //列出用户列表 + } pd.put("ROLE_ID", "1"); map.put("userList", userList); map.put("page", page); @@ -1416,6 +1422,11 @@ public class UsersController extends BaseController { Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); + String[] departmentIds = pd.getString("DEPARTMENT_ID").split(","); + if (departmentIds.length > 1) { + pd.put("departmentIds", departmentIds); + pd.remove("DEPARTMENT_ID"); + } List userList = usersService.listAllUser(pd); //列出Post列表 map.put("userList", userList); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireCheckStandardMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireCheckStandardMapper.java index cd578d8d..dac3a773 100644 --- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireCheckStandardMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireCheckStandardMapper.java @@ -42,4 +42,6 @@ public interface FireCheckStandardMapper { List getListAll(PageData pd) ; List getStandardListByDeviceType(PageData pd); + + List getPointListByUserId(PageData pageData); } diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FirePointMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FirePointMapper.java index 9c3d17fa..8a362a16 100644 --- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FirePointMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FirePointMapper.java @@ -3,6 +3,7 @@ package com.zcloud.mapper.datasource.firemanager; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -79,4 +80,8 @@ public interface FirePointMapper { void removeQualifiedByQIds(PageData pd); List getFirePointCheckPhotos(PageData pd); + + void batchEditFirePointUser(PageData pd); + + List findByIds(@Param("pointIds") List pointIds); } diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java index 79ef8e05..5d224cf1 100644 --- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java @@ -119,4 +119,6 @@ public interface FireRecordMapper { void doRemoveRecordDeviceHiddenByCidRidDid(PageData checkInfo); void doRemoveRecordPointHiddenByCidRidDid(PageData checkInfo); + + PageData getPhotoUploadMethod(PageData pageData); } diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRegionMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRegionMapper.java index 2e45f517..2c48dca6 100644 --- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRegionMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRegionMapper.java @@ -95,4 +95,6 @@ public interface FireRegionMapper { List listAll (PageData pd); void deleteAll(PageData pd); + + void editDeptByIds(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationDelayedMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationDelayedMapper.java index ce1c2bf1..fe2f7e0f 100644 --- a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationDelayedMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationDelayedMapper.java @@ -54,5 +54,6 @@ public interface HotWorkApplicationDelayedMapper{ */ void deleteAll(String[] ArrayDATA_IDS); + void deleteByForeignKey(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java index 0fbcecc3..963490e1 100644 --- a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java @@ -167,5 +167,9 @@ public interface KeyprojectHiddenMapper { List getPhone(PageData pd); + + List listByForeignIds(List foreignIdList); + + void deleteByIds(String[] hiddenIdArray); } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 376f7003..5a9bcd9f 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -6,6 +6,7 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.entity.system.Role; import com.zcloud.entity.system.User; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; /** @@ -310,4 +311,6 @@ public interface UsersMapper { PageData findByCardNo(PageData pd); List listUserByDepId(PageData pd); + + List getDepartmentIds(@Param("departmentIds") String[] departmentIds); } diff --git a/src/main/java/com/zcloud/service/bus/HiddenUserService.java b/src/main/java/com/zcloud/service/bus/HiddenUserService.java index 959576d6..fc7b5aac 100644 --- a/src/main/java/com/zcloud/service/bus/HiddenUserService.java +++ b/src/main/java/com/zcloud/service/bus/HiddenUserService.java @@ -90,5 +90,11 @@ public interface HiddenUserService{ * @throws Exception */ void deleteByHidden (PageData pd) throws Exception; + + /** + * 添加隐患整改人（隐患发现人改为单人） + * @throws Exception + */ + void saveRectificationoSingleFinder(String userIds, String hiddenId, String type, String hiddenFindCreator)throws Exception; } diff --git a/src/main/java/com/zcloud/service/bus/impl/HiddenUserServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/HiddenUserServiceImpl.java index aefd2ea3..55fb2461 100644 --- a/src/main/java/com/zcloud/service/bus/impl/HiddenUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/HiddenUserServiceImpl.java @@ -190,5 +190,37 @@ public class HiddenUserServiceImpl implements HiddenUserService{ public void deleteByHidden(PageData pd) throws Exception { hiddenuserMapper.deleteByHidden(pd); } + + @Override + public void saveRectificationoSingleFinder(String userIds, String hiddenId, String type, String hiddenFindCreator) throws Exception { + if(!Tools.isEmpty(hiddenId)){ + PageData del = new PageData(); + del.put("TYPE",type); + del.put("HIDDEN_ID",hiddenId); + hiddenuserMapper.deleteByHidden(del); // 先删除后添加 + } + if(!Tools.isEmpty(userIds)){ + String removeLoginUser = userIds.replaceAll(Jurisdiction.getUSER_ID(),""); //去除当前登录人的用户id + String userID [] = removeLoginUser.split(","); + for (int i =0;i goRecordDeviceByPid(PageData pd); + + /** + * 检查人id获取检查人所涉及的查询点位列表 + * @Author: limingyu + * @Date: 2024/3/18/008 09:11 + * @throws Exception + */ + List getPointListByUserId(PageData pageData); } diff --git a/src/main/java/com/zcloud/service/firemanager/FirePointService.java b/src/main/java/com/zcloud/service/firemanager/FirePointService.java index a94f7b78..c8a46342 100644 --- a/src/main/java/com/zcloud/service/firemanager/FirePointService.java +++ b/src/main/java/com/zcloud/service/firemanager/FirePointService.java @@ -45,4 +45,8 @@ public interface FirePointService { void removeQualifiedByQIds(PageData pd); List getFirePointCheckPhotos(PageData pd); + + void batchEditFirePointUser(PageData pd); + + List findByIds(List pointIds); } diff --git a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java index 381beb12..f7da6d39 100644 --- a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java +++ b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java @@ -140,4 +140,6 @@ public interface FireRecordService { void doRemoveRecordDeviceHiddenByCidRidDid(PageData checkInfo); void doRemoveRecordPointHiddenByCidRidDid(PageData checkInfo); + + PageData getPhotoUploadMethod(PageData pageData); } diff --git a/src/main/java/com/zcloud/service/firemanager/FireRegionService.java b/src/main/java/com/zcloud/service/firemanager/FireRegionService.java index 75fe677a..c4ce94c8 100644 --- a/src/main/java/com/zcloud/service/firemanager/FireRegionService.java +++ b/src/main/java/com/zcloud/service/firemanager/FireRegionService.java @@ -37,4 +37,5 @@ public interface FireRegionService { Map getAllByCorpIdForExcel (PageData pd); public PageData savaByExcel (String name,String bianma ,String departId) throws Exception; + void editDeptByIds(Map map, PageData pd); } diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireCheckListServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireCheckListServiceImpl.java index 9ffe9ed0..583f8ceb 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireCheckListServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireCheckListServiceImpl.java @@ -10,6 +10,7 @@ import com.zcloud.mapper.datasource.firemanager.FireCheckListMapper; import com.zcloud.service.bus.SysDateService; import com.zcloud.service.firemanager.*; import com.zcloud.service.system.FHlogService; +import com.zcloud.service.system.UsersService; import com.zcloud.util.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,6 +43,8 @@ public class FireCheckListServiceImpl implements FireCheckListService { @Resource private FirePointPreparedService firePointPreparedService; @Resource + private UsersService usersService; + @Resource private InitPageDataUtil initPageDataUtil; /** @@ -108,7 +111,14 @@ public class FireCheckListServiceImpl implements FireCheckListService { List preDataList = new ArrayList<>(); String fire_check_id = UuidUtil.get32UUID(); pd.put("FIRE_CHECK_TYPE", pageData.get("FIRE_CHECK_TYPE")); - pd.put("DEPARTMENT_ID", pageData.get("DEPARTMENT_ID")); + PageData user = new PageData(); + user.put("USER_ID", USERID); + try { + PageData userById = usersService.findById(user); + pd.put("DEPARTMENT_ID", userById.get("DEPARTMENT_ID")); + } catch (Exception e) { + throw new RuntimeException(e); + } pd.put("USER_ID", USERID); pd.put("FIRE_CHECK_STANDARD_NAME", pageData.get("FIRE_CHECK_STANDARD_NAME")); //检查表 @@ -472,6 +482,13 @@ public class FireCheckListServiceImpl implements FireCheckListService { fireCheckData.put("FIRE_CHECK_ID", FIRE_CHECK_ID); fireCheckData.put("FIRE_CHECK_STANDARD_NAME", postData.getString("FIRE_CHECK_STANDARD_NAME")); fireCheckData.put("FIRE_CHECK_TYPE", postData.getString("FIRE_CHECK_TYPE")); + /** + * @date: 2024/03/12 + * @author: limingyu + * @description: 修改点检表可以修改检查人，也可以修改部门 + */ + fireCheckData.put("DEPARTMENT_ID", postData.getString("UPDATE_DEPARTMENT_ID")); + fireCheckData.put("USER_ID", postData.getString("UPDATE_USER_ID")); fireCheckListMapper.upd4PcById(fireCheckData); /* * 修改需要检查的点位 diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireCheckStandardServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireCheckStandardServiceImpl.java index b9f5ebf2..8ce8c2ed 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireCheckStandardServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireCheckStandardServiceImpl.java @@ -5,6 +5,7 @@ import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.firemanager.FireCheckStandardMapper; import com.zcloud.service.bus.SysDateService; import com.zcloud.service.firemanager.FireCheckStandardService; +import com.zcloud.service.firemanager.FirePointService; import com.zcloud.service.firemanager.FirePreparedCheckListService; import com.zcloud.service.firemanager.FireRecordService; import com.zcloud.util.DateUtil; @@ -15,6 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; @@ -38,6 +40,8 @@ public class FireCheckStandardServiceImpl implements FireCheckStandardService { private SysDateService sysDateService; @Resource private FireRecordService fireRecordService; + @Resource + private FirePointService firePointService; @Override @Transactional(rollbackFor = Exception.class) public void saveImportCheckStandard(List listPd) { @@ -232,4 +236,18 @@ public class FireCheckStandardServiceImpl implements FireCheckStandardService { }); return list; } + + @Override + public List getPointListByUserId(PageData pageData) { + List pointListByUserId = fireCheckStandardMapper.getPointListByUserId(pageData); + List pointIds = new ArrayList<>(); + List dataList = new ArrayList<>(); + if (pointListByUserId.size() > 0) { + for (PageData data : pointListByUserId) { + pointIds.add(data.getString("FIRE_POINT_ID")); + } + dataList = firePointService.findByIds(pointIds); + } + return dataList; + } } diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FirePointServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FirePointServiceImpl.java index b11771f6..1a6f0dd9 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FirePointServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FirePointServiceImpl.java @@ -156,4 +156,14 @@ public class FirePointServiceImpl implements FirePointService { public List getFirePointCheckPhotos(PageData pd) { return firePointMapper.getFirePointCheckPhotos(pd); } + + @Override + public void batchEditFirePointUser(PageData pd) { + firePointMapper.batchEditFirePointUser(pd); + } + + @Override + public List findByIds(List pointIds) { + return firePointMapper.findByIds(pointIds); + } } diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java index 11b93b23..e45b77da 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java @@ -795,4 +795,9 @@ public class FireRecordServiceImpl implements FireRecordService { public void doRemoveRecordPointHiddenByCidRidDid(PageData checkInfo) { fireRecordMapper.doRemoveRecordPointHiddenByCidRidDid(checkInfo); } + + @Override + public PageData getPhotoUploadMethod(PageData pageData) { + return fireRecordMapper.getPhotoUploadMethod(pageData); + } } diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireRegionServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireRegionServiceImpl.java index 1dbed436..b35e78ca 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireRegionServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireRegionServiceImpl.java @@ -180,4 +180,16 @@ public class FireRegionServiceImpl implements FireRegionService { this.saveInfo(pd); return pd; } + + @Override + public void editDeptByIds(Map map, PageData pd) { + String DATA_IDS = pd.getString("DATA_IDS"); + if (Tools.notEmpty(DATA_IDS)) { + String ArrayDATA_IDS[] = DATA_IDS.split(","); + pd.put("ArrayDATA_IDS", ArrayDATA_IDS); + initPageDataUtil.initEdit(pd); + fireRegionMapper.editDeptByIds(pd); + map.put("result", "success"); + } + } } diff --git a/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationDelayedService.java b/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationDelayedService.java index 8813536b..129356de 100644 --- a/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationDelayedService.java +++ b/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationDelayedService.java @@ -4,7 +4,7 @@ import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：延时监火 * 作者：luoxiaobao * 时间：2022-05-05 @@ -17,42 +17,43 @@ public interface HotWorkApplicationDelayedService{ * @throws Exception */ public void save(PageData pd)throws Exception; - + /**删除 * @param pd * @throws Exception */ public void delete(PageData pd)throws Exception; - + /**修改 * @param pd * @throws Exception */ public void edit(PageData pd)throws Exception; - + /**列表 * @param page * @throws Exception */ public List list(Page page)throws Exception; - + /**列表(全部) * @param pd * @throws Exception */ public List listAll(PageData pd)throws Exception; - + /**通过id获取数据 * @param pd * @throws Exception */ public PageData findById(PageData pd)throws Exception; - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ public void deleteAll(String[] ArrayDATA_IDS)throws Exception; - + + void deleteByForeignKey(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationDelayedServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationDelayedServiceImpl.java index 2b3aabff..710da448 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationDelayedServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationDelayedServiceImpl.java @@ -79,5 +79,10 @@ public class HotWorkApplicationDelayedServiceImpl implements HotWorkApplicationD hotworkapplicationdelayedMapper.deleteAll(ArrayDATA_IDS); } + @Override + public void deleteByForeignKey(PageData pd) throws Exception { + hotworkapplicationdelayedMapper.deleteByForeignKey(pd); + } + } diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationServiceImpl.java index 128ee401..5c13c373 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationServiceImpl.java @@ -3,6 +3,8 @@ package com.zcloud.service.highriskwork.impl; import java.util.Date; import java.util.List; +import com.zcloud.service.highriskwork.HotWorkApplicationDelayedService; +import com.zcloud.service.highriskwork.HotWorkApplicationUserService; import com.zcloud.util.DateUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,6 +26,10 @@ public class HotWorkApplicationServiceImpl implements HotWorkApplicationService{ @Autowired private HotWorkApplicationMapper hotworkapplicationMapper; + @Autowired + private HotWorkApplicationUserService hotWorkApplicationUserService; + @Autowired + private HotWorkApplicationDelayedService hotWorkApplicationDelayedService; /**新增 * @param pd @@ -39,6 +45,9 @@ public class HotWorkApplicationServiceImpl implements HotWorkApplicationService{ */ public void delete(PageData pd)throws Exception{ hotworkapplicationMapper.delete(pd); + pd.put("FOREIGN_KEY", pd.getString("HOTWORKAPPLICATION_ID")); + hotWorkApplicationUserService.deleteByForeignKey(pd); // 删除动火作业人员关联表 + hotWorkApplicationDelayedService.deleteByForeignKey(pd); // 删除延时监火表对应数据 } /**修改 diff --git a/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java b/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java index 16db8958..4b9270fa 100644 --- a/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java +++ b/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java @@ -189,5 +189,14 @@ public interface KeyprojectHiddenService { String getPUNISHTHEPERSON(PageData pd); List getPhone(PageData pd); + + List listByForeignIds(List foreignIdList); + + /** + * 通过id列表批量删除隐患 + * @param hiddenIdArray + * @throws Exception + */ + void deleteByIds(String[] hiddenIdArray); } diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java index 99fc74dc..beb7b93e 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java @@ -263,5 +263,15 @@ public class KeyprojectHiddenServiceImpl implements KeyprojectHiddenService { public List getPhone(PageData pd) { return hiddenMapper.getPhone(pd); } + + @Override + public List listByForeignIds(List foreignIdList) { + return hiddenMapper.listByForeignIds(foreignIdList); + } + + @Override + public void deleteByIds(String[] hiddenIdArray) { + hiddenMapper.deleteByIds(hiddenIdArray); + } } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 5a3ae771..43988460 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -362,4 +362,6 @@ public interface UsersService { PageData findByCardNo(PageData pd) throws Exception; List listUserByDepId(PageData pd) throws Exception; + + List getDepartmentIds(String[] departmentIds) throws Exception; } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index a9951e90..c3c4e68e 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -496,4 +496,9 @@ public class UsersServiceImpl implements UsersService { public List listUserByDepId(PageData pd) throws Exception { return usersMapper.listUserByDepId(pd); } + + @Override + public List getDepartmentIds(String[] departmentIds) throws Exception { + return usersMapper.getDepartmentIds(departmentIds); + } } diff --git a/src/main/java/com/zcloud/util/DateScheduled.java b/src/main/java/com/zcloud/util/DateScheduled.java index 5b5870c3..3456328e 100644 --- a/src/main/java/com/zcloud/util/DateScheduled.java +++ b/src/main/java/com/zcloud/util/DateScheduled.java @@ -16,11 +16,11 @@ import com.zcloud.service.bus.SysDateService; public class DateScheduled { @Autowired private SysDateService sysdateService; - + //@Scheduled(cron ="0 5 0 * * ?")//每天12点05 @Scheduled(cron ="0 30 0 * * ?")//每天12点30 - + //@Scheduled(cron ="*/20 * * * * ?")//测试 public void scheduled(){ try { @@ -56,7 +56,7 @@ public class DateScheduled { String HalfYearStartTime = DateUtil.getYear().toString(); String HalfYearEndTime = DateUtil.getYear().toString(); Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString()); - + if(bmonth <= 6) { HalfYearStartTime = HalfYearStartTime+"-01-01 00:00:00"; HalfYearEndTime = HalfYearEndTime+"-06-30 23:59:59"; @@ -68,12 +68,24 @@ public class DateScheduled { pd.put("HALFYEAR_END", HalfYearEndTime); pd.put("YEAR_START", DateUtil.getCurrYearFirst()+" 00:00:00"); pd.put("YEAR_END", DateUtil.getCurrYearLast()+" 23:59:59"); + String halfMonthStartTime = DateUtil.getMonthFirstDay().toString(); + String halfMonthEndTime = DateUtil.getMonthEndDay().toString(); + Integer onlyDay = Integer.parseInt(DateUtil.getOnlyDay().toString()); + if (onlyDay <= 15) { + halfMonthStartTime = halfMonthStartTime + " 00:00:00"; + halfMonthEndTime = DateUtil.getMonthAnyDay(15).toString() + " 23:59:59"; + } else if (onlyDay > 15) { + halfMonthStartTime = DateUtil.getMonthAnyDay(16).toString() + " 00:00:00"; + halfMonthEndTime = halfMonthEndTime + " 23:59:59"; + } + pd.put("HALFMONTH_START", halfMonthStartTime); + pd.put("HALFMONTH_END", halfMonthEndTime); sysdateService.save(pd); } catch (Exception e) { e.printStackTrace(); } } - + /** * 数据初始化：bus_sysdate表时使用 */ @@ -112,7 +124,7 @@ public class DateScheduled { String HalfYearStartTime = DateSysUtil.getYear(i).toString(); String HalfYearEndTime = DateSysUtil.getYear(i).toString(); Integer bmonth = Integer.parseInt(DateSysUtil.getMonth(i).toString()); - + if(bmonth <= 6) { HalfYearStartTime = HalfYearStartTime+"-01-01 00:00:00"; HalfYearEndTime = HalfYearEndTime+"-06-30 23:59:59"; @@ -126,7 +138,7 @@ public class DateScheduled { pd.put("YEAR_END", DateSysUtil.getCurrYearLast(i)+" 23:59:59"); sysdateService.save(pd); } - + } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/zcloud/util/DateUtil.java b/src/main/java/com/zcloud/util/DateUtil.java index b1dc183d..6b2dcda6 100644 --- a/src/main/java/com/zcloud/util/DateUtil.java +++ b/src/main/java/com/zcloud/util/DateUtil.java @@ -813,6 +813,17 @@ public static boolean timeCompare(Date amBeginTime, Date amEndTime) { } return 1; } + + /** + * 获取本月某一天的日期 + */ + public static String getMonthAnyDay(int day) { + Calendar thisMonthAnyDateCal = Calendar.getInstance(); + thisMonthAnyDateCal.set(Calendar.DAY_OF_MONTH, day); + String thisMonthAnyTime = sdfDay.format(thisMonthAnyDateCal.getTime()); + return thisMonthAnyTime; + } + public static void main(String[] args) { // List halfYearMonth = DateUtil.getHalfYearMonth(true); diff --git a/src/main/java/com/zcloud/util/PeriodDateUtil.java b/src/main/java/com/zcloud/util/PeriodDateUtil.java index 252be9ea..38898d3a 100644 --- a/src/main/java/com/zcloud/util/PeriodDateUtil.java +++ b/src/main/java/com/zcloud/util/PeriodDateUtil.java @@ -15,6 +15,7 @@ public class PeriodDateUtil { public static final String QUARTER = "checkPeriod0005"; public static final String HALFYEAR = "checkPeriod0007"; public static final String YEAR = "checkPeriod0006"; + public static final String HALFMONTH = "checkPeriod0008"; public static String[] getPeriodDate(PageData sysdate,String FIRE_CHECK_TYPE_NAME) { String[] strings = {"",""}; @@ -47,6 +48,10 @@ public class PeriodDateUtil { strings[0] = sysdate.getString("HALFYEAR_START"); strings[1] = sysdate.getString("HALFYEAR_END"); break; + case PeriodDateUtil.HALFMONTH: + strings[0] = sysdate.getString("HALFMONTH_START"); + strings[1] = sysdate.getString("HALFMONTH_END"); + break; default: break; } diff --git a/src/main/java/com/zcloud/util/RecordHalfMonthScheduled.java b/src/main/java/com/zcloud/util/RecordHalfMonthScheduled.java new file mode 100644 index 00000000..cb73d27b --- /dev/null +++ b/src/main/java/com/zcloud/util/RecordHalfMonthScheduled.java @@ -0,0 +1,114 @@ +package com.zcloud.util; + +import com.zcloud.entity.PageData; +import com.zcloud.service.bus.CheckRecordService; +import com.zcloud.service.bus.ListManagerService; +import com.zcloud.service.firemanager.FireCheckListService; +import com.zcloud.service.firemanager.FireRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.*; + +@Component +public class RecordHalfMonthScheduled { + @Autowired + private ListManagerService listManagerService; + @Autowired + private CheckRecordService checkRecordService; + + @Resource + private FireCheckListService fireCheckListService; + @Resource + private FireRecordService fireRecordService; + +// @Scheduled(cron ="0 0 0 1,16 1-12 ?")//每月1号、16号 00:00 + //@Scheduled(cron ="*/20 * * * * ?")//测试 + public void scheduled() { + try { + System.out.println("============定时增加每月超期未检查记录=========="); + PageData pd = new PageData(); + pd.put("STARTTIME", DateUtil.getTimesLastMonthmorning()); + pd.put("ENDTIME", DateUtil.getTimesLastMonthnight()); + pd.put("PERIOD", "checkPeriod0008"); + List overTimeLists = listManagerService.overTimeRecord(pd); + if(overTimeLists != null && overTimeLists.size() > 0) { + for(PageData list : overTimeLists) { + PageData record = new PageData(); + record.put("CHECKRECORD_ID", this.get32UUID()); + record.put("LISTMANAGER_ID", list.get("LISTMANAGER_ID")); + record.put("LIST_NAME", list.get("NAME")); + record.put("CORPINFO_ID", list.get("CORPINFO_ID")); + record.put("ISDELETE", "0"); + record.put("FINISHED", "1"); + record.put("ISSTATISTICS", "0"); + record.put("TYPE", "2"); + record.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间 + record.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + record.put("PERIODSTART", pd.get("STARTTIME")); //周期开始时间 + record.put("PERIODEND", pd.get("ENDTIME")); //周期结束时间 + checkRecordService.save(record); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Scheduled(cron ="0 0 0 1,16 1-12 ?")//每月1号、16号 00:00 +// @Scheduled(cron ="*/20 * * * * ?")//测试 + public void equipmentNotChecked(){ + System.out.println("============每半月定时增加超期未检查消防设备记录=========="); + PageData pd = new PageData(); + pd.put("FIRE_CHECK_TYPE", PeriodDateUtil.HALFMONTH); + int day = Integer.parseInt(DateUtil.getOnlyDay().toString()); + String startTime = ""; + String endTime = ""; + if (day <= 15) { + startTime = DateUtil.getMonthFirstDay().toString() + " 00:00:00"; + endTime = DateUtil.getMonthAnyDay(15).toString() + " 23:59:59"; + } else { + startTime = DateUtil.getMonthAnyDay(16).toString() + " 00:00:00"; + endTime = DateUtil.getMonthEndDay().toString() + " 23:59:59"; + } + pd.put("STARTTIME",startTime); + pd.put("ENDTIME",endTime); + List preData = fireCheckListService.getNotCheckedByWEEK(pd); + // 前一日没有查询的id + List insertData = new LinkedList<>(); + if (preData != null && !preData.isEmpty()) { + // 添加 + String finalStartTime = startTime; + String finalEndTime = endTime; + preData.forEach(item -> { + PageData pageData = new PageData(); + String FIRE_RECORD_ID = UuidUtil.get32UUID(); + String corpinfoId = (String) item.get("CORPINFO_ID"); + pageData.put("FIRE_CHECK_ID", item.get("FIRE_CHECK_ID")); + pageData.put("FIRE_RECORD_ID", FIRE_RECORD_ID); + pageData.put("CORPINFO_ID", corpinfoId); + pageData.put("PERIODSTART", finalStartTime); + pageData.put("PERIODEND", finalEndTime); + //'添加人''添加时间''修改人''修改时间' + pageData.put("CREATOR", "adminTask"); + pageData.put("CREATTIME", DateUtil.date2Str(new Date())); + pageData.put("OPERATOR", "adminTask"); + pageData.put("OPERATTIME", DateUtil.date2Str(new Date())); + insertData.add(pageData); + }); + // 未检查记录添加 + fireRecordService.additionRecord(insertData); + } + System.out.println("============每半月超期未检查消防设备记录任务结束=========="); + System.out.println("定时任务添加了" + Arrays.toString(insertData.toArray())); + } + + /**得到32位的uuid + * @return + */ + public String get32UUID(){ + return UuidUtil.get32UUID(); + } +} diff --git a/src/main/resources/mybatis/datasource/bus/HiddenExamineMapper.xml b/src/main/resources/mybatis/datasource/bus/HiddenExamineMapper.xml index d9265867..13c29d5b 100644 --- a/src/main/resources/mybatis/datasource/bus/HiddenExamineMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/HiddenExamineMapper.xml @@ -197,6 +197,7 @@ , users.NAME as NEWRECTIFICATIONOR ,exa.RECTIFICATIONDEADLINE as spare3 ,re.name as editUserName + ,usera.name as CREATORNAME from f LEFT JOIN sys_user user on user.USER_ID = f.spare2 @@ -205,6 +206,7 @@ LEFT JOIN sys_dictionaries LEVEL on LEVEL.BIANMA = f.spare1 LEFT JOIN BUS_HIDDEN exa ON f.HIDDEN_ID = exa.HIDDEN_ID LEFT JOIN sys_user re ON re.USER_ID = exa.RECTIFICATIONOR + LEFT JOIN sys_user usera ON usera.USER_ID = f.CREATOR where 1=1 and f.HIDDEN_ID = #{HIDDEN_ID} diff --git a/src/main/resources/mybatis/datasource/bus/PromiseMapper.xml b/src/main/resources/mybatis/datasource/bus/PromiseMapper.xml index f70f1413..4e460ac2 100644 --- a/src/main/resources/mybatis/datasource/bus/PromiseMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/PromiseMapper.xml @@ -24,7 +24,8 @@ f.OPERATOR, f.OPERATTIME, f.CORPINFO_ID, - f.TYPE + f.TYPE, + f.IS_REGULATORY @@ -39,7 +40,8 @@ OPERATOR, OPERATTIME, CORPINFO_ID, - TYPE + TYPE, + IS_REGULATORY @@ -54,7 +56,8 @@ #{OPERATOR}, #{OPERATTIME}, #{CORPINFO_ID}, - #{TYPE} + #{TYPE}, + #{IS_REGULATORY} diff --git a/src/main/resources/mybatis/datasource/bus/SysDateMapper.xml b/src/main/resources/mybatis/datasource/bus/SysDateMapper.xml index 011707c0..d308e4dc 100644 --- a/src/main/resources/mybatis/datasource/bus/SysDateMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/SysDateMapper.xml @@ -29,6 +29,8 @@ f.HALFYEAR_END, f.YEAR_START, f.YEAR_END, + f.HALFMONTH_START, + f.HALFMONTH_END, f.SYSDATE_ID @@ -49,6 +51,8 @@ HALFYEAR_END, YEAR_START, YEAR_END, + HALFMONTH_START, + HALFMONTH_END, SYSDATE_ID @@ -69,6 +73,8 @@ #{HALFYEAR_END}, #{YEAR_START}, #{YEAR_END}, + #{HALFMONTH_START}, + #{HALFMONTH_END}, #{SYSDATE_ID} @@ -113,6 +119,8 @@ HALFYEAR_END = #{HALFYEAR_END}, YEAR_START = #{YEAR_START}, YEAR_END = #{YEAR_END}, + HALFMONTH_START = #{HALFMONTH_START}, + HALFMONTH_END = #{HALFMONTH_END}, SYSDATE_ID = SYSDATE_ID where SYSDATE_ID = #{SYSDATE_ID} diff --git a/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml index 9cd9898c..f06ed085 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml @@ -28,6 +28,12 @@ FIRE_CHECK_TYPE = #{FIRE_CHECK_TYPE}, OPERATOR = #{OPERATOR}, OPERATTIME = #{OPERATTIME} + + ,DEPARTMENT_ID = #{DEPARTMENT_ID} + + + ,USER_ID = #{USER_ID} + WHERE FIRE_CHECK_ID = #{FIRE_CHECK_ID} @@ -166,7 +172,7 @@ oa_department AS oa ON su.DEPARTMENT_ID = oa.DEPARTMENT_ID - INNER JOIN + LEFT JOIN sys_post AS sp ON su.POST_ID = sp.POST_ID @@ -229,6 +235,12 @@ and su.NAME like concat(#{USERNAME},'%') + + and fp.DEPARTMENT_ID in + + #{item} + + and fp.DEPARTMENT_ID = #{DEPARTMENT_ID} @@ -339,6 +351,9 @@ LEFT JOIN sys_dictionaries ON cl.FIRE_CHECK_TYPE = sys_dictionaries.BIANMA WHERE cl.ISDELETE = 0 AND cl.STATE = 0 + + AND fpp.FIRE_POINT_ID = #{pd.pointId} + and fpp.ISDELETE = 0 AND fpc.ISDELETE = 0 diff --git a/src/main/resources/mybatis/datasource/firemanager/FireCheckStandardMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireCheckStandardMapper.xml index 1c1c5137..003f7ce1 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireCheckStandardMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireCheckStandardMapper.xml @@ -338,4 +338,21 @@ and FIRE_DEVICE_TYPE = #{FIRE_DEVICE_TYPE} + + diff --git a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml index 0ac65962..5b958cc6 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml @@ -111,6 +111,12 @@ WHERE fp.ISDELETE = 0 and fd.ISDELETE = 0 and fd.CORPINFO_ID = #{pd.CORPINFO_ID} + + and d.`NAME` like concat('%',#{pd.DEPARTMENT_NAME},'%') + + + and su.`NAME` like concat('%',#{pd.USER_NAME},'%') + and fp.FIRE_POINT_ID = #{pd.FIRE_POINT_ID} diff --git a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml index 9f679748..c9abe552 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml @@ -103,11 +103,22 @@ + + update bus_fire_point set + USER_ID = #{USER_ID} + where + FIRE_POINT_ID in + + #{item} + + + + + diff --git a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml index 911b6cf5..075e710a 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml @@ -379,7 +379,7 @@ INNER JOIN bus_fire_point AS bfp ON bfd.FIRE_POINT_ID = bfp.FIRE_POINT_ID INNER JOIN sys_user AS su ON cl.USER_ID = su.USER_ID INNER JOIN oa_department AS oa ON su.DEPARTMENT_ID = oa.DEPARTMENT_ID - INNER JOIN sys_post AS sp ON su.POST_ID = sp.POST_ID + LEFT JOIN sys_post AS sp ON su.POST_ID = sp.POST_ID INNER JOIN bus_fire_region AS bfr ON bfp.FIRE_REGION_ID = bfr.FIRE_REGION_ID INNER JOIN bus_fire_record AS fr ON cl.FIRE_CHECK_ID = fr.FIRE_CHECK_ID WHERE cl.ISDELETE = 0 @@ -1016,4 +1016,18 @@ bus_fire_device_prepared where HIDDEN_ID = #{HIDDEN_ID} and ISDELETE = 0 order by OPERATTIME desc limit 1 + + diff --git a/src/main/resources/mybatis/datasource/firemanager/FireRegionMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireRegionMapper.xml index 315d58f6..e07b7148 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireRegionMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireRegionMapper.xml @@ -13,7 +13,8 @@ DEPARTMENT_ID, CORPINFO_ID, REMAKE, - STATE + STATE, + PHOTO_UPLOAD_METHOD ,CREATOR @@ -65,7 +66,8 @@ bus_fire_region.FIRE_REGION_CODE, bus_fire_region.STATE, bus_fire_region.REMAKE, - bus_fire_region.DEPARTMENT_ID + bus_fire_region.DEPARTMENT_ID, + bus_fire_region.PHOTO_UPLOAD_METHOD FROM bus_fire_region INNER JOIN @@ -83,6 +85,7 @@ , OPERATOR = #{OPERATOR} , OPERATTIME = #{OPERATTIME} , REMAKE = #{REMAKE} + , PHOTO_UPLOAD_METHOD = #{PHOTO_UPLOAD_METHOD} WHERE FIRE_REGION_ID = #{FIRE_REGION_ID,jdbcType = VARCHAR} @@ -100,15 +103,24 @@ where FIRE_REGION_ID =#{FIRE_REGION_ID} + + update set + DEPARTMENT_ID = #{DEPARTMENT_ID} + where FIRE_REGION_ID in + + #{item} + + + INSERT INTO (`FIRE_REGION_ID`, `FIRE_REGION_NAME`, `FIRE_REGION_CODE`,DEPARTMENT_ID, `CREATOR`, `CREATTIME`, `OPERATOR`, `OPERATTIME`, - `CORPINFO_ID`, `REMAKE`, `ISDELETE`) + `CORPINFO_ID`, `REMAKE`, `ISDELETE`, `PHOTO_UPLOAD_METHOD`) VALUES (#{FIRE_REGION_ID}, #{FIRE_REGION_NAME}, #{FIRE_REGION_CODE},#{DEPARTMENT_ID}, #{CREATOR}, #{CREATTIME}, #{OPERATOR}, #{OPERATTIME}, #{CORPINFO_ID}, - #{REMAKE}, 0) + #{REMAKE}, 0, #{PHOTO_UPLOAD_METHOD}) + + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index e931bf02..575474ae 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -731,6 +731,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.CORPINFO_ID = #{CORPINFO_ID} + + and u.DEPARTMENT_ID in + + #{item} + + AND u.DEPARTMENT_ID = #{DEPARTMENT_ID} @@ -1444,4 +1450,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from f where DEPARTMENT_ID = #{RECEIVER_ID} and ISDELETE = '0' + + diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index b282d600..27164995 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -316,7 +316,7 @@ LEFT JOIN ( select count(c.KEYPROJECTCHECK_ID) co, c.OUTSOURCED_ID from `qa-gwj-prevention`.BUS_KEYPROJECTCHECK c where c.ISDELETE = '0' group by c.OUTSOURCED_ID ) cc on cc.OUTSOURCED_ID = f.OUTSOURCED_ID left join ( SELECT t.OUTSOURCED_ID, COUNT( t.HIDDEN_ID ) HIDDEN_COUNT FROM - ( SELECT IFNULL( k.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID, h.* FROM `qa-gwj-prevention`.bus_keyproject_hidden h LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON h.FOREIGN_ID = k.KEYPROJECTCHECK_ID ) t GROUP BY t.OUTSOURCED_ID ) h on h.OUTSOURCED_ID = f.OUTSOURCED_ID + ( SELECT IFNULL( k.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID, h.* FROM `qa-gwj-prevention`.bus_keyproject_hidden h LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON h.FOREIGN_ID = k.KEYPROJECTCHECK_ID and h.ISDELETE = '0') t GROUP BY t.OUTSOURCED_ID ) h on h.OUTSOURCED_ID = f.OUTSOURCED_ID where f.ISDELETE = '0' and