diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java index f5bc0433..2e4fe821 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java @@ -1656,7 +1656,7 @@ public class AppHiddenController extends BaseController { inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); inspection.put("OPERATOR", pd.getString("FINAL_CHECKOR")); inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); - inspection.put("INSPECTION_STATUS", "7"); // 已验收 + inspection.put("INSPECTION_STATUS", "8"); // 已验收 safetyenvironmentalService.editStatus(inspection); } } diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java index 9e8de2cf..b5484661 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java @@ -9,6 +9,7 @@ import com.zcloud.service.inspection.SafetyEnvironmentalInspectorService; import com.zcloud.service.inspection.SafetyEnvironmentalService; import com.zcloud.service.keyProjects.KeyprojectHiddenService; import com.zcloud.util.*; +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; @@ -86,6 +87,26 @@ public class AppHomeController extends BaseController { PageData myGasAnaly = new PageData(); if(!Tools.isEmpty(pd.get("USER_ID"))){ varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID")); + PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID")); + if (Integer.parseInt(delayedCount.getString("count")) != 0) { + if (varList.size() > 0) { + boolean isDelayedExist = false; + for (PageData data : varList) { + if (StringUtils.equals(data.getString("STATE"), "10")) isDelayedExist = true; + } + if (isDelayedExist) { + for (PageData pageData : varList) { + if (StringUtils.equals(pageData.getString("STATE"), "10")) { + pageData.put("count", delayedCount.getString("count")); + } + } + } else { + varList.add(delayedCount); + } + } else { + varList.add(delayedCount); + } + } myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID")); } map.put("result", errInfo); @@ -126,6 +147,26 @@ public class AppHomeController extends BaseController { PageData myGasAnaly = new PageData(); if(!Tools.isEmpty(pd.get("USER_ID"))){ varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID")); + PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID")); + if (Integer.parseInt(delayedCount.getString("count")) != 0) { + if (varList.size() > 0) { + boolean isDelayedExist = false; + for (PageData data : varList) { + if (StringUtils.equals(data.getString("STATE"), "10")) isDelayedExist = true; + } + if (isDelayedExist) { + for (PageData pageData : varList) { + if (StringUtils.equals(pageData.getString("STATE"), "10")) { + pageData.put("count", delayedCount.getString("count")); + } + } + } else { + varList.add(delayedCount); + } + } else { + varList.add(delayedCount); + } + } myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID")); } @@ -142,7 +183,7 @@ public class AppHomeController extends BaseController { //统计消防总数 List dataList = fireCheckListService.getFireCheckListCountByApp(pd); - + map.put("result", errInfo); map.put("blindboardCount", blindboardCount); map.put("breakGroundCount", breakGroundCount); diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java index 3f88b6e5..275ae9bd 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java @@ -17,6 +17,7 @@ import com.zcloud.service.system.FHlogService; import com.zcloud.util.*; import com.zcloud.util.message.MessageService; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.crypto.hash.SimpleHash; import org.apache.xpath.SourceTree; @@ -745,42 +746,44 @@ public class AppHotWorkApplicationController extends BaseController { } } PageData hotUser = new PageData(); - hotUser.put("hotIds", hotIds); - List hotUserAllList = hotWorkApplicationUserService.listAll(hotUser); - for (PageData userPageData : hotUserAllList){ - String hotAndType = userPageData.getString("FOREIGN_KEY"); - if(hotIdKeyMap.containsKey(hotAndType)){ - PageData hot = varList.get(hotIdKeyMap.get(hotAndType)); - String type = userPageData.get("STATE").toString(); - if("0".equals(type)){ // 申请办理人 - hot.put("APPLY_DEPARTMENT_NAME",userPageData.getString("deptName")); - hot.put("APPLY_USER_NAME",userPageData.getString("userName")); - hot.put("APPLY_USER_ID",userPageData.getString("USER_ID")); - }else if("1".equals(type)){ //动火单位负责人 - hot.put("HOT_WORK_UNIT_LEADER_NAME",userPageData.getString("userName")); - hot.put("HOT_WORK_UNIT_LEADER_ID",userPageData.getString("USER_ID")); - }else if("2".equals(type)){ // 项目发包单位负责人 - hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName")); - hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID")); - }else if("3".equals(type)){ // 现场管辖单位负责人 - hot.put("UNIT_LEADER_NAME",userPageData.getString("userName")); - hot.put("UNIT_LEADER_ID",userPageData.getString("USER_ID")); - }else if("5".equals(type)){ // 动火前 负责人 - hot.put("HOT_WORK_BEFORE_UNIT_LEADER",userPageData.getString("userName")); - }else if("6".equals(type)){ // 现场负责人 - hot.put("SITE_LEADER_NAME",userPageData.getString("userName")); - hot.put("SITE_LEADER_PHONE",userPageData.getString("userPhone")); - }else if("7".equals(type)){ // 动火后 负责人 - hot.put("HOT_WORK_AFTER_UNIT_LEADER",userPageData.getString("userName")); - } else if("11".equals(type)){ // 特级动火 申请人 - hot.put("DEPARTMENT_PERSONNEL_NAME",userPageData.getString("userName")); - hot.put("DEPARTMENT_PERSONNEL_ID",userPageData.getString("USER_ID")); - }else if("20".equals(type)){ // 特级动火 申请人 - hot.put("SUPERVISOR_OF_HOT_WORK_UNIT",userPageData.getString("USER_ID")); - }else if("21".equals(type)){ // 动火后 负责人 - String userName = userPageData.getString("userName2") +","; - String oldName = Tools.isEmpty(pd.get("HOT_WORK_OPERATOR_NAME"))?"":pd.get("HOT_WORK_OPERATOR_NAME").toString(); - hot.put("HOT_WORK_OPERATOR_NAME",oldName + userName); + if (hotIds.size() > 0) { + hotUser.put("hotIds", hotIds); + List hotUserAllList = hotWorkApplicationUserService.listAll(hotUser); + for (PageData userPageData : hotUserAllList){ + String hotAndType = userPageData.getString("FOREIGN_KEY"); + if(hotIdKeyMap.containsKey(hotAndType)){ + PageData hot = varList.get(hotIdKeyMap.get(hotAndType)); + String type = userPageData.get("STATE").toString(); + if("0".equals(type)){ // 申请办理人 + hot.put("APPLY_DEPARTMENT_NAME",userPageData.getString("deptName")); + hot.put("APPLY_USER_NAME",userPageData.getString("userName")); + hot.put("APPLY_USER_ID",userPageData.getString("USER_ID")); + }else if("1".equals(type)){ //动火单位负责人 + hot.put("HOT_WORK_UNIT_LEADER_NAME",userPageData.getString("userName")); + hot.put("HOT_WORK_UNIT_LEADER_ID",userPageData.getString("USER_ID")); + }else if("2".equals(type)){ // 项目发包单位负责人 + hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName")); + hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID")); + }else if("3".equals(type)){ // 现场管辖单位负责人 + hot.put("UNIT_LEADER_NAME",userPageData.getString("userName")); + hot.put("UNIT_LEADER_ID",userPageData.getString("USER_ID")); + }else if("5".equals(type)){ // 动火前 负责人 + hot.put("HOT_WORK_BEFORE_UNIT_LEADER",userPageData.getString("userName")); + }else if("6".equals(type)){ // 现场负责人 + hot.put("SITE_LEADER_NAME",userPageData.getString("userName")); + hot.put("SITE_LEADER_PHONE",userPageData.getString("userPhone")); + }else if("7".equals(type)){ // 动火后 负责人 + hot.put("HOT_WORK_AFTER_UNIT_LEADER",userPageData.getString("userName")); + } else if("11".equals(type)){ // 特级动火 申请人 + hot.put("DEPARTMENT_PERSONNEL_NAME",userPageData.getString("userName")); + hot.put("DEPARTMENT_PERSONNEL_ID",userPageData.getString("USER_ID")); + }else if("20".equals(type)){ // 特级动火 申请人 + hot.put("SUPERVISOR_OF_HOT_WORK_UNIT",userPageData.getString("USER_ID")); + }else if("21".equals(type)){ // 动火后 负责人 + String userName = userPageData.getString("userName2") +","; + String oldName = Tools.isEmpty(pd.get("HOT_WORK_OPERATOR_NAME"))?"":pd.get("HOT_WORK_OPERATOR_NAME").toString(); + hot.put("HOT_WORK_OPERATOR_NAME",oldName + userName); + } } } } @@ -806,11 +809,30 @@ public class AppHotWorkApplicationController extends BaseController { hotUserPd.put("STATE",pd.get("STATE").toString()); // 哪一步 hotUserPd.put("USER_ID",pd.getString("loginUserId"));// 登录人 - List hotUserList = hotWorkApplicationUserService.listAll(hotUserPd); // 找到这一笔的审批人 - if(hotUserList.size() != 1){ - map.put("result", "error"); - map.put("msg", "获取审批人意见失败！请联系管理员"); - return map; + if ("10".equals(pd.get("STATE").toString())) { + PageData hotWorkApplication = hotworkapplicationService.findById(pd); + if(!Tools.isEmpty(hotWorkApplication) && hotWorkApplication.getString("STATE").equals("11")){ // 判断此作业是否已归档 + map.put("result", "error"); + map.put("msg", "此作业已归档，请勿重复操作！"); + return map; + } + } + + List hotUserList = new ArrayList<>(); + if (!pd.getString("STATE").equals("10")) { + hotUserList = hotWorkApplicationUserService.listAll(hotUserPd); // 找到这一笔的审批人 + if (hotUserList.size() != 1) { + map.put("result", "error"); + map.put("msg", "获取审批人意见失败！请联系管理员"); + return map; + } + } else { + hotUserList = hotWorkApplicationUserService.listByDepartment(hotUserPd); // 找到这一笔的审批人们 + if (hotUserList.size() < 1) { + map.put("result", "error"); + map.put("msg", "获取审批人意见失败！请联系管理员"); + return map; + } } @@ -953,7 +975,8 @@ public class AppHotWorkApplicationController extends BaseController { }else if("9".equals(pd.getString("STATE"))){ // 添加 临时监火 PageData leaderUser = new PageData(); leaderUser.put("HOTWORKAPPLICATIONUSER_ID", UuidUtil.get32UUID()); - leaderUser.put("USER_ID",pd.get("TIME_LAPSE_FIREMAN_ID")); +// leaderUser.put("USER_ID",pd.get("TIME_LAPSE_FIREMAN_ID")); + leaderUser.put("USER_ID",pd.get("TIME_LAPSE_FIREMAN_DEPARTMENT_ID")); leaderUser.put("STATE","10"); leaderUser.put("TYPE","-1"); leaderUser.put("ISDELETE","0"); @@ -1339,6 +1362,26 @@ public class AppHotWorkApplicationController extends BaseController { PageData myGasAnaly = new PageData(); if(!Tools.isEmpty(pd.get("USER_ID"))){ varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID")); + PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID")); + if (Integer.parseInt(delayedCount.getString("count")) != 0) { + if (varList.size() > 0) { + boolean isDelayedExist = false; + for (PageData data : varList) { + if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true; + } + if (isDelayedExist) { + for (PageData pageData : varList){ + if (StringUtils.equals(pageData.getString("STATE"),"10")) { + pageData.put("count",delayedCount.getString("count")); + } + } + } else { + varList.add(delayedCount); + } + } else { + varList.add(delayedCount); + } + } myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID")); } map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java index 7ddb9cc4..548935fb 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java @@ -1,5 +1,10 @@ package com.zcloud.controller.app.highriskwork; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -22,6 +27,8 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.highriskwork.HotWorkApplicationDelayedService; +import javax.imageio.ImageIO; + /** * 说明：延时监火 * 作者：luoxiaobao @@ -62,9 +69,38 @@ public class AppHotWorkApplicationDelayedController extends BaseController { map.put("msg", "文件格式不正确！"); return map; } + Image srcImg = ImageIO.read(file.getInputStream()); + //获取图片的宽 + int srcImgWidth = srcImg.getWidth(null); + //获取图片的高 + int srcImgHeight = srcImg.getHeight(null); + + BufferedImage bufImg = new BufferedImage(srcImgWidth, srcImgHeight, BufferedImage.TYPE_INT_RGB); + // 加水印 + //创建画笔 + Graphics2D g = bufImg.createGraphics(); + //srcImg 为上面获取到的原始图片的图片对象 + g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null); + //根据图片的背景设置水印颜色 + g.setColor(new Color(255,255,255,128)); + //设置字体 画笔字体样式为微软雅黑，加粗，文字大小为60pt + g.setFont(new Font("微软雅黑", Font.BOLD, 20)); + //设置水印的坐标 + int x=(srcImgWidth - WaterMarkUtil.getWatermarkLength(DateUtil.date2Str(new Date()), g)) / 2; + int y=srcImgHeight / 2; + //画出水印 第一个参数是水印内容，第二个参数是x轴坐标，第三个参数是y轴坐标 + g.drawString(DateUtil.date2Str(new Date()), x, y); + g.dispose(); + //将加完水印的图片暂存到内存中 + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ImageIO.write(bufImg, suffixName, bos); + ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); + String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile); +// Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile); + //通过流的方式上传文件 + Smb.sshSftpForInput(bis, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile); pd.put("FILEPATH",Const.FILEPATHYHTP + corpInfoId + "/" + ffile + "/" + fileName); } hotworkapplicationdelayedService.save(pd); diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java new file mode 100644 index 00000000..9e5d2a14 --- /dev/null +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -0,0 +1,1513 @@ +package com.zcloud.controller.app.highriskwork; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.controller.base.BaseController; +import com.zcloud.dto.Response; +import com.zcloud.dto.TenCorpConst; +import com.zcloud.dto.TenCorpDto; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.highriskwork.*; +import com.zcloud.util.*; +import com.zcloud.util.mq.MqSendUtil; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; + +import javax.annotation.Resource; +import java.text.DecimalFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * 说明：高空作业 + * 作者：luoxiaobao + * 时间：2021-08-31 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/hotwork/cfd") +public class AppHotworkCfdController extends BaseController { + + @Autowired + private HotworkCfdService hotworkCfdService; + @Autowired + private HotworkAcceptUserCfdService hotworkAcceptUserCfdService; + @Autowired + private HotworkLogCfdService hotworkLogCfdService; + @Autowired + private HotworkToMeasuresCfdService hotworkToMeasuresCfdService; + @Autowired + private HotworkGasCfdService hotworkGasCfdService; + @Autowired + private SendMessageUtil sendMessageUtil; + @Resource + private MqSendUtil mqSendUtil; + + /** + * 获取编码 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getCode") + @ResponseBody +// @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "获取编码") + public Object getCode() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Calendar calendar = Calendar.getInstance(); + DecimalFormat dft = new DecimalFormat("00"); + int year = calendar.get(Calendar.YEAR); + String month = dft.format(calendar.get(Calendar.MONTH) + 1); + String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH)); + pd.put("CREATDATE", year + "-" + month + "-" + day); + pd = hotworkCfdService.getCode(pd); //根据ID读取 + String code = "DH" + year + month + day + dft.format((Integer.parseInt(pd.get("code").toString()) + 1)); + map.put("code", code); + map.put("result", errInfo); + return map; + } + + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @ResponseBody + @Transactional + @LogAnno(menuType = "手机", menuServer = "动火作业", instructionsOperate = "动火作业", instructionsType = "新增") + @SuppressWarnings("all") + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + Calendar calendar = Calendar.getInstance(); + DecimalFormat dft=new DecimalFormat("00"); + int year = calendar.get(Calendar.YEAR); + String month = dft.format(calendar.get(Calendar.MONTH) + 1); + String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH)); + pd2.put("CREATDATE",year + "-" + month + "-" + day); + pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID")); + pd2 = hotworkCfdService.getCode(pd2); //根据ID读取 + String code = "DH" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1)); + pd = this.getPageData(); + pd.put("CHECK_NO", code); + pd.put("HOTWORK_ID", this.get32UUID()); //主键 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + hotworkCfdService.save(pd); + + if (pd.get("APPLY_STATUS").equals("1")) { + PageData log = new PageData(); + log.put("HOTWORKLOG_ID", this.get32UUID()); + log.put("ACTION", "提交申请"); + log.put("HOTWORK_ID", pd.get("HOTWORK_ID")); + log.put("CREATOR", pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + hotworkLogCfdService.save(log); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_Y01");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + PageData params3 = new PageData(); + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "作业单位确认");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + PageData params4 = new PageData(); + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "确认");// 存入上面参数名称所传递的值 + paramsList.add(params4); + //sendMessageUtil.sendMessages(mes, paramsList); + + // 发短信 + PageData mes1 = new PageData(); + mes1.put("RECEIVER_ID", pd.get("ANALYZE_USER_ID"));// 收信人userid + mes1.put("templateCode", "DH_QT");// 短信模板编码 + mes1.put("SMSCode", "SMS_223540753");// 短信模板编码 + mes1.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList1 = new ArrayList(); + // 第1个参数 + PageData params5 = new PageData(); + params5.put("name", "params1");// 存入短信模板中的参数名称 + params5.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList1.add(params5); + // 第2个参数 + PageData params6 = new PageData(); + params6.put("name", "params2");// 存入短信模板中的参数名称 + params6.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList1.add(params6); + //sendMessageUtil.sendMessages(mes1, paramsList1); + TenCorpDto tenCorpDto = new TenCorpDto(); + tenCorpDto.setMark(pd.getString("HOTWORK_ID")); + tenCorpDto.setMark_name("HOTWORK_ID"); + tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); + tenCorpDto.setTopic("eightWork"); + tenCorpDto.setData(pd); + tenCorpDto.setMessage(TenCorpConst.hotWork); + + Response response = mqSendUtil.sendDelayQueue(tenCorpDto); + if (!"succeed".equals(response.getResult()) || !"0".equals(response.getCode())) { + throw new RuntimeException("系统异常"); + } + System.out.println("amazing:!!!!!" + JSONObject.toJSONString(response)); + } + map.put("result", errInfo); + return map; + } + + /** + * 删除 + * + * @param out + * @throws Exception + */ + @RequestMapping(value = "/delete") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "动火作业", instructionsOperate = "动火作业", instructionsType = "删除") + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hotworkCfdService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + @ResponseBody + @Transactional + @LogAnno(menuType = "手机", menuServer = "动火作业", instructionsOperate = "动火作业", instructionsType = "修改") + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hotworkCfdService.edit(pd); + if (pd.get("APPLY_STATUS").equals("1")) { + PageData log = new PageData(); + log.put("HOTWORKLOG_ID", this.get32UUID()); + log.put("ACTION", "提交申请"); + log.put("HOTWORK_ID", pd.get("HOTWORK_ID")); + log.put("CREATOR", pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + hotworkLogCfdService.save(log); + + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_Y01");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + PageData params3 = new PageData(); + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "作业单位确认");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + PageData params4 = new PageData(); + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "确认");// 存入上面参数名称所传递的值 + paramsList.add(params4); + //sendMessageUtil.sendMessages(mes, paramsList); + } + TenCorpDto tenCorpDto = new TenCorpDto(); + tenCorpDto.setMark(pd.getString("HOTWORK_ID")); + tenCorpDto.setMark_name("HOTWORK_ID"); + tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); + tenCorpDto.setTopic("eightWork"); + tenCorpDto.setData(pd); + tenCorpDto.setMessage(TenCorpConst.hotWork); + + Response response = mqSendUtil.sendDelayQueue(tenCorpDto); + if (!"succeed".equals(response.getResult()) || !"0".equals(response.getCode())) { + throw new RuntimeException("系统异常"); + } + map.put("result", errInfo); + return map; + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editGuardian") + @ResponseBody + @Transactional + @LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "修改") + public Object editGuardian( + @RequestParam(value = "FFILE", required = false) MultipartFile[] files + ) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = hotworkCfdService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); +// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); +// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + } + + map.put("result", errInfo); + return map; + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editConfess") + @ResponseBody + @Transactional + @LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "修改") + public Object editConfess( + @RequestParam(value = "FFILE", required = false) MultipartFile[] files + ) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = hotworkCfdService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); +// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); +// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + } + map.put("result", errInfo); + return map; + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editAcceptconfess") + @ResponseBody + @Transactional + @LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "修改") + public Object editAcceptconfess(MultipartRequest request) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = hotworkCfdService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file" + i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"), pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + fileList.clear(); + } + map.put("result", errInfo); + return map; + } + + private void saveImg(MultipartFile[] files, String signertime, String HOTWORK_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception { + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + PageData pd = new PageData(); + pd = this.getPageData(); + MultipartFile file = files[i]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); + pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); + pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); + pd.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); + pd.put("ISDELETE", '0'); + pd.put("CORPINFO_ID", CORPINFO_ID); + pd.put("HOTWORK_ID", HOTWORK_ID); + pd.put("ACCEPT_CONFESS_USER_ID", ACCEPT_CONFESS_USER_ID); + pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID); + pd.put("ACCEPT_USER_ID",""); + pd.put("ACCEPT_DEPARTMENT_ID", ""); + hotworkAcceptUserCfdService.save(pd); + } + } + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editAcceptStatus") + @ResponseBody + @Transactional + @LogAnno(menuType = "手机", menuServer = "动火作业", instructionsOperate = "动火作业", instructionsType = "修改") + public Object editAcceptStatus(MultipartRequest request) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = hotworkCfdService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + PageData log = new PageData(); + log.put("HOTWORKLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("HOTWORK_ID", pd.get("HOTWORK_ID")); + log.put("CREATOR", pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status)) { + pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;")); + } else if ("-2".equals(status) || "-3".equals(status) || "-4".equals(status) || "-5".equals(status) || "-6".equals(status) || "-7".equals(status) || "-8".equals(status)) { + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); + } + + switch (status) { + + case "8"://验收人 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file" + i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_USER_ID"), pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + } + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + log.put("ACTION", "验收通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_Y08");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + //sendMessageUtil.sendMessages(mes, paramsList); + break; + + case "-8"://审批打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + hotworkCfdService.edit(pd2); + + // 发短信 + PageData mes6 = new PageData(); + mes6.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes6.put("templateCode", "DH_N08");// 短信模板编码 + mes6.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes6.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList6 = new ArrayList(); + // 第1个参数 + PageData params19 = new PageData(); + params19.put("name", "params1");// 存入短信模板中的参数名称 + params19.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList6.add(params19); + // 第2个参数 + PageData params20 = new PageData(); + params20.put("name", "params2");// 存入短信模板中的参数名称 + params20.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList6.add(params20); + // 第3个参数 + PageData params21 = new PageData(); + params21.put("name", "params3");// 存入短信模板中的参数名称 + params21.put("value", "验收归档");// 存入上面参数名称所传递的值 + paramsList6.add(params21); + //sendMessageUtil.sendMessages(mes6, paramsList6); + break; + default: + break; + } + hotworkLogCfdService.save(log); + + map.put("result", errInfo); + return map; + } + + private void saveAcceptImg(MultipartFile[] files,String signertime, String HOTWORK_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + PageData cpd = new PageData(); + cpd = this.getPageData(); + MultipartFile file = files[i]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); + cpd.put("ACCEPT_USER_SIGNER_TIME", signertime); + cpd.put("ACCEPT_CONFESS_ID", this.get32UUID()); + cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人 + cpd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + cpd.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); + cpd.put("ISDELETE", '0'); + cpd.put("CORPINFO_ID", CORPINFO_ID); + cpd.put("HOTWORK_ID", HOTWORK_ID); + cpd.put("ACCEPT_USER_ID", ACCEPT_USER_ID); + cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ""); + cpd.put("ACCEPT_CONFESS_USER_ID", ""); + cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID); + hotworkAcceptUserCfdService.save(cpd); + } + } + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editStatus") + @ResponseBody + @Transactional + @LogAnno(menuType = "手机", menuServer = "动火作业", instructionsOperate = "动火作业", instructionsType = "修改") + public Object editStatus( + @RequestParam(value = "FFILE", required = false) MultipartFile[] files + ) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = hotworkCfdService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + PageData log = new PageData(); + log.put("HOTWORKLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("HOTWORK_ID", pd.get("HOTWORK_ID")); + log.put("CREATOR", pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status)) { + pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;")); + } else if ("-2".equals(status) || "-3".equals(status) || "-4".equals(status) || "-5".equals(status) || "-6".equals(status) || "-7".equals(status) || "-8".equals(status)) { + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); + } + + switch (status) { + case "2"://确认 + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("CONFIRM_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + hotworkToMeasuresCfdService.delete(pd2); + List list = (List) JSON.parse(pd.get("measuresList").toString()); + for (JSONObject json : list) { + PageData measures = new PageData(); + measures.put("HOTWORKTOMEASURES_ID", this.get32UUID()); // 主键 + measures.put("HOTWORK_ID", pd2.get("HOTWORK_ID")); + measures.put("BUS_HOTWORK_MEASURES_ID", json.get("BUS_HOTWORK_MEASURES_ID")); + measures.put("ANSWER1", json.get("ANSWER1")); + measures.put("ANSWER2", json.get("ANSWER2")); + measures.put("ANSWER3", json.get("ANSWER3")); + measures.put("ANSWER4", json.get("ANSWER4")); + measures.put("STATUS", json.get("STATUS")); + measures.put("CONFIRM_ID", pd.get("OPERATOR")); + measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); + hotworkToMeasuresCfdService.save(measures); + } + log.put("ACTION", "作业单位通过"); + + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_Y02");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + PageData params3 = new PageData(); + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "动火点所在单位审核");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + PageData params4 = new PageData(); + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "审核");// 存入上面参数名称所传递的值 + paramsList.add(params4); + //sendMessageUtil.sendMessages(mes, paramsList); + } + break; + +// case "3"://监护人确认 +// if (files != null && files.length > 0) { +// MultipartFile file = files[0]; +// +// String ffile = DateUtil.getDays(); +// String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); +// Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); +// +// pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); +// pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); +// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); +// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); +// hotworkService.edit(pd2); +// log.put("ACTION", "监护人确认通过"); +// +// // 发短信 +// PageData mes = new PageData(); +// mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid +// mes.put("templateCode", "SMS_227245922");// 短信模板编码 +// mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id +// // 参数集合 +// List paramsList = new ArrayList(); +// // 第1个参数 +// PageData params1 = new PageData(); +// params1.put("name", "number");// 存入短信模板中的参数名称 +// params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 +// paramsList.add(params1); +// // 第2个参数 +// PageData params2 = new PageData(); +// params2.put("name", "params1");// 存入短信模板中的参数名称 +// params2.put("value", "动火作业");// 存入上面参数名称所传递的值 +// paramsList.add(params2); +// // 第3个参数 +// PageData params3 = new PageData(); +// params3.put("name", "params2");// 存入短信模板中的参数名称 +// params3.put("value", "动火点所在单位审核");// 存入上面参数名称所传递的值 +// paramsList.add(params3); +// // 第4个参数 +// PageData params4 = new PageData(); +// params4.put("name", "params3");// 存入短信模板中的参数名称 +// params4.put("value", "审核");// 存入上面参数名称所传递的值 +// paramsList.add(params4); +// //sendMessageUtil.sendMessages(mes, paramsList); +// } +// break; + + case "4"://单位负责人人确认 + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("LEADER_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + log.put("ACTION", "单位负责人确认"); + + + // 发短信 + PageData mes = new PageData(); + if ("4".equals(pd.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("AUDIT_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_Y04");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("5".equals(pd.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("APPROVE_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_Y05");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("6".equals(pd.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("MONITOR_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + PageData params3 = new PageData(); + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "安全部门审核");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + PageData params4 = new PageData(); + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "审核");// 存入上面参数名称所传递的值 + paramsList.add(params4); + //sendMessageUtil.sendMessages(mes, paramsList); + } + break; + + case "5"://审批人审批 + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("AUDIT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + log.put("ACTION", "安全部门审核通过"); + + // 发短信 + PageData mes = new PageData(); + if ("5".equals(pd.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("APPROVE_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_Y05");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("6".equals(pd.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("MONITOR_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + PageData params3 = new PageData(); + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "审批人审批");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + PageData params4 = new PageData(); + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "审批");// 存入上面参数名称所传递的值 + paramsList.add(params4); + //sendMessageUtil.sendMessages(mes, paramsList); + } + break; + + case "6"://审批部门 + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("APPROVE_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + log.put("ACTION", "审批部门通过"); + + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("MONITOR_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + PageData params3 = new PageData(); + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "班长验票");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + PageData params4 = new PageData(); + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "验票");// 存入上面参数名称所传递的值 + paramsList.add(params4); + //sendMessageUtil.sendMessages(mes, paramsList); + } + + break; + + case "7"://班长 + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("MONITOR_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("MONITOR_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("MONITOR_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + log.put("ACTION", "班长验票通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_Y07");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + PageData params3 = new PageData(); + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "验收");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + PageData params4 = new PageData(); + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "验收");// 存入上面参数名称所传递的值 + paramsList.add(params4); + //sendMessageUtil.sendMessages(mes, paramsList); + +// // 发短信 +// PageData mes1 = new PageData(); +// mes1.put("RECEIVER_ID", pd2.get("ANALYZE_USER_ID"));// 收信人userid +// mes1.put("templateCode", "DH_QT");// 短信模板编码 +// mes1.put("SMSCode", "SMS_223540753");// 短信模板编码 +// mes1.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id +// // 参数集合 +// List paramsList1 = new ArrayList(); +// // 第1个参数 +// PageData params5 = new PageData(); +// params5.put("name", "params1");// 存入短信模板中的参数名称 +// params5.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 +// paramsList1.add(params5); +// // 第2个参数 +// PageData params6 = new PageData(); +// params6.put("name", "params2");// 存入短信模板中的参数名称 +// params6.put("value", "动火作业");// 存入上面参数名称所传递的值 +// paramsList1.add(params6); +// //sendMessageUtil.sendMessages(mes1, paramsList1); + } + break; + + case "8"://验收人 + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + log.put("ACTION", "验收通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_Y08");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + //sendMessageUtil.sendMessages(mes, paramsList); + } + break; + case "-2"://确认打回 + log.put("ACTION", "作业单位打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); + hotworkCfdService.edit(pd2); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_N02");// 短信模板编码 + mes.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "params1");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params2");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + PageData params3 = new PageData(); + params3.put("name", "params3");// 存入短信模板中的参数名称 + params3.put("value", "作业单位");// 存入上面参数名称所传递的值 + paramsList.add(params3); + //sendMessageUtil.sendMessages(mes, paramsList); + break; +// case "-3"://监护人确认打回 +// log.put("ACTION", "监护人打回"); +// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); +// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); +// hotworkService.edit(pd2); +// // 发短信 +// PageData mes1 = new PageData(); +// mes1.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid +// mes1.put("templateCode", "SMS_223580715");// 短信模板编码 +// mes1.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id +// // 参数集合 +// List paramsList1 = new ArrayList(); +// // 第1个参数 +// PageData params4 = new PageData(); +// params4.put("name", "params1");// 存入短信模板中的参数名称 +// params4.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 +// paramsList1.add(params4); +// // 第2个参数 +// PageData params5 = new PageData(); +// params5.put("name", "params2");// 存入短信模板中的参数名称 +// params5.put("value", "动火作业");// 存入上面参数名称所传递的值 +// paramsList1.add(params5); +// // 第3个参数 +// PageData params6 = new PageData(); +// params6.put("name", "params3");// 存入短信模板中的参数名称 +// params6.put("value", "监护人确认");// 存入上面参数名称所传递的值 +// paramsList1.add(params6); +// //sendMessageUtil.sendMessages(mes1, paramsList1); +// break; + case "-4"://单位负责人打回 + log.put("ACTION", "单位负责人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); + hotworkCfdService.edit(pd2); + + // 发短信 + PageData mes2 = new PageData(); + mes2.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes2.put("templateCode", "DH_N04");// 短信模板编码 + mes2.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes2.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList2 = new ArrayList(); + // 第1个参数 + PageData params7 = new PageData(); + params7.put("name", "params1");// 存入短信模板中的参数名称 + params7.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList2.add(params7); + // 第2个参数 + PageData params8 = new PageData(); + params8.put("name", "params2");// 存入短信模板中的参数名称 + params8.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList2.add(params8); + // 第3个参数 + PageData params9 = new PageData(); + params9.put("name", "params3");// 存入短信模板中的参数名称 + params9.put("value", "动火点所在单位审核");// 存入上面参数名称所传递的值 + paramsList2.add(params9); + //sendMessageUtil.sendMessages(mes2, paramsList2); + break; + case "-5"://审批部门打回 + log.put("ACTION", "安全部门打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); + hotworkCfdService.edit(pd2); + + // 发短信 + PageData mes3 = new PageData(); + mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes3.put("templateCode", "DH_N05");// 短信模板编码 + mes3.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes3.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList3 = new ArrayList(); + // 第1个参数 + PageData params10 = new PageData(); + params10.put("name", "params1");// 存入短信模板中的参数名称 + params10.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList3.add(params10); + // 第2个参数 + PageData params11 = new PageData(); + params11.put("name", "params2");// 存入短信模板中的参数名称 + params11.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList3.add(params11); + // 第3个参数 + PageData params12 = new PageData(); + params12.put("name", "params3");// 存入短信模板中的参数名称 + params12.put("value", "安全部门");// 存入上面参数名称所传递的值 + paramsList3.add(params12); + //sendMessageUtil.sendMessages(mes3, paramsList3); + break; + case "-6"://审批打回 + log.put("ACTION", "审批部门打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + hotworkCfdService.edit(pd2); + // 发短信 + PageData mes4 = new PageData(); + mes4.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes4.put("templateCode", "DH_N06");// 短信模板编码 + mes4.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes4.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList4 = new ArrayList(); + // 第1个参数 + PageData params13 = new PageData(); + params13.put("name", "params1");// 存入短信模板中的参数名称 + params13.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList4.add(params13); + // 第2个参数 + PageData params14 = new PageData(); + params14.put("name", "params2");// 存入短信模板中的参数名称 + params14.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList4.add(params14); + // 第3个参数 + PageData params15 = new PageData(); + params15.put("name", "params3");// 存入短信模板中的参数名称 + params15.put("value", "审批人审核");// 存入上面参数名称所传递的值 + paramsList4.add(params15); + //sendMessageUtil.sendMessages(mes4, paramsList4); + break; + case "-7"://审批打回 + log.put("ACTION", "班长验票打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + hotworkCfdService.edit(pd2); + // 发短信 + PageData mes5 = new PageData(); + mes5.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes5.put("templateCode", "DH_N07");// 短信模板编码 + mes5.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes5.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList5 = new ArrayList(); + // 第1个参数 + PageData params16 = new PageData(); + params16.put("name", "params1");// 存入短信模板中的参数名称 + params16.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList5.add(params16); + // 第2个参数 + PageData params17 = new PageData(); + params17.put("name", "params2");// 存入短信模板中的参数名称 + params17.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList5.add(params17); + // 第3个参数 + PageData params18 = new PageData(); + params18.put("name", "params3");// 存入短信模板中的参数名称 + params18.put("value", "班长验票");// 存入上面参数名称所传递的值 + paramsList5.add(params18); + //sendMessageUtil.sendMessages(mes5, paramsList5); + break; + case "-8"://审批打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + hotworkCfdService.edit(pd2); + + // 发短信 + PageData mes6 = new PageData(); + mes6.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes6.put("templateCode", "DH_N08");// 短信模板编码 + mes6.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes6.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList6 = new ArrayList(); + // 第1个参数 + PageData params19 = new PageData(); + params19.put("name", "params1");// 存入短信模板中的参数名称 + params19.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList6.add(params19); + // 第2个参数 + PageData params20 = new PageData(); + params20.put("name", "params2");// 存入短信模板中的参数名称 + params20.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList6.add(params20); + // 第3个参数 + PageData params21 = new PageData(); + params21.put("name", "params3");// 存入短信模板中的参数名称 + params21.put("value", "验收归档");// 存入上面参数名称所传递的值 + paramsList6.add(params21); + //sendMessageUtil.sendMessages(mes6, paramsList6); + break; + default: + break; + } + hotworkLogCfdService.save(log); + + map.put("result", errInfo); + return map; + } + + /** + * 作废 + * + * @param out + * @throws Exception + */ + @PostMapping(value = "/cancel") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "受限空间", instructionsOperate = "受限空间", instructionsType = "作废") + public void cancel(@RequestBody PageData pd) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + System.out.println(JSONObject.toJSONString(pd)); + PageData cpd = new PageData(); + cpd = hotworkCfdService.findById(pd); + if (cpd != null && cpd.size() > 0 && Tools.notEmpty(cpd.getString("ANALYZE_TIME")) && Tools.notEmpty(cpd.getString("MONITOR_USER_SIGNER_TIME"))) { + String WORK_START_DATE = pd.getString("WORK_START_DATE"); + String ANALYZE_TIME = cpd.getString("ANALYZE_TIME"); + String MONITOR_USER_SIGNER_TIME = cpd.getString("MONITOR_USER_SIGNER_TIME"); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + System.out.println(WORK_START_DATE); + System.out.println(ANALYZE_TIME); + System.out.println(MONITOR_USER_SIGNER_TIME); + System.out.println("-------------123----------"); + try { + Date date1 = format.parse(WORK_START_DATE); + Date date2 = format.parse(ANALYZE_TIME); + Date date3 = format.parse(MONITOR_USER_SIGNER_TIME); + long workTime = date1.getTime(); + long analyzeTime = date2.getTime(); + long monitorTime = date3.getTime(); + System.out.println(workTime - analyzeTime); + System.out.println(analyzeTime - workTime); + System.out.println(workTime - monitorTime); + if (workTime - analyzeTime >= 0 && workTime - monitorTime >= 0) { + return; + } else { + hotworkCfdService.cancel(pd); + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_ZF");// 短信模板编码 + mes.put("SMSCode", "SMS_462060039");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + //sendMessageUtil.sendMessages(mes, paramsList); + } + } catch (ParseException e) { + e.printStackTrace(); + } + }else if (cpd!=null && cpd.size()>0 && Tools.isEmpty(cpd.getString("ANALYZE_TIME"))){ + pd.put("APPLY_STATUS",-98); + hotworkCfdService.cancel(pd); + PageData pd2 = new PageData(); + pd2 = hotworkCfdService.checkno(pd); + PageData pd3 = new PageData(); + pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); + pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + hotworkCfdService.editSpecialwork(pd3); + hotworkCfdService.editSpecialwork1(pd3); + hotworkCfdService.editSpecialwork2(pd3); + hotworkCfdService.editSpecialwork3(pd3); + hotworkCfdService.editSpecialwork4(pd3); + hotworkCfdService.editSpecialwork5(pd3); + hotworkCfdService.editSpecialwork6(pd3); + hotworkCfdService.editSpecialwork7(pd3); + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_ZF1");// 短信模板编码 + mes.put("SMSCode", "SMS_462060039");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + //sendMessageUtil.sendMessages(mes, paramsList); + }else if (cpd!=null && cpd.size()>0 && Tools.notEmpty(cpd.getString("ANALYZE_TIME")) && Tools.isEmpty(cpd.getString("MONITOR_USER_SIGNER_TIME"))){ + pd.put("APPLY_STATUS",-99); + hotworkCfdService.cancel(pd); + PageData pd2 = new PageData(); + pd2 = hotworkCfdService.checkno(pd); + PageData pd3 = new PageData(); + pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); + pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + hotworkCfdService.editSpecialwork(pd3); + hotworkCfdService.editSpecialwork1(pd3); + hotworkCfdService.editSpecialwork2(pd3); + hotworkCfdService.editSpecialwork3(pd3); + hotworkCfdService.editSpecialwork4(pd3); + hotworkCfdService.editSpecialwork5(pd3); + hotworkCfdService.editSpecialwork6(pd3); + hotworkCfdService.editSpecialwork7(pd3); + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid + mes.put("templateCode", "DH_ZF2");// 短信模板编码 + mes.put("SMSCode", "SMS_462060039");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + //sendMessageUtil.sendMessages(mes, paramsList); + } + + map.put("result", errInfo); //返回结果 + return ; + } + + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/jhlist") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "列表") + public Object jhlist(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = hotworkCfdService.jhlist(page); //列出confinedspace列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/aqlist") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "列表") + public Object aqlist(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = hotworkCfdService.aqlist(page); //列出confinedspace列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/jslist") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "列表") + public Object jslist(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = hotworkCfdService.jslist(page); //列出confinedspace列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @ResponseBody +// @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "列表") + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = hotworkCfdService.list(page); //列出hotwork列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "去修改页面获取数据") + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = hotworkCfdService.findById(pd); //根据ID读取 + map.put("measuresList", hotworkCfdService.listAllMeasures(pd)); + map.put("gasList", hotworkGasCfdService.listAll(pd)); + map.put("imgList", hotworkAcceptUserCfdService.findByIds(pd)); + map.put("imgList1", hotworkAcceptUserCfdService.findById(pd)); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/gas/list") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "去修改页面获取数据") + public Object gasList() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = hotworkGasCfdService.listAll(pd); //列出hotwork列表 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/gas/delete") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "去修改页面获取数据") + public Object gasDel() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hotworkGasCfdService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/gas/save") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "去修改页面获取数据") + public Object gasSave() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("HOTWORKGAS_ID", this.get32UUID()); //主键 + pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + hotworkGasCfdService.save(pd); + hotworkCfdService.edittime(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /**待办作业数统计 + * @param + * @throws Exception + */ + @RequestMapping(value="/countCheck") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "待办作业数统计") + public Object countCheck() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData count = hotworkCfdService.countCheck(pd); + map.put("result", errInfo); + map.put("count", count); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java index 9c96a3ea..a66edc34 100644 --- a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java +++ b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java @@ -10,6 +10,7 @@ import java.util.Map; import com.zcloud.service.bus.CorpInfoRelatedService; import com.zcloud.service.system.DictionariesService; import com.zcloud.util.*; +import net.sf.json.JSONArray; import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -583,4 +584,23 @@ public class CorpInfoController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 显示列表ztree(只查企业端部门) 有排序 + * + * @return + */ + @RequestMapping(value = "/listTreeManageAndCorpHasOrder") + @ResponseBody + public Object listTreeManageAndCorpHasOrder() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd.put("DEPARTMENT_ID", "0"); //查询父节点为0的根节点数据 + List rootList = departmentService.listTreeManageAndCorpHasOrder(pd); + JSONArray arr = JSONArray.fromObject(rootList); + map.put("zTreeNodes", arr.toString()); + 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 f9674020..925cd04c 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenController.java @@ -2902,7 +2902,7 @@ public class HiddenController extends BaseController { inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); inspection.put("OPERATOR", Jurisdiction.getUSER_ID()); inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); - inspection.put("INSPECTION_STATUS", "7"); // 已验收 + inspection.put("INSPECTION_STATUS", "8"); // 已验收 safetyenvironmentalService.editStatus(inspection); } diff --git a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java index 9622785c..49fedbd9 100644 --- a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java @@ -1311,6 +1311,8 @@ public class HotWorkApplicationController extends BaseController { hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName")); hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID")); }else if("4".equals(type)){ // 现场管辖单位负责人 + hot.put("UNIT_LEADER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + hot.put("UNIT_LEADER_DEPARTMENT_NAME",userPageData.getString("deptName")); hot.put("UNIT_LEADER_NAME",userPageData.getString("userName")); hot.put("UNIT_LEADER_ID",userPageData.getString("USER_ID")); }else if("5".equals(type)){ // 动火前 负责人 diff --git a/src/main/java/com/zcloud/controller/eightWork/AppEightWorkCfdController.java b/src/main/java/com/zcloud/controller/eightWork/AppEightWorkCfdController.java new file mode 100644 index 00000000..279540c9 --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightWork/AppEightWorkCfdController.java @@ -0,0 +1,160 @@ +package com.zcloud.controller.eightWork; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.Response; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.eightWork.EightWorkCfdService; +import com.zcloud.service.highriskwork.*; +import com.zcloud.service.system.DictionariesService; +import com.zcloud.service.system.UsersService; +import com.zcloud.util.Tools; +import com.zcloud.util.Warden; +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; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：八项作业 + * 作者：luoxiaobao + * 时间：2021-08-31 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/eightwork/cfd") +public class AppEightWorkCfdController extends BaseController { + + @Autowired + private EightWorkCfdService eightworkCfdService; + @Autowired + private DictionariesService dictionariesService; + @Autowired + private UsersService usersService; + @Autowired + private ConfinedSpaceService confinedSpaceService; + @Autowired + private BlindBoardService blindBoardService; + @Autowired + private BreakGroundService breakGroundService; + @Autowired + private HighWorkService highWorkService; + @Autowired + private HoistingService hoistingService; + @Autowired + private ElectricityService electricityService; + @Autowired + private HotworkService hotworkService; + @Autowired + private CutRoadService cutRoadService; + + /**八项作业列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "八项作业",instructionsOperate = "八项作业",instructionsType = "列表") + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); +// pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + page.setPd(pd); + List varList = eightworkCfdService.list(page); //列出confinedspace列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * description: + * accidentType-风险点 + * hiddenLevel-隐患级别 + * + * @return tree or list + * @throws Exception all + */ + @RequestMapping(value = "/getInfo") + @ResponseBody + public Response getInfo() throws Exception { + Response response = Response.getResponse(); + try { + PageData request = this.getPageData(); + if (StringUtils.isBlank(request.getString("vectors"))) throw new RuntimeException("未找到要获取的数据字典类型"); + List vectors = Warden.getList(request.getString("vectors"),String.class); + for (String vector: vectors) { + switch (vector) { + case "accidentType": + //事故类型 + response.put("accidentType", dictionariesService.getTreeById("cee1190ea96a4ca9b7bca81e11f0d0f8")); + continue; + default: + } + } + return response.OK(); + } catch (Exception e) { + e.printStackTrace(); + return response.errorMessage(e.getMessage()); + } + } + + /** + * 获取全部用户列表 + * @return + * @throws Exception + */ + @RequestMapping(value = "/getAllUserList") + @ResponseBody + public Object getAllUserList() throws Exception{ + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + return usersService.getAllUserList(); + } + + /** + * 高危作业待办数量统计 + * @return + * @throws Exception + */ + @RequestMapping(value = "/countCheck") + @ResponseBody + public Object countCheck() throws Exception{ + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData count1 = confinedSpaceService.countCheck(pd); + PageData count2 = blindBoardService.countCheck(pd); + PageData count3 = breakGroundService.countCheck(pd); + PageData count4 = highWorkService.countCheck(pd); + PageData count5 = hoistingService.countCheck(pd); + PageData count6 = electricityService.countCheck(pd); + PageData count7 = hotworkService.countCheck(pd); + PageData count8 = cutRoadService.countCheck(pd); + + map.put("result", errInfo); + map.put("count1", count1); + map.put("count2", count2); + map.put("count3", count3); + map.put("count4", count4); + map.put("count5", count5); + map.put("count6", count6); + map.put("count7", count7); + map.put("count8", count8); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/highriskwork/HotworkCfdController.java b/src/main/java/com/zcloud/controller/highriskwork/HotworkCfdController.java new file mode 100644 index 00000000..5d8a61c5 --- /dev/null +++ b/src/main/java/com/zcloud/controller/highriskwork/HotworkCfdController.java @@ -0,0 +1,318 @@ +package com.zcloud.controller.highriskwork; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.highriskwork.HotworkAcceptUserCfdService; +import com.zcloud.service.highriskwork.HotworkCfdService; +import com.zcloud.service.highriskwork.HotworkGasCfdService; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.ObjectExcelView; +import com.zcloud.util.Tools; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：动火作业 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/hotwork/cfd") +public class HotworkCfdController extends BaseController { + + @Autowired + private HotworkCfdService hotworkCfdService; + @Autowired + private HotworkGasCfdService hotworkGasCfdService; + @Autowired + private HotworkAcceptUserCfdService hotworkacceptuserCfdService; + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @RequiresPermissions("hotwork:add") + @ResponseBody + public Object add() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("HOTWORK_ID", this.get32UUID()); //主键 + hotworkCfdService.save(pd); + map.put("result", errInfo); + return map; + } + + /**删除 + * @param out + * @throws Exception + */ + @RequestMapping(value="/delete") + @RequiresPermissions("hotwork:del") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hotworkCfdService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @RequiresPermissions("hotwork:edit") + @ResponseBody + public Object edit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hotworkCfdService.edit(pd); + map.put("result", errInfo); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @RequiresPermissions("hotwork:list") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "动火作业管理",instructionsOperate = "动火作业数据",instructionsType = "列表") + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + pd.put("ISMAIN", Jurisdiction.getIS_MAIN()); + pd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); + pd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + String DEPTIDS = pd.getString("DEPTIDS"); + if(Tools.notEmpty(DEPTIDS)) { + String DEPT_IDS[] = DEPTIDS.split(","); + pd.put("DEPT_IDS", DEPT_IDS); + } + page.setPd(pd); + List varList = hotworkCfdService.list(page); //列出Hotwork列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "动火作业管理",instructionsOperate = "动火作业数据",instructionsType = "去修改页面获取数据") + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = hotworkCfdService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("measuresList", hotworkCfdService.listAllMeasures(pd)); + map.put("gasList", hotworkGasCfdService.listAll(pd)); + map.put("imgList", hotworkacceptuserCfdService.findByIds(pd)); + map.put("imgList1", hotworkacceptuserCfdService.findById(pd)); + map.put("result", errInfo); + return map; + } + + /**批量删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/deleteAll") + @RequiresPermissions("hotwork:del") + @ResponseBody + public Object deleteAll() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if(Tools.notEmpty(DATA_IDS)){ + String ArrayDATA_IDS[] = DATA_IDS.split(","); + hotworkCfdService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + }else{ + errInfo = "error"; + } + map.put("result", errInfo); //返回结果 + return map; + } + + /**导出到excel + * @param + * @throws Exception + */ + @RequestMapping(value="/excel") + @RequiresPermissions("toExcel") + public ModelAndView exportExcel() throws Exception{ + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("所属企业"); //1 + titles.add("删除标志"); //2 + titles.add("创建时间"); //3 + titles.add("添加人"); //4 + titles.add("修改时间"); //5 + titles.add("修改人"); //6 + titles.add("编号"); //7 + titles.add("作业内容"); //8 + titles.add("工作开始时间"); //9 + titles.add("工作结束时间"); //10 + titles.add("确认单位"); //11 + titles.add("确认单位人"); //12 + titles.add("确认单位签字"); //13 + titles.add("确认单位签字时间"); //14 + titles.add("审核部门"); //15 + titles.add("审核人"); //16 + titles.add("审核签字"); //17 + titles.add("审核签字时间"); //18 + titles.add("审批部门"); //19 + titles.add("审批部门人"); //20 + titles.add("审批部门签字"); //21 + titles.add("审批部门签字时间"); //22 + titles.add("状态"); //23 + titles.add("确认意见"); //24 + titles.add("审核意见"); //25 + titles.add("审批意见"); //26 + titles.add("其他防护措施"); //27 + titles.add("验收部门"); //28 + titles.add("验收人"); //29 + titles.add("验收签字"); //30 + titles.add("验收签字时间"); //31 + titles.add("验收意见"); //32 + titles.add("申请部门"); //33 + titles.add("申请人"); //34 + titles.add("动火地点"); //35 + titles.add("作业级别"); //36 + titles.add("作业人"); //37 + titles.add("特殊作业"); //38 + titles.add("风险辨识"); //39 + titles.add("作业负责人"); //40 + titles.add("分析部门"); //41 + titles.add("分析人"); //42 + titles.add("监护人部门"); //43 + titles.add("监护人"); //44 + titles.add("监护人签字"); //45 + titles.add("监护人签字时间"); //46 + titles.add("监护人意见"); //47 + titles.add("动火点车间"); //48 + titles.add("动火点车间负责人"); //49 + titles.add("车间负责人签字"); //50 + titles.add("车间负责人签字时间"); //51 + titles.add("车间负责人意见"); //52 + titles.add("班长部门"); //53 + titles.add("班长"); //54 + titles.add("班长签字"); //55 + titles.add("班长签字时间"); //56 + titles.add("班长意见"); //57 + titles.add("交底人"); //58 + titles.add("教育人"); //59 + titles.add("接受教育人"); //60 + titles.add("初审人"); //61 + dataMap.put("titles", titles); + List varOList = hotworkCfdService.listAll(pd); + List varList = new ArrayList(); + for(int i=0;i map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + outsourcedService.updateState(pd); + map.put("result", errInfo); //返回结果 + return map; + } + } diff --git a/src/main/java/com/zcloud/controller/mq/EightWorkListener.java b/src/main/java/com/zcloud/controller/mq/EightWorkListener.java new file mode 100644 index 00000000..cd792061 --- /dev/null +++ b/src/main/java/com/zcloud/controller/mq/EightWorkListener.java @@ -0,0 +1,92 @@ +package com.zcloud.controller.mq; + +import com.alibaba.fastjson.JSON; +import com.zcloud.controller.app.highriskwork.AppHotworkCfdController; +import com.zcloud.dto.TenCorpDto; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mq.MqMessageLogMapper; +import com.zcloud.service.mq.LogService; +import com.zcloud.service.mq.SendMessageService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Warden; +import com.zcloud.util.mq.MqUtil; +import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; +import org.apache.rocketmq.spring.annotation.SelectorType; +import org.apache.rocketmq.spring.core.RocketMQListener; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.Date; + +/** + * 说明：消费某个 topic 下指定 tag 的消息 对接课件DEMO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Component +@RocketMQMessageListener(consumerGroup = "${mq.group.eightWork}", + topic = "${mq.topic.eightWork}", + selectorType = SelectorType.TAG) +public class EightWorkListener implements RocketMQListener { + + +// @Resource +// private AppConfinedSpaceController appConfinedSpaceController; +// @Resource +// private AppElectricityController appElectricityController; + @Resource + private AppHotworkCfdController appHotworkCfdController; + + @Resource + private SendMessageService sendMessageService; + + @Resource + private LogService logService; + + @Resource + private MqMessageLogMapper mqMessageLogMapper; + + @Override + public void onMessage(String message) { + TenCorpDto data = JSON.parseObject(message, TenCorpDto.class); + PageData log = data.getPd(); + log.put("MESSAGE_LOG_ID", Warden.get32UUID()); + log.put("CREATE_TIME", DateUtil.getTime()); + log.put("PRODUCER_NAME",data.getProducer_name()); + log.put("TYPE","1"); + try { + System.out.println("消费者:" + data.toString()); + Date limit_date = MqUtil.dateFormat(data.getTime_stamp()); + if (limit_date.getTime() - new Date().getTime() > 1000) { + sendMessageService.SendDelayQueue(data); + log.put("DIGESTION_FLAG","0"); + } else { + switch (data.getMessage()){ + case "confined-space": + System.out.println("受限空间模块消费"); +// appConfinedSpaceController.cancel(data.getData()); + break; + case "electricity": + System.out.println("临时用电模块消费"); +// appElectricityController.cancel(data.getData()); + break; + case "hot-work": + System.out.println("动火模块消费"); + appHotworkCfdController.cancel(data.getData()); + break; + default: + System.out.println("异常模块不消费"); + throw new RuntimeException("未找到对应的消费者"); + } + log.put("DIGESTION_FLAG","1"); + } + mqMessageLogMapper.save(log); + } catch (Exception e) { + e.printStackTrace(); + logService.saveErrorMessage(log,e.getMessage()); + throw new RuntimeException(e); + } + } + +} + diff --git a/src/main/java/com/zcloud/controller/mq/MqListener.java b/src/main/java/com/zcloud/controller/mq/MqListener.java new file mode 100644 index 00000000..b34984e7 --- /dev/null +++ b/src/main/java/com/zcloud/controller/mq/MqListener.java @@ -0,0 +1,32 @@ +package com.zcloud.controller.mq; + +import com.alibaba.fastjson.JSON; +import com.zcloud.dto.TenCorpDto; +import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; +import org.apache.rocketmq.spring.annotation.SelectorType; +import org.apache.rocketmq.spring.core.RocketMQListener; +import org.springframework.stereotype.Component; + +/** + * 说明：消费某个 topic 下指定 tag 的消息 对接课件DEMO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Component +@RocketMQMessageListener(consumerGroup = "${mq.group.info}", + topic = "${mq.topic.info}", + selectorType = SelectorType.TAG) +public class MqListener implements RocketMQListener { + + @Override + public void onMessage(String message) { + TenCorpDto data = JSON.parseObject(message, TenCorpDto.class); + try { + System.out.println("2消费者:" + data.toString()); + } catch (Exception e) { + e.printStackTrace(); + throw new RuntimeException(e); + } + } +} + diff --git a/src/main/java/com/zcloud/controller/mq/SendController.java b/src/main/java/com/zcloud/controller/mq/SendController.java new file mode 100644 index 00000000..649331ff --- /dev/null +++ b/src/main/java/com/zcloud/controller/mq/SendController.java @@ -0,0 +1,51 @@ +package com.zcloud.controller.mq; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.dto.Response; +import com.zcloud.dto.TenCorpDto; +import com.zcloud.service.mq.SendMessageService; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import javax.annotation.Resource; + +/** + * 说明： + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public class SendController extends BaseController { + + @Resource + private SendMessageService sendMessageService; + + + public Response sendMessage(@RequestParam("tenCorpDto") TenCorpDto tenCorpDto) throws Exception { + try { + sendMessageService.sendMessage(tenCorpDto); + } catch (Exception e) { + e.printStackTrace(); + } + return Response.OK(); + } + + public Response timelyQueue(@RequestBody TenCorpDto tenCorpDto) throws Exception { + try { + sendMessageService.sendMessage(tenCorpDto); + } catch (Exception e) { + e.printStackTrace(); + } + return Response.OK(); + } + + public Response SendDelayQueue(@RequestBody TenCorpDto tenCorpDto) throws Exception { + try { + sendMessageService.SendDelayQueue(tenCorpDto); + return Response.OK(); + } catch (Exception e) { + e.printStackTrace(); + return Response.ERROR(e.getMessage()); + } + + } +} diff --git a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java index 841f5464..6c888b4e 100644 --- a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java +++ b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java @@ -82,6 +82,28 @@ public class OpenApiController extends BaseController { return map; } + @RequestMapping(value="/user/getUserInfo") + @ResponseBody + public Object getUserInfo() throws Exception{ + PageData map = new PageData(); + PageData pd = this.getPageData(); + PageData userInfo = usersService.getUserInfo(pd); //列出Post列表 + map.putAll(userInfo); + map.put("result", "success"); + return map; + } + + @RequestMapping(value="/department/getDepartmentInfo") + @ResponseBody + public Object getDepartmentInfo() throws Exception{ + PageData map = new PageData(); + PageData pd = this.getPageData(); + PageData departmentInfo = departmentService.getDepartmentInfo(pd); //列出Post列表 + map.putAll(departmentInfo); + map.put("result", "success"); + return map; + } + /**列表 * @throws Exception */ @@ -97,4 +119,20 @@ public class OpenApiController extends BaseController { map.put("result", errInfo); return map; } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/corp/findById") + @ResponseBody + public Object findById() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = corpInfoService.findById(pd); //列出Post列表 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/specialoperation/AppPersonnelManagementCfdController.java b/src/main/java/com/zcloud/controller/specialoperation/AppPersonnelManagementCfdController.java new file mode 100644 index 00000000..efec0f69 --- /dev/null +++ b/src/main/java/com/zcloud/controller/specialoperation/AppPersonnelManagementCfdController.java @@ -0,0 +1,238 @@ +package com.zcloud.controller.specialoperation; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.bus.SpecialUserService; +import com.zcloud.service.specialoperation.PersonnelManagementCfdService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.ObjectExcelView; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import java.util.*; + +/** + * 说明：特种作业人员管理 + * 作者：luoxiaobao + * 时间：2022-06-16 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/personnelmanagement/cfd") +public class AppPersonnelManagementCfdController extends BaseController { + + @Autowired + private PersonnelManagementCfdService personnelmanagementCfdService; + @Autowired + private SpecialUserService specialUserService; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @ResponseBody + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "新增") + public Object add() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("PERSONNELMANAGEMENT_ID", this.get32UUID()); //主键 + pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ISDELETE", "0"); //是否删除 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + personnelmanagementCfdService.save(pd); + map.put("result", errInfo); + return map; + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "删除") + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + personnelmanagementCfdService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @ResponseBody + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "修改") + public Object edit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + personnelmanagementCfdService.edit(pd); + map.put("result", errInfo); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @ResponseBody + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "列表") + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String endday = DateUtil.getDay(); + PageData getPD = new PageData(); + getPD.put("endday",endday); + List varList = specialUserService.nameListAll(getPD); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @ResponseBody + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "去修改页面获取数据") + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = personnelmanagementCfdService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /**批量删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/deleteAll") + @ResponseBody + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "批量删除") + public Object deleteAll() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if(Tools.notEmpty(DATA_IDS)){ + String ArrayDATA_IDS[] = DATA_IDS.split(","); + personnelmanagementCfdService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + }else{ + errInfo = "error"; + } + map.put("result", errInfo); //返回结果 + return map; + } + + /**判断特种作业证书编号是否存在 + * @return + */ + @RequestMapping(value="/hasCertificate") + @ResponseBody + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "判断特种作业证书编号是否存在") + public Object hasCertificate() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if(personnelmanagementCfdService.findByCertificate(pd) != null){ + map.put("msg","特种作业证书编号已存在"); + } + map.put("result", errInfo); //返回结果 + return map; + } + /**导出到excel + * @param + * @throws Exception + */ + @RequestMapping(value="/excel") + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "导出到excel") + public ModelAndView exportExcel() throws Exception{ + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("添加人"); //1 + titles.add("添加单位"); //2 + titles.add("单位名称"); //3 + titles.add("人员类型"); //4 + titles.add("作业类别"); //5 + titles.add("操作项目"); //6 + titles.add("姓名"); //7 + titles.add("性别"); //8 + titles.add("特种作业证书编号"); //9 + titles.add("复审时间"); //10 + titles.add("手机号码"); //11 + titles.add("身份证号码"); //12 + titles.add("发证机关"); //13 + titles.add("有效期"); //14 + titles.add("添加时间"); //15 + titles.add("修改人"); //16 + titles.add("修改时间"); //17 + titles.add("是否删除"); //18 + titles.add("企业ID"); //19 + dataMap.put("titles", titles); + List varOList = personnelmanagementCfdService.listAll(pd); + List varList = new ArrayList(); + for(int i=0;i map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("PERSONNELMANAGEMENT_ID", this.get32UUID()); //主键 + pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ISDELETE", "0"); //是否删除 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + personnelmanagementCfdService.save(pd); + map.put("result", errInfo); + return map; + } + + /**删除 + * @param out + * @throws Exception + */ + @RequestMapping(value="/delete") + @RequiresPermissions("personnelmanagement:del") + @ResponseBody + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "删除") + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + personnelmanagementCfdService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @RequiresPermissions("personnelmanagement:edit") + @ResponseBody + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "修改") + public Object edit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + personnelmanagementCfdService.edit(pd); + map.put("result", errInfo); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @RequiresPermissions("personnelmanagement:list") + @ResponseBody + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "列表") + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + page.setPd(pd); + List varList = personnelmanagementCfdService.list(page); //列出PersonnelManagement列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @RequiresPermissions("personnelmanagement:edit") + @ResponseBody + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "去修改页面获取数据") + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = personnelmanagementCfdService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /**批量删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/deleteAll") + @RequiresPermissions("personnelmanagement:del") + @ResponseBody + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "批量删除") + public Object deleteAll() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if(Tools.notEmpty(DATA_IDS)){ + String ArrayDATA_IDS[] = DATA_IDS.split(","); + personnelmanagementCfdService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + }else{ + errInfo = "error"; + } + map.put("result", errInfo); //返回结果 + return map; + } + + /**判断特种作业证书编号是否存在 + * @return + */ + @RequestMapping(value="/hasCertificate") + @ResponseBody + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "判断特种作业证书编号是否存在") + public Object hasCertificate() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if(personnelmanagementCfdService.findByCertificate(pd) != null){ + map.put("msg","特种作业证书编号已存在"); + } + map.put("result", errInfo); //返回结果 + return map; + } + /**导出到excel + * @param + * @throws Exception + */ + @RequestMapping(value="/excel") + @RequiresPermissions("toExcel") + @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "导出到excel") + public ModelAndView exportExcel() throws Exception{ + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("添加人"); //1 + titles.add("添加单位"); //2 + titles.add("单位名称"); //3 + titles.add("人员类型"); //4 + titles.add("作业类别"); //5 + titles.add("操作项目"); //6 + titles.add("姓名"); //7 + titles.add("性别"); //8 + titles.add("特种作业证书编号"); //9 + titles.add("复审时间"); //10 + titles.add("手机号码"); //11 + titles.add("身份证号码"); //12 + titles.add("发证机关"); //13 + titles.add("有效期"); //14 + titles.add("添加时间"); //15 + titles.add("修改人"); //16 + titles.add("修改时间"); //17 + titles.add("是否删除"); //18 + titles.add("企业ID"); //19 + dataMap.put("titles", titles); + List varOList = personnelmanagementCfdService.listAll(pd); + List varList = new ArrayList(); + for(int i=0;i map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserDetailInfoById", pd); + return result; + } + + private String getPageUrl(Page page){ + return "?showCount=" +page.getShowCount() + "¤tPage=" + page.getUrlCurrentPage(); + } + + /** + * 相关方单位--根据企业端corpInfoId查询到对应的相关方部门树形结构 + * @return + * @throws Exception + */ + @RequestMapping(value="/listTreeByFgsId") + @ResponseBody + public Object listTreeByFgsId() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpFgs/listTreeByFgsId", pd); + return result; + } + + +} diff --git a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java index 2a561de1..d3c4f6e1 100644 --- a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java +++ b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java @@ -31,7 +31,6 @@ public class FlowTrainController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("MAndTUserId",Jurisdiction.getUSER_ID()); -// pd.put("TRAIN_CORP_LEADER", Jurisdiction.getUSER_ID()); Map result = HttpClientService.doPost(xgfUrl + "/openApi/trainingbatch/list" +getPageUrl(page), pd); return result; } diff --git a/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java b/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java new file mode 100644 index 00000000..443a6470 --- /dev/null +++ b/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java @@ -0,0 +1,240 @@ +package com.zcloud.controller.xgf; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.util.DateUtil; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.ObjectExcelView; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import java.util.*; + +/** + * 说明：相关方管理 + * 作者：luoxiaobao + * 时间：2022-06-07 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/relevantunits") +public class RelevantUnitsController extends BaseController { + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + /** + * 相关方单位信息审核模块的列表 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list() throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/list", pd); + return result; + } + + /** + * 审核 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/examine") + @ResponseBody + public Object examine() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); + String type = pd.getString("STATE"); //2 通过 3.未通过 + if ("2".equals(type)) { + pd.put("STATE", "2"); // 审核状态改为通过 + } else if ("3".equals(type)) { + pd.put("STATE", "3"); // 审核状态改为打回 + } + // Map result2 = HttpClientService.doPost(XGF_EDITROLEBTG, pd); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/corpInfoAudit", pd); + map.put("result", errInfo); + return map; + } + + /** + * 相关方单位人员-人员基础信息管理-list + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getCorpInfoDetail") + @ResponseBody + public Object getCorpInfoDetail() throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/getDataForEditByCorpInfoIdForApi", pd); + return result; + } + + /** + * 相关方单位账号管理-列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getCorpInfoList") + @ResponseBody + public Object getCorpInfoList(Page page) throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/list", pd); + return result; + } + + /** + * 导出到excel + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/excelAll") + @RequiresPermissions("toExcel") + public ModelAndView exportExcel() throws Exception { + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("序号"); //1 + titles.add("企业状态"); //2 + titles.add("股份主管部门"); //3 + titles.add("基层单位主管公司"); //4 + titles.add("基层单位主管部门"); //5 + titles.add("相关方单位名称"); //6 + titles.add("统一社会信用代码"); //7 + titles.add("经营地址"); //8 + titles.add("法人"); //9 + titles.add("联系人"); //10 + titles.add("联系电话"); //11 + titles.add("用工形式"); //12 + titles.add("选取形式"); //13 + titles.add("流动人员比例%"); //14 + titles.add("添加人"); //15 + titles.add("添加时间"); //16 + dataMap.put("titles", titles); + + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/unitCorpInfo", pd); + List> varOList = (List>) result.get("unitCorp"); + + List varList = new ArrayList(); + for (int i = 0; i < varOList.size(); i++) { + PageData vpd = new PageData(); + vpd.put("var1", i + 1); + if (varOList.get(i).get("STATE").equals("0")) { + vpd.put("var2", "未填报"); + } else if (varOList.get(i).get("STATE").equals("1")) { + vpd.put("var2", "待审核"); + } else if (varOList.get(i).get("STATE").equals("2")) { + vpd.put("var2", "已审核"); + } else if (varOList.get(i).get("STATE").equals("3")) { + vpd.put("var2", "已打回"); + } else if (varOList.get(i).get("STATE").equals("4")) { + vpd.put("var2", "已填报"); + } + + vpd.put("var3", varOList.get(i).get("MAIN_DEPARTMENT_NAME")); + vpd.put("var4", varOList.get(i).get("SUPERVISE_CORPINFO_NAME")); + vpd.put("var5", varOList.get(i).get("SUPERVISE_DEPARTMENT_NAME")); + vpd.put("var6", varOList.get(i).get("RELEVANT_UNIT_NAME")); + vpd.put("var7", varOList.get(i).get("SOCIAL_CODE")); + vpd.put("var8", varOList.get(i).get("BUSINESS_ADDRESS")); + vpd.put("var9", varOList.get(i).get("LEGAL_PERSON")); + vpd.put("var10", varOList.get(i).get("CONTACT_PERSON")); + vpd.put("var11", varOList.get(i).get("CONTACT_TEL")); + vpd.put("var12", varOList.get(i).get("EMPLOYMENT_FORM_NAME")); + if (varOList.get(i).get("SELECT_FORM").equals("competitive_negotiation")) { + vpd.put("var13", "竞争性谈判"); + } + if (varOList.get(i).get("SELECT_FORM").equals("invite_tenders")) { + vpd.put("var13", "招标"); + } + vpd.put("var14", varOList.get(i).get("FLOATING_PERCENT")); + vpd.put("var15", varOList.get(i).get("CREATOR_NAME")); + vpd.put("var16", varOList.get(i).get("CREATTIME").toString().replace("T", " ").replace(".000+0000", "")); + varList.add(vpd); + } + dataMap.put("varList", varList); + ObjectExcelView erv = new ObjectExcelView(); + mv = new ModelAndView(erv, dataMap); + return mv; + } + + /** + * 保存数据 + * + * @throws Exception + */ + @RequestMapping(value = "/saveCorpInfo") + @ResponseBody + public Object saveCorpInfo() throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/saveDataForApi", pd); + return result; + } + + /** + * 查询相关方名称是否唯一 + * + * @throws Exception + */ + @RequestMapping(value = "/hasName") + @ResponseBody + public Object hasName() throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/hasName", pd); + return result; + } + + /** + * 查询相关方统一社会信用代码是否唯一 + * + * @throws Exception + */ + @RequestMapping(value = "/hasSocialCode") + @ResponseBody + public Object hasSocialCode() throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/hasSocialCode", pd); + return result; + } + + /** + * 查询相关方统一社会信用代码是否唯一 + * + * @throws Exception + */ + @RequestMapping(value = "/resetPassword") + @ResponseBody + public Object resetPassword() throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/resetPasswordByCorpInfoId", pd); + return result; + } + +} diff --git a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java index af776b24..d3e7835d 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java @@ -236,7 +236,6 @@ public class XgfCorpController extends BaseController { } else if ("3".equals(type)) { pd.put("STATE", "3"); // 审核状态改为打回 } - // Map result2 = HttpClientService.doPost(XGF_EDITROLEBTG, pd); Map result = HttpClientService.doPost(url + "/api/corpinfo/corpInfoAudit", pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/xgf/XgfDictionariesController.java b/src/main/java/com/zcloud/controller/xgf/XgfDictionariesController.java index 4f566b8a..0555b29b 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfDictionariesController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfDictionariesController.java @@ -54,4 +54,20 @@ public class XgfDictionariesController extends BaseController { Map result = HttpClientService.doPost(url + "/api/dictionaries/getAreaLevels", pd); return result; } + + /** + * 字典 + * @return + * @throws Exception + */ + @RequestMapping(value="/listSelectTree") + @ResponseBody + public Object listSelectTree() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(url + "/api/dictionaries/listSelectTree", pd); + return result; + } } diff --git a/src/main/java/com/zcloud/controller/xgf/app/AppCorpFgsController.java b/src/main/java/com/zcloud/controller/xgf/app/AppCorpFgsController.java new file mode 100644 index 00000000..fef97c0b --- /dev/null +++ b/src/main/java/com/zcloud/controller/xgf/app/AppCorpFgsController.java @@ -0,0 +1,110 @@ +package com.zcloud.controller.xgf.app; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author fangjiakai + * @date 2023/05/15 11:09 + */ +@Controller +@RequestMapping("/app/corpFgs") +public class AppCorpFgsController extends BaseController { + + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + /** + * 相关方单位列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value="/corpFgsList") + @ResponseBody + public Object batchList(Page page) throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpFgs/corpFgsList" +getPageUrl(page), pd); + return result; + } + + /** + * 相关方单位人员列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value="/corpUserFgsList") + @ResponseBody + public Object batchUserList(Page page) throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserFgsList" +getPageUrl(page), pd); + return result; + } + + /** + * 相关方单位人员-人员基础信息管理-人员详细信息 + * @return + * @throws Exception + */ + @RequestMapping(value="/getCorpUserDetail") + @ResponseBody + public Object getCorpUserDetail() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserDetailInfoById", pd); + return result; + } + + private String getPageUrl(Page page){ + return "?showCount=" +page.getShowCount() + "¤tPage=" + page.getUrlCurrentPage(); + } + + /** + * 相关方单位--根据企业端corpInfoId查询到对应的相关方部门树形结构 + * @return + * @throws Exception + */ + @RequestMapping(value="/listTreeByFgsId") + @ResponseBody + public Object listTreeByFgsId() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpFgs/listTreeByFgsId", pd); + return result; + } + + /** + * 根据相关方部门id获取部门下所有人员 + * @return + * @throws Exception + */ + @RequestMapping(value="/findUserByDepartmentId") + @ResponseBody + public Object findUserByDepartmentId() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpUserFgs/findUserByDepartmentId", pd); + return result; + } + + +} diff --git a/src/main/java/com/zcloud/dto/Response.java b/src/main/java/com/zcloud/dto/Response.java new file mode 100644 index 00000000..2e7054cd --- /dev/null +++ b/src/main/java/com/zcloud/dto/Response.java @@ -0,0 +1,68 @@ +package com.zcloud.dto; + +import com.alibaba.fastjson.JSON; +import lombok.Data; + +@Data +public class Response { + private String result; + + private String exception; + + private String code; + + private String message; + + public Response Ok() { + this.result = "succeed"; + this.code = "0"; + return this; + } + + public static Response OK() { + Response response = new Response(); + response.result = "succeed"; + response.code = "0"; + return response; + } + + public Response Error() { + this.result = "succeed"; + this.code = "9999"; + this.exception = "系统异常"; + return this; + } + + public Response Error(String errorMessage) { + this.result = "succeed"; + this.code = "9999"; + this.exception = errorMessage; + return this; + } + + public Response Error(String code, String errorMessage) { + this.result = "succeed"; + this.code = code; + this.exception = errorMessage; + return this; + } + + public static Response ERROR() { + Response response = new Response(); + response.result = "succeed"; + response.code = "0"; + return response; + } + + public static Response ERROR(String errorMessage) { + Response response = new Response(); + response.result = "exception"; + response.code = "9999"; + response.exception = errorMessage; + return response; + } + + public void setMessage(Object obj) { + this.message = JSON.toJSONString(obj); + } +} diff --git a/src/main/java/com/zcloud/dto/TenCorpConst.java b/src/main/java/com/zcloud/dto/TenCorpConst.java new file mode 100644 index 00000000..737a8f49 --- /dev/null +++ b/src/main/java/com/zcloud/dto/TenCorpConst.java @@ -0,0 +1,7 @@ +package com.zcloud.dto; + +public class TenCorpConst { + public static final String confinedSpace = "confined-space"; + public static final String electricity = "electricity"; + public static final String hotWork = "hot-work"; +} diff --git a/src/main/java/com/zcloud/dto/TenCorpDto.java b/src/main/java/com/zcloud/dto/TenCorpDto.java new file mode 100644 index 00000000..011721d9 --- /dev/null +++ b/src/main/java/com/zcloud/dto/TenCorpDto.java @@ -0,0 +1,45 @@ +package com.zcloud.dto; + +import com.alibaba.fastjson.JSON; +import com.zcloud.entity.PageData; +import lombok.Data; + +@Data +public class TenCorpDto { + // 请秋id + private String id; + // 消息来源名称 + private String producer_name = "qa-prevention-cfd"; + private String topic; + //印记(方便寻找该条请求) + private String mark; + // 标记名称 + private String mark_name; + // 消息发送时间(yyyy-MM-dd HH:mm:ss:SSS) + private String time_stamp; + // 消息体 + // 八项作业根据这个区分接口 + private String message; + // 消息体 + private PageData data; + + public TenCorpDto() { + this.id = Warden.get32UUID(); + } + + @Override + public String toString() { + return JSON.toJSONString(this); + } + + public PageData getPd() { + PageData info = new PageData(); + info.put("ID", this.id); + info.put("PRODUCER_NAME", this.producer_name); + info.put("MARK", this.mark); + info.put("MARK_NAME", this.mark_name); + info.put("MESSAGE", this.message); + info.put("TOPIC",this.topic); + return info; + } +} diff --git a/src/main/java/com/zcloud/dto/Warden.java b/src/main/java/com/zcloud/dto/Warden.java new file mode 100644 index 00000000..be44bd42 --- /dev/null +++ b/src/main/java/com/zcloud/dto/Warden.java @@ -0,0 +1,87 @@ +package com.zcloud.dto; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.entity.PageData; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.UuidUtil; +import org.apache.commons.lang.StringUtils; + +import java.util.*; + +public class Warden { + + public static List getList(String raw) { + return JSON.parseArray(raw, PageData.class); + } + + public static List getList(String raw, Class clazz) { + return JSON.parseArray(raw, clazz); + } + + public static List getList(JSONArray raw) { + return JSON.parseArray(raw.toJSONString(), PageData.class); + } + + public static PageData getPageData(JSONObject raw) { + return JSON.parseObject(raw.toJSONString(), PageData.class); + } + + public static PageData getPageData(String raw) { + return JSON.parseObject(raw, PageData.class); + } + + public static String get32UUID() { + return UuidUtil.get32UUID(); + } + + public static List> getVueUploadEntity(String url) { + List> list = new ArrayList<>(); + Map map = new HashMap<>(); + map.put("name", get32UUID()); + map.put("url", url); + list.add(map); + return list; + } + + public static void initDate(PageData entity) { + entity.put("CREATOR", Jurisdiction.getUSER_ID()); + entity.put("CREATE_TIME", DateUtil.getTime()); + entity.put("CREATOR_NAME", Jurisdiction.getName()); + entity.put("CREATTIME", DateUtil.getTime()); + entity.put("OPERATOR", Jurisdiction.getUSER_ID()); + entity.put("OPERATOR_NAME", Jurisdiction.getName()); + entity.put("OPERAT_TIME", DateUtil.getTime()); + entity.put("OPERATTIME", DateUtil.getTime()); + entity.put("ISDELETE", "0"); + } + + public static void updateDate(PageData entity) { + entity.put("OPERATOR", Jurisdiction.getUSER_ID()); + entity.put("OPERAT_TIME", DateUtil.getTime()); + entity.put("OPERATTIME", DateUtil.getTime()); + entity.put("ISDELETE", "0"); + } + + public static Date addDate(Date date, long day) { + if (date == null) { + return new Date(); + } + long time = date.getTime(); // 得到指定日期的毫秒数 + day = day * 24 * 60 * 60 * 1000; // 要加上的天数转换成毫秒数 + time += day; // 相加得到新的毫秒数 + return new Date(time); // 将毫秒数转换成日期 + } + + public static String checkId(Object object) { + if (object == null || StringUtils.isEmpty(object.toString())) { + return get32UUID(); + } else { + return object.toString(); + } + } + + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/bus/SpecialUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/bus/SpecialUserMapper.java index 5b97d670..39a683be 100644 --- a/src/main/java/com/zcloud/mapper/datasource/bus/SpecialUserMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/bus/SpecialUserMapper.java @@ -66,5 +66,7 @@ public interface SpecialUserMapper{ * @throws Exception */ void deleteTem(PageData pd); + + List nameListAll(PageData getPD); } diff --git a/src/main/java/com/zcloud/mapper/datasource/eightWork/EightWorkCfdMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightWork/EightWorkCfdMapper.java new file mode 100644 index 00000000..05bdd295 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightWork/EightWorkCfdMapper.java @@ -0,0 +1,26 @@ +package com.zcloud.mapper.datasource.eightWork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：有限空间作业 + * 作者：luoxiaobao + * 时间：2021-09-13 + * 官网：www.zcloudchina.com + */ +public interface EightWorkCfdMapper { + + + + /**列表 + * @param page + * @throws Exception + */ + List datalist(Page page); + + List getWorkUserLabels(List workUserIds); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationMapper.java index f00f1ba5..eaa1c75b 100644 --- a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationMapper.java @@ -91,5 +91,7 @@ public interface HotWorkApplicationMapper{ * @throws Exception */ void updateState4ids(PageData pageData); + + PageData getCountByMyApprovalForDelayedHotWork(PageData pageData); } diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationUserMapper.java index 88dd120e..3d9b3fe2 100644 --- a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationUserMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationUserMapper.java @@ -89,5 +89,7 @@ public interface HotWorkApplicationUserMapper{ List getHotdelayed (PageData pd) throws Exception; List getHotGasanalysis (PageData pd) throws Exception; + + List listByDepartment(PageData hotUserPd) throws Exception; } diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkAcceptUserCfdMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkAcceptUserCfdMapper.java new file mode 100644 index 00000000..d65f0887 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkAcceptUserCfdMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.highriskwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface HotworkAcceptUserCfdMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void deleteList(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + List findById(PageData pd); + List findByIds(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + List listAllByIds(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkCfdMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkCfdMapper.java new file mode 100644 index 00000000..0536d207 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkCfdMapper.java @@ -0,0 +1,89 @@ +package com.zcloud.mapper.datasource.highriskwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：动火作业 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +public interface HotworkCfdMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + List jhdatalistPage(Page page); + List aqdatalistPage(Page page); + List jsdatalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + void cancel(PageData pd); + + PageData checkno(PageData pd); + + + void editSpecialwork(PageData pd); + void editSpecialwork1(PageData pd); + void editSpecialwork2(PageData pd); + void editSpecialwork3(PageData pd); + void editSpecialwork4(PageData pd); + void editSpecialwork5(PageData pd); + void editSpecialwork6(PageData pd); + void editSpecialwork7(PageData pd); + + void edittime(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + List listAllMeasures(PageData pd); + + /** + * 待办作业数 + * @param pd + * @return + * @throws Exception + */ + PageData countCheck(PageData pd); + + PageData getCode(PageData pd); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkGasCfdMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkGasCfdMapper.java new file mode 100644 index 00000000..1f71c099 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkGasCfdMapper.java @@ -0,0 +1,59 @@ +package com.zcloud.mapper.datasource.highriskwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：动火气体检测 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +public interface HotworkGasCfdMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkLogCfdMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkLogCfdMapper.java new file mode 100644 index 00000000..ef2ab0a3 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkLogCfdMapper.java @@ -0,0 +1,59 @@ +package com.zcloud.mapper.datasource.highriskwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：动火日志 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +public interface HotworkLogCfdMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkToMeasuresCfdMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkToMeasuresCfdMapper.java new file mode 100644 index 00000000..0810dab8 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkToMeasuresCfdMapper.java @@ -0,0 +1,59 @@ +package com.zcloud.mapper.datasource.highriskwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：动火措施中间表 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +public interface HotworkToMeasuresCfdMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementCfdMapper.java b/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementCfdMapper.java new file mode 100644 index 00000000..069a8152 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementCfdMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.specialoperation; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：特种作业人员管理 + * 作者：luoxiaobao + * 时间：2022-06-16 + * 官网：www.zcloudchina.com + */ +public interface PersonnelManagementCfdMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + List namelist(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /** + * 判断特种作业证书编号是否存在，减少返回字段，优化压力 + * @param pd + * @return + */ + PageData findByCertificate(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java index da0ee487..5b9f4d3d 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java @@ -173,5 +173,9 @@ public interface DepartmentMapper{ * @return */ List listTreeManageAndCorpForPcPunishThePerson(PageData pd); + + PageData getInfo(PageData pd) throws Exception; + + List listTreeManageAndCorpHasOrder(PageData pd); } 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 63de3eb8..85a1f671 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -36,6 +36,13 @@ public interface UsersMapper { PageData findBySelect(PageData pd); PageData findByName(PageData pd); + /** + * 获取全部用户名称列表 + * @return + * @throws Exception + */ + List getAllUserList()throws Exception; + /**用户列表 * @param page * @return @@ -292,4 +299,6 @@ public interface UsersMapper { List selectUserListByUserIds(PageData pd); void resetCardNo(PageData pd); + + PageData getUserInfo(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java index c63201ea..569023c7 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java @@ -73,5 +73,7 @@ public interface OutSourcedMapper{ //校验结束重点工程是否有为完成的内容 PageData jieshuOutSourced(PageData pd); + + void updateState(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java b/src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java new file mode 100644 index 00000000..8bc15d35 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java @@ -0,0 +1,117 @@ +package com.zcloud.mapper.dsno2.system; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Department; + +import java.util.List; + +/** + * 说明： 组织机构接Mapper + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +public interface Department2Mapper { + + /**新增 + * @param pd + * @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 datalistPage(Page page)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**通过编码获取数据 + * @param pd + * @throws Exception + */ + public PageData findByBianma(PageData pd)throws Exception; + + /** + * 通过ID获取其子级列表 + * @param parentId + * @return + * @throws Exception + */ + public List listSubDepartmentByParentId(String parentId) throws Exception; + + /** + * 通过ID获取其子级列表 + * @param parentId + * @return + * @throws Exception + */ + public List listByCorpInfoId(String parentId,String CORPINFO_ID) throws Exception; + List deptinformation(PageData pageData) throws Exception; + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理) + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllDepartment(String parentId) throws Exception; + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用 + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllDepartmentToSelect(String parentId, List zdepartmentPdList) throws Exception; + + /**获取某个部门所有下级部门ID(返回拼接字符串 in的形式) + * @param DEPARTMENT_ID + * @return + * @throws Exception + */ + public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception; + + public List listAll(PageData pd); + + public List listAllMent (PageData pd); + + public List listAllDepartmentByType(PageData pd) throws Exception; + + void saveCorpdept(PageData pd); + + List saftpersonlist(PageData pd) throws Exception; + + List saftmanagelist(PageData pd); + + List findbyCorpIdtoDeptlistPage(Page page); + + List findByDeptIdlistPage(Page page); + + public PageData findCorpDeptDetail(PageData pd); + + void editNameBDId(PageData deptPageData); + + //从管理端修改部门 新 + void editCorpdeptNew(PageData pd); + + List listTreeCorpDept(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/bus/SpecialUserService.java b/src/main/java/com/zcloud/service/bus/SpecialUserService.java index 57e9fd28..25821548 100644 --- a/src/main/java/com/zcloud/service/bus/SpecialUserService.java +++ b/src/main/java/com/zcloud/service/bus/SpecialUserService.java @@ -68,5 +68,6 @@ public interface SpecialUserService{ */ public void deleteTem(PageData pd)throws Exception; + List nameListAll(PageData getPD)throws Exception; } diff --git a/src/main/java/com/zcloud/service/bus/impl/SpecialUserServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/SpecialUserServiceImpl.java index ac7a1470..4de404bd 100644 --- a/src/main/java/com/zcloud/service/bus/impl/SpecialUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/SpecialUserServiceImpl.java @@ -94,5 +94,10 @@ public class SpecialUserServiceImpl implements SpecialUserService{ public void deleteTem(PageData pd)throws Exception{ specialuserMapper.deleteTem(pd); } + + @Override + public List nameListAll(PageData getPD) throws Exception { + return specialuserMapper.nameListAll(getPD); + } } diff --git a/src/main/java/com/zcloud/service/corpFgs/CorpFgsService.java b/src/main/java/com/zcloud/service/corpFgs/CorpFgsService.java new file mode 100644 index 00000000..bf5fc6e7 --- /dev/null +++ b/src/main/java/com/zcloud/service/corpFgs/CorpFgsService.java @@ -0,0 +1,19 @@ +package com.zcloud.service.corpFgs; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：用电气体检测 + * 作者：luoxiaobao + * 时间：2021-09-08 + * 官网：www.zcloudchina.com + */ +public interface CorpFgsService { + + String getXgfUserName(String workUser); + +} + diff --git a/src/main/java/com/zcloud/service/corpFgs/impl/CorpFgsServiceImpl.java b/src/main/java/com/zcloud/service/corpFgs/impl/CorpFgsServiceImpl.java new file mode 100644 index 00000000..c8a95429 --- /dev/null +++ b/src/main/java/com/zcloud/service/corpFgs/impl/CorpFgsServiceImpl.java @@ -0,0 +1,46 @@ +package com.zcloud.service.corpFgs.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.eightWork.ElectricityYthGasMapper; +import com.zcloud.service.corpFgs.CorpFgsService; +import com.zcloud.service.eightWork.ElectricityYthGasService; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; + +/** + * 说明：用电气体检测 + * 作者：luoxiaobao + * 时间：2021-09-08 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class CorpFgsServiceImpl implements CorpFgsService { + + + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + @Override + public String getXgfUserName(String workUser){ + PageData pd = new PageData(); + pd.put("USER_ID",workUser); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/user/findUserById", pd); + Map pageData = (Map) result.get("pd"); + if(Tools.isEmpty(pageData)){ + return workUser; + }else { + return pageData.get("NAME").toString(); + } + + } +} + diff --git a/src/main/java/com/zcloud/service/eightWork/EightWorkCfdService.java b/src/main/java/com/zcloud/service/eightWork/EightWorkCfdService.java new file mode 100644 index 00000000..2c37d61f --- /dev/null +++ b/src/main/java/com/zcloud/service/eightWork/EightWorkCfdService.java @@ -0,0 +1,26 @@ +package com.zcloud.service.eightWork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：有限空间作业 + * 作者：luoxiaobao + * 时间：2021-09-13 + * 官网：www.zcloudchina.com + */ +public interface EightWorkCfdService { + + + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + List getWorkUserLabels(List workUserIds)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/eightWork/impl/EightWorkCfdServiceImpl.java b/src/main/java/com/zcloud/service/eightWork/impl/EightWorkCfdServiceImpl.java new file mode 100644 index 00000000..92559d1e --- /dev/null +++ b/src/main/java/com/zcloud/service/eightWork/impl/EightWorkCfdServiceImpl.java @@ -0,0 +1,41 @@ +package com.zcloud.service.eightWork.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.eightWork.EightWorkCfdMapper; +import com.zcloud.service.eightWork.EightWorkCfdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：有限空间作业 + * 作者：luoxiaobao + * 时间：2021-09-13 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class EightWorkCfdServiceImpl implements EightWorkCfdService { + + @Autowired + private EightWorkCfdMapper eightworkCfdMapper; + + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return eightworkCfdMapper.datalist(page); + } + + @Override + public List getWorkUserLabels(List workUserIds) throws Exception { + return eightworkCfdMapper.getWorkUserLabels(workUserIds); + } + +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java index 49bf00e3..991d6f6e 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java @@ -1,8 +1,10 @@ package com.zcloud.service.gf.impl; +import com.zcloud.controller.xgf.app.AppCorpFgsController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.gf.GFBlindBoardMapper; +import com.zcloud.service.corpFgs.CorpFgsService; import com.zcloud.service.gf.GFBlindBoardService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,6 +25,9 @@ public class GFBlindBoardServiceImpl implements GFBlindBoardService { @Resource private GFBlindBoardMapper GFblindboardMapper; + @Resource + private CorpFgsService corpFgsService; + /**新增 * @param pd * @throws Exception @@ -76,7 +81,11 @@ public class GFBlindBoardServiceImpl implements GFBlindBoardService { * @throws Exception */ public PageData findById(PageData pd)throws Exception{ - return GFblindboardMapper.findById(pd); + PageData pageData = GFblindboardMapper.findById(pd); + //调用接口 获取用户信息 + String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER")); + pageData.put("WORK_USER",workUser); + return pageData; } /**批量删除 diff --git a/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java index 19dc4e2a..5a86ee6b 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java @@ -3,6 +3,7 @@ package com.zcloud.service.gf.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.gf.GFHighWorkMapper; +import com.zcloud.service.corpFgs.CorpFgsService; import com.zcloud.service.gf.GFHighWorkService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,6 +23,8 @@ public class GFHighWorkServiceImpl implements GFHighWorkService { @Resource private GFHighWorkMapper GFhighworkMapper; + @Resource + private CorpFgsService corpFgsService; /**新增 * @param pd @@ -77,7 +80,11 @@ public class GFHighWorkServiceImpl implements GFHighWorkService { * @throws Exception */ public PageData findById(PageData pd)throws Exception{ - return GFhighworkMapper.findById(pd); + PageData pageData = GFhighworkMapper.findById(pd); + //调用接口 获取用户信息 + String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER")); + pageData.put("PROJECT_MANAGER",workUser); + return pageData; } /**批量删除 diff --git a/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationService.java b/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationService.java index ec26febd..872f7d61 100644 --- a/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationService.java +++ b/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationService.java @@ -110,6 +110,8 @@ public interface HotWorkApplicationService{ public List archivelist(Page page) throws Exception; public void updateState4ids(PageData pageData); + + PageData getCountByMyApprovalForDelayedHotWork(String user_id) throws Exception; } diff --git a/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java b/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java index e6c8bb32..d5ac1286 100644 --- a/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java +++ b/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java @@ -112,5 +112,7 @@ public interface HotWorkApplicationUserService{ public List getHotdelayed (PageData pd) throws Exception; public List getHotGasanalysis (PageData pd) throws Exception; + + List listByDepartment(PageData hotUserPd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/highriskwork/HotworkAcceptUserCfdService.java b/src/main/java/com/zcloud/service/highriskwork/HotworkAcceptUserCfdService.java new file mode 100644 index 00000000..5b12b3f1 --- /dev/null +++ b/src/main/java/com/zcloud/service/highriskwork/HotworkAcceptUserCfdService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.highriskwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface HotworkAcceptUserCfdService { + + /**新增 + * @param pd + * @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 deleteList(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 List findById(PageData pd)throws Exception; + public List findByIds(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + public List listAllByIds(PageData pd)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/highriskwork/HotworkCfdService.java b/src/main/java/com/zcloud/service/highriskwork/HotworkCfdService.java new file mode 100644 index 00000000..2be5cf0d --- /dev/null +++ b/src/main/java/com/zcloud/service/highriskwork/HotworkCfdService.java @@ -0,0 +1,88 @@ +package com.zcloud.service.highriskwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：动火作业 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +public interface HotworkCfdService { + + /**新增 + * @param pd + * @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; + public List jhlist(Page page)throws Exception; + public List aqlist(Page page)throws Exception; + public List jslist(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; + public void cancel(PageData pd)throws Exception; + + public PageData checkno(PageData pd)throws Exception; + + public void editSpecialwork(PageData pd)throws Exception; + public void editSpecialwork1(PageData pd)throws Exception; + public void editSpecialwork2(PageData pd)throws Exception; + public void editSpecialwork3(PageData pd)throws Exception; + public void editSpecialwork4(PageData pd)throws Exception; + public void editSpecialwork5(PageData pd)throws Exception; + public void editSpecialwork6(PageData pd)throws Exception; + public void editSpecialwork7(PageData pd)throws Exception; + + + public void edittime(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + public List listAllMeasures(PageData pd)throws Exception; + + /** + * 待办作业数 + * @param pd + * @return + * @throws Exception + */ + PageData countCheck(PageData pd)throws Exception; + + PageData getCode(PageData pd)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/highriskwork/HotworkGasCfdService.java b/src/main/java/com/zcloud/service/highriskwork/HotworkGasCfdService.java new file mode 100644 index 00000000..b00c52cf --- /dev/null +++ b/src/main/java/com/zcloud/service/highriskwork/HotworkGasCfdService.java @@ -0,0 +1,59 @@ +package com.zcloud.service.highriskwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：动火气体检测 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +public interface HotworkGasCfdService { + + /**新增 + * @param pd + * @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; + +} + diff --git a/src/main/java/com/zcloud/service/highriskwork/HotworkLogCfdService.java b/src/main/java/com/zcloud/service/highriskwork/HotworkLogCfdService.java new file mode 100644 index 00000000..7aad7910 --- /dev/null +++ b/src/main/java/com/zcloud/service/highriskwork/HotworkLogCfdService.java @@ -0,0 +1,59 @@ +package com.zcloud.service.highriskwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：动火日志 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +public interface HotworkLogCfdService { + + /**新增 + * @param pd + * @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; + +} + diff --git a/src/main/java/com/zcloud/service/highriskwork/HotworkToMeasuresCfdService.java b/src/main/java/com/zcloud/service/highriskwork/HotworkToMeasuresCfdService.java new file mode 100644 index 00000000..0cdc5cd9 --- /dev/null +++ b/src/main/java/com/zcloud/service/highriskwork/HotworkToMeasuresCfdService.java @@ -0,0 +1,59 @@ +package com.zcloud.service.highriskwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：动火措施中间表 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +public interface HotworkToMeasuresCfdService { + + /**新增 + * @param pd + * @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; + +} + 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 268f42d9..128ee401 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationServiceImpl.java @@ -105,6 +105,14 @@ public class HotWorkApplicationServiceImpl implements HotWorkApplicationService{ public void updateState4ids(PageData pageData){ hotworkapplicationMapper.updateState4ids(pageData); } + + @Override + public PageData getCountByMyApprovalForDelayedHotWork(String user_id) throws Exception { + PageData pd = new PageData(); + pd.put("USER_ID",user_id); + return hotworkapplicationMapper.getCountByMyApprovalForDelayedHotWork(pd); + } + /**修改 动火状态 * 1.如果是打回。state =0 * @throws Exception diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java index 388b8f6f..0a931c53 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java @@ -370,5 +370,10 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser public List getHotGasanalysis (PageData pd) throws Exception{ return hotworkapplicationuserMapper.getHotGasanalysis(pd); } + + @Override + public List listByDepartment(PageData hotUserPd) throws Exception { + return hotworkapplicationuserMapper.listByDepartment(hotUserPd); + } } diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkAcceptUserCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkAcceptUserCfdServiceImpl.java new file mode 100644 index 00000000..24efb188 --- /dev/null +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkAcceptUserCfdServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.highriskwork.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.highriskwork.HotworkAcceptUserCfdMapper; +import com.zcloud.service.highriskwork.HotworkAcceptUserCfdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class HotworkAcceptUserCfdServiceImpl implements HotworkAcceptUserCfdService { + + @Autowired + private HotworkAcceptUserCfdMapper hotworkAcceptUserCfdMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + hotworkAcceptUserCfdMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + hotworkAcceptUserCfdMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + hotworkAcceptUserCfdMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + hotworkAcceptUserCfdMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return hotworkAcceptUserCfdMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return hotworkAcceptUserCfdMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return hotworkAcceptUserCfdMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return hotworkAcceptUserCfdMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + hotworkAcceptUserCfdMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return hotworkAcceptUserCfdMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java new file mode 100644 index 00000000..3179f798 --- /dev/null +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -0,0 +1,150 @@ +package com.zcloud.service.highriskwork.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.highriskwork.HotworkCfdMapper; +import com.zcloud.service.highriskwork.HotworkCfdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：动火作业 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class HotworkCfdServiceImpl implements HotworkCfdService { + + @Autowired + private HotworkCfdMapper hotworkCfdMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + hotworkCfdMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + hotworkCfdMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + hotworkCfdMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return hotworkCfdMapper.datalistPage(page); + } + public List jhlist(Page page)throws Exception{ + return hotworkCfdMapper.jhdatalistPage(page); + } + public List aqlist(Page page)throws Exception{ + return hotworkCfdMapper.aqdatalistPage(page); + } + public List jslist(Page page)throws Exception{ + return hotworkCfdMapper.jsdatalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return hotworkCfdMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return hotworkCfdMapper.findById(pd); + } + + public void cancel(PageData pd)throws Exception{ + hotworkCfdMapper.cancel(pd); + } + public PageData checkno(PageData pd)throws Exception{ + return hotworkCfdMapper.checkno(pd); + } + + public void editSpecialwork(PageData pd)throws Exception{ + hotworkCfdMapper.editSpecialwork(pd); + } + public void editSpecialwork1(PageData pd)throws Exception{ + hotworkCfdMapper.editSpecialwork1(pd); + } + public void editSpecialwork2(PageData pd)throws Exception{ + hotworkCfdMapper.editSpecialwork2(pd); + } + public void editSpecialwork3(PageData pd)throws Exception{ + hotworkCfdMapper.editSpecialwork3(pd); + } + public void editSpecialwork4(PageData pd)throws Exception{ + hotworkCfdMapper.editSpecialwork4(pd); + } + public void editSpecialwork5(PageData pd)throws Exception{ + hotworkCfdMapper.editSpecialwork5(pd); + } + public void editSpecialwork6(PageData pd)throws Exception{ + hotworkCfdMapper.editSpecialwork6(pd); + } + public void editSpecialwork7(PageData pd)throws Exception{ + hotworkCfdMapper.editSpecialwork7(pd); + } + + public void edittime(PageData pd)throws Exception{ + hotworkCfdMapper.edittime(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + hotworkCfdMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllMeasures(PageData pd)throws Exception{ + return hotworkCfdMapper.listAllMeasures(pd); + } + + /** + * 待办作业数 + * @param pd + * @return + */ + @Override + public PageData countCheck(PageData pd) throws Exception { + return hotworkCfdMapper.countCheck(pd); + } + + @Override + public PageData getCode(PageData pd)throws Exception{ + return hotworkCfdMapper.getCode(pd); + } +} + diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkGasCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkGasCfdServiceImpl.java new file mode 100644 index 00000000..2b8f0096 --- /dev/null +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkGasCfdServiceImpl.java @@ -0,0 +1,83 @@ +package com.zcloud.service.highriskwork.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.highriskwork.HotworkGasCfdMapper; +import com.zcloud.service.highriskwork.HotworkGasCfdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：动火气体检测 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class HotworkGasCfdServiceImpl implements HotworkGasCfdService { + + @Autowired + private HotworkGasCfdMapper hotworkGasCfdMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + hotworkGasCfdMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + hotworkGasCfdMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + hotworkGasCfdMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return hotworkGasCfdMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return hotworkGasCfdMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return hotworkGasCfdMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + hotworkGasCfdMapper.deleteAll(ArrayDATA_IDS); + } + +} + diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkLogCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkLogCfdServiceImpl.java new file mode 100644 index 00000000..0adbd84a --- /dev/null +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkLogCfdServiceImpl.java @@ -0,0 +1,83 @@ +package com.zcloud.service.highriskwork.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.highriskwork.HotworkLogCfdMapper; +import com.zcloud.service.highriskwork.HotworkLogCfdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：动火日志 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class HotworkLogCfdServiceImpl implements HotworkLogCfdService { + + @Autowired + private HotworkLogCfdMapper hotworkLogCfdMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + hotworkLogCfdMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + hotworkLogCfdMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + hotworkLogCfdMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return hotworkLogCfdMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return hotworkLogCfdMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return hotworkLogCfdMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + hotworkLogCfdMapper.deleteAll(ArrayDATA_IDS); + } + +} + diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkToMeasuresCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkToMeasuresCfdServiceImpl.java new file mode 100644 index 00000000..5670a645 --- /dev/null +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkToMeasuresCfdServiceImpl.java @@ -0,0 +1,83 @@ +package com.zcloud.service.highriskwork.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.highriskwork.HotworkToMeasuresCfdMapper; +import com.zcloud.service.highriskwork.HotworkToMeasuresCfdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：动火措施中间表 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class HotworkToMeasuresCfdServiceImpl implements HotworkToMeasuresCfdService { + + @Autowired + private HotworkToMeasuresCfdMapper hotworkToMeasuresCfdMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + hotworkToMeasuresCfdMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + hotworkToMeasuresCfdMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + hotworkToMeasuresCfdMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return hotworkToMeasuresCfdMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return hotworkToMeasuresCfdMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return hotworkToMeasuresCfdMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + hotworkToMeasuresCfdMapper.deleteAll(ArrayDATA_IDS); + } + +} + diff --git a/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java b/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java index f6e1474a..bf05b77d 100644 --- a/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java +++ b/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java @@ -74,5 +74,7 @@ public interface OutSourcedService{ //校验结束重点工程是否有为完成的内容 PageData jieshuOutSourced(PageData pd); + + void updateState(PageData pd); } diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java index db3f5b50..af090e91 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java @@ -4,10 +4,12 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.dsno2.keyProjects.OutSourcedMapper; import com.zcloud.service.keyProjects.OutSourcedService; +import com.zcloud.util.DateUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; /** @@ -98,5 +100,11 @@ public class OutSourcedServiceImpl implements OutSourcedService { public PageData jieshuOutSourced(PageData pd) { return outsourcedMapper.jieshuOutSourced(pd); } + + @Override + public void updateState(PageData pd) { + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); + outsourcedMapper.updateState(pd); + } } diff --git a/src/main/java/com/zcloud/service/mq/LogService.java b/src/main/java/com/zcloud/service/mq/LogService.java new file mode 100644 index 00000000..0f0e68d0 --- /dev/null +++ b/src/main/java/com/zcloud/service/mq/LogService.java @@ -0,0 +1,11 @@ +package com.zcloud.service.mq; + +import com.zcloud.entity.PageData; + +public interface LogService { + + void saveLog(PageData pageData); + void saveLog(PageData pageData,String type); + + void saveErrorMessage(PageData pageData,String errorMessage); +} diff --git a/src/main/java/com/zcloud/service/mq/SendMessageService.java b/src/main/java/com/zcloud/service/mq/SendMessageService.java new file mode 100644 index 00000000..29722abc --- /dev/null +++ b/src/main/java/com/zcloud/service/mq/SendMessageService.java @@ -0,0 +1,11 @@ +package com.zcloud.service.mq; + +import com.zcloud.dto.TenCorpDto; + +public interface SendMessageService { + + void sendMessage(TenCorpDto tenCorpDto) throws Exception; + + void SendDelayQueue(TenCorpDto tenCorpDto); + void SendDelayQueue(String message); +} diff --git a/src/main/java/com/zcloud/service/mq/impl/LogServiceImpl.java b/src/main/java/com/zcloud/service/mq/impl/LogServiceImpl.java new file mode 100644 index 00000000..cb845379 --- /dev/null +++ b/src/main/java/com/zcloud/service/mq/impl/LogServiceImpl.java @@ -0,0 +1,43 @@ +package com.zcloud.service.mq.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mq.MqErrorMessageLogMapper; +import com.zcloud.mapper.datasource.mq.MqMessageLogMapper; +import com.zcloud.service.mq.LogService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Warden; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class LogServiceImpl implements LogService { + + @Resource + private MqErrorMessageLogMapper mqErrorMessageLogMapper; + + @Resource + private MqMessageLogMapper mqMessageLogMapper; + + @Override + @Async + public void saveLog(PageData pageData) { + this.saveLog(pageData,"0"); + } + + @Override + public void saveLog(PageData pageData, String type) { + + } + + @Override + @Async + public void saveErrorMessage(PageData log,String errorMessage) { + log.put("ERROR_MESSAGE", errorMessage); + log.put("MESSAGE_ERROR_LOG_ID", Warden.get32UUID()); + log.put("TYPE", "0"); + log.put("TIME", DateUtil.getTime()); + mqErrorMessageLogMapper.save(log); + } +} diff --git a/src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java b/src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java new file mode 100644 index 00000000..37d9ea32 --- /dev/null +++ b/src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java @@ -0,0 +1,129 @@ +package com.zcloud.service.mq.impl; + +import com.alibaba.fastjson.JSONObject; +import com.zcloud.dto.TenCorpDto; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mq.MqErrorMessageLogMapper; +import com.zcloud.mapper.datasource.mq.MqMessageLogMapper; +import com.zcloud.service.mq.LogService; +import com.zcloud.service.mq.SendMessageService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Warden; +import com.zcloud.util.mq.MqUtil; +import org.apache.rocketmq.client.producer.SendResult; +import org.apache.rocketmq.client.producer.SendStatus; +import org.apache.rocketmq.spring.core.RocketMQTemplate; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.messaging.support.GenericMessage; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class SendMessageServiceImpl implements SendMessageService { + + @Value("${mq.topic.info}") + private String info; + + @Resource + private RocketMQTemplate rocketMQTemplate; + + @Resource + private MqErrorMessageLogMapper mqErrorMessageLogMapper; + + @Resource + private LogService logService; + + @Resource + private MqMessageLogMapper mqMessageLogMapper; + + public void sendMessage(TenCorpDto tenCorpDto) throws Exception { + try { + PageData log = tenCorpDto.getPd(); + log.put("MESSAGE_LOG_ID", Warden.get32UUID()); + log.put("CREATE_TIME", DateUtil.getTime()); + mqMessageLogMapper.save(log); + System.out.println("生产者:" + tenCorpDto.toString()); + SendResult sendResult = rocketMQTemplate.syncSend(this.info, tenCorpDto.toString()); + if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { + throw new RuntimeException("产品入栈失败"); + } + } catch (Exception e) { + e.printStackTrace(); + PageData log = tenCorpDto.getPd(); + log.put("MESSAGE_ERROR_LOG_ID", Warden.get32UUID()); + log.put("ERROR_MESSAGE", e.getMessage()); + log.put("TYPE", "0"); + log.put("TIME", DateUtil.getTime()); + mqErrorMessageLogMapper.save(log); + } + } + + @Override + public void SendDelayQueue(TenCorpDto tenCorpDto) { + PageData log = tenCorpDto.getPd(); + log.put("MESSAGE_LOG_ID", Warden.get32UUID()); + try { + log.put("CREATE_TIME", DateUtil.getTime()); + log.put("PRODUCER_NAME",tenCorpDto.getProducer_name()); + log.put("TYPE","0"); + log.put("PLAN_TIME",tenCorpDto.getTime_stamp()); + mqMessageLogMapper.save(log); + System.out.println("生产者:" + tenCorpDto.toString()); + // 推送消息 + SendResult sendResult = rocketMQTemplate.syncSend( + MqUtil.analysistopic(tenCorpDto.getTopic()), + new GenericMessage<>(tenCorpDto.toString()), + 3000, + MqUtil.analysisTime(tenCorpDto.getTime_stamp())); + + if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { + throw new RuntimeException("产品入栈失败"); + } + } catch (Exception e) { + e.printStackTrace(); + log.put("ERROR_MESSAGE", e.getMessage()); + log.put("MESSAGE_ERROR_LOG_ID", Warden.get32UUID()); + log.put("TYPE", "0"); + log.put("TIME", DateUtil.getTime()); + mqErrorMessageLogMapper.save(log); + } + } + + @Override + public void SendDelayQueue(String message) { + TenCorpDto tenCorpDto = JSONObject.parseObject(message,TenCorpDto.class); + try { + PageData log = tenCorpDto.getPd(); + log.put("CREATE_TIME", DateUtil.getTime()); + log.put("PRODUCER_NAME",tenCorpDto.getProducer_name()); + log.put("MESSAGE_LOG_ID", Warden.get32UUID()); + mqMessageLogMapper.save(log); + System.out.println("生产者:" + tenCorpDto.toString()); + // 推送消息 + SendResult sendResult = rocketMQTemplate.syncSend( + MqUtil.analysistopic(tenCorpDto.getTopic()), + new GenericMessage<>(message), + 3000, + MqUtil.analysisTime(tenCorpDto.getTime_stamp())); + + if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { + throw new RuntimeException("产品入栈失败"); + } + } catch (Exception e) { + PageData log = tenCorpDto.getPd(); + logService.saveErrorMessage(log,e.getMessage()); + e.printStackTrace(); + } + } + + public static void main(String[] args) { + try { + System.out.println(MqUtil.analysisTime("2023-06-30 14:30:00:000")); + }catch (Exception e){ + e.printStackTrace(); + } + } + + +} diff --git a/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementCfdService.java b/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementCfdService.java new file mode 100644 index 00000000..522fce43 --- /dev/null +++ b/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementCfdService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.specialoperation; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：特种作业人员管理 + * 作者：luoxiaobao + * 时间：2022-06-16 + * 官网：www.zcloudchina.com + */ +public interface PersonnelManagementCfdService { + + /**新增 + * @param pd + * @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; + public List namelist(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; + + /** + * 判断特种作业证书编号是否存在 + * @param pd + * @return + * @throws Exception + */ + public PageData findByCertificate(PageData pd)throws Exception; + +} + diff --git a/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementCfdServiceImpl.java b/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementCfdServiceImpl.java new file mode 100644 index 00000000..ec81f489 --- /dev/null +++ b/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementCfdServiceImpl.java @@ -0,0 +1,95 @@ +package com.zcloud.service.specialoperation.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.specialoperation.PersonnelManagementCfdMapper; +import com.zcloud.service.specialoperation.PersonnelManagementCfdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：特种作业人员管理 + * 作者：luoxiaobao + * 时间：2022-06-16 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class PersonnelManagementCfdServiceImpl implements PersonnelManagementCfdService { + + @Autowired + private PersonnelManagementCfdMapper personnelmanagementCfdMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + personnelmanagementCfdMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + personnelmanagementCfdMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + personnelmanagementCfdMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return personnelmanagementCfdMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return personnelmanagementCfdMapper.listAll(pd); + } + public List namelist(PageData pd)throws Exception{ + return personnelmanagementCfdMapper.namelist(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return personnelmanagementCfdMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + personnelmanagementCfdMapper.deleteAll(ArrayDATA_IDS); + } + /** + * 判断特种作业证书编号是否存在 + * @param pd + * @return + * @throws Exception + */ + public PageData findByCertificate(PageData pd) throws Exception { + return personnelmanagementCfdMapper.findByCertificate(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/system/DepartmentService.java b/src/main/java/com/zcloud/service/system/DepartmentService.java index 61c7e0ba..a79792c5 100644 --- a/src/main/java/com/zcloud/service/system/DepartmentService.java +++ b/src/main/java/com/zcloud/service/system/DepartmentService.java @@ -223,5 +223,9 @@ public interface DepartmentService{ List listTreeManageAndCorp1(PageData pd)throws Exception; List listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception; + + PageData getDepartmentInfo(PageData pd) throws Exception; + + List listTreeManageAndCorpHasOrder(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/DictionariesService.java b/src/main/java/com/zcloud/service/system/DictionariesService.java index a0e72a1f..2a78321b 100644 --- a/src/main/java/com/zcloud/service/system/DictionariesService.java +++ b/src/main/java/com/zcloud/service/system/DictionariesService.java @@ -34,6 +34,8 @@ public interface DictionariesService { */ public PageData findById(PageData pd)throws Exception; + public List getTreeById(String id) throws Exception; + /**通过id获取数据 * @param pd * @throws Exception diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 74747c24..f6f9b316 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -28,6 +28,13 @@ public interface UsersService { */ public PageData findByUsername(PageData pd)throws Exception; + /** + * 获取全部用户信息列表 + * @return + * @throws Exception + */ + Object getAllUserList()throws Exception; + /**通过组ID获取组下级角色列表 * @param pd * @return @@ -343,4 +350,6 @@ public interface UsersService { List selectUserListByUserIds(PageData selectPageData); void resetCardNo(PageData pd); + + PageData getUserInfo(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java index 7d631fdd..13c86e06 100644 --- a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java @@ -409,5 +409,15 @@ public class DepartmentServiceImpl implements DepartmentService{ public List listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception { return departmentMapper.listTreeManageAndCorpForPcPunishThePerson(pd); } + + @Override + public PageData getDepartmentInfo(PageData pd) throws Exception { + return departmentMapper.getInfo(pd); + } + + @Override + public List listTreeManageAndCorpHasOrder(PageData pd) { + return departmentMapper.listTreeManageAndCorpHasOrder(pd); + } } diff --git a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java index 1e13a329..a1588b09 100644 --- a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java @@ -65,6 +65,18 @@ public class DictionariesServiceImpl implements DictionariesService { return dictionariesMapper.listSubDictByParentIdAndCourseware(pd); } + @Override + public List getTreeById(String id) throws Exception { + List _list = this.listSubDictByParentId(id); //用传过来的ID获取此ID下的子列表数据 + return _list.stream().map(n -> { + PageData entity = new PageData(); + entity.put("DICTIONARIES_ID", n.getDICTIONARIES_ID()); + entity.put("BIANMA", n.getBIANMA()); + entity.put("NAME", n.getNAME()); + return entity; + }).collect(Collectors.toList()); + } + /** * 获取所有数据并填充每条数据的子级列表(递归处理)用于代码生成器引用数据字典 * @param MENU_ID 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 9bec3e26..84142fa1 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -79,6 +79,40 @@ public class UsersServiceImpl implements UsersService { return usersMapper.findById(pd); } + /** + * 获取全部用户信息列表 + * @return + * @throws Exception + */ + @Override + @Transactional + public Object getAllUserList() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; +// List varList = new ArrayList<>(); +// List corpInfoList = corpInfoMapper.getAllCorpInfoList(); + // 所有企业列表 +// Map corpInfoListMap = new HashMap<>(); +// Map corpInfoListMapLived = new HashMap<>(); +// for (PageData pageData : corpInfoList) { +// corpInfoListMap.put(pageData.getString("CORPINFO_ID"),pageData); +// } + + // 所有部门列表 +// List departmentList = departmentMapper.getAllDepartmentList(); +// Map departmentListMap = new HashMap<>(); +// for (PageData pageData : departmentList) { +// departmentListMap.put(pageData.getString("DEPARTMENT_ID"),pageData); +// } + + // 所有人员列表 + List userList = usersMapper.getAllUserList(); + + map.put("userList", userList); + map.put("result",errInfo); + return map; + } + /**通过用户ID获取用户信息 * @param pd * @return @@ -434,4 +468,9 @@ public class UsersServiceImpl implements UsersService { public void resetCardNo(PageData pd) { usersMapper.resetCardNo(pd); } + + @Override + public PageData getUserInfo(PageData pd) { + return usersMapper.getUserInfo(pd); + } } diff --git a/src/main/java/com/zcloud/util/Const.java b/src/main/java/com/zcloud/util/Const.java index b1d017c3..ef400d4c 100644 --- a/src/main/java/com/zcloud/util/Const.java +++ b/src/main/java/com/zcloud/util/Const.java @@ -55,5 +55,8 @@ public class Const { public final static String OA_APPID = "wx69f7e25b3760001c";//公众号 public final static String OA_SECRET = "087fe91f660300df63d0ef16fd162124";//公众号 + // mq + public static final String topic_eightWork="eightWork"; + public static final String topic_info="info"; } diff --git a/src/main/java/com/zcloud/util/WaterMarkUtil.java b/src/main/java/com/zcloud/util/WaterMarkUtil.java new file mode 100644 index 00000000..d9c601e2 --- /dev/null +++ b/src/main/java/com/zcloud/util/WaterMarkUtil.java @@ -0,0 +1,15 @@ +package com.zcloud.util; + +import java.awt.*; + +public class WaterMarkUtil { + /** + * 获取水印文字的长度 + * @param waterMarkContent + * @param g + * @return + */ + public static int getWatermarkLength(String waterMarkContent, Graphics2D g) { + return g.getFontMetrics(g.getFont()).charsWidth(waterMarkContent.toCharArray(), 0, waterMarkContent.length()); + } +} diff --git a/src/main/java/com/zcloud/util/mq/MqSendUtil.java b/src/main/java/com/zcloud/util/mq/MqSendUtil.java new file mode 100644 index 00000000..49700185 --- /dev/null +++ b/src/main/java/com/zcloud/util/mq/MqSendUtil.java @@ -0,0 +1,49 @@ +package com.zcloud.util.mq; + +import com.zcloud.dto.Response; +import com.zcloud.dto.TenCorpDto; +import com.zcloud.service.mq.SendMessageService; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * @author zhangyue + * @date 2023/9/23/023 13:54 + */ +@Component +public class MqSendUtil { + + + @Resource + private SendMessageService sendMessageService; + + public Response sendMessage(TenCorpDto tenCorpDto) throws Exception { + try { + sendMessageService.sendMessage(tenCorpDto); + } catch (Exception e) { + e.printStackTrace(); + } + return Response.OK(); + } + + public Response timelyQueue(TenCorpDto tenCorpDto) throws Exception { + try { + sendMessageService.sendMessage(tenCorpDto); + } catch (Exception e) { + e.printStackTrace(); + } + return Response.OK(); + } + + public Response sendDelayQueue(TenCorpDto tenCorpDto) throws Exception { + try { + sendMessageService.SendDelayQueue(tenCorpDto); + return Response.OK(); + } catch (Exception e) { + e.printStackTrace(); + return Response.ERROR(e.getMessage()); + } + + } +} diff --git a/src/main/java/com/zcloud/util/mq/MqUtil.java b/src/main/java/com/zcloud/util/mq/MqUtil.java new file mode 100644 index 00000000..aa448009 --- /dev/null +++ b/src/main/java/com/zcloud/util/mq/MqUtil.java @@ -0,0 +1,87 @@ +package com.zcloud.util.mq; + + +import com.zcloud.util.Const; + +import java.text.SimpleDateFormat; +import java.util.Date; + +public class MqUtil { + + private final static SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS"); + + public static Integer analysisTime(String time) throws Exception{ + Date agreed_date = timeFormat.parse(time); + long time_difference = agreed_date.getTime() - new Date().getTime(); + if (time_difference < 0){ + return 0; + } + if (time_difference > 2 * 60 * 60 * 1000){ + return 18; + } + if (time_difference > 60 * 60 * 1000){ + return 17; + } + if (time_difference > 30 * 60 * 1000){ + return 16; + } + if (time_difference > 20 * 60 * 1000){ + return 15; + } + if (time_difference > 10 * 60 * 1000){ + return 14; + } + if (time_difference > 9 * 60 * 1000){ + return 13; + } + if (time_difference > 8 * 60 * 1000){ + return 12; + } + if (time_difference > 7 * 60 * 1000){ + return 11; + } + if (time_difference > 6 * 60 * 1000){ + return 10; + } + if (time_difference > 5 * 60 * 1000){ + return 9; + } + if (time_difference > 4 * 60 * 1000){ + return 8; + } + if (time_difference > 3 * 60 * 1000){ + return 7; + } + if (time_difference > 2 * 60 * 1000){ + return 6; + } + if (time_difference > 60 * 1000){ + return 5; + } + if (time_difference > 30 * 1000){ + return 4; + } + if (time_difference > 10 * 1000){ + return 3; + } +// if (time_difference > 5 * 1000){ +// return 2; +// } + if (time_difference > 1000){ + return 2; + } + return 0; + } + + public static String analysistopic(String producerName) { + switch (producerName){ + case "eightWork" : return Const.topic_eightWork; + case "info" : return Const.topic_info; + default: return ""; + } + } + + public static Date dateFormat(String date) throws Exception{ + return timeFormat.parse(date); + } +} diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 13026235..8d8cc1c0 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -70,3 +70,26 @@ smb.port=22 smb.user=root smb.password=Zcloud@zcloud88888 smb.basePath=/mnt/qgfile/file/ + +#Mq\u914D\u7F6E +rocketmq.consumer.group2=edu-admin-edit +rocketmq.consumer.group1=edu-admin-add +#rocketmq.name-server=10.0.140.141:9876 +#rocketmq.name-server=192.168.0.70:9876 +rocketmq.name-server=192.168.151.57:9876 +rocketmq.producer.group=libmiddle +rocketmq.producer.send-message-timeout=3000 +rocketmq.producer.compress-message-body-threshold=4096 +rocketmq.producer.max-message-size=4194304 +rocketmq.producer.retry-times-when-send-failed=3 +rocketmq.producer.retry-next-server=true +rocketmq.producer.retry-times-when-send-async-failed=3 +## topic \u524D\u7F00 + +mq.topic.info=info +mq.topic.eightWork=eightWork +mq.group.info=scheduled_tasks +mq.group.eightWork=scheduled_tasks_eightWork + +corp.default.pic-path=https://qgqy.qhdsafety.com/file/ +corp.default.back-end-path=http://192.168.151.57:8092/ diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index d0201a70..c6426837 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -64,4 +64,26 @@ smb.port=22 smb.user=root smb.password=SJSKAQHBGLXT@20220311 smb.basePath=/mnt/qask/file/ +#Mq\u914D\u7F6E +rocketmq.consumer.group2=edu-admin-edit +rocketmq.consumer.group1=edu-admin-add +#rocketmq.name-server=10.0.140.141:9876 +#rocketmq.name-server=192.168.0.70:9876 +rocketmq.name-server=192.168.192.201:9876 +rocketmq.producer.group=libmiddle +rocketmq.producer.send-message-timeout=3000 +rocketmq.producer.compress-message-body-threshold=4096 +rocketmq.producer.max-message-size=4194304 +rocketmq.producer.retry-times-when-send-failed=3 +rocketmq.producer.retry-next-server=true +rocketmq.producer.retry-times-when-send-async-failed=3 +## topic \u524D\u7F00 +mq.topic.info=info +mq.topic.eightWork=eightWork +mq.group.info=scheduled_tasks +mq.group.eightWork=scheduled_tasks_eightWork + + +corp.default.pic-path=https://qgqy.qhdsafety.com/file/ +corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a93edfdf..a48eb064 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,7 +3,7 @@ server.port=8091 #?? #spring.profiles.active=local -#?? +#31ʱʹ spring.profiles.active=dev #?? #spring.profiles.active=master diff --git a/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml b/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml index 282cf422..37acd5f1 100644 --- a/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml @@ -1,65 +1,65 @@ - + BUS_SHIFTWORKRULES - + SYS_DICTIONARIES - + - f.NAME, - f.CORPINFO_ID, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, + f.NAME, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE, f.PARENTID, f.LEVEL, f.ISCUSTOM, f.SHIFTWORKRULES_ID - + - NAME, - CORPINFO_ID, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, + NAME, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE, PARENTID, LEVEL, ISCUSTOM, SHIFTWORKRULES_ID - + - #{NAME}, - #{CORPINFO_ID}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, + #{NAME}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE}, #{PARENTID}, #{LEVEL}, #{ISCUSTOM}, #{SHIFTWORKRULES_ID} - + - insert into + insert into ( @@ -67,7 +67,7 @@ ) - + update @@ -76,10 +76,10 @@ ISDELETE = '1', OPERATOR = #{OPERATOR}, OPERATTIME = #{OPERATTIME} - where + where SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID} - + update @@ -88,15 +88,15 @@ ISDELETE = '1', OPERATOR = #{OPERATOR}, OPERATTIME = #{OPERATTIME} - where + where PARENTID = #{PARENTID} - + update - set + set NAME = #{NAME}, @@ -109,56 +109,57 @@ OPERATTIME = #{OPERATTIME}, - + SHIFTWORKRULES_ID = SHIFTWORKRULES_ID - where + where SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID} - + - + - + - + update set ISDELETE = '1' - where + where SHIFTWORKRULES_ID in #{item} - + + + + delete from diff --git a/src/main/resources/mybatis/datasource/eightWork/EightWorkCfdMapper.xml b/src/main/resources/mybatis/datasource/eightWork/EightWorkCfdMapper.xml new file mode 100644 index 00000000..dd86e561 --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightWork/EightWorkCfdMapper.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml index bbdcd6ca..29bb52a9 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml @@ -179,55 +179,29 @@ left join sys_user u on f.CREATOR = u.USER_ID left join oa_department d on d.DEPARTMENT_ID = u.DEPARTMENT_ID left join vi_user_all ua on ua.USER_ID = f.OPERATOR - where f.ISDELETE = '0' + left join sys_user uu on uu.USER_ID = #{pd.loginUserId} and uu.DEPARTMENT_ID = fu.USER_ID + where + + + ( + + f.ISDELETE = '0' and ( f.JOB_NUMBER LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') or f.HOT_WORK_POSITION LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') ) - - - - and f.CREATOR = #{pd.CREATOR} and f.state !='-4' - - - and f.STATE in ('1','2','3','4','5','6' - ,'7','8','9') - - - and (f.STATE in ('11','-3')) - - - - and ( - ( - f.STATE >= 1 - and f.STATE <= 11 - ) - or f.STATE = '-3' - ) - - - - - - - and (f.STATE = #{pd.STATE}) - - - - - - and f.CORPINFO_ID = #{pd.CORPINFO_ID} - - - and (f.CREATOR = #{pd.CREATOR}) - - - and (HOT_WORK_LEVEL_INDEX = #{pd.HOT_WORK_LEVEL_INDEX}) - - + + and f.CORPINFO_ID = #{pd.CORPINFO_ID} + + + and (f.CREATOR = #{pd.CREATOR}) + + + and (HOT_WORK_LEVEL_INDEX = #{pd.HOT_WORK_LEVEL_INDEX}) + + @@ -300,6 +274,40 @@ and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN sus_user u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApproveUserName}),'%') and STATE = '12') + + + + and f.CREATOR = #{pd.CREATOR} and f.state !='-4' + + + and f.STATE in ('1','2','3','4','5','6' + ,'7','8','9') + + + and (f.STATE in ('11','-3')) + + + + and ( + ( + f.STATE >= 1 + and f.STATE <= 11 + ) + or f.STATE = '-3' + ) + + + + + + and (f.STATE != '11') + ) or (uu.USER_ID is not null and f.ISDELETE = '0') + + + and (f.STATE = #{pd.STATE}) + + + group by f.HOTWORKAPPLICATION_ID ORDER BY f.CREATTIME desc @@ -321,6 +329,9 @@ left join vi_user_all ua on ua.USER_ID = f.OPERATOR LEFT JOIN bus_hotworkapplicationuser bhu ON bhu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID LEFT JOIN vi_user_all bhuuser ON bhuuser.USER_ID = bhu.USER_ID + left join bus_hotworkapplicationuser hot on f.HOTWORKAPPLICATION_ID = hot.FOREIGN_KEY and hot.ISDELETE ='0' and hot.state='4' + left join sys_user hu on hot.USER_ID = hu.USER_ID + left join oa_department hd on hd.DEPARTMENT_ID = hu.DEPARTMENT_ID where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -342,6 +353,18 @@ and (f.JOB_NUMBER LIKE CONCAT(CONCAT('%', #{pd.keyJobNumber}),'%')) + + and f.JOB_CONTENT LIKE CONCAT(CONCAT('%', #{pd.JOB_CONTENT}),'%') + + + and f.HOT_WORK_POSITION LIKE CONCAT(CONCAT('%', #{pd.HOT_WORK_POSITION}),'%') + + + and f.HOT_WORK_LEVEL_INDEX = #{pd.HOT_WORK_LEVEL_INDEX} + + + and hd.DEPARTMENT_ID = #{pd.UNIT_LEADER_DEPARTMENT_ID} + and f.STATE = #{pd.keyState} @@ -541,4 +564,12 @@ GROUP BY HOTWORKAPPLICATION_ID ORDER BY f.OPERATTIME desc + + diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml index 58b67881..c717f435 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml @@ -319,4 +319,41 @@ order by CREATTIME + + diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkAcceptUserCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkAcceptUserCfdMapper.xml new file mode 100644 index 00000000..75f2b27d --- /dev/null +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkAcceptUserCfdMapper.xml @@ -0,0 +1,217 @@ + + + + + + + + BUS_HOTWORK_ACCEPTUSER_CFD + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.HOTWORK_ID, + f.CORPINFO_ID, + f.ISDELETE, + f.OPERATTIME, + f.OPERATOR, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + f.ACCEPT_CONFESS_USER_SIGNER_PATH, + f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.ISSELF, + f.ACCEPT_USER_ID, + f.ACCEPT_USER_SIGNER_PATH, + f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_DEPARTMENT_ID + + + + + ACCEPT_CONFESS_ID, + HOTWORK_ID, + CORPINFO_ID, + ISDELETE, + OPERATTIME, + OPERATOR, + ACCEPT_CONFESS_DEPARTMENT_ID, + ACCEPT_CONFESS_USER_ID, + ACCEPT_CONFESS_USER_SIGNER_PATH, + ACCEPT_CONFESS_USER_SIGNER_TIME, + ISSELF, + ACCEPT_USER_ID, + ACCEPT_USER_SIGNER_PATH, + ACCEPT_USER_SIGNER_TIME, + ACCEPT_DEPARTMENT_ID + + + + + + #{ACCEPT_CONFESS_ID}, + #{HOTWORK_ID}, + #{CORPINFO_ID}, + #{ISDELETE}, + #{OPERATTIME}, + #{OPERATOR}, + #{ACCEPT_CONFESS_DEPARTMENT_ID}, + #{ACCEPT_CONFESS_USER_ID}, + #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{ISSELF}, + #{ACCEPT_USER_ID}, + #{ACCEPT_USER_SIGNER_PATH}, + #{ACCEPT_USER_SIGNER_TIME}, + #{ACCEPT_DEPARTMENT_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + update + + set + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}, + HOTWORK_ID = #{HOTWORK_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + ISSELF = #{ISSELF} + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + ACCEPT_CONFESS_ID in + + #{item} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml new file mode 100644 index 00000000..df9170bb --- /dev/null +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml @@ -0,0 +1,1713 @@ + + + + + + + BUS_HOTWORK_CFD + + + + + SYS_DICTIONARIES + + + + + f.CORPINFO_ID, + f.ISDELETE, + f.CREATTIME, + f.CREATOR, + f.OPERATTIME, + f.OPERATOR, + f.CHECK_NO, + f.WORK_CONTENT, + f.WORK_START_DATE, + f.WORK_END_DATE, + f.CONFIRM_DEPARTMENT_ID, + f.CONFIRM_USER_ID, + f.CONFIRM_USER_SIGNER_PATH, + f.CONFIRM_USER_SIGNER_TIME, + f.AUDIT_DEPARTMENT_ID, + f.AUDIT_USER_ID, + f.AUDIT_USER_SIGNER_PATH, + f.AUDIT_USER_SIGNER_TIME, + f.APPROVE_DEPARTMENT_ID, + f.APPROVE_USER_ID, + f.APPROVE_USER_SIGNER_PATH, + f.APPROVE_USER_SIGNER_TIME, + f.APPLY_STATUS, + f.CONFIRM_CONTENT, + f.AUDIT_CONTENT, + f.APPROVE_CONTENT, + f.OTHER_PROTECTIVE_MEASURES, + f.ACCEPT_DEPARTMENT_ID, + f.ACCEPT_USER_ID, + f.ACCEPT_USER_SIGNER_PATH, + f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_CONTENT, + f.APPLY_DEPARTMENT_ID, + f.APPLY_USER_ID, + f.WORK_PLACE, + f.WORK_LEVEL, + f.WORK_USER, + f.WORK_LONGITUDE, + f.WORK_LATITUDE, + f.SPECIAL_WORK, + f.RISK_IDENTIFICATION, + f.WORK_MANAGER, + f.ANALYZE_DEPARTMENT_ID, + f.ANALYZE_USER_ID, + f.GUARDIAN_DEPARTMENT_ID, + f.GUARDIAN_USER_ID, + f.GUARDIAN_USER_SIGNER_PATH, + f.GUARDIAN_USER_SIGNER_TIME, + f.GUARDIAN_CONTENT, + f.LEADER_DEPARTMENT_ID, + f.LEADER_USER_ID, + f.LEADER_USER_SIGNER_PATH, + f.LEADER_USER_SIGNER_TIME, + f.LEADER_CONTENT, + f.MONITOR_DEPARTMENT_ID, + f.MONITOR_USER_ID, + f.MONITOR_USER_SIGNER_PATH, + f.MONITOR_USER_SIGNER_TIME, + f.MONITOR_CONTENT, + f.CONFESS_USER, + f.EDUCATE_USER, + f.ACCEPT_EDUCATE_USER, + f.TRIAL_USER, + f.WORK_FUNCTION, + f.GUARDIAN_USER, + f.HOTWORK_ID, + f.CONFESS_DEPARTMENT_ID, + f.CONFESS_USER_ID, + f.CONFESS_USER_SIGNER_PATH, + f.CONFESS_USER_SIGNER_TIME, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + f.ACCEPT_CONFESS_USER_SIGNER_PATH, + f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.ANALYZE_TIME + + + + + CORPINFO_ID, + ISDELETE, + CREATTIME, + CREATOR, + OPERATTIME, + OPERATOR, + CHECK_NO, + WORK_CONTENT, + WORK_START_DATE, + WORK_END_DATE, + CONFIRM_DEPARTMENT_ID, + CONFIRM_USER_ID, + CONFIRM_USER_SIGNER_PATH, + CONFIRM_USER_SIGNER_TIME, + AUDIT_DEPARTMENT_ID, + AUDIT_USER_ID, + AUDIT_USER_SIGNER_PATH, + AUDIT_USER_SIGNER_TIME, + APPROVE_DEPARTMENT_ID, + APPROVE_USER_ID, + APPROVE_USER_SIGNER_PATH, + APPROVE_USER_SIGNER_TIME, + APPLY_STATUS, + CONFIRM_CONTENT, + AUDIT_CONTENT, + APPROVE_CONTENT, + OTHER_PROTECTIVE_MEASURES, + ACCEPT_DEPARTMENT_ID, + ACCEPT_USER_ID, + ACCEPT_USER_SIGNER_PATH, + ACCEPT_USER_SIGNER_TIME, + ACCEPT_CONTENT, + APPLY_DEPARTMENT_ID, + APPLY_USER_ID, + WORK_PLACE, + WORK_LEVEL, + WORK_USER, + WORK_LONGITUDE, + WORK_LATITUDE, + SPECIAL_WORK, + RISK_IDENTIFICATION, + WORK_MANAGER, + ANALYZE_DEPARTMENT_ID, + ANALYZE_USER_ID, + GUARDIAN_DEPARTMENT_ID, + GUARDIAN_USER_ID, + GUARDIAN_USER_SIGNER_PATH, + GUARDIAN_USER_SIGNER_TIME, + GUARDIAN_CONTENT, + LEADER_DEPARTMENT_ID, + LEADER_USER_ID, + LEADER_USER_SIGNER_PATH, + LEADER_USER_SIGNER_TIME, + LEADER_CONTENT, + MONITOR_DEPARTMENT_ID, + MONITOR_USER_ID, + MONITOR_USER_SIGNER_PATH, + MONITOR_USER_SIGNER_TIME, + MONITOR_CONTENT, + CONFESS_USER, + EDUCATE_USER, + ACCEPT_EDUCATE_USER, + TRIAL_USER, + WORK_FUNCTION, + GUARDIAN_USER, + HOTWORK_ID, + CONFESS_DEPARTMENT_ID, + CONFESS_USER_ID, + CONFESS_USER_SIGNER_PATH, + CONFESS_USER_SIGNER_TIME, + ACCEPT_CONFESS_DEPARTMENT_ID, + ACCEPT_CONFESS_USER_ID, + ACCEPT_CONFESS_USER_SIGNER_PATH, + ACCEPT_CONFESS_USER_SIGNER_TIME, + ANALYZE_TIME + + + + + #{CORPINFO_ID}, + #{ISDELETE}, + #{CREATTIME}, + #{CREATOR}, + #{OPERATTIME}, + #{OPERATOR}, + #{CHECK_NO}, + #{WORK_CONTENT}, + #{WORK_START_DATE}, + #{WORK_END_DATE}, + #{CONFIRM_DEPARTMENT_ID}, + #{CONFIRM_USER_ID}, + #{CONFIRM_USER_SIGNER_PATH}, + #{CONFIRM_USER_SIGNER_TIME}, + #{AUDIT_DEPARTMENT_ID}, + #{AUDIT_USER_ID}, + #{AUDIT_USER_SIGNER_PATH}, + #{AUDIT_USER_SIGNER_TIME}, + #{APPROVE_DEPARTMENT_ID}, + #{APPROVE_USER_ID}, + #{APPROVE_USER_SIGNER_PATH}, + #{APPROVE_USER_SIGNER_TIME}, + #{APPLY_STATUS}, + #{CONFIRM_CONTENT}, + #{AUDIT_CONTENT}, + #{APPROVE_CONTENT}, + #{OTHER_PROTECTIVE_MEASURES}, + #{ACCEPT_DEPARTMENT_ID}, + #{ACCEPT_USER_ID}, + #{ACCEPT_USER_SIGNER_PATH}, + #{ACCEPT_USER_SIGNER_TIME}, + #{ACCEPT_CONTENT}, + #{APPLY_DEPARTMENT_ID}, + #{APPLY_USER_ID}, + #{WORK_PLACE}, + #{WORK_LEVEL}, + #{WORK_USER}, + #{WORK_LONGITUDE}, + #{WORK_LATITUDE}, + #{SPECIAL_WORK}, + #{RISK_IDENTIFICATION}, + #{WORK_MANAGER}, + #{ANALYZE_DEPARTMENT_ID}, + #{ANALYZE_USER_ID}, + #{GUARDIAN_DEPARTMENT_ID}, + #{GUARDIAN_USER_ID}, + #{GUARDIAN_USER_SIGNER_PATH}, + #{GUARDIAN_USER_SIGNER_TIME}, + #{GUARDIAN_CONTENT}, + #{LEADER_DEPARTMENT_ID}, + #{LEADER_USER_ID}, + #{LEADER_USER_SIGNER_PATH}, + #{LEADER_USER_SIGNER_TIME}, + #{LEADER_CONTENT}, + #{MONITOR_DEPARTMENT_ID}, + #{MONITOR_USER_ID}, + #{MONITOR_USER_SIGNER_PATH}, + #{MONITOR_USER_SIGNER_TIME}, + #{MONITOR_CONTENT}, + #{CONFESS_USER}, + #{EDUCATE_USER}, + #{ACCEPT_EDUCATE_USER}, + #{TRIAL_USER}, + #{WORK_FUNCTION}, + #{GUARDIAN_USER}, + #{HOTWORK_ID}, + #{CONFESS_DEPARTMENT_ID}, + #{CONFESS_USER_ID}, + #{CONFESS_USER_SIGNER_PATH}, + #{CONFESS_USER_SIGNER_TIME}, + #{ACCEPT_CONFESS_DEPARTMENT_ID}, + #{ACCEPT_CONFESS_USER_ID}, + #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{ANALYZE_TIME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + HOTWORK_ID = #{HOTWORK_ID} + + + update + + set + ANALYZE_TIME = #{ANALYZE_TIME} + where + HOTWORK_ID = #{HOTWORK_ID} + + + + update + + set + CORPINFO_ID = #{CORPINFO_ID}, + ISDELETE = #{ISDELETE}, + CREATTIME = #{CREATTIME}, + CREATOR = #{CREATOR}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + CHECK_NO = #{CHECK_NO}, + WORK_CONTENT = #{WORK_CONTENT}, + WORK_START_DATE = #{WORK_START_DATE}, + WORK_END_DATE = #{WORK_END_DATE}, + CONFIRM_DEPARTMENT_ID = #{CONFIRM_DEPARTMENT_ID}, + CONFIRM_USER_ID = #{CONFIRM_USER_ID}, + CONFIRM_USER_SIGNER_PATH = #{CONFIRM_USER_SIGNER_PATH}, + CONFIRM_USER_SIGNER_TIME = #{CONFIRM_USER_SIGNER_TIME}, + AUDIT_DEPARTMENT_ID = #{AUDIT_DEPARTMENT_ID}, + AUDIT_USER_ID = #{AUDIT_USER_ID}, + AUDIT_USER_SIGNER_PATH = #{AUDIT_USER_SIGNER_PATH}, + AUDIT_USER_SIGNER_TIME = #{AUDIT_USER_SIGNER_TIME}, + APPROVE_DEPARTMENT_ID = #{APPROVE_DEPARTMENT_ID}, + APPROVE_USER_ID = #{APPROVE_USER_ID}, + APPROVE_USER_SIGNER_PATH = #{APPROVE_USER_SIGNER_PATH}, + APPROVE_USER_SIGNER_TIME = #{APPROVE_USER_SIGNER_TIME}, + APPLY_STATUS = #{APPLY_STATUS}, + CONFIRM_CONTENT = #{CONFIRM_CONTENT}, + AUDIT_CONTENT = #{AUDIT_CONTENT}, + APPROVE_CONTENT = #{APPROVE_CONTENT}, + OTHER_PROTECTIVE_MEASURES = #{OTHER_PROTECTIVE_MEASURES}, + ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID}, + ACCEPT_USER_ID = #{ACCEPT_USER_ID}, + ACCEPT_USER_SIGNER_PATH = #{ACCEPT_USER_SIGNER_PATH}, + ACCEPT_USER_SIGNER_TIME = #{ACCEPT_USER_SIGNER_TIME}, + ACCEPT_CONTENT = #{ACCEPT_CONTENT}, + APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID}, + APPLY_USER_ID = #{APPLY_USER_ID}, + WORK_PLACE = #{WORK_PLACE}, + WORK_LEVEL = #{WORK_LEVEL}, + WORK_USER = #{WORK_USER}, + WORK_LONGITUDE = #{WORK_LONGITUDE}, + WORK_LATITUDE = #{WORK_LATITUDE}, + SPECIAL_WORK = #{SPECIAL_WORK}, + RISK_IDENTIFICATION = #{RISK_IDENTIFICATION}, + WORK_MANAGER = #{WORK_MANAGER}, + ANALYZE_DEPARTMENT_ID = #{ANALYZE_DEPARTMENT_ID}, + ANALYZE_USER_ID = #{ANALYZE_USER_ID}, + GUARDIAN_DEPARTMENT_ID = #{GUARDIAN_DEPARTMENT_ID}, + GUARDIAN_USER_ID = #{GUARDIAN_USER_ID}, + GUARDIAN_USER_SIGNER_PATH = #{GUARDIAN_USER_SIGNER_PATH}, + GUARDIAN_USER_SIGNER_TIME = #{GUARDIAN_USER_SIGNER_TIME}, + GUARDIAN_CONTENT = #{GUARDIAN_CONTENT}, + LEADER_DEPARTMENT_ID = #{LEADER_DEPARTMENT_ID}, + LEADER_USER_ID = #{LEADER_USER_ID}, + LEADER_USER_SIGNER_PATH = #{LEADER_USER_SIGNER_PATH}, + LEADER_USER_SIGNER_TIME = #{LEADER_USER_SIGNER_TIME}, + LEADER_CONTENT = #{LEADER_CONTENT}, + MONITOR_DEPARTMENT_ID = #{MONITOR_DEPARTMENT_ID}, + MONITOR_USER_ID = #{MONITOR_USER_ID}, + MONITOR_USER_SIGNER_PATH = #{MONITOR_USER_SIGNER_PATH}, + MONITOR_USER_SIGNER_TIME = #{MONITOR_USER_SIGNER_TIME}, + MONITOR_CONTENT = #{MONITOR_CONTENT}, + CONFESS_USER = #{CONFESS_USER}, + EDUCATE_USER = #{EDUCATE_USER}, + ACCEPT_EDUCATE_USER = #{ACCEPT_EDUCATE_USER}, + TRIAL_USER = #{TRIAL_USER}, + WORK_FUNCTION=#{WORK_FUNCTION}, + GUARDIAN_USER=#{GUARDIAN_USER}, + CONFESS_DEPARTMENT_ID = #{CONFESS_DEPARTMENT_ID}, + CONFESS_USER_ID = #{CONFESS_USER_ID}, + CONFESS_USER_SIGNER_PATH = #{CONFESS_USER_SIGNER_PATH}, + CONFESS_USER_SIGNER_TIME = #{CONFESS_USER_SIGNER_TIME}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + HOTWORK_ID = HOTWORK_ID + where + HOTWORK_ID = #{HOTWORK_ID} + + + + update + + set + APPLY_STATUS = #{APPLY_STATUS} + where + HOTWORK_ID = #{HOTWORK_ID} + + + + update + bus_confinedspace f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_blindboard f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_electricity f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_hoisting f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_breakground f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_cutroad f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_highwork f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + + bus_hotwork_cfd f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + + + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + HOTWORK_ID in + + #{item} + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkGasCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkGasCfdMapper.xml new file mode 100644 index 00000000..f360cd40 --- /dev/null +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkGasCfdMapper.xml @@ -0,0 +1,138 @@ + + + + + + + BUS_HOTWORKGAS_CFD + + + + + SYS_DICTIONARIES + + + + + f.HOTWORK_ID, + f.ANALYZE_TIME, + f.ANALYZE_PLACE, + f.ANALYZE_RESULT, + f.ANALYZE_USER, + f.ISDELETE, + f.HOTWORKGAS_ID + + + + + HOTWORK_ID, + ANALYZE_TIME, + ANALYZE_PLACE, + ANALYZE_RESULT, + ANALYZE_USER, + ISDELETE, + HOTWORKGAS_ID + + + + + #{HOTWORK_ID}, + #{ANALYZE_TIME}, + #{ANALYZE_PLACE}, + #{ANALYZE_RESULT}, + #{ANALYZE_USER}, + #{ISDELETE}, + #{HOTWORKGAS_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + HOTWORKGAS_ID = #{HOTWORKGAS_ID} + + + + + update + + set + HOTWORK_ID = #{HOTWORK_ID}, + ANALYZE_TIME = #{ANALYZE_TIME}, + ANALYZE_PLACE = #{ANALYZE_PLACE}, + ANALYZE_RESULT = #{ANALYZE_RESULT}, + ANALYZE_USER = #{ANALYZE_USER}, + ISDELETE = #{ISDELETE}, + HOTWORKGAS_ID = HOTWORKGAS_ID + where + HOTWORKGAS_ID = #{HOTWORKGAS_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + HOTWORKGAS_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkLogCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkLogCfdMapper.xml new file mode 100644 index 00000000..21e0b147 --- /dev/null +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkLogCfdMapper.xml @@ -0,0 +1,127 @@ + + + + + + + BUS_HOTWORKLOG_CFD + + + + + SYS_DICTIONARIES + + + + + f.HOTWORK_ID, + f.ACTION, + f.CREATTIME, + f.CREATOR, + f.HOTWORKLOG_ID + + + + + HOTWORK_ID, + ACTION, + CREATTIME, + CREATOR, + HOTWORKLOG_ID + + + + + #{HOTWORK_ID}, + #{ACTION}, + #{CREATTIME}, + #{CREATOR}, + #{HOTWORKLOG_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + HOTWORKLOG_ID = #{HOTWORKLOG_ID} + + + + + update + + set + HOTWORK_ID = #{HOTWORK_ID}, + ACTION = #{ACTION}, + CREATTIME = #{CREATTIME}, + CREATOR = #{CREATOR}, + HOTWORKLOG_ID = HOTWORKLOG_ID + where + HOTWORKLOG_ID = #{HOTWORKLOG_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + HOTWORKLOG_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkToMeasuresCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkToMeasuresCfdMapper.xml new file mode 100644 index 00000000..b3ba03ae --- /dev/null +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkToMeasuresCfdMapper.xml @@ -0,0 +1,145 @@ + + + + + + + BUS_HOTWORKTOMEASURES_CFD + + + + + SYS_DICTIONARIES + + + + + f.HOTWORK_ID, + f.BUS_HOTWORK_MEASURES_ID, + f.STATUS, + f.ANSWER1, + f.ANSWER2, + f.ANSWER3, + f.ANSWER4, + f.HOTWORKTOMEASURES_ID, + f.CONFIRM_ID, + f.CONFIRM_NAME + + + + + HOTWORK_ID, + BUS_HOTWORK_MEASURES_ID, + STATUS, + ANSWER1, + ANSWER2, + ANSWER3, + ANSWER4, + HOTWORKTOMEASURES_ID, + CONFIRM_ID, + CONFIRM_NAME + + + + + #{HOTWORK_ID}, + #{BUS_HOTWORK_MEASURES_ID}, + #{STATUS}, + #{ANSWER1}, + #{ANSWER2}, + #{ANSWER3}, + #{ANSWER4}, + #{HOTWORKTOMEASURES_ID}, + #{CONFIRM_ID}, + #{CONFIRM_NAME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + HOTWORK_ID = #{HOTWORK_ID} + + + + + update + + set + HOTWORK_ID = #{HOTWORK_ID}, + BUS_HOTWORK_MEASURES_ID = #{BUS_HOTWORK_MEASURES_ID}, + STATUS = #{STATUS}, + ANSWER1 = #{ANSWER1}, + ANSWER2 = #{ANSWER2}, + ANSWER3 = #{ANSWER3}, + ANSWER4 = #{ANSWER4}, + HOTWORKTOMEASURES_ID = HOTWORKTOMEASURES_ID, + ICONFIRM_ID = #{CONFIRM_ID}, + CONFRM_NAME = #{CONFIRM_NAME} + where + HOTWORKTOMEASURES_ID = #{HOTWORKTOMEASURES_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + HOTWORKTOMEASURES_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/mq/MqErrorMessageLogMapper.xml b/src/main/resources/mybatis/datasource/mq/MqErrorMessageLogMapper.xml new file mode 100644 index 00000000..e2b35718 --- /dev/null +++ b/src/main/resources/mybatis/datasource/mq/MqErrorMessageLogMapper.xml @@ -0,0 +1,131 @@ + + + + + + + MQ_MESSAGE_ERROR_LOG + + + + + SYS_DICTIONARIES + + + + + f.MESSAGE_LOG_ID, + f.ERROR_MESSAGE, + f.TIME, + f.TYPE, + f.SOURCE, + f.MESSAGE_ERROR_LOG_ID + + + + + MESSAGE_LOG_ID, + ERROR_MESSAGE, + TIME, + TYPE, + SOURCE, + MESSAGE_ERROR_LOG_ID + + + + + #{MESSAGE_LOG_ID}, + #{ERROR_MESSAGE}, + #{TIME}, + #{TYPE}, + #{SOURCE}, + #{MESSAGE_ERROR_LOG_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + MESSAGE_ERROR_LOG_ID = #{MESSAGE_ERROR_LOG_ID} + + + + + update + + set + MESSAGE_LOG_ID = #{MESSAGE_LOG_ID}, + ERROR_MESSAGE = #{ERROR_MESSAGE}, + TIME = #{TIME}, + TYPE = #{TYPE}, + SOURCE = #{SOURCE}, + MESSAGE_ERROR_LOG_ID = MESSAGE_ERROR_LOG_ID + where + MESSAGE_ERROR_LOG_ID = #{MESSAGE_ERROR_LOG_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + MESSAGE_ERROR_LOG_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/mq/MqMessageLogMapper.xml b/src/main/resources/mybatis/datasource/mq/MqMessageLogMapper.xml new file mode 100644 index 00000000..98685a2b --- /dev/null +++ b/src/main/resources/mybatis/datasource/mq/MqMessageLogMapper.xml @@ -0,0 +1,143 @@ + + + + + + + MQ_MESSAGE_LOG + + + + + SYS_DICTIONARIES + + + + + f.ID, + f.PRODUCER_NAME, + f.MARK, + f.MARK_NAME, + f.MESSAGE, + f.CREATE_TIME, + f.MESSAGE_LOG_ID, + f.TYPE, + f.DIGESTION_FLAG, + f.PLAN_TIME + + + + + ID, + PRODUCER_NAME, + MARK, + MARK_NAME, + MESSAGE, + CREATE_TIME, + MESSAGE_LOG_ID, + TYPE, + DIGESTION_FLAG, + PLAN_TIME + + + + + #{ID}, + #{PRODUCER_NAME}, + #{MARK}, + #{MARK_NAME}, + #{MESSAGE}, + #{CREATE_TIME}, + #{MESSAGE_LOG_ID}, + #{TYPE}, + #{DIGESTION_FLAG}, + #{PLAN_TIME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + MESSAGE_LOG_ID = #{MESSAGE_LOG_ID} + + + + + update + + set + ID = #{ID}, + PRODUCER_NAME = #{PRODUCER_NAME}, + MARK = #{MARK}, + MARK_NAME = #{MARK_NAME}, + MESSAGE = #{MESSAGE}, + CREATE_TIME = #{CREATE_TIME}, + TYPE = #{TYPE}, + DIGESTION_FLAG = #{DIGESTION_FLAG}, + PLAN_TIME = #{PLAN_TIME}, + MESSAGE_LOG_ID = MESSAGE_LOG_ID + where + MESSAGE_LOG_ID = #{MESSAGE_LOG_ID} + + + + + + + + + + + + + + delete from + + where + MESSAGE_LOG_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml new file mode 100644 index 00000000..23c4ba79 --- /dev/null +++ b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml @@ -0,0 +1,225 @@ + + + + + + + BUS_PERSONNELMANAGEMENT_CFD + + + + + SYS_DICTIONARIES + + + + + f.CREATOR, + f.UNITS_ID, + f.PTYPE, + f.JOB_TYPE, + f.OPERATIONITEM, + f.NAME, + f.SEX, + f.CERTIFICATE_NUM, + f.REVIEWTIME, + f.PHONENUM, + f.IDENTITYCARD, + f.LICENSING, + f.VALID_STIME, + f.VALID_ETIME, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE, + f.CORPINFO_ID, + f.PERSONNELMANAGEMENT_ID + + + + + CREATOR, + UNITS_ID, + PTYPE, + JOB_TYPE, + OPERATIONITEM, + NAME, + SEX, + CERTIFICATE_NUM, + REVIEWTIME, + PHONENUM, + IDENTITYCARD, + LICENSING, + VALID_STIME, + VALID_ETIME, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE, + CORPINFO_ID, + PERSONNELMANAGEMENT_ID + + + + + #{CREATOR}, + #{UNITS_ID}, + #{PTYPE}, + #{JOB_TYPE}, + #{OPERATIONITEM}, + #{NAME}, + #{SEX}, + #{CERTIFICATE_NUM}, + #{REVIEWTIME}, + #{PHONENUM}, + #{IDENTITYCARD}, + #{LICENSING}, + #{VALID_STIME}, + #{VALID_ETIME}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE}, + #{CORPINFO_ID}, + #{PERSONNELMANAGEMENT_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID} + + + + + update + + set + UNITS_ID = #{UNITS_ID}, + PTYPE = #{PTYPE}, + JOB_TYPE = #{JOB_TYPE}, + OPERATIONITEM = #{OPERATIONITEM}, + NAME = #{NAME}, + SEX = #{SEX}, + CERTIFICATE_NUM = #{CERTIFICATE_NUM}, + REVIEWTIME = #{REVIEWTIME}, + PHONENUM = #{PHONENUM}, + IDENTITYCARD = #{IDENTITYCARD}, + LICENSING = #{LICENSING}, + VALID_STIME = #{VALID_STIME}, + VALID_ETIME = #{VALID_ETIME} + where + PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID} + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + PERSONNELMANAGEMENT_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml index 1f8157e8..2215e418 100644 --- a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml @@ -550,4 +550,33 @@ + + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 52653c68..59ce3768 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -755,6 +755,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by u.DEPARTMENT_ID asc, u.SORT asc,u.LAST_LOGIN desc + + + + diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 3fbb08db..7f2e8852 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -106,7 +106,8 @@ COMPETENT_DEPT_ID, GROUP_UNIT, MANAGER_DEPARTMENT_ID, - JURISDICTION_UNIT + JURISDICTION_UNIT, + IS_SMS @@ -154,7 +155,8 @@ #{COMPETENT_DEPT_ID}, #{GROUP_UNIT}, #{MANAGER_DEPARTMENT_ID}, - #{JURISDICTION_UNIT} + #{JURISDICTION_UNIT}, + #{IS_SMS} @@ -683,4 +685,16 @@ ) AI ON AI.OUTSOURCED_ID = o.OUTSOURCED_ID WHERE o.OUTSOURCED_ID=#{OUTSOURCED_ID} + + + + update + + set + STATE = #{STATE}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME} + where + OUTSOURCED_ID = #{OUTSOURCED_ID} +