diff --git a/src/main/java/com/zcloud/controller/gf/AppEightWorkController.java b/src/main/java/com/zcloud/controller/gf/AppEightWorkController.java new file mode 100644 index 00000000..0a47751a --- /dev/null +++ b/src/main/java/com/zcloud/controller/gf/AppEightWorkController.java @@ -0,0 +1,89 @@ +package com.zcloud.controller.gf; + +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.eightWork.*; +import com.zcloud.service.gf.EightWorkService; +import com.zcloud.service.system.DictionariesService; +import com.zcloud.util.*; +import com.zcloud.entity.Response; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.*; + +/** + * 说明：八项作业 + * 作者：luoxiaobao + * 时间：2021-08-31 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/eightwork") +public class AppEightWorkController extends BaseController { + + @Autowired + private EightWorkService eightworkService; + @Autowired + private DictionariesService dictionariesService; + + /**八项作业列表 + * @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 = eightworkService.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()); + } + } + +} diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java index 79e3d14d..dbf58c1d 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java @@ -5,18 +5,18 @@ import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.service.gf.GFBlindBoardLogService; -import com.zcloud.service.gf.GFBlindBoardService; -import com.zcloud.service.gf.GFBlindBoardToMeasuresService; -import com.zcloud.service.gf.GFBlindBoardInfoService; +import com.zcloud.service.gf.*; import com.zcloud.util.*; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; import javax.annotation.Resource; import java.text.DecimalFormat; @@ -36,13 +36,18 @@ public class AppGFBlindBoardController extends BaseController { private GFBlindBoardService GFblindboardService; @Resource private GFBlindBoardInfoService GFblindBoardInfoService; + + @Autowired + private GFBlindBoardAcceptUserService blindboardacceptuserService; + @Resource private GFBlindBoardLogService GFblindBoardLogService; - @Resource + @Autowired private SendMessageUtil sendMessageUtil; @Resource private GFBlindBoardToMeasuresService GFblindBoardToMeasuresService; - + @Autowired + private Smb smb; /**获取编码 * @param * @throws Exception @@ -84,6 +89,19 @@ public class AppGFBlindBoardController extends BaseController { 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")); + System.out.println(pd.get("CORPINFO_ID")); + pd2 = GFblindboardService.getCode(pd2); //根据ID读取 + String code = "MB"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); + pd = this.getPageData(); + pd.put("CHECK_NO", code); pd.put("BLINDBOARD_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); @@ -93,7 +111,7 @@ public class AppGFBlindBoardController extends BaseController { 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); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -195,7 +213,7 @@ public class AppGFBlindBoardController extends BaseController { 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); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); } @@ -216,7 +234,7 @@ public class AppGFBlindBoardController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - Smb.deleteFile(pd.getString("path")); + smb.deleteFile(pd.getString("path")); map.put("result", errInfo); return map; } @@ -257,7 +275,7 @@ public class AppGFBlindBoardController extends BaseController { 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); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -378,7 +396,7 @@ public class AppGFBlindBoardController extends BaseController { 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); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -387,6 +405,37 @@ public class AppGFBlindBoardController extends BaseController { pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); GFblindboardService.edit(pd2); log.put("ACTION", "作业负责人通过"); + GFblindBoardInfoService.delete(pd); + if(pd.get("boardList")!=null){ + List list = (List) JSON.parse(pd.get("boardList").toString()); + for (JSONObject json : list) { + PageData board = new PageData(); + board.put("BLINDBOARDINFO_ID", this.get32UUID()); // 主键 + board.put("BLINDBOARD_ID", pd.get("BLINDBOARD_ID")); + board.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + board.put("BOARD_MATERIAL", json.get("BOARD_MATERIAL")); + board.put("BOARD_SPECIFICATION", json.get("BOARD_SPECIFICATION")); + board.put("BOARD_NO", json.get("BOARD_NO")); + board.put("ISDELETE", 0); + GFblindBoardInfoService.save(board); + } + } + + GFblindBoardToMeasuresService.delete(pd); + if(pd.get("measuresList")!=null){ + List list = (List) JSON.parse(pd.get("measuresList").toString()); + for (JSONObject json : list) { + PageData measures = new PageData(); + measures.put("BLINDBOARDTOMEASURES_ID", this.get32UUID()); // 主键 + measures.put("BLINDBOARD_ID", pd.get("BLINDBOARD_ID")); + measures.put("BUS_BLINDBOARD_MEASURES_ID", json.get("BUS_BLINDBOARD_MEASURES_ID")); + measures.put("STATUS", json.get("STATUS")); + measures.put("CONFIRM_ID", pd.get("OPERATOR")); + measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); + GFblindBoardToMeasuresService.save(measures); + } + } + // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); @@ -399,7 +448,7 @@ public class AppGFBlindBoardController extends BaseController { 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); + 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")); @@ -420,7 +469,7 @@ public class AppGFBlindBoardController extends BaseController { 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); + 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")); @@ -517,13 +566,114 @@ public class AppGFBlindBoardController extends BaseController { pd = this.getPageData(); pd = GFblindboardService.findById(pd); //根据ID读取 map.put("pd", pd); + map.put("imgList",blindboardacceptuserService.findByIds(pd)); + map.put("imgList1",blindboardacceptuserService.findById(pd)); map.put("measuresList", GFblindboardService.listAllMeasures(pd)); map.put("boardList", GFblindBoardInfoService.listAll(pd)); map.put("result", errInfo); return map; } - /**批量删除 + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/editAcceptStatus") + @ResponseBody + @Transactional + 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 = GFblindboardService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + PageData log = new PageData(); + log.put("BLINDBOARDLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("BLINDBOARD_ID", pd.get("BLINDBOARD_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String 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") + ";_;") : ";_;"); + + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); + switch (status) { + + + case "6"://验收人 + 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("BLINDBOARD_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("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFblindboardService.edit(pd2); + log.put("ACTION", "验收通过"); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + + break; + + case "-6"://验收人打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFblindboardService.edit(pd2); + + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + break; + default: + break; + } + GFblindBoardLogService.save(log); + map.put("result", errInfo); + return map; + } + + private void saveAcceptImg(MultipartFile[] files,String signertime, String BLINDBOARD_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("BLINDBOARD_ID", BLINDBOARD_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); + blindboardacceptuserService.save(cpd); + } + } + } + + + + /**批量删除 * @param * @throws Exception */ @@ -736,7 +886,7 @@ public class AppGFBlindBoardController extends BaseController { 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); + 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")); @@ -829,7 +979,7 @@ public class AppGFBlindBoardController extends BaseController { 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); + 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")); @@ -846,7 +996,7 @@ public class AppGFBlindBoardController extends BaseController { @ResponseBody @Transactional public Object editAcceptconfess( - @RequestParam(value="FFILE",required=false) MultipartFile[] files + MultipartRequest request ) throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -856,18 +1006,43 @@ public class AppGFBlindBoardController extends BaseController { pd2 = GFblindboardService.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]; + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - 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_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - GFblindboardService.edit(pd2); + 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("BLINDBOARD_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 BLINDBOARD_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("BLINDBOARD_ID", BLINDBOARD_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", ""); + blindboardacceptuserService.save(pd); + } + } + } } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java index 145165a7..a2fef163 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java @@ -5,17 +5,20 @@ import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFBreakGroundAcceptUserService; import com.zcloud.service.gf.GFBreakGroundLogService; import com.zcloud.service.gf.GFBreakGroundService; import com.zcloud.service.gf.GFBreakGroundToMeasuresService; 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.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; import javax.annotation.Resource; import java.text.DecimalFormat; @@ -33,12 +36,16 @@ public class AppGFBreakGroundController extends BaseController { @Resource private GFBreakGroundService GFbreakGroundService; + @Autowired + private GFBreakGroundAcceptUserService breakgroundacceptuserService; @Resource private GFBreakGroundLogService GFbreakGroundLogService; @Resource private GFBreakGroundToMeasuresService GFbreakGroundToMeasuresService; @Resource private SendMessageUtil sendMessageUtil; + @Autowired + private Smb smb; /**获取编码 * @param * @throws Exception @@ -78,6 +85,18 @@ public class AppGFBreakGroundController extends BaseController { 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 = GFbreakGroundService.getCode(pd2); //根据ID读取 + String code = "DT"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); + pd = this.getPageData(); + pd.put("CHECK_NO", code); pd.put("BREAKGROUND_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 @@ -88,28 +107,13 @@ public class AppGFBreakGroundController extends BaseController { 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); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); } GFbreakGroundService.save(pd); - GFbreakGroundToMeasuresService.delete(pd); - if(pd.get("measuresList")!=null){ - List list = (List) JSON.parse(pd.get("measuresList").toString()); - for (JSONObject json : list) { - PageData measures = new PageData(); - measures.put("BREAKGROUNDTOMEASURES_ID", this.get32UUID()); // 主键 - measures.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID")); - measures.put("BUS_BREAKGROUND_MEASURES_ID", json.get("BUS_BREAKGROUND_MEASURES_ID")); - measures.put("STATUS", json.get("STATUS")); - measures.put("ANSWER", json.get("ANSWER")); - measures.put("CONFIRM_ID", pd.get("OPERATOR")); - measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); - GFbreakGroundToMeasuresService.save(measures); - } - } if(pd.get("APPLY_STATUS").equals("1")) { PageData log = new PageData(); log.put("BREAKGROUNDLOG_ID", this.get32UUID()); @@ -178,7 +182,7 @@ public class AppGFBreakGroundController extends BaseController { 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); + 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")); @@ -210,7 +214,7 @@ public class AppGFBreakGroundController extends BaseController { 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); + 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")); @@ -226,9 +230,7 @@ public class AppGFBreakGroundController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional - public Object editAcceptconfess( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception { + public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -237,20 +239,46 @@ public class AppGFBreakGroundController extends BaseController { pd2 = GFbreakGroundService.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]; + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - 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_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - GFbreakGroundService.edit(pd2); + 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("BREAKGROUND_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 BREAKGROUND_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("BREAKGROUND_ID", BREAKGROUND_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", ""); + breakgroundacceptuserService.save(pd); + } + } + } + /**上传图 * @param * @throws Exception @@ -270,7 +298,7 @@ public class AppGFBreakGroundController extends BaseController { 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); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); } @@ -291,14 +319,14 @@ public class AppGFBreakGroundController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - Smb.deleteFile(pd.getString("path")); + smb.deleteFile(pd.getString("path")); map.put("result", errInfo); return map; } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -335,7 +363,7 @@ public class AppGFBreakGroundController extends BaseController { 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); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -402,6 +430,105 @@ public class AppGFBreakGroundController extends BaseController { return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/editAcceptStatus") + @ResponseBody + @Transactional + 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 = GFbreakGroundService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + + PageData log = new PageData(); + log.put("BREAKGROUNDLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String 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") + ";_;") : ";_;"); + String HAZARD_IDENTIFICATION = (StringUtils.isNotBlank(pd2.getString("HAZARD_IDENTIFICATION")) ? pd2.getString("HAZARD_IDENTIFICATION") : "") + + (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? (pd.getString("HAZARD_IDENTIFICATION") + ";_;") : ";_;"); + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); + pd2.put("HAZARD_IDENTIFICATION", ""); + switch (status) { + + case "6"://验收人 + 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("BREAKGROUND_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("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFbreakGroundService.edit(pd2); + log.put("ACTION", "验收通过"); + + + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + break; + + case "-6"://审批打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFbreakGroundService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + break; + default: + break; + } + GFbreakGroundLogService.save(log); + map.put("result", errInfo); + return map; + } + private void saveAcceptImg(MultipartFile[] files,String signertime, String BREAKGROUND_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("BREAKGROUND_ID", BREAKGROUND_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); + breakgroundacceptuserService.save(cpd); + } + } + } + /**修改 * @param * @throws Exception @@ -443,7 +570,7 @@ public class AppGFBreakGroundController extends BaseController { 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); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -465,7 +592,21 @@ public class AppGFBreakGroundController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFbreakGroundService.edit(pd2); log.put("ACTION", "作业负责单位通过"); - + GFbreakGroundToMeasuresService.delete(pd); + if(pd.get("measuresList")!=null){ + List list = (List) JSON.parse(pd.get("measuresList").toString()); + for (JSONObject json : list) { + PageData measures = new PageData(); + measures.put("BREAKGROUNDTOMEASURES_ID", this.get32UUID()); // 主键 + measures.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID")); + measures.put("BUS_BREAKGROUND_MEASURES_ID", json.get("BUS_BREAKGROUND_MEASURES_ID")); + measures.put("STATUS", json.get("STATUS")); + measures.put("ANSWER", json.get("ANSWER")); + measures.put("CONFIRM_ID", pd.get("OPERATOR")); + measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); + GFbreakGroundToMeasuresService.save(measures); + } + } // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); } @@ -478,7 +619,7 @@ public class AppGFBreakGroundController extends BaseController { 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); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("PRODUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("PRODUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -508,7 +649,7 @@ public class AppGFBreakGroundController extends BaseController { 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); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("SAFETY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("SAFETY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -534,7 +675,7 @@ public class AppGFBreakGroundController extends BaseController { 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); + 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")); @@ -556,7 +697,7 @@ public class AppGFBreakGroundController extends BaseController { 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); + 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")); @@ -733,6 +874,8 @@ public class AppGFBreakGroundController extends BaseController { pd = GFbreakGroundService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFbreakGroundService.listAllMeasures(pd)); + map.put("imgList1",breakgroundacceptuserService.findById(pd)); + map.put("imgList",breakgroundacceptuserService.findByIds(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java index 34d46804..4ce881b9 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java @@ -3,21 +3,25 @@ package com.zcloud.controller.gf; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; +import com.zcloud.dto.mq.TenCorpDto; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.mq.util.TenCorpConst; import com.zcloud.service.gf.*; 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.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; +import com.zcloud.mq.service.SendMessageService; import javax.annotation.Resource; import java.text.DecimalFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -39,7 +43,16 @@ public class AppGFConfinedSpaceController extends BaseController { @Resource private GFConfinedSpaceGasService GFconfinedspaceGasService; @Autowired + private GFConfinedSpaceAcceptUserService confinedspaceacceptuserService; + @Autowired + private GFConfinedSpaceGasWHService confinedspacegaswhService; + @Autowired private SendMessageUtil sendMessageUtil; + @Autowired + private Smb smb; + + @Resource + private SendMessageService mqClient; /**获取编码 * @param * @throws Exception @@ -76,6 +89,18 @@ public class AppGFConfinedSpaceController extends BaseController { 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 = GFconfinedspaceService.getCode(pd2); //根据ID读取 + String code = "YX"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); + pd = this.getPageData(); + pd.put("CHECK_NO", code); pd.put("CONFINEDSPACE_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 @@ -119,14 +144,42 @@ public class AppGFConfinedSpaceController extends BaseController { params4.put("name", "params3");// 存入短信模板中的参数名称 params4.put("value", "确认");// 存入上面参数名称所传递的值 paramsList.add(params4); -// sendMessageUtil.sendMessages(mes, paramsList); + sendMessageUtil.sendMessages(mes, paramsList); + // 发短信 + + PageData mes1 = new PageData(); + mes1.put("RECEIVER_ID", pd.get("ANALYZE_USER_ID"));// 收信人userid + mes1.put("templateCode", "YX_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.setTopic("eightWork"); + tenCorpDto.setMark(pd.getString("CONFINEDSPACE_ID")); + tenCorpDto.setMessage(TenCorpConst.confinedSpace); + tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); + tenCorpDto.setData(pd); + tenCorpDto.setMark_name("CONFINEDSPACE_ID"); + mqClient.SendDelayQueue(tenCorpDto); map.put("result", errInfo); return map; } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -141,6 +194,138 @@ public class AppGFConfinedSpaceController extends BaseController { return map; } + + /**作废 + * @param + * @throws Exception + */ + @PostMapping(value="/cancel") + @ResponseBody + 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 = GFconfinedspaceService.findById(pd); + if(cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") != null){ +// String WORK_START_DATE = pd.getString("WORK_START_DATE"); +// String ANALYZE_TIME = cpd.getString("ANALYZE_TIME"); +// String GUARDIAN_USER_SIGNER_TIME = cpd.getString("GUARDIAN_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("-------------123----------"); +// try { +// Date date1 = format.parse(WORK_START_DATE); +// Date date2 = format.parse(ANALYZE_TIME); +// Date date3 = format.parse(GUARDIAN_USER_SIGNER_TIME); +// long workTime = date1.getTime(); +// long analyzeTime = date2.getTime(); +// long signtime = date3.getTime(); +// System.out.println(workTime - analyzeTime); +// System.out.println(analyzeTime - workTime); +// if (workTime - analyzeTime >= 0 && workTime - signtime >= 0) { + return; +// } else { +// pd.put("APPLY_STATUS",-99); +// confinedspaceService.cancel(pd); +// // 发短信 +// PageData mes = new PageData(); +// mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid +// mes.put("templateCode", "YX_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 && cpd.getString("ANALYZE_TIME") == null){ + pd.put("APPLY_STATUS",-98); + GFconfinedspaceService.cancel(pd); + PageData pd2 = new PageData(); + pd2 = GFconfinedspaceService.checkno(pd); + PageData pd3 = new PageData(); + pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); + pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + GFconfinedspaceService.editSpecialwork(pd3); + GFconfinedspaceService.editSpecialwork1(pd3); + GFconfinedspaceService.editSpecialwork2(pd3); + GFconfinedspaceService.editSpecialwork3(pd3); + GFconfinedspaceService.editSpecialwork4(pd3); + GFconfinedspaceService.editSpecialwork5(pd3); + GFconfinedspaceService.editSpecialwork6(pd3); + GFconfinedspaceService.editSpecialwork7(pd3); + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid + mes.put("templateCode", "YX_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 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") == null){ + pd.put("APPLY_STATUS",-99); + GFconfinedspaceService.cancel(pd); + PageData pd2 = new PageData(); + pd2 = GFconfinedspaceService.checkno(pd); + PageData pd3 = new PageData(); + pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); + pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + GFconfinedspaceService.editSpecialwork(pd3); + GFconfinedspaceService.editSpecialwork1(pd3); + GFconfinedspaceService.editSpecialwork2(pd3); + GFconfinedspaceService.editSpecialwork3(pd3); + GFconfinedspaceService.editSpecialwork4(pd3); + GFconfinedspaceService.editSpecialwork5(pd3); + GFconfinedspaceService.editSpecialwork6(pd3); + GFconfinedspaceService.editSpecialwork7(pd3); + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid + mes.put("templateCode", "YX_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 * @throws Exception @@ -194,6 +379,14 @@ public class AppGFConfinedSpaceController extends BaseController { paramsList.add(params4); sendMessageUtil.sendMessages(mes, paramsList); } + TenCorpDto tenCorpDto = new TenCorpDto(); + tenCorpDto.setTopic("eightWork"); + tenCorpDto.setMark(pd.getString("CONFINEDSPACE_ID")); + tenCorpDto.setMessage(TenCorpConst.confinedSpace); + tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); + tenCorpDto.setData(pd); + tenCorpDto.setMark_name("CONFINEDSPACE_ID"); + mqClient.SendDelayQueue(tenCorpDto); map.put("result", errInfo); return map; } @@ -221,7 +414,7 @@ public class AppGFConfinedSpaceController extends BaseController { 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); + 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")); @@ -296,7 +489,7 @@ public class AppGFConfinedSpaceController extends BaseController { 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); + 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")); @@ -306,7 +499,40 @@ public class AppGFConfinedSpaceController extends BaseController { } map.put("result", errInfo); return map; -} + } +// /**修改 +// * @param +// * @throws Exception +// */ +// @RequestMapping(value="/editAcceptconfess") +// @ResponseBody +// @Transactional +// @LogAnno(menuType= "手机",menuServer= "受限空间",instructionsOperate = "受限空间",instructionsType = "接受交底人签字") +// public Object editAcceptconfess( +// @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 = confinedspaceService.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("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); +// pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); +// confinedspaceacceptuserService.edit(pd2); +// } +// map.put("result", errInfo); +// return map; +// } + /**修改 * @param * @throws Exception @@ -314,9 +540,7 @@ public class AppGFConfinedSpaceController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional - public Object editAcceptconfess( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception { + public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -325,22 +549,183 @@ public class AppGFConfinedSpaceController extends BaseController { pd2 = GFconfinedspaceService.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); + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); -// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); -// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - GFconfinedspaceService.edit(pd2); + 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("CONFINEDSPACE_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 CONFINEDSPACE_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("CONFINEDSPACE_ID", CONFINEDSPACE_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", ""); + confinedspaceacceptuserService.save(pd); + } + } + } + + @RequestMapping(value="/editAcceptStatus") + @ResponseBody + @Transactional + 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 = GFconfinedspaceService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + PageData log = new PageData(); + log.put("CONFINEDSPACELOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("CONFINEDSPACE_ID", pd.get("CONFINEDSPACE_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)) { + 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)) { + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); + } + + switch (status) { + case "6"://验收人 + + 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("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + } + + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFconfinedspaceService.edit(pd2); + log.put("ACTION", "验收通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "YX_Y06");// 短信模板编码 + 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 "-6"://验收人打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFconfinedspaceService.edit(pd2); + + // 发短信 + PageData mes4 = new PageData(); + mes4.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes4.put("templateCode", "YX_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; + default: + break; + } + GFconfinedspaceLogService.save(log); + + map.put("result", errInfo); + return map; + } + private void saveAcceptImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_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("CONFINEDSPACE_ID", CONFINEDSPACE_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); + confinedspaceacceptuserService.save(cpd); + } + } + } + + + /**修改 * @param * @throws Exception @@ -382,7 +767,7 @@ public class AppGFConfinedSpaceController extends BaseController { 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); + 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")); @@ -445,6 +830,14 @@ public class AppGFConfinedSpaceController extends BaseController { params4.put("value", "审批");// 存入上面参数名称所传递的值 paramsList.add(params4); sendMessageUtil.sendMessages(mes, paramsList); + TenCorpDto tenCorpDto = new TenCorpDto(); + tenCorpDto.setTopic("eightWork"); + tenCorpDto.setMark(pd.getString("CONFINEDSPACE_ID")); + tenCorpDto.setMessage(TenCorpConst.confinedSpace); + tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); + tenCorpDto.setData(pd); + tenCorpDto.setMark_name("CONFINEDSPACE_ID"); + mqClient.SendDelayQueue(tenCorpDto); } break; @@ -454,7 +847,7 @@ public class AppGFConfinedSpaceController extends BaseController { 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); + 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")); @@ -504,7 +897,7 @@ public class AppGFConfinedSpaceController extends BaseController { // // 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); +// 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")); @@ -548,7 +941,7 @@ public class AppGFConfinedSpaceController extends BaseController { // // 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); +// smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); // // pd2.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); // pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -564,7 +957,7 @@ public class AppGFConfinedSpaceController extends BaseController { // // 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); +// 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")); @@ -581,7 +974,7 @@ public class AppGFConfinedSpaceController extends BaseController { 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); + 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")); @@ -621,25 +1014,25 @@ public class AppGFConfinedSpaceController extends BaseController { paramsList.add(params4); sendMessageUtil.sendMessages(mes, paramsList); - // 发短信 - PageData mes1 = new PageData(); - mes1.put("RECEIVER_ID", pd2.get("ANALYZE_USER_ID"));// 收信人userid - mes1.put("templateCode", "YX_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); +// // 发短信 +// PageData mes1 = new PageData(); +// mes1.put("RECEIVER_ID", pd2.get("ANALYZE_USER_ID"));// 收信人userid +// mes1.put("templateCode", "YX_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; @@ -649,7 +1042,7 @@ public class AppGFConfinedSpaceController extends BaseController { 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); + 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")); @@ -861,6 +1254,25 @@ public class AppGFConfinedSpaceController extends BaseController { return map; } + + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/gasEdit") + @ResponseBody + public Object gasEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = GFconfinedspaceGasService.gasEdit(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + /**列表 * @param page * @throws Exception @@ -922,7 +1334,7 @@ public class AppGFConfinedSpaceController extends BaseController { return map; } - /**去修改页面获取数据 + /**去修改页面获取数据 * @param * @throws Exception */ @@ -936,6 +1348,9 @@ public class AppGFConfinedSpaceController extends BaseController { pd = GFconfinedspaceService.findById(pd); //根据ID读取 map.put("measuresList", GFconfinedspaceService.listAllMeasures(pd)); map.put("gasList", GFconfinedspaceGasService.listAll(pd)); + map.put("imgList",confinedspaceacceptuserService.findByIds(pd)); + map.put("imgList1",confinedspaceacceptuserService.findById(pd)); + map.put("pd", pd); map.put("result", errInfo); return map; @@ -987,7 +1402,9 @@ public class AppGFConfinedSpaceController extends BaseController { pd = this.getPageData(); pd.put("CONFINEDSPACEGAS_ID", this.get32UUID()); //主键 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 GFconfinedspaceGasService.save(pd); + confinedspacegaswhService.edittime(pd); map.put("result", errInfo); //返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java index b9f7ba14..13d4bb3b 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java @@ -4,13 +4,17 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.gf.GFConfinedSpaceGasWHService; +import com.zcloud.util.DateUtil; 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 org.apache.shiro.authz.annotation.RequiresPermissions; import javax.annotation.Resource; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -39,14 +43,21 @@ public class AppGFConfinedSpaceGasWHController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd.put("CONFINEDSPACEGASWH_ID", this.get32UUID()); //主键 - GFconfinedspacegaswhService.save(pd); + PageData pd2 = new PageData(); + pd2 = GFconfinedspacegaswhService.findById(pd); + if(pd2 != null && pd2.size()>0){ + GFconfinedspacegaswhService.edit(pd); + }else{ + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("CONFINEDSPACEGASWH_ID", this.get32UUID()); //主键 + GFconfinedspacegaswhService.save(pd); + } map.put("result", errInfo); return map; } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -72,6 +83,7 @@ public class AppGFConfinedSpaceGasWHController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 GFconfinedspacegaswhService.edit(pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java index df663519..9b3f375f 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; import javax.annotation.Resource; import java.text.DecimalFormat; @@ -37,6 +38,8 @@ public class AppGFCutRoadController extends BaseController { @Resource private GFCutRoadToMeasuresService GFcutRoadToMeasuresService; @Autowired + private GFCutRoadAcceptUserService cutroadacceptuserService; + @Autowired private SendMessageUtil sendMessageUtil; /**获取编码 * @param @@ -76,6 +79,18 @@ public class AppGFCutRoadController extends BaseController { 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 = GFcutRoadService.getCode(pd2); //根据ID读取 + String code = "DL"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); + pd = this.getPageData(); + pd.put("CHECK_NO", code); pd.put("CUTROAD_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 @@ -93,21 +108,7 @@ public class AppGFCutRoadController extends BaseController { } GFcutRoadService.save(pd); - GFcutRoadToMeasuresService.delete(pd); - if(pd.get("measuresList")!=null){ - List list = (List) JSON.parse(pd.get("measuresList").toString()); - for (JSONObject json : list) { - PageData measures = new PageData(); - measures.put("CUTROADTOMEASURES_ID", this.get32UUID()); // 主键 - measures.put("CUTROAD_ID", pd.get("CUTROAD_ID")); - measures.put("BUS_CUTROAD_MEASURES_ID", json.get("BUS_CUTROAD_MEASURES_ID")); - measures.put("STATUS", json.get("STATUS")); - measures.put("ANSWER", json.get("ANSWER")); - measures.put("CONFIRM_ID", pd.get("OPERATOR")); - measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); - GFcutRoadToMeasuresService.save(measures); - } - } + if(pd.get("APPLY_STATUS").equals("1")) { PageData log = new PageData(); log.put("CUTROADLOG_ID", this.get32UUID()); @@ -200,7 +201,7 @@ public class AppGFCutRoadController extends BaseController { /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -376,9 +377,7 @@ public class AppGFCutRoadController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional - public Object editAcceptconfess( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception { + public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -387,22 +386,147 @@ public class AppGFCutRoadController extends BaseController { pd2 = GFcutRoadService.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]; + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - 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_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); -// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); -// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - GFcutRoadService.edit(pd2); + 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("CUTROAD_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 CUTROAD_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("CUTROAD_ID", CUTROAD_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", ""); + cutroadacceptuserService.save(pd); + } + } + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/editAcceptStatus") + @ResponseBody + @Transactional + 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 = GFcutRoadService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + + PageData log = new PageData(); + log.put("CUTROADLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("CUTROAD_ID", pd.get("CUTROAD_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String 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") + ";_;") : ";_;"); +// String HAZARD_IDENTIFICATION = (StringUtils.isNotBlank(pd2.getString("HAZARD_IDENTIFICATION")) ? pd2.getString("HAZARD_IDENTIFICATION") : "") + +// (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? (pd.getString("HAZARD_IDENTIFICATION") + ";_;") : ";_;"); + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); +// pd2.put("HAZARD_IDENTIFICATION", ""); + switch (status) { + + case "6"://验收人 + 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("BREAKGROUND_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("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); +// pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFcutRoadService.edit(pd2); + log.put("ACTION", "验收通过"); + + + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + + break; + + case "-6"://审批打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFcutRoadService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + break; + default: + break; + } + GFcutRoadLogService.save(log); + map.put("result", errInfo); + return map; + } + + private void saveAcceptImg(MultipartFile[] files,String signertime, String BREAKGROUND_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("BREAKGROUND_ID", BREAKGROUND_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); + cutroadacceptuserService.save(cpd); + } + } + } + /**修改 * @param * @throws Exception @@ -466,7 +590,21 @@ public class AppGFCutRoadController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFcutRoadService.edit(pd2); log.put("ACTION", "作业负责单位通过"); - + GFcutRoadToMeasuresService.delete(pd); + if(pd.get("measuresList")!=null){ + List list = (List) JSON.parse(pd.get("measuresList").toString()); + for (JSONObject json : list) { + PageData measures = new PageData(); + measures.put("CUTROADTOMEASURES_ID", this.get32UUID()); // 主键 + measures.put("CUTROAD_ID", pd.get("CUTROAD_ID")); + measures.put("BUS_CUTROAD_MEASURES_ID", json.get("BUS_CUTROAD_MEASURES_ID")); + measures.put("STATUS", json.get("STATUS")); + measures.put("ANSWER", json.get("ANSWER")); + measures.put("CONFIRM_ID", pd.get("OPERATOR")); + measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); + GFcutRoadToMeasuresService.save(measures); + } + } // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); } @@ -734,6 +872,8 @@ public class AppGFCutRoadController extends BaseController { pd = GFcutRoadService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFcutRoadService.listAllMeasures(pd)); + map.put("imgList",cutroadacceptuserService.findByIds(pd)); + map.put("imgList1",cutroadacceptuserService.findById(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java index 1927db63..e5fa227c 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java @@ -3,21 +3,26 @@ package com.zcloud.controller.gf; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; +import com.zcloud.dto.mq.Response; +import com.zcloud.dto.mq.TenCorpDto; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.mq.util.TenCorpConst; import com.zcloud.service.gf.*; 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.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; +import com.zcloud.mq.service.SendMessageService; import javax.annotation.Resource; import java.text.DecimalFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -30,6 +35,8 @@ import java.util.*; @RequestMapping("/app/gfElectricity") public class AppGFElectricityController extends BaseController { + @Resource + private GFElectricityAcceptUserService electricityacceptuserService; @Resource private GFElectricityService GFelectricityService; @Resource @@ -40,6 +47,12 @@ public class AppGFElectricityController extends BaseController { private GFElectricityGasService GFelectricityGasService; @Autowired private SendMessageUtil sendMessageUtil; + @Autowired + private Smb smb; + + @Resource + private SendMessageService mqClient; + /**获取编码 * @param * @throws Exception @@ -77,6 +90,18 @@ public class AppGFElectricityController extends BaseController { 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 = GFelectricityService.getCode(pd2); //根据ID读取 + String code = "YD"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); + pd = this.getPageData(); + pd.put("CHECK_NO", code); pd.put("ELECTRICITY_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 @@ -120,7 +145,37 @@ public class AppGFElectricityController extends BaseController { params4.put("name", "params3");// 存入短信模板中的参数名称 params4.put("value", "确认");// 存入上面参数名称所传递的值 paramsList.add(params4); - //sendMessageUtil.sendMessages(mes, paramsList); + sendMessageUtil.sendMessages(mes, paramsList); + } + if("1".equals(pd.get("ISANALYZE"))){ + TenCorpDto tenCorpDto = new TenCorpDto(); + tenCorpDto.setMark(pd.getString("ELECTRICITY_ID")); + tenCorpDto.setMark_name("ELECTRICITY_ID"); + tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); + tenCorpDto.setTopic("eightWork"); + tenCorpDto.setData(pd); + tenCorpDto.setMessage(TenCorpConst.electricity); + + mqClient.SendDelayQueue(tenCorpDto); + // 发短信 + 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); } map.put("result", errInfo); return map; @@ -194,6 +249,17 @@ public class AppGFElectricityController extends BaseController { paramsList.add(params4); sendMessageUtil.sendMessages(mes, paramsList); } + if("1".equals(pd.get("ISANALYZE"))){ + TenCorpDto tenCorpDto = new TenCorpDto(); + tenCorpDto.setMark(pd.getString("ELECTRICITY_ID")); + tenCorpDto.setMark_name("ELECTRICITY_ID"); + tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); + tenCorpDto.setTopic("eightWork"); + tenCorpDto.setData(pd); + tenCorpDto.setMessage(TenCorpConst.electricity); + + mqClient.SendDelayQueue(tenCorpDto); + } map.put("result", errInfo); return map; } @@ -220,7 +286,7 @@ public class AppGFElectricityController extends BaseController { 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); + 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")); @@ -254,7 +320,7 @@ public class AppGFElectricityController extends BaseController { 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); + 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")); @@ -272,9 +338,7 @@ public class AppGFElectricityController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional - public Object editAcceptconfess( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception { + public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -283,22 +347,186 @@ public class AppGFElectricityController extends BaseController { pd2 = GFelectricityService.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]; + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - 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_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); -// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); -// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - GFelectricityService.edit(pd2); + 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("ELECTRICITY_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 ELECTRICITY_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("ELECTRICITY_ID", ELECTRICITY_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", ""); + electricityacceptuserService.save(pd); + } + } + } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/editAcceptStatus") + @ResponseBody + @Transactional + 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 = GFelectricityService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + PageData log = new PageData(); + log.put("ELECTRICITYLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("ELECTRICITY_ID", pd.get("ELECTRICITY_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)) { + String 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") + ";_;") : ";_;"); + pd.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + } else if ("-2".equals(status) || "-3".equals(status) || "-4".equals(status) || "-5".equals(status)) { + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); + } + + switch (status) { + + case "5"://验收人 + 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("ELECTRICITY_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")); + GFelectricityService.edit(pd2); + log.put("ACTION", "验收通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "YD_Y05");// 短信模板编码 + 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 "-5"://验收打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFelectricityService.edit(pd2); + + PageData mes3 = new PageData(); + mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes3.put("templateCode", "YD_N05");// 短信模板编码 + mes3.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes3.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList3 = new ArrayList(); + // 第1个参数 + PageData paramsc1 = new PageData(); + paramsc1.put("name", "params1");// 存入短信模板中的参数名称 + paramsc1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList3.add(paramsc1); + + // 第2个参数 + PageData paramsc2 = new PageData(); + paramsc2.put("name", "params2");// 存入短信模板中的参数名称 + paramsc2.put("value", "临时用电安全作业");// 存入上面参数名称所传递的值 + paramsList3.add(paramsc2); + // 第3个参数 + PageData paramsc3 = new PageData(); + paramsc3.put("name", "params3");// 存入短信模板中的参数名称 + paramsc3.put("value", "验收");// 存入上面参数名称所传递的值 + paramsList3.add(paramsc3); + sendMessageUtil.sendMessages(mes3, paramsList3); + break; + default: + break; + } + GFelectricityLogService.save(log); + + map.put("result", errInfo); + return map; + } + + private void saveAcceptImg(MultipartFile[] files,String signertime, String ELECTRICITY_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("ELECTRICITY_ID", ELECTRICITY_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); + electricityacceptuserService.save(cpd); + } + } + } + + /**修改 * @param * @throws Exception @@ -342,7 +570,7 @@ public class AppGFElectricityController extends BaseController { 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); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.putAll(pd); pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); @@ -393,6 +621,18 @@ public class AppGFElectricityController extends BaseController { params4.put("value", "审核");// 存入上面参数名称所传递的值 paramsList.add(params4); sendMessageUtil.sendMessages(mes, paramsList); + if("1".equals(pd.get("ISANALYZE"))){ + TenCorpDto tenCorpDto = new TenCorpDto(); + tenCorpDto.setMark(pd.getString("ELECTRICITY_ID")); + tenCorpDto.setMark_name("ELECTRICITY_ID"); + tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); + tenCorpDto.setTopic("eightWork"); + tenCorpDto.setData(pd); + tenCorpDto.setMessage(TenCorpConst.electricity); + + mqClient.SendDelayQueue(tenCorpDto); + } + } break; @@ -402,7 +642,7 @@ public class AppGFElectricityController extends BaseController { 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); + 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")); @@ -449,7 +689,7 @@ public class AppGFElectricityController extends BaseController { 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); + 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")); @@ -479,34 +719,14 @@ public class AppGFElectricityController extends BaseController { // 第3个参数 PageData params3 = new PageData(); params3.put("name", "params2");// 存入短信模板中的参数名称 - params3.put("value", "验收");// 存入上面参数名称所传递的值 + params3.put("value", "用电单位审核");// 存入上面参数名称所传递的值 paramsList.add(params3); // 第4个参数 PageData params4 = new PageData(); params4.put("name", "params3");// 存入短信模板中的参数名称 - params4.put("value", "验收");// 存入上面参数名称所传递的值 + 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", "YD_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; @@ -516,7 +736,7 @@ public class AppGFElectricityController extends BaseController { 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); + 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")); @@ -758,7 +978,97 @@ public class AppGFElectricityController extends BaseController { return map; } - /**去修改页面获取数据 + /**作废 + * @paramout + * @throws Exception + */ + @PostMapping(value="/cancel") + @ResponseBody + 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 = GFelectricityService.findById(pd); + if(cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null){ + String WORK_START_DATE = pd.getString("WORK_START_DATE"); + String ANALYZE_TIME = cpd.getString("ANALYZE_TIME"); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + System.out.println(WORK_START_DATE); + System.out.println(ANALYZE_TIME); + System.out.println("-------------123----------"); + try { + Date date1 = format.parse(WORK_START_DATE); + Date date2 = format.parse(ANALYZE_TIME); + long workTime = date1.getTime(); + long analyzeTime = date2.getTime(); + System.out.println(workTime - analyzeTime); + System.out.println(analyzeTime - workTime); + if (workTime - analyzeTime >= 0) { + return; + } else { + GFelectricityService.cancel(pd); + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid + mes.put("templateCode", "YD_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{ + GFelectricityService.cancel(pd); + PageData pd2 = new PageData(); + pd2 = GFelectricityService.checkno(pd); + PageData pd3 = new PageData(); + pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); + pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + GFelectricityService.editSpecialwork(pd3); + GFelectricityService.editSpecialwork1(pd3); + GFelectricityService.editSpecialwork2(pd3); + GFelectricityService.editSpecialwork3(pd3); + GFelectricityService.editSpecialwork4(pd3); + GFelectricityService.editSpecialwork5(pd3); + GFelectricityService.editSpecialwork6(pd3); + GFelectricityService.editSpecialwork7(pd3); + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid + mes.put("templateCode", "YD_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); + } + map.put("result", errInfo); //返回结果 + return ; + } + + /**去修改页面获取数据 * @param * @throws Exception */ @@ -772,6 +1082,8 @@ public class AppGFElectricityController extends BaseController { pd = GFelectricityService.findById(pd); //根据ID读取 map.put("measuresList", GFelectricityService.listAllMeasures(pd)); map.put("gasList", GFelectricityGasService.listAll(pd)); + map.put("imgList1",electricityacceptuserService.findById(pd)); + map.put("imgList",electricityacceptuserService.findByIds(pd)); map.put("pd", pd); map.put("result", errInfo); return map; @@ -824,6 +1136,7 @@ public class AppGFElectricityController extends BaseController { pd.put("ELECTRICITYGAS_ID", this.get32UUID()); //主键 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 GFelectricityGasService.save(pd); + GFelectricityService.edittime(pd); map.put("result", errInfo); //返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java index 331d0a70..0acf912e 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; import javax.annotation.Resource; import java.io.File; @@ -32,7 +33,9 @@ import java.util.*; @RequestMapping("/app/gfHighwork") public class AppGFHighWorkController extends BaseController { - @Resource + @Autowired + private GFHighWorkAcceptUserService highworkacceptuserService; + @Autowired private GFHighWorkService GFhighworkService; @Resource private GFHighWorkLogService GFhighWorkLogService; @@ -40,6 +43,8 @@ public class AppGFHighWorkController extends BaseController { private GFHighWorkToMeasuresService GFhighWorkToMeasuresService; @Autowired private SendMessageUtil sendMessageUtil; + @Autowired + private Smb smb; /**获取编码 * @param * @throws Exception @@ -76,6 +81,18 @@ public class AppGFHighWorkController extends BaseController { 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 = GFhighworkService.getCode(pd2); //根据ID读取 + String code = "GK"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); + pd = this.getPageData(); + pd.put("CHECK_NO", code); pd.put("HIGHWORK_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 @@ -126,7 +143,7 @@ public class AppGFHighWorkController extends BaseController { } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -220,7 +237,7 @@ public class AppGFHighWorkController extends BaseController { 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); + 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")); @@ -296,7 +313,7 @@ public class AppGFHighWorkController extends BaseController { 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); + 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")); @@ -314,9 +331,7 @@ public class AppGFHighWorkController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional - public Object editAcceptconfess( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception { + public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -325,22 +340,191 @@ public class AppGFHighWorkController extends BaseController { pd2 = GFhighworkService.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]; + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - 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_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); -// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); -// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - GFhighworkService.edit(pd2); + 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("HIGHWORK_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 HIGHWORK_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("HIGHWORK_ID", HIGHWORK_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", ""); + highworkacceptuserService.save(pd); + } + } + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/editAcceptStatus") + @ResponseBody + @Transactional + 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 = GFhighworkService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 +// pd2.put("OTHER_PROTECTIVE_MEASURES", pd.get("OTHER_PROTECTIVE_MEASURES")); //修改人 +// pd2.put("HAZARD_IDENTIFICATION", pd.get("HAZARD_IDENTIFICATION")); //修改人 + PageData log = new PageData(); + log.put("HIGHWORKLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("HIGHWORK_ID", pd.get("HIGHWORK_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String OTHER_PROTECTIVE_MEASURES = pd2.getString("OTHER_PROTECTIVE_MEASURES"); + if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status)) { + 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") + ";_;") : ";_;"); +// 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") + ";_;") : ";_;")); +// pd2.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd2.getString("HAZARD_IDENTIFICATION")) ? pd2.getString("HAZARD_IDENTIFICATION") : "") + +// (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? (pd.getString("HAZARD_IDENTIFICATION") + ";_;") : ";_;")); + } else if ("-2".equals(status) || "-3".equals(status) || "-4".equals(status) || "-5".equals(status) || "-6".equals(status)) { + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); +// pd2.put("HAZARD_IDENTIFICATION", ""); + } + switch (status) { + + case "6"://验收人 + 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("HIGHWORK_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("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFhighworkService.edit(pd2); + log.put("ACTION", "验收通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid + mes.put("templateCode", "GK_Y06");// 短信模板编码 + 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 "-6"://验收人打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFhighworkService.edit(pd2); + + + // 发短信 + PageData mes3 = new PageData(); + mes3.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid + mes3.put("templateCode", "GK_N06");// 短信模板编码 + 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; + default: + break; + } + GFhighWorkLogService.save(log); + map.put("result", errInfo); + return map; + } + private void saveAcceptImg(MultipartFile[] files,String signertime, String HIGHWORK_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("HIGHWORK_ID", HIGHWORK_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); + highworkacceptuserService.save(cpd); + } + } + } + /**修改 * @param * @throws Exception @@ -392,7 +576,7 @@ public class AppGFHighWorkController extends BaseController { 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); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -479,7 +663,7 @@ public class AppGFHighWorkController extends BaseController { 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); + 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")); @@ -545,7 +729,7 @@ public class AppGFHighWorkController extends BaseController { 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); + 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")); @@ -603,7 +787,7 @@ public class AppGFHighWorkController extends BaseController { 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); + 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")); @@ -651,7 +835,7 @@ public class AppGFHighWorkController extends BaseController { 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); + 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")); @@ -941,6 +1125,8 @@ public class AppGFHighWorkController extends BaseController { pd = GFhighworkService.findById(pd); //根据ID读取 map.put("measuresList", GFhighworkService.listAllMeasures(pd)); map.put("pd", pd); + map.put("imgList1",highworkacceptuserService.findById(pd)); + map.put("imgList",highworkacceptuserService.findByIds(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java index 7d87b63b..32c52b33 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; import javax.annotation.Resource; import java.text.DecimalFormat; @@ -30,6 +31,8 @@ import java.util.*; @RequestMapping("/app/gfHoisting") public class AppGFHoistingController extends BaseController { + @Autowired + private GFHoistingAcceptUserService hoistingacceptuserService; @Resource private GFHoistingService GFhoistingService; @Resource @@ -74,6 +77,18 @@ public class AppGFHoistingController extends BaseController { 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")); + System.out.println(pd.get("CORPINFO_ID")); + pd2 = GFhoistingService.getCode(pd2); //根据ID读取 + String code = "DZ"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); + pd.put("CHECK_NO", code); pd.put("HOISTING_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 @@ -267,9 +282,7 @@ public class AppGFHoistingController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional - public Object editAcceptconfess( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception { + public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -278,22 +291,189 @@ public class AppGFHoistingController extends BaseController { pd2 = GFhoistingService.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]; + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - 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_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); -// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); -// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - GFhoistingService.edit(pd2); + 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("HOISTING_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 HOISTING_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("HOISTING_ID", HOISTING_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", ""); + hoistingacceptuserService.save(pd); + } + } + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/editAcceptStatus") + @ResponseBody + @Transactional + 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 = GFhoistingService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 +// pd2.put("OTHER_PROTECTIVE_MEASURES", pd.get("OTHER_PROTECTIVE_MEASURES")); //修改人 +// pd2.put("HAZARD_IDENTIFICATION", pd.get("HAZARD_IDENTIFICATION")); //修改人 + PageData log = new PageData(); + log.put("HOISTINGLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("HOISTING_ID", pd.get("HOISTING_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String 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") + ";_;") : ";_;"); +// String HAZARD_IDENTIFICATION = (StringUtils.isNotBlank(pd2.getString("HAZARD_IDENTIFICATION")) ? pd2.getString("HAZARD_IDENTIFICATION") : "") + +// (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? (pd.getString("HAZARD_IDENTIFICATION") + ";_;") : ";_;"); + + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); +// pd2.put("HAZARD_IDENTIFICATION", ""); + switch (status) { + + case "6"://验收人 + 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("HOISTING_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("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFhoistingService.edit(pd2); + log.put("ACTION", "验收通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid + mes.put("templateCode", "DZ_Y06");// 短信模板编码 + 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 "-6"://审批打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFhoistingService.edit(pd2); + + + // 发短信 + PageData mes3 = new PageData(); + mes3.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid + mes3.put("templateCode", "DZ_N06");// 短信模板编码 + 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; + default: + break; + } + GFhighWorkLogService.save(log); + map.put("result", errInfo); + return map; + } + private void saveAcceptImg(MultipartFile[] files,String signertime, String HOISTING_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("HOISTING_ID", HOISTING_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); + hoistingacceptuserService.save(cpd); + } + } + } + + /**修改 * @param * @throws Exception @@ -886,6 +1066,8 @@ public class AppGFHoistingController extends BaseController { pd = this.getPageData(); pd = GFhoistingService.findById(pd); //根据ID读取 map.put("measuresList", GFhoistingService.listAllMeasures(pd)); + map.put("imgList",hoistingacceptuserService.findByIds(pd)); + map.put("imgList1",hoistingacceptuserService.findById(pd)); map.put("pd", pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java index 73c147e8..69f1af4d 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java @@ -3,21 +3,26 @@ package com.zcloud.controller.gf; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; +import com.zcloud.dto.mq.Response; +import com.zcloud.dto.mq.TenCorpDto; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.mq.service.SendMessageService; +import com.zcloud.mq.util.TenCorpConst; import com.zcloud.service.gf.*; 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.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +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.*; /** @@ -32,7 +37,9 @@ public class AppGFHotworkController extends BaseController { @Resource private GFHotworkService GFhotworkService; - @Resource + @Autowired + private GFHotworkAcceptUserService hotworkacceptuserService; + @Autowired private GFHotworkLogService GFhotworkLogService; @Resource private GFHotworkToMeasuresService GFhotworkToMeasuresService; @@ -40,7 +47,14 @@ public class AppGFHotworkController extends BaseController { private GFHotworkGasService GFhotworkGasService; @Autowired private SendMessageUtil sendMessageUtil; - /**获取编码 + @Autowired + private Smb smb; + @Resource + private SendMessageService mqClient; + + /** + * 获取编码 + * * @param * @throws Exception */ @@ -76,10 +90,22 @@ public class AppGFHotworkController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - 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-否 + 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 = GFhotworkService.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-否 GFhotworkService.save(pd); if(pd.get("APPLY_STATUS").equals("1")) { @@ -120,14 +146,41 @@ public class AppGFHotworkController extends BaseController { 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); + + mqClient.SendDelayQueue(tenCorpDto); map.put("result", errInfo); return map; } /**删除 - * @param out - * @throws Exception */ @RequestMapping(value="/delete") @ResponseBody @@ -194,6 +247,15 @@ public class AppGFHotworkController extends BaseController { 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); + + mqClient.SendDelayQueue(tenCorpDto); map.put("result", errInfo); return map; } @@ -273,9 +335,7 @@ public class AppGFHotworkController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional - public Object editAcceptconfess( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception { + public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -284,23 +344,190 @@ public class AppGFHotworkController extends BaseController { pd2 = GFhotworkService.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]; + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - 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_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); -// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); -// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - GFhotworkService.edit(pd2); + 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", ""); + hotworkacceptuserService.save(pd); + } + } + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editAcceptStatus") + @ResponseBody + @Transactional + 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 = GFhotworkService.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")); + GFhotworkService.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")); + GFhotworkService.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; + } + GFhotworkLogService.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); + hotworkacceptuserService.save(cpd); + } + } + } + + /** + * 修改 + * * @param * @throws Exception */ @@ -653,25 +880,25 @@ public class AppGFHotworkController extends BaseController { 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); +// // 发短信 +// 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; @@ -932,8 +1159,136 @@ public class AppGFHotworkController extends BaseController { return map; } - public static void main(String[] args) { - System.out.println(UuidUtil.get32UUID()); + /** + * 作废 + * + */ + @PostMapping(value = "/cancel") + @ResponseBody + 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 = GFhotworkService.findById(pd); + if (cpd != null && cpd.size() > 0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("MONITOR_USER_SIGNER_TIME") != null) { +// 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 { +// hotworkService.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 && cpd.getString("ANALYZE_TIME") == null){ + pd.put("APPLY_STATUS",-98); + GFhotworkService.cancel(pd); + PageData pd2 = new PageData(); + pd2 = GFhotworkService.checkno(pd); + PageData pd3 = new PageData(); + pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); + pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + GFhotworkService.editSpecialwork(pd3); + GFhotworkService.editSpecialwork1(pd3); + GFhotworkService.editSpecialwork2(pd3); + GFhotworkService.editSpecialwork3(pd3); + GFhotworkService.editSpecialwork4(pd3); + GFhotworkService.editSpecialwork5(pd3); + GFhotworkService.editSpecialwork6(pd3); + GFhotworkService.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 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("MONITOR_USER_SIGNER_TIME") == null){ + pd.put("APPLY_STATUS",-99); + GFhotworkService.cancel(pd); + PageData pd2 = new PageData(); + pd2 = GFhotworkService.checkno(pd); + PageData pd3 = new PageData(); + pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); + pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + GFhotworkService.editSpecialwork(pd3); + GFhotworkService.editSpecialwork1(pd3); + GFhotworkService.editSpecialwork2(pd3); + GFhotworkService.editSpecialwork3(pd3); + GFhotworkService.editSpecialwork4(pd3); + GFhotworkService.editSpecialwork5(pd3); + GFhotworkService.editSpecialwork6(pd3); + GFhotworkService.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 ; } /**列表 @@ -1032,6 +1387,8 @@ public class AppGFHotworkController extends BaseController { pd = GFhotworkService.findById(pd); //根据ID读取 map.put("measuresList", GFhotworkService.listAllMeasures(pd)); map.put("gasList", GFhotworkGasService.listAll(pd)); + map.put("imgList",hotworkacceptuserService.findByIds(pd)); + map.put("imgList1",hotworkacceptuserService.findById(pd)); map.put("pd", pd); map.put("result", errInfo); return map; @@ -1084,6 +1441,7 @@ public class AppGFHotworkController extends BaseController { pd.put("HOTWORKGAS_ID", this.get32UUID()); //主键 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 GFhotworkGasService.save(pd); + GFhotworkService.edittime(pd); map.put("result", errInfo); //返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java index 0f426f6d..6a15271b 100644 --- a/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.gf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFBlindBoardAcceptUserService; import com.zcloud.service.gf.GFBlindBoardInfoService; import com.zcloud.service.gf.GFBlindBoardService; import com.zcloud.util.Jurisdiction; @@ -35,6 +36,8 @@ public class GFBlindBoardController extends BaseController { private GFBlindBoardService GFblindboardService; @Autowired private GFBlindBoardInfoService GFblindBoardInfoService; + @Autowired + private GFBlindBoardAcceptUserService blindboardacceptuserService; /**新增 * @param @@ -132,6 +135,8 @@ public class GFBlindBoardController extends BaseController { pd = GFblindboardService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFblindboardService.listAllMeasures(pd)); + map.put("imgList",blindboardacceptuserService.findByIds(pd)); + map.put("imgList1",blindboardacceptuserService.findById(pd)); map.put("boardList", GFblindBoardInfoService.listAll(pd)); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java b/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java index 76e7fe7a..285fd878 100644 --- a/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java +++ b/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.gf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFBreakGroundAcceptUserService; import com.zcloud.service.gf.GFBreakGroundService; import com.zcloud.util.Jurisdiction; import com.zcloud.util.ObjectExcelView; @@ -31,6 +32,8 @@ public class GFBreakGroundController extends BaseController { @Autowired private GFBreakGroundService GFbreakgroundService; + @Autowired + private GFBreakGroundAcceptUserService breakgroundacceptuserService; /**新增 * @param @@ -51,7 +54,7 @@ public class GFBreakGroundController extends BaseController { } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -129,6 +132,8 @@ public class GFBreakGroundController extends BaseController { pd = GFbreakgroundService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFbreakgroundService.listAllMeasures(pd)); + map.put("imgList",breakgroundacceptuserService.findByIds(pd)); + map.put("imgList1",breakgroundacceptuserService.findById(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java index 73d14fd1..1f6aa9f8 100644 --- a/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.gf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFConfinedSpaceAcceptUserService; import com.zcloud.service.gf.GFConfinedSpaceGasService; import com.zcloud.service.gf.GFConfinedSpaceGasWHService; import com.zcloud.service.gf.GFConfinedSpaceService; @@ -38,6 +39,10 @@ public class GFConfinedSpaceController extends BaseController { private GFConfinedSpaceGasService GFconfinedspaceGasService; @Resource private GFConfinedSpaceGasWHService GFconfinedspacegaswhService; + @Autowired + private GFConfinedSpaceService confinedspaceService; + @Autowired + private GFConfinedSpaceAcceptUserService confinedspaceacceptuserService; /**新增 * @param * @throws Exception @@ -57,7 +62,7 @@ public class GFConfinedSpaceController extends BaseController { } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -135,6 +140,8 @@ public class GFConfinedSpaceController extends BaseController { pd = GFconfinedspaceService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFconfinedspaceService.listAllMeasures(pd)); + map.put("imgList",confinedspaceacceptuserService.findByIds(pd)); + map.put("imgList1",confinedspaceacceptuserService.findById(pd)); map.put("gasList", GFconfinedspaceGasService.listAll(pd)); map.put("gas", GFconfinedspacegaswhService.findById(pd)); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/gf/GFCutRoadController.java b/src/main/java/com/zcloud/controller/gf/GFCutRoadController.java index 7173ffea..e38c5973 100644 --- a/src/main/java/com/zcloud/controller/gf/GFCutRoadController.java +++ b/src/main/java/com/zcloud/controller/gf/GFCutRoadController.java @@ -3,11 +3,13 @@ package com.zcloud.controller.gf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFCutRoadAcceptUserService; import com.zcloud.service.gf.GFCutRoadService; 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; @@ -31,7 +33,8 @@ public class GFCutRoadController extends BaseController { @Resource private GFCutRoadService GFcutroadService; - + @Autowired + private GFCutRoadAcceptUserService cutroadacceptuserService; /** * 新增 * @@ -139,6 +142,8 @@ public class GFCutRoadController extends BaseController { pd = GFcutroadService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFcutroadService.listAllMeasures(pd)); + map.put("imgList",cutroadacceptuserService.findByIds(pd)); + map.put("imgList1",cutroadacceptuserService.findById(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/GFElectricityController.java b/src/main/java/com/zcloud/controller/gf/GFElectricityController.java index 95f0fc8d..0dd02f1a 100644 --- a/src/main/java/com/zcloud/controller/gf/GFElectricityController.java +++ b/src/main/java/com/zcloud/controller/gf/GFElectricityController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.gf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFElectricityAcceptUserService; import com.zcloud.service.gf.GFElectricityGasService; import com.zcloud.service.gf.GFElectricityService; import com.zcloud.util.Jurisdiction; @@ -34,6 +35,8 @@ public class GFElectricityController extends BaseController { private GFElectricityService GFelectricityService; @Autowired private GFElectricityGasService GFelectricityGasService; + @Autowired + private GFElectricityAcceptUserService electricityacceptuserService; /**新增 * @param * @throws Exception @@ -53,7 +56,7 @@ public class GFElectricityController extends BaseController { } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -131,6 +134,8 @@ public class GFElectricityController extends BaseController { pd = GFelectricityService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFelectricityService.listAllMeasures(pd)); + map.put("imgList",electricityacceptuserService.findByIds(pd)); + map.put("imgList1",electricityacceptuserService.findById(pd)); map.put("gasList", GFelectricityGasService.listAll(pd)); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java b/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java index 39590313..ea6f0a68 100644 --- a/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java +++ b/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.gf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFHighWorkAcceptUserService; import com.zcloud.service.gf.GFHighWorkService; import com.zcloud.util.Jurisdiction; import com.zcloud.util.ObjectExcelView; @@ -31,6 +32,8 @@ public class GFHighWorkController extends BaseController { @Autowired private GFHighWorkService GFhighworkService; + @Autowired + private GFHighWorkAcceptUserService highworkacceptuserService; /**新增 * @param @@ -129,6 +132,8 @@ public class GFHighWorkController extends BaseController { pd = GFhighworkService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFhighworkService.listAllMeasures(pd)); + map.put("imgList",highworkacceptuserService.findByIds(pd)); + map.put("imgList1",highworkacceptuserService.findById(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/GFHoistingController.java b/src/main/java/com/zcloud/controller/gf/GFHoistingController.java index 08f9ecf1..3d13a354 100644 --- a/src/main/java/com/zcloud/controller/gf/GFHoistingController.java +++ b/src/main/java/com/zcloud/controller/gf/GFHoistingController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.gf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFHoistingAcceptUserService; import com.zcloud.service.gf.GFHoistingService; import com.zcloud.util.Jurisdiction; import com.zcloud.util.ObjectExcelView; @@ -31,6 +32,8 @@ public class GFHoistingController extends BaseController { @Autowired private GFHoistingService GFhoistingService; + @Autowired + private GFHoistingAcceptUserService hoistingacceptuserService; /**新增 * @param @@ -129,6 +132,8 @@ public class GFHoistingController extends BaseController { pd = GFhoistingService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFhoistingService.listAllMeasures(pd)); + map.put("imgList",hoistingacceptuserService.findByIds(pd)); + map.put("imgList1",hoistingacceptuserService.findById(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/GFHotworkController.java b/src/main/java/com/zcloud/controller/gf/GFHotworkController.java index a9b3ee7a..d5b7a85f 100644 --- a/src/main/java/com/zcloud/controller/gf/GFHotworkController.java +++ b/src/main/java/com/zcloud/controller/gf/GFHotworkController.java @@ -34,6 +34,8 @@ public class GFHotworkController extends BaseController { private GFHotworkService GFhotworkService; @Autowired private GFHotworkGasService GFhotworkGasService; + @Autowired + private GFHotworkAcceptUserService hotworkacceptuserService; /**新增 * @param * @throws Exception @@ -53,7 +55,6 @@ public class GFHotworkController extends BaseController { } /**删除 - * @param out * @throws Exception */ @RequestMapping(value="/delete") @@ -132,6 +133,8 @@ public class GFHotworkController extends BaseController { map.put("pd", pd); map.put("measuresList", GFhotworkService.listAllMeasures(pd)); map.put("gasList", GFhotworkGasService.listAll(pd)); + map.put("imgList",hotworkacceptuserService.findByIds(pd)); + map.put("imgList1",hotworkacceptuserService.findById(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/dto/mq/Response.java b/src/main/java/com/zcloud/dto/mq/Response.java new file mode 100644 index 00000000..0e9ba3dc --- /dev/null +++ b/src/main/java/com/zcloud/dto/mq/Response.java @@ -0,0 +1,68 @@ +package com.zcloud.dto.mq; + +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 = "succeed"; + 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/mq/TenCorpDto.java b/src/main/java/com/zcloud/dto/mq/TenCorpDto.java new file mode 100644 index 00000000..ca168261 --- /dev/null +++ b/src/main/java/com/zcloud/dto/mq/TenCorpDto.java @@ -0,0 +1,46 @@ +package com.zcloud.dto.mq; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.entity.PageData; +import com.zcloud.util.Warden; +import lombok.Data; + +@Data +public class TenCorpDto { + // 请秋id + private String id; + // 消息来源名称 + private String producer_name; + 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", JSONObject.toJSONString(this.data)); + info.put("TOPIC",this.topic); + return info; + } +} diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/EightWorkMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/EightWorkMapper.java new file mode 100644 index 00000000..8a964f74 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/EightWorkMapper.java @@ -0,0 +1,25 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：有限空间作业 + * 作者：luoxiaobao + * 时间：2021-09-13 + * 官网：www.zcloudchina.com + */ +public interface EightWorkMapper { + + + + /**列表 + * @param page + * @throws Exception + */ + List datalist(Page page); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFBlindBoardAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFBlindBoardAcceptUserMapper.java new file mode 100644 index 00000000..e33867bf --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFBlindBoardAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFBlindBoardAcceptUserMapper { + + /**新增 + * @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/gf/GFBreakGroundAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFBreakGroundAcceptUserMapper.java new file mode 100644 index 00000000..3c854668 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFBreakGroundAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFBreakGroundAcceptUserMapper { + + /**新增 + * @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/gf/GFConfinedSpaceAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceAcceptUserMapper.java new file mode 100644 index 00000000..f4f0179c --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFConfinedSpaceAcceptUserMapper { + + /**新增 + * @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/gf/GFConfinedSpaceGasMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasMapper.java index acdb18ea..7492ca35 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasMapper.java @@ -49,6 +49,8 @@ public interface GFConfinedSpaceGasMapper{ */ PageData findById(PageData pd); + PageData gasEdit(PageData pd); + /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasWHMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasWHMapper.java index d8d112ac..0a2e6f26 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasWHMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasWHMapper.java @@ -30,7 +30,7 @@ public interface GFConfinedSpaceGasWHMapper{ * @throws Exception */ void edit(PageData pd); - + void edittime(PageData pd); /**列表 * @param page * @throws Exception diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceMapper.java index 87a9eac5..66b9fe31 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceMapper.java @@ -25,6 +25,21 @@ public interface GFConfinedSpaceMapper{ */ void delete(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); + + /**修改 * @param pd * @throws Exception diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFCutRoadAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFCutRoadAcceptUserMapper.java new file mode 100644 index 00000000..e17db6fd --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFCutRoadAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFCutRoadAcceptUserMapper { + + /**新增 + * @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/gf/GFElectricityAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFElectricityAcceptUserMapper.java new file mode 100644 index 00000000..03fc6d6e --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFElectricityAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFElectricityAcceptUserMapper { + + /**新增 + * @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/gf/GFElectricityMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFElectricityMapper.java index 0b93c78e..17cbb7bc 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gf/GFElectricityMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFElectricityMapper.java @@ -30,6 +30,7 @@ public interface GFElectricityMapper{ * @throws Exception */ void edit(PageData pd); + void edittime(PageData pd); /**列表 * @param page @@ -52,6 +53,22 @@ public interface GFElectricityMapper{ */ 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); + + + /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFHighWorkAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFHighWorkAcceptUserMapper.java new file mode 100644 index 00000000..9a7ea495 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFHighWorkAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFHighWorkAcceptUserMapper { + + /**新增 + * @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/gf/GFHoistingAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFHoistingAcceptUserMapper.java new file mode 100644 index 00000000..e03f6ea7 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFHoistingAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFHoistingAcceptUserMapper { + + /**新增 + * @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/gf/GFHotworkAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFHotworkAcceptUserMapper.java new file mode 100644 index 00000000..52a907cc --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFHotworkAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFHotworkAcceptUserMapper { + + /**新增 + * @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/gf/GFHotworkMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFHotworkMapper.java index ac8dccc4..ce6b4f38 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gf/GFHotworkMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFHotworkMapper.java @@ -52,6 +52,22 @@ public interface GFHotworkMapper{ */ 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 diff --git a/src/main/java/com/zcloud/mq/controller/EightWorkListener.java b/src/main/java/com/zcloud/mq/controller/EightWorkListener.java new file mode 100644 index 00000000..c99519e0 --- /dev/null +++ b/src/main/java/com/zcloud/mq/controller/EightWorkListener.java @@ -0,0 +1,87 @@ +package com.zcloud.mq.controller; + +import com.alibaba.fastjson.JSON; +import com.zcloud.controller.gf.GFEightWorkController; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mq.MqMessageLogMapper; +import com.zcloud.dto.mq.TenCorpDto; +import com.zcloud.mq.service.LogService; +import com.zcloud.mq.service.SendMessageService; +import com.zcloud.mq.util.MqUtil; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Warden; +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 GFEightWorkController eightWorkClient; + + @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("受限空间模块消费"); +// eightWorkClient.confinedSpaceCancel(data.getData()); + break; + case "electricity": + System.out.println("临时用电模块消费"); +// eightWorkClient.electricityCancel(data.getData()); + break; + case "hot-work": + System.out.println("动火模块消费"); +// eightWorkClient.hotWorkCancel(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/mq/controller/MqListener.java b/src/main/java/com/zcloud/mq/controller/MqListener.java new file mode 100644 index 00000000..2ca3f4e0 --- /dev/null +++ b/src/main/java/com/zcloud/mq/controller/MqListener.java @@ -0,0 +1,32 @@ +package com.zcloud.mq.controller; + +import com.alibaba.fastjson.JSON; +import com.zcloud.dto.mq.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/mq/controller/SendController.java b/src/main/java/com/zcloud/mq/controller/SendController.java new file mode 100644 index 00000000..b6bbcd50 --- /dev/null +++ b/src/main/java/com/zcloud/mq/controller/SendController.java @@ -0,0 +1,54 @@ +package com.zcloud.mq.controller; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.dto.mq.Response; +import com.zcloud.dto.mq.TenCorpDto; +import com.zcloud.mq.service.SendMessageService; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@RestController +@RequestMapping("/messageQueue") +public class SendController extends BaseController { + + @Resource + private SendMessageService sendMessageService; + + @RequestMapping("/sendMessage") + public Response sendMessage(@RequestParam("tenCorpDto") TenCorpDto tenCorpDto) throws Exception { + try { + sendMessageService.sendMessage(tenCorpDto); + } catch (Exception e) { + e.printStackTrace(); + } + return Response.OK(); + } + + @PostMapping("SendTimelyQueue") + public Response timelyQueue(@RequestBody TenCorpDto tenCorpDto) throws Exception { + try { + sendMessageService.sendMessage(tenCorpDto); + } catch (Exception e) { + e.printStackTrace(); + } + return Response.OK(); + } + + @PostMapping("/SendDelayQueue") + 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/mq/service/LogService.java b/src/main/java/com/zcloud/mq/service/LogService.java new file mode 100644 index 00000000..1c963440 --- /dev/null +++ b/src/main/java/com/zcloud/mq/service/LogService.java @@ -0,0 +1,11 @@ +package com.zcloud.mq.service; + +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/mq/service/SendMessageService.java b/src/main/java/com/zcloud/mq/service/SendMessageService.java new file mode 100644 index 00000000..1a49f784 --- /dev/null +++ b/src/main/java/com/zcloud/mq/service/SendMessageService.java @@ -0,0 +1,11 @@ +package com.zcloud.mq.service; + +import com.zcloud.dto.mq.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/mq/service/impl/LogServiceImpl.java b/src/main/java/com/zcloud/mq/service/impl/LogServiceImpl.java new file mode 100644 index 00000000..7c8c0e2d --- /dev/null +++ b/src/main/java/com/zcloud/mq/service/impl/LogServiceImpl.java @@ -0,0 +1,43 @@ +package com.zcloud.mq.service.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mq.MqErrorMessageLogMapper; +import com.zcloud.mapper.datasource.mq.MqMessageLogMapper; +import com.zcloud.mq.service.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/mq/service/impl/SendMessageServiceImpl.java b/src/main/java/com/zcloud/mq/service/impl/SendMessageServiceImpl.java new file mode 100644 index 00000000..0538a358 --- /dev/null +++ b/src/main/java/com/zcloud/mq/service/impl/SendMessageServiceImpl.java @@ -0,0 +1,129 @@ +package com.zcloud.mq.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.zcloud.dto.mq.TenCorpDto; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mq.MqErrorMessageLogMapper; +import com.zcloud.mapper.datasource.mq.MqMessageLogMapper; +import com.zcloud.mq.service.LogService; +import com.zcloud.mq.service.SendMessageService; +import com.zcloud.mq.util.MqUtil; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Warden; +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/mq/util/Const.java b/src/main/java/com/zcloud/mq/util/Const.java new file mode 100644 index 00000000..2150eb63 --- /dev/null +++ b/src/main/java/com/zcloud/mq/util/Const.java @@ -0,0 +1,6 @@ +package com.zcloud.mq.util; + +public class Const { + public static final String topic_eightWork="eightWork"; + public static final String topic_info="info"; +} diff --git a/src/main/java/com/zcloud/mq/util/MqUtil.java b/src/main/java/com/zcloud/mq/util/MqUtil.java new file mode 100644 index 00000000..7f1ba12e --- /dev/null +++ b/src/main/java/com/zcloud/mq/util/MqUtil.java @@ -0,0 +1,84 @@ +package com.zcloud.mq.util; + +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 1; + } + 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/java/com/zcloud/mq/util/TenCorpConst.java b/src/main/java/com/zcloud/mq/util/TenCorpConst.java new file mode 100644 index 00000000..55a049d0 --- /dev/null +++ b/src/main/java/com/zcloud/mq/util/TenCorpConst.java @@ -0,0 +1,7 @@ +package com.zcloud.mq.util; + +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/service/gf/EightWorkService.java b/src/main/java/com/zcloud/service/gf/EightWorkService.java new file mode 100644 index 00000000..fbfd0243 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/EightWorkService.java @@ -0,0 +1,25 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：有限空间作业 + * 作者：luoxiaobao + * 时间：2021-09-13 + * 官网：www.zcloudchina.com + */ +public interface EightWorkService { + + + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + +} + diff --git a/src/main/java/com/zcloud/service/gf/GFBlindBoardAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFBlindBoardAcceptUserService.java new file mode 100644 index 00000000..c86c8c80 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFBlindBoardAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFBlindBoardAcceptUserService { + + /**新增 + * @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/gf/GFBreakGroundAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFBreakGroundAcceptUserService.java new file mode 100644 index 00000000..2feb52b0 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFBreakGroundAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFBreakGroundAcceptUserService { + + /**新增 + * @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/gf/GFConfinedSpaceAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceAcceptUserService.java new file mode 100644 index 00000000..7de9a200 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFConfinedSpaceAcceptUserService { + + /**新增 + * @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/gf/GFConfinedSpaceGasService.java b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasService.java index 8f4ccb3b..deaadb8d 100644 --- a/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasService.java +++ b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasService.java @@ -48,6 +48,7 @@ public interface GFConfinedSpaceGasService{ * @throws Exception */ public PageData findById(PageData pd)throws Exception; + public PageData gasEdit(PageData pd)throws Exception; /**批量删除 * @param ArrayDATA_IDS diff --git a/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasWHService.java b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasWHService.java index c6f6c43f..a8a22105 100644 --- a/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasWHService.java +++ b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasWHService.java @@ -30,7 +30,7 @@ public interface GFConfinedSpaceGasWHService{ * @throws Exception */ public void edit(PageData pd)throws Exception; - + public void edittime(PageData pd)throws Exception; /**列表 * @param page * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/GFConfinedSpaceService.java b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceService.java index 43259d5c..edb8df75 100644 --- a/src/main/java/com/zcloud/service/gf/GFConfinedSpaceService.java +++ b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceService.java @@ -25,6 +25,19 @@ public interface GFConfinedSpaceService{ */ public void delete(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; + /**修改 * @param pd * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/GFCutRoadAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFCutRoadAcceptUserService.java new file mode 100644 index 00000000..74133285 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFCutRoadAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFCutRoadAcceptUserService { + + /**新增 + * @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/gf/GFElectricityAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFElectricityAcceptUserService.java new file mode 100644 index 00000000..483492e1 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFElectricityAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFElectricityAcceptUserService { + + /**新增 + * @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/gf/GFElectricityService.java b/src/main/java/com/zcloud/service/gf/GFElectricityService.java index 91750cec..106aa3f0 100644 --- a/src/main/java/com/zcloud/service/gf/GFElectricityService.java +++ b/src/main/java/com/zcloud/service/gf/GFElectricityService.java @@ -30,7 +30,7 @@ public interface GFElectricityService{ * @throws Exception */ public void edit(PageData pd)throws Exception; - + public void edittime(PageData pd)throws Exception; /**列表 * @param page * @throws Exception @@ -52,6 +52,20 @@ public interface GFElectricityService{ */ 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; + + /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/GFHighWorkAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFHighWorkAcceptUserService.java new file mode 100644 index 00000000..53966691 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFHighWorkAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFHighWorkAcceptUserService { + + /**新增 + * @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/gf/GFHoistingAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFHoistingAcceptUserService.java new file mode 100644 index 00000000..2dc213c0 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFHoistingAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFHoistingAcceptUserService { + + /**新增 + * @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/gf/GFHotworkAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFHotworkAcceptUserService.java new file mode 100644 index 00000000..5b48a4f2 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFHotworkAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFHotworkAcceptUserService { + + /**新增 + * @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/gf/GFHotworkService.java b/src/main/java/com/zcloud/service/gf/GFHotworkService.java index 5aef64c7..69be0580 100644 --- a/src/main/java/com/zcloud/service/gf/GFHotworkService.java +++ b/src/main/java/com/zcloud/service/gf/GFHotworkService.java @@ -51,6 +51,21 @@ public interface GFHotworkService{ * @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 diff --git a/src/main/java/com/zcloud/service/gf/impl/CutRoadAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/CutRoadAcceptUserServiceImpl.java new file mode 100644 index 00000000..b258f7db --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/CutRoadAcceptUserServiceImpl.java @@ -0,0 +1,121 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFCutRoadAcceptUserMapper; +import com.zcloud.service.gf.GFCutRoadAcceptUserService; +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 CutRoadAcceptUserServiceImpl implements GFCutRoadAcceptUserService { + + @Autowired + private GFCutRoadAcceptUserMapper cutroadacceptuserMapper; + + /** + * 新增 + * + * @param pd + * @throws Exception + */ + public void save(PageData pd) throws Exception { + cutroadacceptuserMapper.save(pd); + } + + /** + * 删除 + * + * @param pd + * @throws Exception + */ + public void delete(PageData pd) throws Exception { + cutroadacceptuserMapper.delete(pd); + } + + /** + * 删除 + * + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd) throws Exception { + cutroadacceptuserMapper.deleteList(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception { + cutroadacceptuserMapper.edit(pd); + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + public List list(Page page) throws Exception { + return cutroadacceptuserMapper.datalistPage(page); + } + + /** + * 列表(全部) + * + * @param pd + * @throws Exception + */ + public List listAll(PageData pd) throws Exception { + return cutroadacceptuserMapper.listAll(pd); + } + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public List findById(PageData pd) throws Exception { + return cutroadacceptuserMapper.findById(pd); + } + + public List findByIds(PageData pd) throws Exception { + return cutroadacceptuserMapper.findByIds(pd); + } + + /** + * 批量删除 + * + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS) throws Exception { + cutroadacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /** + * 列表(全部) + * + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd) throws Exception { + return cutroadacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/EightWorkServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/EightWorkServiceImpl.java new file mode 100644 index 00000000..5da1e4c8 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/EightWorkServiceImpl.java @@ -0,0 +1,36 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.EightWorkMapper; +import com.zcloud.service.gf.EightWorkService; +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 EightWorkServiceImpl implements EightWorkService { + + @Autowired + private EightWorkMapper eightworkMapper; + + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return eightworkMapper.datalist(page); + } + +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardAcceptUserServiceImpl.java new file mode 100644 index 00000000..6ed92f74 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardAcceptUserServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFBlindBoardAcceptUserMapper; +import com.zcloud.service.gf.GFBlindBoardAcceptUserService; +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 GFBlindBoardAcceptUserServiceImpl implements GFBlindBoardAcceptUserService { + + @Autowired + private GFBlindBoardAcceptUserMapper blindboardacceptuserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + blindboardacceptuserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + blindboardacceptuserMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + blindboardacceptuserMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + blindboardacceptuserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return blindboardacceptuserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return blindboardacceptuserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return blindboardacceptuserMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return blindboardacceptuserMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + blindboardacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return blindboardacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFBreakGroundAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFBreakGroundAcceptUserServiceImpl.java new file mode 100644 index 00000000..9b9d0323 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/GFBreakGroundAcceptUserServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFBreakGroundAcceptUserMapper; +import com.zcloud.service.gf.GFBreakGroundAcceptUserService; +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 GFBreakGroundAcceptUserServiceImpl implements GFBreakGroundAcceptUserService { + + @Autowired + private GFBreakGroundAcceptUserMapper breakgroundacceptuserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + breakgroundacceptuserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + breakgroundacceptuserMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + breakgroundacceptuserMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + breakgroundacceptuserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return breakgroundacceptuserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return breakgroundacceptuserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return breakgroundacceptuserMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return breakgroundacceptuserMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + breakgroundacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return breakgroundacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceAcceptUserServiceImpl.java new file mode 100644 index 00000000..751eac27 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceAcceptUserServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFConfinedSpaceAcceptUserMapper; +import com.zcloud.service.gf.GFConfinedSpaceAcceptUserService; +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 GFConfinedSpaceAcceptUserServiceImpl implements GFConfinedSpaceAcceptUserService { + + @Autowired + private GFConfinedSpaceAcceptUserMapper confinedspaceacceptuserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + confinedspaceacceptuserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + confinedspaceacceptuserMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + confinedspaceacceptuserMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + confinedspaceacceptuserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return confinedspaceacceptuserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return confinedspaceacceptuserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return confinedspaceacceptuserMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return confinedspaceacceptuserMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + confinedspaceacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return confinedspaceacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasServiceImpl.java index 848d9407..c30692a5 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasServiceImpl.java @@ -70,7 +70,9 @@ public class GFConfinedSpaceGasServiceImpl implements GFConfinedSpaceGasService public PageData findById(PageData pd)throws Exception{ return GFconfinedspacegasMapper.findById(pd); } - + public PageData gasEdit(PageData pd)throws Exception{ + return GFconfinedspacegasMapper.gasEdit(pd); + } /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasWHServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasWHServiceImpl.java index 8f325324..4148df75 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasWHServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasWHServiceImpl.java @@ -46,7 +46,9 @@ public class GFConfinedSpaceGasWHServiceImpl implements GFConfinedSpaceGasWHServ public void edit(PageData pd)throws Exception{ GFconfinedspacegaswhMapper.edit(pd); } - + public void edittime(PageData pd)throws Exception{ + GFconfinedspacegaswhMapper.edittime(pd); + } /**列表 * @param page * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceServiceImpl.java index efecb163..080e48b8 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceServiceImpl.java @@ -39,6 +39,41 @@ public class GFConfinedSpaceServiceImpl implements GFConfinedSpaceService { GFconfinedspaceMapper.delete(pd); } + public void cancel(PageData pd)throws Exception{ + GFconfinedspaceMapper.cancel(pd); + } + + public PageData checkno(PageData pd)throws Exception{ + return GFconfinedspaceMapper.checkno(pd); + } + + public void editSpecialwork(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork(pd); + } + public void editSpecialwork1(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork1(pd); + } + public void editSpecialwork2(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork2(pd); + } + public void editSpecialwork3(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork3(pd); + } + public void editSpecialwork4(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork4(pd); + } + public void editSpecialwork5(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork5(pd); + } + public void editSpecialwork6(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork6(pd); + } + public void editSpecialwork7(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork7(pd); + } + + + /**修改 * @param pd * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/impl/GFElectricityAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFElectricityAcceptUserServiceImpl.java new file mode 100644 index 00000000..c9dfd45e --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/GFElectricityAcceptUserServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFElectricityAcceptUserMapper; +import com.zcloud.service.gf.GFElectricityAcceptUserService; +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 GFElectricityAcceptUserServiceImpl implements GFElectricityAcceptUserService { + + @Autowired + private GFElectricityAcceptUserMapper electricityacceptuserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + electricityacceptuserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + electricityacceptuserMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + electricityacceptuserMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + electricityacceptuserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return electricityacceptuserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return electricityacceptuserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return electricityacceptuserMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return electricityacceptuserMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + electricityacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return electricityacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFElectricityServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFElectricityServiceImpl.java index 9ff6fe29..b9b79ed5 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFElectricityServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFElectricityServiceImpl.java @@ -80,7 +80,42 @@ public class GFElectricityServiceImpl implements GFElectricityService { public PageData findById(PageData pd)throws Exception{ return GFelectricityMapper.findById(pd); } + public void cancel(PageData pd)throws Exception{ + GFelectricityMapper.cancel(pd); + } + public PageData checkno(PageData pd)throws Exception{ + return GFelectricityMapper.checkno(pd); + } + + public void editSpecialwork(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork(pd); + } + public void editSpecialwork1(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork1(pd); + } + public void editSpecialwork2(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork2(pd); + } + public void editSpecialwork3(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork3(pd); + } + public void editSpecialwork4(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork4(pd); + } + public void editSpecialwork5(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork5(pd); + } + public void editSpecialwork6(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork6(pd); + } + public void editSpecialwork7(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork7(pd); + } + + public void edittime(PageData pd)throws Exception{ + GFelectricityMapper.edittime(pd); + } /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/impl/GFHighWorkAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkAcceptUserServiceImpl.java new file mode 100644 index 00000000..5736429e --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkAcceptUserServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFHighWorkAcceptUserMapper; +import com.zcloud.service.gf.GFHighWorkAcceptUserService; +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 GFHighWorkAcceptUserServiceImpl implements GFHighWorkAcceptUserService { + + @Autowired + private GFHighWorkAcceptUserMapper highworkacceptuserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + highworkacceptuserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + highworkacceptuserMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + highworkacceptuserMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + highworkacceptuserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return highworkacceptuserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return highworkacceptuserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return highworkacceptuserMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return highworkacceptuserMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + highworkacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return highworkacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFHoistingAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFHoistingAcceptUserServiceImpl.java new file mode 100644 index 00000000..50eee922 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/GFHoistingAcceptUserServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFHoistingAcceptUserMapper; +import com.zcloud.service.gf.GFHoistingAcceptUserService; +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 GFHoistingAcceptUserServiceImpl implements GFHoistingAcceptUserService { + + @Autowired + private GFHoistingAcceptUserMapper hoistingacceptuserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + hoistingacceptuserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + hoistingacceptuserMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + hoistingacceptuserMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + hoistingacceptuserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return hoistingacceptuserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return hoistingacceptuserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return hoistingacceptuserMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return hoistingacceptuserMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + hoistingacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return hoistingacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFHotworkAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFHotworkAcceptUserServiceImpl.java new file mode 100644 index 00000000..3ddabee5 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/GFHotworkAcceptUserServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFHotworkAcceptUserMapper; +import com.zcloud.service.gf.GFHotworkAcceptUserService; +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 GFHotworkAcceptUserServiceImpl implements GFHotworkAcceptUserService { + + @Autowired + private GFHotworkAcceptUserMapper hotworkacceptuserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + hotworkacceptuserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + hotworkacceptuserMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + hotworkacceptuserMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + hotworkacceptuserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return hotworkacceptuserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return hotworkacceptuserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return hotworkacceptuserMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return hotworkacceptuserMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + hotworkacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return hotworkacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFHotworkServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFHotworkServiceImpl.java index a396403f..12499d07 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFHotworkServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFHotworkServiceImpl.java @@ -80,6 +80,42 @@ public class GFHotworkServiceImpl implements GFHotworkService { return GFhotworkMapper.findById(pd); } + public void cancel(PageData pd)throws Exception{ + GFhotworkMapper.cancel(pd); + } + public PageData checkno(PageData pd)throws Exception{ + return GFhotworkMapper.checkno(pd); + } + + public void editSpecialwork(PageData pd)throws Exception{ + GFhotworkMapper.editSpecialwork(pd); + } + public void editSpecialwork1(PageData pd)throws Exception{ + GFhotworkMapper.editSpecialwork1(pd); + } + public void editSpecialwork2(PageData pd)throws Exception{ + GFhotworkMapper.editSpecialwork2(pd); + } + public void editSpecialwork3(PageData pd)throws Exception{ + GFhotworkMapper.editSpecialwork3(pd); + } + public void editSpecialwork4(PageData pd)throws Exception{ + GFhotworkMapper.editSpecialwork4(pd); + } + public void editSpecialwork5(PageData pd)throws Exception{ + GFhotworkMapper.editSpecialwork5(pd); + } + public void editSpecialwork6(PageData pd)throws Exception{ + GFhotworkMapper.editSpecialwork6(pd); + } + public void editSpecialwork7(PageData pd)throws Exception{ + GFhotworkMapper.editSpecialwork7(pd); + } + + public void edittime(PageData pd)throws Exception{ + GFhotworkMapper.edittime(pd); + } + /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/resources/mybatis/datasource/gf/BlindBoardAcceptUserMapper.xml b/src/main/resources/mybatis/datasource/gf/BlindBoardAcceptUserMapper.xml new file mode 100644 index 00000000..f9ef97b6 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/BlindBoardAcceptUserMapper.xml @@ -0,0 +1,217 @@ + + + + + + + + GF_BLINDBOARD_ACCEPTUSER + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.BLINDBOARD_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, + BLINDBOARD_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}, + #{BLINDBOARD_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}, + BLINDBOARD_ID = #{BLINDBOARD_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/gf/BlindBoardMapper.xml b/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml index 2e3abd32..da5034b2 100644 --- a/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml @@ -355,7 +355,7 @@ f.WORK_TYPE, f.CONFESS_USER, f.ACCEPT_CONFESS_USER, - f.SPECIAL_WORK, + IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK, f.GUARDIAN_USER, f.WORK_USER, f.OTHER_PROTECTIVE_MEASURES, @@ -439,7 +439,74 @@ diff --git a/src/main/resources/mybatis/datasource/gf/BreakGroundAcceptUserMapper.xml b/src/main/resources/mybatis/datasource/gf/BreakGroundAcceptUserMapper.xml new file mode 100644 index 00000000..552997f9 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/BreakGroundAcceptUserMapper.xml @@ -0,0 +1,217 @@ + + + + + + + + GF_BREAKGROUND_ACCEPTUSER + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.BREAKGROUND_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, + BREAKGROUND_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}, + #{BREAKGROUND_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}, + BREAKGROUND_ID = #{BREAKGROUND_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/gf/BreakGroundMapper.xml b/src/main/resources/mybatis/datasource/gf/BreakGroundMapper.xml index 8a4c1098..39018c32 100644 --- a/src/main/resources/mybatis/datasource/gf/BreakGroundMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/BreakGroundMapper.xml @@ -332,8 +332,8 @@ f.CHECK_NO, f.PROJECT_MANAGER, f.WORK_CONTENT, - f.WORK_START_DATE, - f.WORK_END_DATE, + replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE, + replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE, f.WORK_PLACE, f.CONSTRUCTION_DEPARTMENT_ID, f.CONSTRUCTION_USER_ID, @@ -366,7 +366,7 @@ f.HAZARD_IDENTIFICATION, f.CONFESS_USER, f.ACCEPT_CONFESS_USER, - f.SPECIAL_WORK, + IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK, f.GUARDIAN_USER, f.JOB_CONTENT, f.APPLY_USER_SIGNER_PATH, @@ -450,7 +450,74 @@ diff --git a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceAcceptUserMapper.xml b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceAcceptUserMapper.xml new file mode 100644 index 00000000..2acd7bbd --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceAcceptUserMapper.xml @@ -0,0 +1,221 @@ + + + + + + + + GF_CONFINEDSPACE_ACCEPTUSER + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.CONFINEDSPACE_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, + CONFINEDSPACE_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}, + #{CONFINEDSPACE_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}, + CONFINEDSPACE_ID = #{CONFINEDSPACE_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}, + ACCEPT_USER_ID = #{ACCEPT_USER_ID}, + ACCEPT_USER_SIGNER_PATH = #{ACCEPT_USER_SIGNER_PATH}, + ACCEPT_USER_SIGNER_TIME = #{ACCEPT_USER_SIGNER_TIME}, + ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID} + 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/gf/ConfinedSpaceGasMapper.xml b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasMapper.xml index e32ca93d..6d33ec03 100644 --- a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasMapper.xml @@ -115,8 +115,7 @@ from f - where - f.CONFINEDSPACEGAS_ID = #{CONFINEDSPACEGAS_ID} + where f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} @@ -149,6 +148,15 @@ ORDER BY f.ANALYZE_TIME desc + + update diff --git a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasWHMapper.xml b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasWHMapper.xml index 67a92e9e..86ef1ea3 100644 --- a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasWHMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasWHMapper.xml @@ -23,7 +23,8 @@ f.GAS_STANDARD3, f.GAS_NAME4, f.GAS_STANDARD4, - f.CONFINEDSPACEGASWH_ID + f.CONFINEDSPACEGASWH_ID, + f.OPERATTIME @@ -37,7 +38,8 @@ GAS_STANDARD3, GAS_NAME4, GAS_STANDARD4, - CONFINEDSPACEGASWH_ID + CONFINEDSPACEGASWH_ID, + OPERATTIME @@ -51,7 +53,8 @@ #{GAS_STANDARD3}, #{GAS_NAME4}, #{GAS_STANDARD4}, - #{CONFINEDSPACEGASWH_ID} + #{CONFINEDSPACEGASWH_ID}, + #{OPERATTIME} @@ -89,11 +92,22 @@ GAS_STANDARD3 = #{GAS_STANDARD3}, GAS_NAME4 = #{GAS_NAME4}, GAS_STANDARD4 = #{GAS_STANDARD4}, - CONFINEDSPACEGASWH_ID = CONFINEDSPACEGASWH_ID + CONFINEDSPACEGASWH_ID = CONFINEDSPACEGASWH_ID, + OPERATTIME = #{OPERATTIME} where CONFINEDSPACEGASWH_ID = #{CONFINEDSPACEGASWH_ID} + + + update + + set + OPERATTIME = #{OPERATTIME} + where + CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} + + + SELECT + CONCAT_WS( " ", "受限空间作业", f.CHECK_NO ) AS CHECK_NO, + f.CONFINEDSPACE_ID AS ID + FROM + GF_CONFINEDSPACE f + WHERE + f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} + AND f.ISDELETE = '0' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update + GF_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 + GF_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 + GF_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 + GF_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 + GF_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 + GF_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 + GF_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 + GF_hotwork 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 @@ -306,8 +435,8 @@ f.OPERATOR, f.CHECK_NO, f.WORK_CONTENT, - f.WORK_START_DATE, - f.WORK_END_DATE, + replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE, + replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE, f.CONFIRM_DEPARTMENT_ID, f.CONFIRM_USER_ID, f.CONFIRM_USER_SIGNER_PATH, @@ -335,7 +464,7 @@ f.BELONG_CORP, f.LIMITSPACE_ID, f.WORK_USER, - f.SPECIAL_WORK, + IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK, f.RISK_IDENTIFICATION, f.MEDIUM_NAME, f.EDUCATE_USER, @@ -358,6 +487,10 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, + (SELECT replace(a.ANALYZE_TIME,'-','/') from GF_CONFINEDSPACEGAS a where a.ISDELETE = '0' + AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID + ORDER BY + a.ANALYZE_TIME DESC LIMIT 1) as ANALYZE_TIME, sp.NAME as LIMITSPACE_NAME, ad.NAME as APPLY_DEPARTMENT_NAME, @@ -388,6 +521,7 @@ aacu.NAME as ACCEPT_CONFESS_USER_NAME from f + left join GF_confinedspacegaswh b on b.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID left join GF_LIMITSPACE sp on sp.LIMITSPACE_ID=f.LIMITSPACE_ID left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID @@ -423,7 +557,74 @@ select - , + 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.BELONG_CORP, + f.LIMITSPACE_ID, + f.WORK_USER, + f.SPECIAL_WORK, + f.RISK_IDENTIFICATION, + f.MEDIUM_NAME, + f.EDUCATE_USER, + 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.CONFESS_USER, + f.ACCEPT_CONFESS_USER, + f.GUARDIAN_USER, + f.CONFINEDSPACE_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, + IFNULL((SELECT replace(a.ANALYZE_TIME,'-','/') from GF_confinedspacegas a where a.ISDELETE = '0' + AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID + ORDER BY + a.ANALYZE_TIME DESC LIMIT 1),'无') as ANALYZE_TIME, + + (SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_CONFINEDSPACE_ACCEPTUSER a where a.ISDELETE = '0' + AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID + ORDER BY + a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME, sp.NAME as LIMITSPACE_NAME, ad.NAME as APPLY_DEPARTMENT_NAME, @@ -642,7 +912,7 @@ left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID - where f.ISDELETE = '0' and f.APPLY_STATUS < 6 and f.GUARDIAN_USER_SIGNER_TIME is null and f.APPLY_STATUS > 0 + where f.APPLY_STATUS = '5' and f.GUARDIAN_USER_SIGNER_TIME is null and f.APPLY_STATUS > 0 and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -739,7 +1009,73 @@ diff --git a/src/main/resources/mybatis/datasource/gf/CutRoadAcceptUserMapper.xml b/src/main/resources/mybatis/datasource/gf/CutRoadAcceptUserMapper.xml new file mode 100644 index 00000000..4a290140 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/CutRoadAcceptUserMapper.xml @@ -0,0 +1,218 @@ + + + + + + + + GF_CUTROAD_ACCEPTUSER + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.CUTROAD_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, + CUTROAD_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}, + #{CUTROAD_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}, + CUTROAD_ID = #{CUTROAD_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/gf/CutRoadMapper.xml b/src/main/resources/mybatis/datasource/gf/CutRoadMapper.xml index fe19ddf6..fa60e7f9 100644 --- a/src/main/resources/mybatis/datasource/gf/CutRoadMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/CutRoadMapper.xml @@ -339,8 +339,8 @@ f.CHECK_NO, f.PROJECT_MANAGER, f.WORK_CONTENT, - f.WORK_START_DATE, - f.WORK_END_DATE, + replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE, + replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE, f.CONSTRUCTION_DEPARTMENT_ID, f.CONSTRUCTION_USER_ID, f.CONSTRUCTION_USER_SIGNER_PATH, @@ -372,7 +372,7 @@ f.HAZARD_IDENTIFICATION, f.CONFESS_USER, f.ACCEPT_CONFESS_USER, - f.SPECIAL_WORK, + IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK, f.GUARDIAN_USER, f.JOB_CONTENT, f.APPLY_USER_SIGNER_PATH, @@ -457,8 +457,80 @@ diff --git a/src/main/resources/mybatis/datasource/gf/EightWorkMapper.xml b/src/main/resources/mybatis/datasource/gf/EightWorkMapper.xml new file mode 100644 index 00000000..878efb06 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/EightWorkMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/gf/ElectricityAcceptUserMapper.xml b/src/main/resources/mybatis/datasource/gf/ElectricityAcceptUserMapper.xml new file mode 100644 index 00000000..c3d7d5cc --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/ElectricityAcceptUserMapper.xml @@ -0,0 +1,216 @@ + + + + + + + + GF_ELECTRICITY_ACCEPTUSER + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.ELECTRICITY_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, + ELECTRICITY_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}, + #{ELECTRICITY_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}, + ELECTRICITY_ID = #{ELECTRICITY_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/gf/ElectricityGasMapper.xml b/src/main/resources/mybatis/datasource/gf/ElectricityGasMapper.xml index 7a8af77d..b8cb12f1 100644 --- a/src/main/resources/mybatis/datasource/gf/ElectricityGasMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/ElectricityGasMapper.xml @@ -88,7 +88,7 @@ from f where - f.ELECTRICITYGAS_ID = #{ELECTRICITYGAS_ID} + f.ELECTRICITY_ID = #{ELECTRICITY_ID} diff --git a/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml b/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml index f82510a1..ab53bbf7 100644 --- a/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml @@ -78,6 +78,8 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.ANALYZE_TIME, + f.ISANALYZE, f.WORK_LONGITUDE, f.WORK_LATITUDE @@ -148,6 +150,8 @@ ACCEPT_CONFESS_USER_ID, ACCEPT_CONFESS_USER_SIGNER_PATH, ACCEPT_CONFESS_USER_SIGNER_TIME, + ANALYZE_TIME, + ISANALYZE, WORK_LONGITUDE, WORK_LATITUDE @@ -218,6 +222,8 @@ #{ACCEPT_CONFESS_USER_ID}, #{ACCEPT_CONFESS_USER_SIGNER_PATH}, #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{ANALYZE_TIME}, + #{ISANALYZE}, #{WORK_LONGITUDE}, #{WORK_LATITUDE} @@ -242,7 +248,14 @@ where ELECTRICITY_ID = #{ELECTRICITY_ID} - + + update + + set + ANALYZE_TIME = #{ANALYZE_TIME} + where + ELECTRICITY_ID = #{ELECTRICITY_ID} + update @@ -312,8 +325,9 @@ ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, ELECTRICITY_ID = ELECTRICITY_ID, - WORK_LONGITUDE = #{WORK_LONGITUDE}, - WORK_LATITUDE = #{WORK_LATITUDE} + ISANALYZE = #{ISANALYZE}, + WORK_LONGITUDE = #{WORK_LONGITUDE}, + WORK_LATITUDE = #{WORK_LATITUDE} where ELECTRICITY_ID = #{ELECTRICITY_ID} @@ -329,8 +343,8 @@ f.OPERATOR, f.CHECK_NO, f.WORK_CONTENT, - f.WORK_START_DATE, - f.WORK_END_DATE, + replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE, + replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE, f.CONFIRM_DEPARTMENT_ID, f.CONFIRM_USER_ID, f.CONFIRM_USER_SIGNER_PATH, @@ -362,7 +376,7 @@ f.WORK_USER, f.CARD_NO, f.GUARDIAN, - f.SPECIAL_WORK, + IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK, f.RISK_IDENTIFICATION, f.CONFESS_USER, f.ACCEPT_CONFESS_USER, @@ -385,6 +399,11 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, + (SELECT a.ANALYZE_TIME from GF_ELECTRICITYGAS a where a.ISDELETE = '0' + AND a.ELECTRICITY_ID = #{ELECTRICITY_ID} + ORDER BY + a.ANALYZE_TIME DESC LIMIT 1) as ANALYZE_TIME, + f.ISANALYZE, f.WORK_LATITUDE, f.WORK_LONGITUDE, @@ -446,10 +465,183 @@ f.ELECTRICITY_ID = #{ELECTRICITY_ID} + + update + + set + APPLY_STATUS = '-99' + where + ELECTRICITY_ID = #{ELECTRICITY_ID} + + + + + update + GF_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 + GF_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 + GF_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 + GF_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 + GF_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 + GF_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 + GF_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 + GF_hotwork 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 ) ) + + + + select + f.ACCEPT_CONFESS_ID, + f.HIGHWORK_ID, + f.CORPINFO_ID, + f.ISDELETE, + f.OPERATTIME, + f.OPERATOR, + f.ACCEPT_USER_ID, + f.ACCEPT_USER_SIGNER_PATH, + f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_DEPARTMENT_ID + from + f + where + f.HIGHWORK_ID = #{HIGHWORK_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_USER_ID = #{ACCEPT_USER_ID} + order by f.ACCEPT_USER_SIGNER_TIME asc + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + ACCEPT_CONFESS_ID in + + #{item} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml b/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml index 8b77f9dc..cd583107 100644 --- a/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml @@ -327,8 +327,8 @@ f.CHECK_NO, f.PROJECT_MANAGER, f.WORK_CONTENT, - f.WORK_START_DATE, - f.WORK_END_DATE, + replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE, + replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE, f.CONSTRUCTION_DEPARTMENT_ID, f.CONSTRUCTION_USER_ID, f.CONSTRUCTION_USER_SIGNER_PATH, @@ -362,7 +362,7 @@ f.LEADER_USER_SIGNER_TIME, f.CONFESS_USER, f.ACCEPT_CONFESS_USER, - f.SPECIAL_WORK, + IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK, f.GUARDIAN_USER, f.WORK_HIGH, f.WORK_LEVEL, @@ -443,7 +443,75 @@ diff --git a/src/main/resources/mybatis/datasource/gf/HoistingAcceptUserMapper.xml b/src/main/resources/mybatis/datasource/gf/HoistingAcceptUserMapper.xml new file mode 100644 index 00000000..20063d30 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/HoistingAcceptUserMapper.xml @@ -0,0 +1,216 @@ + + + + + + + + GF_HOISTING_ACCEPTUSER + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.HOISTING_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, + HOISTING_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}, + #{HOISTING_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}, + HOISTING_ID = #{HOISTING_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/gf/HoistingMapper.xml b/src/main/resources/mybatis/datasource/gf/HoistingMapper.xml index eac0ca5c..4a4658d6 100644 --- a/src/main/resources/mybatis/datasource/gf/HoistingMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/HoistingMapper.xml @@ -77,6 +77,7 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.SPECIAL_WORK, f.WORK_LONGITUDE, f.WORK_LATITUDE @@ -146,6 +147,7 @@ ACCEPT_CONFESS_USER_ID, ACCEPT_CONFESS_USER_SIGNER_PATH, ACCEPT_CONFESS_USER_SIGNER_TIME, + SPECIAL_WORK, WORK_LONGITUDE, WORK_LATITUDE @@ -215,6 +217,7 @@ #{ACCEPT_CONFESS_USER_ID}, #{ACCEPT_CONFESS_USER_SIGNER_PATH}, #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{SPECIAL_WORK}, #{WORK_LONGITUDE}, #{WORK_LATITUDE} @@ -308,6 +311,7 @@ ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, HOISTING_ID = HOISTING_ID, + SPECIAL_WORK = #{SPECIAL_WORK}, WORK_LONGITUDE = #{WORK_LONGITUDE}, WORK_LATITUDE = #{WORK_LATITUDE} where @@ -328,8 +332,8 @@ f.CHECK_NO, f.PROJECT_MANAGER, f.WORK_CONTENT, - f.WORK_START_DATE, - f.WORK_END_DATE, + replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE, + replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE, f.CONSTRUCTION_DEPARTMENT_ID, f.CONSTRUCTION_USER_ID, f.CONSTRUCTION_USER_SIGNER_PATH, @@ -382,6 +386,7 @@ f.ACCEPT_CONFESS_USER_SIGNER_TIME, f.WORK_LATITUDE, f.WORK_LONGITUDE, + f.SPECIAL_WORK, ad.NAME as APPLY_DEPARTMENT_NAME, getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL, @@ -443,7 +448,74 @@ diff --git a/src/main/resources/mybatis/datasource/gf/HotworkAcceptUserMapper.xml b/src/main/resources/mybatis/datasource/gf/HotworkAcceptUserMapper.xml new file mode 100644 index 00000000..164cdf2e --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/HotworkAcceptUserMapper.xml @@ -0,0 +1,217 @@ + + + + + + + + GF_HOTWORK_ACCEPTUSER + + + + + 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/gf/HotworkMapper.xml b/src/main/resources/mybatis/datasource/gf/HotworkMapper.xml index 2bd1ae62..fd43b6fa 100644 --- a/src/main/resources/mybatis/datasource/gf/HotworkMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/HotworkMapper.xml @@ -85,7 +85,8 @@ f.ACCEPT_CONFESS_DEPARTMENT_ID, f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, - f.ACCEPT_CONFESS_USER_SIGNER_TIME + f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.ANALYZE_TIME @@ -161,7 +162,8 @@ ACCEPT_CONFESS_DEPARTMENT_ID, ACCEPT_CONFESS_USER_ID, ACCEPT_CONFESS_USER_SIGNER_PATH, - ACCEPT_CONFESS_USER_SIGNER_TIME + ACCEPT_CONFESS_USER_SIGNER_TIME, + ANALYZE_TIME @@ -237,7 +239,8 @@ #{ACCEPT_CONFESS_DEPARTMENT_ID}, #{ACCEPT_CONFESS_USER_ID}, #{ACCEPT_CONFESS_USER_SIGNER_PATH}, - #{ACCEPT_CONFESS_USER_SIGNER_TIME} + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{ANALYZE_TIME} @@ -260,7 +263,14 @@ where HOTWORK_ID = #{HOTWORK_ID} - + + update + + set + ANALYZE_TIME = #{ANALYZE_TIME} + where + HOTWORK_ID = #{HOTWORK_ID} + update @@ -342,6 +352,105 @@ 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 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 ) ) + + + select - , + 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.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, + + IFNULL((SELECT replace(a.ANALYZE_TIME,'-','/') from bus_hotworkgas a where a.ISDELETE = '0' + AND a.HOTWORK_ID = f.HOTWORK_ID + ORDER BY + a.ANALYZE_TIME DESC LIMIT 1),'无') as ANALYZE_TIME, + + (SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from BUS_HOTWORK_ACCEPTUSER a where a.ISDELETE = '0' + AND a.HOTWORK_ID = f.HOTWORK_ID + ORDER BY + a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME, + ad.NAME as APPLY_DEPARTMENT_NAME, getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL, au.NAME as APPLY_USER_NAME, @@ -562,7 +755,9 @@ and f.APPLY_STATUS = #{pd.APPLY_STATUS} - + + and f.APPLY_STATUS in ('1','2','4','5','6') + and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -667,7 +862,82 @@