From 6bc2d02caec0f353adcca024bac85a0020ca9dae Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 28 Aug 2024 19:01:22 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8D=95=E7=8B=AC?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gf/AppGFBlindBoardController.java | 103 +++++++++++++ .../gf/AppGFBreakGroundController.java | 104 +++++++++++++ .../gf/AppGFConfinedSpaceController.java | 140 +++++++++++++++++ .../controller/gf/AppGFCutRoadController.java | 103 +++++++++++++ .../gf/AppGFElectricityController.java | 142 +++++++++++++++++ .../gf/AppGFHighWorkController.java | 139 +++++++++++++++-- .../gf/AppGFHoistingController.java | 144 ++++++++++++++++++ 7 files changed, 865 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java index 3046d6f5..bd6d0c3a 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java @@ -797,6 +797,76 @@ public class AppGFBlindBoardController extends BaseController { return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(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"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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++) { @@ -1172,6 +1242,39 @@ public class AppGFBlindBoardController extends BaseController { map.put("result", errInfo); return map; } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptconfess") + @ResponseBody + @Transactional + public Object suEditAcceptconfess( + 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())); //修改时间 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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++) { diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java index f5ed0b87..158c5e4a 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java @@ -256,6 +256,36 @@ public class AppGFBreakGroundController extends BaseController { map.put("result", errInfo); return map; } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptconfess") + @ResponseBody + @Transactional + public Object suEditAcceptconfess(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())); //修改时间 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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++) { @@ -507,6 +537,80 @@ public class AppGFBreakGroundController extends BaseController { map.put("result", errInfo); return map; } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(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"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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); + this.sendNotice(pd); + 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++) { diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java index d70ea087..56806d14 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java @@ -735,6 +735,37 @@ public class AppGFConfinedSpaceController extends BaseController { map.put("result", errInfo); return map; } + + /**修改(单个文件上传接口) + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptconfess") + @ResponseBody + @Transactional + public Object suEditAcceptconfess(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())); //修改时间 + + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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++) { @@ -868,6 +899,115 @@ public class AppGFConfinedSpaceController extends BaseController { map.put("result", errInfo); return map; } + + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(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"); + + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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); + this.sendNotice(pd); + 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++) { diff --git a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java index 1122ab23..681e11be 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java @@ -613,6 +613,35 @@ public class AppGFCutRoadController extends BaseController { map.put("result", errInfo); return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptconfess") + @ResponseBody + @Transactional + public Object suEditAcceptconfess(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())); //修改时间 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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++) { @@ -714,6 +743,80 @@ public class AppGFCutRoadController extends BaseController { return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(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"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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++) { diff --git a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java index dc83b16e..a766ad86 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java @@ -554,6 +554,35 @@ public class AppGFElectricityController extends BaseController { map.put("result", errInfo); return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptconfess") + @ResponseBody + @Transactional + public Object suEditAcceptconfess(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())); //修改时间 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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++) { @@ -693,6 +722,119 @@ public class AppGFElectricityController extends BaseController { return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(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"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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++) { diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java index 1538eea4..8023186d 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java @@ -542,10 +542,10 @@ public class AppGFHighWorkController extends BaseController { * @param * @throws Exception */ - @RequestMapping(value="/editAcceptconfess") + @RequestMapping(value="/singleUpload/editAcceptconfess") @ResponseBody @Transactional - public Object editAcceptconfess(MultipartRequest request) throws Exception { + public Object suEditAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -556,15 +556,14 @@ public class AppGFHighWorkController extends BaseController { pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 List fileList = new ArrayList(); String signertime = ""; - String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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(); - 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; } @@ -681,6 +680,126 @@ public class AppGFHighWorkController extends BaseController { 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; + } + + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(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"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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 diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java index 8a2e7510..66620418 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java @@ -519,6 +519,35 @@ public class AppGFHoistingController extends BaseController { map.put("result", errInfo); return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptconfess") + @ResponseBody + @Transactional + public Object suEditAcceptconfess(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())); //修改时间 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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++) { @@ -622,6 +651,121 @@ public class AppGFHoistingController extends BaseController { 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; + } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(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"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + 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")); From 692140c13141d5a0e62ce59883ad73262e2575d6 Mon Sep 17 00:00:00 2001 From: water_xu Date: Mon, 2 Sep 2024 10:03:55 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8D=95=E7=8B=AC?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=20-=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E5=88=86=E9=9A=94=E5=90=8E=E7=BC=80?= =?UTF-8?q?=E5=88=A4=E7=A9=BA,=E9=BB=98=E8=AE=A4PNG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/gf/AppGFBlindBoardController.java | 7 ++++++- .../zcloud/controller/gf/AppGFBreakGroundController.java | 7 ++++++- .../zcloud/controller/gf/AppGFConfinedSpaceController.java | 7 ++++++- .../com/zcloud/controller/gf/AppGFCutRoadController.java | 7 ++++++- .../zcloud/controller/gf/AppGFElectricityController.java | 7 ++++++- .../com/zcloud/controller/gf/AppGFHighWorkController.java | 7 ++++++- .../com/zcloud/controller/gf/AppGFHoistingController.java | 7 ++++++- 7 files changed, 42 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java index bd6d0c3a..3c006006 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java @@ -1282,7 +1282,12 @@ public class AppGFBlindBoardController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + }else { + 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()); diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java index 158c5e4a..fdd60a18 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java @@ -293,7 +293,12 @@ public class AppGFBreakGroundController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + }else { + 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()); diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java index 56806d14..57bd3cd7 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java @@ -773,7 +773,12 @@ public class AppGFConfinedSpaceController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + } else { + 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()); diff --git a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java index 681e11be..0e21a104 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java @@ -649,7 +649,12 @@ public class AppGFCutRoadController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + }else { + 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()); diff --git a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java index a766ad86..076255ba 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java @@ -590,7 +590,12 @@ public class AppGFElectricityController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + }else { + 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()); diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java index 8023186d..ca04b4b9 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java @@ -574,7 +574,12 @@ public class AppGFHighWorkController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + }else { + 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()); diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java index 66620418..0cd4d373 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java @@ -555,7 +555,12 @@ public class AppGFHoistingController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + }else { + 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()); From 1cb6ce1c9559cbab3f91230662a273c21d42c398 Mon Sep 17 00:00:00 2001 From: water_xu Date: Tue, 10 Sep 2024 15:38:03 +0800 Subject: [PATCH 03/22] =?UTF-8?q?Revert=20"=E4=BA=BA=E5=91=98=E4=B8=AD?= =?UTF-8?q?=E5=8F=B0=20-=20=E4=BA=BA=E5=91=98=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b3ec041f58ed2c70df892f65e3ea9a6750f378a4. --- .../controller/system/UsersController.java | 111 ------------------ .../mybatis/datasource/system/UsersMapper.xml | 66 ++++------- 2 files changed, 23 insertions(+), 154 deletions(-) diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 65cf57f4..bfde8859 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -2590,115 +2590,4 @@ public class UsersController extends BaseController { } return returnMap; } - - static String CREATOR = null; - static String OPERATOR = null; - @RequestMapping(value = "/initCore") - @ResponseBody - public Object initCore() throws Exception { - - PageData p1d = new PageData(); -// pd = this.getPageData(); - if (CREATOR == null) { - CREATOR = Jurisdiction.getUSER_ID(); - OPERATOR = Jurisdiction.getUSER_ID(); - } - List pageData = usersService.listAllUser(p1d); - - for (PageData pd : pageData) { - try { - pd.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间 - pd.put("CREATOR", CREATOR); //创建人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - pd.put("OPERATOR", OPERATOR); //修改人 - PageData sexPd = new PageData(); - if (Tools.notEmpty(pd.getString("SEX"))) { - sexPd.put("DICTIONARIES_ID", pd.getString("SEX")); - PageData byId = dictionariesService.findById(sexPd); - if (Tools.notEmpty(byId)) { - pd.put("SEX", byId.getString("NAME")); - } - } - StringBuilder ORG_PATH = new StringBuilder(); - boolean hasPid = true; - PageData department = departmentService.findById(pd); - if (department != null) { - ORG_PATH.insert(0, department.getString("NAME")); - String deptId = department.getString("PARENT_ID"); - PageData deptPd = new PageData(); - deptPd.put("DEPARTMENT_ID", deptId); - if (!"0".equals(department.get("PARENT_ID"))) { - while (hasPid) { - PageData dept = departmentService.findById(deptPd); - if ("0".equals(dept.get("PARENT_ID"))) { - hasPid = false; - } else { - deptId = dept.getString("PARENT_ID"); - deptPd.put("DEPARTMENT_ID", deptId); - } - ORG_PATH.insert(0, dept.getString("NAME") + "/"); - } - } - pd.put("ORG_PATH", ORG_PATH); - } else { - ORG_PATH.insert(0, ""); - - - } - PageData CorpName = corpInfoService.findById(pd); - - - pd.put("CORPINFO_NAME", CorpName == null ? "" : CorpName.getString("CORP_NAME")); - pd.put("USER_TYPE", "1"); - - HashMap param = new HashMap<>(); - Set set = pd.keySet(); - for (Object key : set) { - param.put(key.toString(), pd.getString(key.toString())); - } - - - //要推送的照片集合 - List userPhotoDTOList = new ArrayList<>(); - //人脸照片 - PageData photoPd = new PageData(); - photoPd.put("USER_PHOTO_ID", pd.getString("IMGFILES_ID")); - photoPd.put("USER_ID", pd.getString("FOREIGN_KEY")); - photoPd.put("PHOTO_URL", pd.getString("FILEPATH")); - photoPd.put("PHOTO_TYPE", "1"); - photoPd.put("ISDELETE", "0"); - userPhotoDTOList.add(photoPd); - param.put("userPhotoDTOList", userPhotoDTOList); - String userResult = HttpClientUtilDoGet.sendHttpGet(tongBuUrl + "/docking/core/user/getUserInfoById" + "?USER_ID=" + pd.getString("USER_ID")); - Map userReturnMap = (Map) JSON.parse(userResult); - if (userReturnMap.get("USERINFO") != null) { //有用户数据获取修改信息 - PageData userInfoPd = JSON.parseObject(userReturnMap.get("USERINFO").toString(), PageData.class); - String updateDescription = UpdateEnum.getUpdateDescription(userInfoPd, pd); - param.put("REMARKS", updateDescription); - - } else { //没有数据则获取新增信息 - String insertDescription = UpdateEnum.getInsertDescription(pd); - param.put("REMARKS", insertDescription); - } - String UserDto = JSON.toJSONString(param); - String result = HttpClientUtilDoGet.sendHttpPost(tongBuUrl + "/docking/core/user/addOrUpdate", UserDto, null); - Map returnMap = (Map) JSON.parse(result); - if (returnMap.get("result").equals("success")) { - PageData pushPd = new PageData(); - pushPd.put("ISPUSH", "1"); - if (!Tools.isEmpty(pd.get("operateType")) && pd.getString("operateType").equals("delete")) { - pushPd.put("ISDELETE", "1"); - } else { - pushPd.put("ISDELETE", "0"); - } - pushPd.put("USER_ID", pd.getString("USER_ID")); - usersService.editPushStatus(pushPd); - } - }catch (Exception e){ - - } - } - - return null; - } } diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 1b0a68d3..e7625a89 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -391,46 +391,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update - set - - NAME = #{NAME} - - - ,DEPARTMENT_ID = #{DEPARTMENT_ID} - - - ,POST_ID = #{POST_ID} - - - ,ROLE_ID = #{ROLE_ID} - - - ,ROLE_IDS = #{ROLE_IDS} - - - ,BZ = #{BZ} - - - ,EMAIL = #{EMAIL} - - - ,NUMBER = #{NUMBER} - - - ,SORT = #{SORT} - - - ,PERSON_TYPE = #{PERSON_TYPE} - - - ,IS_HAZARDCONFIRMER = #{IS_HAZARDCONFIRMER} - - - ,IS_ONLINELEARNING = #{IS_ONLINELEARNING} - - - ,PHONE = #{PHONE} - + set NAME = #{NAME}, + DEPARTMENT_ID = #{DEPARTMENT_ID}, + POST_ID =#{POST_ID}, + ROLE_ID = #{ROLE_ID}, + ROLE_IDS = #{ROLE_IDS}, + BZ = #{BZ}, + EMAIL = #{EMAIL}, + NUMBER = #{NUMBER}, + SORT = #{SORT}, + PERSON_TYPE = #{PERSON_TYPE}, + IS_HAZARDCONFIRMER = #{IS_HAZARDCONFIRMER}, + IS_ONLINELEARNING = #{IS_ONLINELEARNING}, + PHONE = #{PHONE} ,ISPUSH = #{ISPUSH} @@ -797,9 +770,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select + + from + f + where + f.AREA_ID=#{AREA_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + AREA_ID in + + #{item} + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/dsno2/door/MkmjDeviceMapper.xml b/src/main/resources/mybatis/dsno2/door/MkmjDeviceMapper.xml new file mode 100644 index 00000000..a0045045 --- /dev/null +++ b/src/main/resources/mybatis/dsno2/door/MkmjDeviceMapper.xml @@ -0,0 +1,217 @@ + + + + + + + MKMJ_DEVICE + + + + + SYS_DICTIONARIES + + + + + f.DEVICE_ID, + f.DOCK_DEVICE_ID, + f.DOOR_ID, + f.PATH_ID, + f.DEVICE_NAME, + f.DEVICE_TYPE, + f.STATUS, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + DEVICE_ID, + DOCK_DEVICE_ID, + DOOR_ID, + PATH_ID, + DEVICE_NAME, + DEVICE_TYPE, + STATUS, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{DEVICE_ID}, + #{DOCK_DEVICE_ID}, + #{DOOR_ID}, + #{PATH_ID}, + #{DEVICE_NAME}, + #{DEVICE_TYPE}, + #{STATUS}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + DEVICE_ID = #{DEVICE_ID} + + + + + update + + set + DOCK_DEVICE_ID = #{DOCK_DEVICE_ID}, + DOOR_ID = #{DOOR_ID}, + PATH_ID = #{PATH_ID}, + DEVICE_NAME = #{DEVICE_NAME}, + DEVICE_TYPE = #{DEVICE_TYPE}, + STATUS = #{STATUS}, + CORPINFO_ID = #{CORPINFO_ID}, + CREATOR = #{CREATOR}, + CREATTIME = #{CREATTIME}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + ISDELETE = #{ISDELETE} + where + DEVICE_ID=#{DEVICE_ID} + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + DEVICE_ID in + + #{item} + + + + + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + DEVICE_ID = #{DEVICE_ID} + + diff --git a/src/main/resources/mybatis/dsno2/door/MkmjDoorVideoMapper.xml b/src/main/resources/mybatis/dsno2/door/MkmjDoorVideoMapper.xml new file mode 100644 index 00000000..3524087c --- /dev/null +++ b/src/main/resources/mybatis/dsno2/door/MkmjDoorVideoMapper.xml @@ -0,0 +1,202 @@ + + + + + + + MKMJ_DOOR_VIDEO + + + + + SYS_DICTIONARIES + + + + + f.DOOR_VIDEO_ID, + f.DOOR_ID, + f.PLATFORMVIDEOMANAGEMENT_ID, + f.LONGITUDE, + f.LATITUDE, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + DOOR_VIDEO_ID, + DOOR_ID, + PLATFORMVIDEOMANAGEMENT_ID, + LONGITUDE, + LATITUDE, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{DOOR_VIDEO_ID}, + #{DOOR_ID}, + #{PLATFORMVIDEOMANAGEMENT_ID}, + #{LONGITUDE}, + #{LATITUDE}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + DOOR_VIDEO_ID = #{DOOR_VIDEO_ID} + + + + + update + + set + DOOR_VIDEO_ID= DOOR_VIDEO_ID, + DOOR_ID=#{DOOR_ID}, + PLATFORMVIDEOMANAGEMENT_ID=#{PLATFORMVIDEOMANAGEMENT_ID}, + LONGITUDE=#{LONGITUDE}, + LATITUDE=#{LATITUDE}, + CORPINFO_ID=#{CORPINFO_ID}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE} + where + DOOR_VIDEO_ID=#{DOOR_VIDEO_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + DOOR_VIDEO_ID in + + #{item} + + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + DOOR_VIDEO_ID = #{DOOR_VIDEO_ID} + + + + + + + + + diff --git a/src/main/resources/mybatis/dsno2/door/MkmjPathMapper.xml b/src/main/resources/mybatis/dsno2/door/MkmjPathMapper.xml new file mode 100644 index 00000000..3c451a42 --- /dev/null +++ b/src/main/resources/mybatis/dsno2/door/MkmjPathMapper.xml @@ -0,0 +1,244 @@ + + + + + + + MKMJ_PATH + + + + + SYS_DICTIONARIES + + + + + f.PATH_ID, + f.DOOR_ID, + f.PATH_NAME, + f.PATH_TYPE, + f.STATUS, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + PATH_ID, + DOOR_ID, + PATH_NAME, + PATH_TYPE, + STATUS, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{PATH_ID}, + #{DOOR_ID}, + #{PATH_NAME}, + #{PATH_TYPE}, + #{STATUS}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + PATH_ID = #{PATH_ID} + + + + + update + + set + DOOR_ID = #{DOOR_ID}, + PATH_NAME = #{PATH_NAME}, + PATH_TYPE = #{PATH_TYPE}, + STATUS = #{STATUS}, + CORPINFO_ID = #{CORPINFO_ID}, + CREATOR = #{CREATOR}, + CREATTIME = #{CREATTIME}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + ISDELETE = #{ISDELETE} + where + PATH_ID=#{PATH_ID} + + + + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + PATH_ID in + + #{item} + + + + + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + PATH_ID = #{PATH_ID} + + diff --git a/src/main/resources/mybatis/dsno2/door/MkmjRelationMapper.xml b/src/main/resources/mybatis/dsno2/door/MkmjRelationMapper.xml new file mode 100644 index 00000000..bfe7984f --- /dev/null +++ b/src/main/resources/mybatis/dsno2/door/MkmjRelationMapper.xml @@ -0,0 +1,325 @@ + + + + + + + MKMJ_RELATION + + + + + SYS_DICTIONARIES + + + + + f.RELATION_ID, + f.AREA_ID, + f.DEVICE_ID, + f.TYPE, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + RELATION_ID, + AREA_ID, + DEVICE_ID, + TYPE, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{RELATION_ID}, + #{AREA_ID}, + #{DEVICE_ID}, + #{TYPE}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + RELATION_ID = #{RELATION_ID} + + + + + update + + set + RELATION_ID = RELATION_ID, + AREA_ID = #{AREA_ID}, + DEVICE_ID = #{DEVICE_ID}, + TYPE = #{TYPE}, + CORPINFO_ID = #{CORPINFO_ID}, + CREATOR = #{CREATOR}, + CREATTIME = #{CREATTIME}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + ISDELETE = #{ISDELETE} + where + RELATION_ID=#{RELATION_ID} + + + + + + + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + DEVICE_ID in + + #{item} + + + + + + + + diff --git a/src/main/resources/mybatis/dsno2/door/PlatformDoorVideoMapper.xml b/src/main/resources/mybatis/dsno2/door/PlatformDoorVideoMapper.xml new file mode 100644 index 00000000..24868a8d --- /dev/null +++ b/src/main/resources/mybatis/dsno2/door/PlatformDoorVideoMapper.xml @@ -0,0 +1,236 @@ + + + + + + + BUS_PLATFORM_DOOR_VIDEO + + + + + SYS_DICTIONARIES + + + + + f.CORPINFO_ID, + f.INDEXCODE, + f.REGIONINDEXCODE, + f.EXTERNALINDEXCODE, + f.NAME, + f.LONGITUDE, + f.LATITUDE, + f.CAMERATYPE, + f.CASCADECODE, + f.DECODETAG, + f.RESOURCETYPE, + f.CREATETIME, + f.UPDATETIME, + f.SORT, + f.DISORDER, + f.RECORDLOCATION, + f.CASCADETYPE, + f.REGIONNAME, + f.REGIONPATH, + f.REGIONPATHNAME, + f.PLATFORMDOORVIDEO_ID + + + + + CORPINFO_ID, + INDEXCODE, + REGIONINDEXCODE, + EXTERNALINDEXCODE, + NAME, + LONGITUDE, + LATITUDE, + CAMERATYPE, + CASCADECODE, + DECODETAG, + RESOURCETYPE, + CREATETIME, + UPDATETIME, + SORT, + DISORDER, + RECORDLOCATION, + CASCADETYPE, + REGIONNAME, + REGIONPATH, + REGIONPATHNAME, + PLATFORMDOORVIDEO_ID + + + + + #{CORPINFO_ID}, + #{INDEXCODE}, + #{REGIONINDEXCODE}, + #{EXTERNALINDEXCODE}, + #{NAME}, + #{LONGITUDE}, + #{LATITUDE}, + #{CAMERATYPE}, + #{CASCADECODE}, + #{DECODETAG}, + #{RESOURCETYPE}, + #{CREATETIME}, + #{UPDATETIME}, + #{SORT}, + #{DISORDER}, + #{RECORDLOCATION}, + #{CASCADETYPE}, + #{REGIONNAME}, + #{REGIONPATH}, + #{REGIONPATHNAME}, + #{PLATFORMDOORVIDEO_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + PLATFORMDOORVIDEO_ID = #{PLATFORMDOORVIDEO_ID} + + + + + update + + set + CORPINFO_ID = #{CORPINFO_ID}, + INDEXCODE = #{INDEXCODE}, + REGIONINDEXCODE = #{REGIONINDEXCODE}, + EXTERNALINDEXCODE = #{EXTERNALINDEXCODE}, + NAME = #{NAME}, + LONGITUDE = #{LONGITUDE}, + LATITUDE = #{LATITUDE}, + CAMERATYPE = #{CAMERATYPE}, + CASCADECODE = #{CASCADECODE}, + DECODETAG = #{DECODETAG}, + RESOURCETYPE = #{RESOURCETYPE}, + CREATETIME = #{CREATETIME}, + UPDATETIME = #{UPDATETIME}, + SORT = #{SORT}, + DISORDER = #{DISORDER}, + RECORDLOCATION = #{RECORDLOCATION}, + CASCADETYPE = #{CASCADETYPE}, + REGIONNAME = #{REGIONNAME}, + REGIONPATH = #{REGIONPATH}, + REGIONPATHNAME = #{REGIONPATHNAME}, + PLATFORMDOORVIDEO_ID = PLATFORMDOORVIDEO_ID + where + PLATFORMDOORVIDEO_ID = #{PLATFORMDOORVIDEO_ID} + + + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + PLATFORMDOORVIDEO_ID in + + #{item} + + + + + + + update + + set + LONGITUDE = null, + LATITUDE = null, + CORPINFO_ID = null + where + PLATFORMDOORVIDEO_ID = #{PLATFORMDOORVIDEO_ID} + + From c2068c6ebd5305eb637040a494b2a0ba0ae91614 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Sat, 14 Sep 2024 16:50:01 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E6=B6=88=E9=98=B2=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E6=89=AB=E7=A0=81=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=A3=80=E6=9F=A5=E8=AE=B0=E5=BD=95=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../firemanager/FireRecordMapper.java | 1 - .../firemanager/FireRecordService.java | 1 - .../impl/FireRecordServiceImpl.java | 5 -- .../datasource/corpsystem/CorpMenuMapper.xml | 2 +- .../firemanager/FireRecordMapper.xml | 53 ------------------- .../mybatis/datasource/system/MenuMapper.xml | 2 +- 6 files changed, 2 insertions(+), 62 deletions(-) diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java index 8caf8132..abf8fc57 100644 --- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java @@ -89,7 +89,6 @@ public interface FireRecordMapper { List datalistPageV2(Page page); - List datalistPageV3(Page page); List datalistPage(Page page); List getCheckingByCid(String fireCheckId); diff --git a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java index 54caa768..e10279e6 100644 --- a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java +++ b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java @@ -80,7 +80,6 @@ public interface FireRecordService { List getCheckListByApp(Page page); List getCheckListByAppV2(Page page); - List getCheckListByAppV3(Page page); List getCheckRecordByPid(PageData pd); /** diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java index 7a307fa2..3c7fbdcc 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java @@ -723,11 +723,6 @@ public class FireRecordServiceImpl implements FireRecordService { return data; } - @Override - public List getCheckListByAppV3(Page page) { - List data = fireRecordMapper.datalistPageV3(page); - return data; - } @Override public List getCheckRecordByPid(PageData pd) { return fireRecordMapper.getCheckRecordByPid(pd); diff --git a/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml index 24f3cd6b..9cde531e 100644 --- a/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml +++ b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SYS_MENU + sys_menu2 diff --git a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml index bd0a81ec..29996134 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml @@ -1031,58 +1031,5 @@ frp.EQUIPMENT_POINT_ID = #{EQUIPMENT_POINT_ID} AND frp.ISDELETE = '0' - diff --git a/src/main/resources/mybatis/datasource/system/MenuMapper.xml b/src/main/resources/mybatis/datasource/system/MenuMapper.xml index b8ffb1ba..cc6123ea 100644 --- a/src/main/resources/mybatis/datasource/system/MenuMapper.xml +++ b/src/main/resources/mybatis/datasource/system/MenuMapper.xml @@ -34,7 +34,7 @@ - SYS_MENU + sys_menu2 From 32899c9531f8b7445af060fa8f0a53a58a1d974c Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Sat, 14 Sep 2024 16:59:52 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=A1=A8=E6=81=A2?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml | 2 +- src/main/resources/mybatis/datasource/system/MenuMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml index 9cde531e..8cabb206 100644 --- a/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml +++ b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - sys_menu2 + sys_menu diff --git a/src/main/resources/mybatis/datasource/system/MenuMapper.xml b/src/main/resources/mybatis/datasource/system/MenuMapper.xml index cc6123ea..5ee7f957 100644 --- a/src/main/resources/mybatis/datasource/system/MenuMapper.xml +++ b/src/main/resources/mybatis/datasource/system/MenuMapper.xml @@ -34,7 +34,7 @@ - sys_menu2 + sys_menu From e932aacc86720c4d37ddb3b4d992a314b533fff4 Mon Sep 17 00:00:00 2001 From: water_xu Date: Sat, 14 Sep 2024 17:05:11 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml | 2 +- src/main/resources/mybatis/datasource/system/MenuMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml index 8cabb206..24f3cd6b 100644 --- a/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml +++ b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - sys_menu + SYS_MENU diff --git a/src/main/resources/mybatis/datasource/system/MenuMapper.xml b/src/main/resources/mybatis/datasource/system/MenuMapper.xml index 5ee7f957..b8ffb1ba 100644 --- a/src/main/resources/mybatis/datasource/system/MenuMapper.xml +++ b/src/main/resources/mybatis/datasource/system/MenuMapper.xml @@ -34,7 +34,7 @@ - sys_menu + SYS_MENU From 415bfd3086333ab02973f95d085d91c019d93b4e Mon Sep 17 00:00:00 2001 From: shanao Date: Sat, 14 Sep 2024 19:43:49 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accident/AccidentRecordsController.java | 18 ++++++--- .../accident/AccidentRecordsService.java | 7 ++-- .../impl/AccidentRecordsServiceImpl.java | 39 ++++++++++++++++++- 3 files changed, 53 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java b/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java index f46e4dab..b7ddfa80 100644 --- a/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java +++ b/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java @@ -1,6 +1,7 @@ package com.zcloud.controller.accident; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.zcloud.controller.base.BaseController; @@ -71,8 +72,11 @@ public class AccidentRecordsController extends BaseController { @ResponseBody @RequestMapping("/save") public Map save(HttpServletRequest request) { - AccidentRecords accidentRecords = BeanUtil.mapToBean(new PageData(request), AccidentRecords.class, true); - accidentRecordsService.save(accidentRecords); + PageData pageData = new PageData(request); + if (CollUtil.isEmpty(pageData)){ + throw new RuntimeException("参数不能为空"); + } + accidentRecordsService.save(pageData); Map result = new HashMap<>(); result.put("result", "success"); return result; @@ -88,9 +92,13 @@ public class AccidentRecordsController extends BaseController { @RequestMapping("/update") public Map update(HttpServletRequest request) { PageData pageData = new PageData(request); - AccidentRecords accidentRecords = BeanUtil.mapToBean(pageData, AccidentRecords.class, true); - accidentRecords.setId(Optional.of(accidentRecords.getId()).orElseThrow(() -> new RuntimeException("id不能为空"))); - accidentRecordsService.update(accidentRecords); + if (CollUtil.isEmpty(pageData)){ + throw new RuntimeException("参数不能为空"); + } + if (pageData.get("id") != null) { + throw new RuntimeException("id不能为空"); + } + accidentRecordsService.update(pageData); Map result = new HashMap<>(); result.put("result", "success"); return result; diff --git a/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java b/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java index 8ed30d49..2d003b70 100644 --- a/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java +++ b/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java @@ -2,7 +2,6 @@ package com.zcloud.service.accident; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.entity.accident.AccidentRecords; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -29,16 +28,16 @@ public interface AccidentRecordsService { /** * 新增 * - * @param accidentRecords 要保存的实体 + * @param pageData 要保存的实体 */ - void save(AccidentRecords accidentRecords); + void save(PageData pageData); /** * 修改 * * @param bean 要修改的实体 */ - void update(AccidentRecords bean); + void update(PageData pageData); /** * 删除 diff --git a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java index f3777606..ca806922 100644 --- a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java +++ b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java @@ -1,5 +1,6 @@ package com.zcloud.service.accident.impl; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; @@ -58,7 +59,8 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { @Override @Transactional(rollbackFor = Exception.class) - public void save(AccidentRecords accidentRecords) { + public void save(PageData pageData) { + AccidentRecords accidentRecords = new AccidentRecords(); accidentRecords.setId(IdUtil.fastSimpleUUID()); accidentRecords.setCreatedBy(Jurisdiction.getUsername()); Date date = new Date(); @@ -71,12 +73,45 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { accidentRecords.setIsDeleted(0); String corpinfoId = StrUtil.isEmpty(accidentRecords.getCorpinfoId()) ? Jurisdiction.getCORPINFO_ID() : accidentRecords.getCorpinfoId(); accidentRecords.setCorpinfoId(corpinfoId); + accidentRecords.setIncidentNumber(pageData.getString("incidentNumber")); + accidentRecords.setIncidentName(pageData.getString("incidentName")); + accidentRecords.setIncidentType(pageData.getString("incidentType")); + accidentRecords.setIncidentLevel(pageData.getString("incidentLevel")); + accidentRecords.setLocation(pageData.getString("location")); + accidentRecords.setIncidentDate(DateUtil.parse(pageData.getString("incidentDate"), DatePattern.UTC_MS_PATTERN)); + accidentRecords.setDirectLoss(Convert.toInt(pageData.get("directLoss"))); + accidentRecords.setInjured(Convert.toInt(pageData.get("injured"))); + accidentRecords.setSeriouslyInjured(Convert.toInt(pageData.get("seriouslyInjured"))); + accidentRecords.setCause(pageData.getString("cause")); + accidentRecords.setSummary(pageData.getString("summary")); + accidentRecords.setAnalysis(pageData.getString("analysis")); + accidentRecords.setSuggestions(pageData.getString("suggestions")); + accidentRecords.setMeasures(pageData.getString("measures")); + accidentRecords.setCreator(pageData.getString("creator")); + accidentRecords.setReportDate(DateUtil.parse(pageData.getString("reportDate"), DatePattern.UTC_MS_PATTERN)); Assert.isTrue(accidentRecordsMapper.save(accidentRecords) == 1, "新增事故记录失败"); } @Override @Transactional(rollbackFor = Exception.class) - public void update(AccidentRecords accidentRecords) { + public void update(PageData pageData) { + AccidentRecords accidentRecords = new AccidentRecords(); + accidentRecords.setIncidentNumber(pageData.getString("incidentNumber")); + accidentRecords.setIncidentName(pageData.getString("incidentName")); + accidentRecords.setIncidentType(pageData.getString("incidentType")); + accidentRecords.setIncidentLevel(pageData.getString("incidentLevel")); + accidentRecords.setLocation(pageData.getString("location")); + accidentRecords.setIncidentDate(DateUtil.parse(pageData.getString("incidentDate"), DatePattern.UTC_MS_PATTERN)); + accidentRecords.setDirectLoss(Convert.toInt(pageData.get("directLoss"))); + accidentRecords.setInjured(Convert.toInt(pageData.get("injured"))); + accidentRecords.setSeriouslyInjured(Convert.toInt(pageData.get("seriouslyInjured"))); + accidentRecords.setCause(pageData.getString("cause")); + accidentRecords.setSummary(pageData.getString("summary")); + accidentRecords.setAnalysis(pageData.getString("analysis")); + accidentRecords.setSuggestions(pageData.getString("suggestions")); + accidentRecords.setMeasures(pageData.getString("measures")); + accidentRecords.setCreator(pageData.getString("creator")); + accidentRecords.setReportDate(DateUtil.parse(pageData.getString("reportDate"), DatePattern.UTC_MS_PATTERN)); accidentRecords.setUpdatedBy(Jurisdiction.getUsername()); accidentRecords.setUpdatedTime(new Date()); String corpinfoId = StrUtil.isEmpty(accidentRecords.getCorpinfoId()) ? Jurisdiction.getCORPINFO_ID() : accidentRecords.getCorpinfoId(); From e61cb0b9ea3d76b9814e10556c2e9f00dcc4081d Mon Sep 17 00:00:00 2001 From: shanao Date: Sat, 14 Sep 2024 19:59:53 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/accident/AccidentRecordsController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java b/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java index b7ddfa80..d1f125a8 100644 --- a/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java +++ b/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java @@ -1,13 +1,11 @@ package com.zcloud.controller.accident; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.entity.accident.AccidentRecords; import com.zcloud.service.accident.AccidentRecordsService; import com.zcloud.util.ObjectExcelView; import lombok.RequiredArgsConstructor; @@ -95,7 +93,7 @@ public class AccidentRecordsController extends BaseController { if (CollUtil.isEmpty(pageData)){ throw new RuntimeException("参数不能为空"); } - if (pageData.get("id") != null) { + if (pageData.get("id") == null) { throw new RuntimeException("id不能为空"); } accidentRecordsService.update(pageData); From cbd2c424dc0b6ea5cb501ddfc46ee7f94bf6b48c Mon Sep 17 00:00:00 2001 From: shanao Date: Sat, 14 Sep 2024 20:17:18 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/accident/impl/AccidentRecordsServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java index ca806922..97919fec 100644 --- a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java +++ b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java @@ -97,11 +97,12 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { public void update(PageData pageData) { AccidentRecords accidentRecords = new AccidentRecords(); accidentRecords.setIncidentNumber(pageData.getString("incidentNumber")); + accidentRecords.setId(pageData.getString("id")); accidentRecords.setIncidentName(pageData.getString("incidentName")); accidentRecords.setIncidentType(pageData.getString("incidentType")); accidentRecords.setIncidentLevel(pageData.getString("incidentLevel")); accidentRecords.setLocation(pageData.getString("location")); - accidentRecords.setIncidentDate(DateUtil.parse(pageData.getString("incidentDate"), DatePattern.UTC_MS_PATTERN)); + accidentRecords.setIncidentDate(DateUtil.parse(pageData.getString("incidentDate"), "YYYY-MM-DD HH:mm:ss")); accidentRecords.setDirectLoss(Convert.toInt(pageData.get("directLoss"))); accidentRecords.setInjured(Convert.toInt(pageData.get("injured"))); accidentRecords.setSeriouslyInjured(Convert.toInt(pageData.get("seriouslyInjured"))); @@ -111,7 +112,7 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { accidentRecords.setSuggestions(pageData.getString("suggestions")); accidentRecords.setMeasures(pageData.getString("measures")); accidentRecords.setCreator(pageData.getString("creator")); - accidentRecords.setReportDate(DateUtil.parse(pageData.getString("reportDate"), DatePattern.UTC_MS_PATTERN)); + accidentRecords.setReportDate(DateUtil.parse(pageData.getString("reportDate"), "YYYY-MM-DD HH:mm:ss")); accidentRecords.setUpdatedBy(Jurisdiction.getUsername()); accidentRecords.setUpdatedTime(new Date()); String corpinfoId = StrUtil.isEmpty(accidentRecords.getCorpinfoId()) ? Jurisdiction.getCORPINFO_ID() : accidentRecords.getCorpinfoId(); From 39f19b35268be4425b6cc08a6ee3a142428a0f13 Mon Sep 17 00:00:00 2001 From: shanao Date: Sat, 14 Sep 2024 20:41:30 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/entity/accident/AccidentRecords.java | 4 ++-- .../service/accident/impl/AccidentRecordsServiceImpl.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zcloud/entity/accident/AccidentRecords.java b/src/main/java/com/zcloud/entity/accident/AccidentRecords.java index f44e8ca1..3fc18cc2 100644 --- a/src/main/java/com/zcloud/entity/accident/AccidentRecords.java +++ b/src/main/java/com/zcloud/entity/accident/AccidentRecords.java @@ -67,7 +67,7 @@ public class AccidentRecords implements Serializable { /** * 事故发生时间 */ - private Date incidentDate; + private String incidentDate; /** * 直接经济损失（万元） @@ -130,7 +130,7 @@ public class AccidentRecords implements Serializable { /** * 报出日期 */ - private Date reportDate; + private String reportDate; /** * 创建人 diff --git a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java index 97919fec..493cf2d5 100644 --- a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java +++ b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java @@ -78,7 +78,7 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { accidentRecords.setIncidentType(pageData.getString("incidentType")); accidentRecords.setIncidentLevel(pageData.getString("incidentLevel")); accidentRecords.setLocation(pageData.getString("location")); - accidentRecords.setIncidentDate(DateUtil.parse(pageData.getString("incidentDate"), DatePattern.UTC_MS_PATTERN)); + accidentRecords.setIncidentDate(pageData.getString("incidentDate")); accidentRecords.setDirectLoss(Convert.toInt(pageData.get("directLoss"))); accidentRecords.setInjured(Convert.toInt(pageData.get("injured"))); accidentRecords.setSeriouslyInjured(Convert.toInt(pageData.get("seriouslyInjured"))); @@ -88,7 +88,7 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { accidentRecords.setSuggestions(pageData.getString("suggestions")); accidentRecords.setMeasures(pageData.getString("measures")); accidentRecords.setCreator(pageData.getString("creator")); - accidentRecords.setReportDate(DateUtil.parse(pageData.getString("reportDate"), DatePattern.UTC_MS_PATTERN)); + accidentRecords.setReportDate(pageData.getString("reportDate")); Assert.isTrue(accidentRecordsMapper.save(accidentRecords) == 1, "新增事故记录失败"); } @@ -102,7 +102,7 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { accidentRecords.setIncidentType(pageData.getString("incidentType")); accidentRecords.setIncidentLevel(pageData.getString("incidentLevel")); accidentRecords.setLocation(pageData.getString("location")); - accidentRecords.setIncidentDate(DateUtil.parse(pageData.getString("incidentDate"), "YYYY-MM-DD HH:mm:ss")); + accidentRecords.setIncidentDate(pageData.getString("incidentDate")); accidentRecords.setDirectLoss(Convert.toInt(pageData.get("directLoss"))); accidentRecords.setInjured(Convert.toInt(pageData.get("injured"))); accidentRecords.setSeriouslyInjured(Convert.toInt(pageData.get("seriouslyInjured"))); @@ -112,7 +112,7 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { accidentRecords.setSuggestions(pageData.getString("suggestions")); accidentRecords.setMeasures(pageData.getString("measures")); accidentRecords.setCreator(pageData.getString("creator")); - accidentRecords.setReportDate(DateUtil.parse(pageData.getString("reportDate"), "YYYY-MM-DD HH:mm:ss")); + accidentRecords.setReportDate(pageData.getString("reportDate")); accidentRecords.setUpdatedBy(Jurisdiction.getUsername()); accidentRecords.setUpdatedTime(new Date()); String corpinfoId = StrUtil.isEmpty(accidentRecords.getCorpinfoId()) ? Jurisdiction.getCORPINFO_ID() : accidentRecords.getCorpinfoId(); From d39cf3da8798043a28c270f970d93f4d8fe7afd3 Mon Sep 17 00:00:00 2001 From: shanao Date: Sat, 14 Sep 2024 21:15:25 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=9B=B8=E5=B7=AE8=E5=B0=8F=E6=97=B6=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/accident/AccidentRecords.java | 4 +-- .../impl/AccidentRecordsServiceImpl.java | 27 +++++++++++-------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zcloud/entity/accident/AccidentRecords.java b/src/main/java/com/zcloud/entity/accident/AccidentRecords.java index 3fc18cc2..f44e8ca1 100644 --- a/src/main/java/com/zcloud/entity/accident/AccidentRecords.java +++ b/src/main/java/com/zcloud/entity/accident/AccidentRecords.java @@ -67,7 +67,7 @@ public class AccidentRecords implements Serializable { /** * 事故发生时间 */ - private String incidentDate; + private Date incidentDate; /** * 直接经济损失（万元） @@ -130,7 +130,7 @@ public class AccidentRecords implements Serializable { /** * 报出日期 */ - private String reportDate; + private Date reportDate; /** * 创建人 diff --git a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java index 493cf2d5..b9e08329 100644 --- a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java +++ b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java @@ -2,6 +2,7 @@ package com.zcloud.service.accident.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; @@ -26,7 +27,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.lang.reflect.Field; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -63,12 +63,6 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { AccidentRecords accidentRecords = new AccidentRecords(); accidentRecords.setId(IdUtil.fastSimpleUUID()); accidentRecords.setCreatedBy(Jurisdiction.getUsername()); - Date date = new Date(); - SimpleDateFormat dateFormat = new SimpleDateFormat(DatePattern.NORM_DATETIME_PATTERN); - // 设置成东八区时间 - dateFormat.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); - - DateUtil.parse(dateFormat.format(date), DatePattern.NORM_DATETIME_PATTERN); accidentRecords.setIsDeleted(0); String corpinfoId = StrUtil.isEmpty(accidentRecords.getCorpinfoId()) ? Jurisdiction.getCORPINFO_ID() : accidentRecords.getCorpinfoId(); @@ -78,7 +72,12 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { accidentRecords.setIncidentType(pageData.getString("incidentType")); accidentRecords.setIncidentLevel(pageData.getString("incidentLevel")); accidentRecords.setLocation(pageData.getString("location")); - accidentRecords.setIncidentDate(pageData.getString("incidentDate")); + + DateTime time = DateUtil.parse(pageData.getString("incidentDate"), "yyyy-MM-dd HH:mm:ss"); + accidentRecords.setIncidentDate(time); + DateTime time1 = DateUtil.parse(pageData.getString("incidentDate"), "yyyy-MM-dd HH:mm:ss"); + accidentRecords.setReportDate(time1); + accidentRecords.setDirectLoss(Convert.toInt(pageData.get("directLoss"))); accidentRecords.setInjured(Convert.toInt(pageData.get("injured"))); accidentRecords.setSeriouslyInjured(Convert.toInt(pageData.get("seriouslyInjured"))); @@ -88,7 +87,7 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { accidentRecords.setSuggestions(pageData.getString("suggestions")); accidentRecords.setMeasures(pageData.getString("measures")); accidentRecords.setCreator(pageData.getString("creator")); - accidentRecords.setReportDate(pageData.getString("reportDate")); + accidentRecords.setPhotos(pageData.getString("photos")); Assert.isTrue(accidentRecordsMapper.save(accidentRecords) == 1, "新增事故记录失败"); } @@ -102,7 +101,12 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { accidentRecords.setIncidentType(pageData.getString("incidentType")); accidentRecords.setIncidentLevel(pageData.getString("incidentLevel")); accidentRecords.setLocation(pageData.getString("location")); - accidentRecords.setIncidentDate(pageData.getString("incidentDate")); + + DateTime time = DateUtil.parse(pageData.getString("incidentDate"), "yyyy-MM-dd HH:mm:ss"); + accidentRecords.setIncidentDate(time); + DateTime time1 = DateUtil.parse(pageData.getString("incidentDate"), "yyyy-MM-dd HH:mm:ss"); + accidentRecords.setReportDate(time1); + accidentRecords.setDirectLoss(Convert.toInt(pageData.get("directLoss"))); accidentRecords.setInjured(Convert.toInt(pageData.get("injured"))); accidentRecords.setSeriouslyInjured(Convert.toInt(pageData.get("seriouslyInjured"))); @@ -112,9 +116,10 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { accidentRecords.setSuggestions(pageData.getString("suggestions")); accidentRecords.setMeasures(pageData.getString("measures")); accidentRecords.setCreator(pageData.getString("creator")); - accidentRecords.setReportDate(pageData.getString("reportDate")); + accidentRecords.setPhotos(pageData.getString("creator")); accidentRecords.setUpdatedBy(Jurisdiction.getUsername()); accidentRecords.setUpdatedTime(new Date()); + accidentRecords.setPhotos(pageData.getString("photos") == null ? null : pageData.getString("photos")); String corpinfoId = StrUtil.isEmpty(accidentRecords.getCorpinfoId()) ? Jurisdiction.getCORPINFO_ID() : accidentRecords.getCorpinfoId(); accidentRecords.setCorpinfoId(corpinfoId); Assert.isTrue(accidentRecordsMapper.updateById(accidentRecords) == 1, "更新事故记录失败"); From 25752ec5effed626c7058fb52b9874c682238d0c Mon Sep 17 00:00:00 2001 From: shanao Date: Sat, 14 Sep 2024 22:11:16 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/accident/impl/AccidentRecordsServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java index b9e08329..7cae2184 100644 --- a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java +++ b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java @@ -72,6 +72,7 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { accidentRecords.setIncidentType(pageData.getString("incidentType")); accidentRecords.setIncidentLevel(pageData.getString("incidentLevel")); accidentRecords.setLocation(pageData.getString("location")); + accidentRecords.setFatalities(Convert.toInt(pageData.get("fatalities"))); DateTime time = DateUtil.parse(pageData.getString("incidentDate"), "yyyy-MM-dd HH:mm:ss"); accidentRecords.setIncidentDate(time); @@ -101,6 +102,7 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { accidentRecords.setIncidentType(pageData.getString("incidentType")); accidentRecords.setIncidentLevel(pageData.getString("incidentLevel")); accidentRecords.setLocation(pageData.getString("location")); + accidentRecords.setFatalities(Convert.toInt(pageData.get("fatalities"))); DateTime time = DateUtil.parse(pageData.getString("incidentDate"), "yyyy-MM-dd HH:mm:ss"); accidentRecords.setIncidentDate(time); From bd4185fcb7768e9994c7c95b6dca437fcec1232c Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Thu, 19 Sep 2024 08:46:49 +0800 Subject: [PATCH 18/22] =?UTF-8?q?1.=E6=B6=88=E9=98=B2=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../firemanager/FireRecordMapper.xml | 54 ++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml index 29996134..081c690b 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml @@ -1031,5 +1031,57 @@ frp.EQUIPMENT_POINT_ID = #{EQUIPMENT_POINT_ID} AND frp.ISDELETE = '0' - + From 3fdd6ee1e67d7b9d5a558cd38f915e189b0c4015 Mon Sep 17 00:00:00 2001 From: water_xu Date: Thu, 19 Sep 2024 09:06:05 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 0af30d47..1c079768 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -58,14 +58,14 @@ spring.main.banner-mode=off #preventionxgf.api.url=http://127.0.0.1:8088/ # #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 -preventionxgf.api.url=http://39.100.115.58:8082/qa-prevention-xgf/ -qa-regulatory-gwj.api.url=http://39.100.115.58:8081/qa-regulatory-gwj/ +preventionxgf.api.url=https://qggf.qhdsafety.com/xgfApi/ +qa-regulatory-gwj.api.url=https://qggf.qhdsafety.com/jgApi/ dw.url=http://192.168.192.201:8888/qa-dingWei-gwj/ #????? -smb.host=39.101.130.96 +smb.host=172.24.151.13 smb.port=22 smb.user=root -smb.password=Zcloud@zcloud88888 +smb.password=0#MGi=dgtbU$r26_ smb.basePath=/mnt/wwag/file/ #Mq\u914D\u7F6E @@ -106,7 +106,6 @@ perLoc.url=http://192.168.210.32:8084 perLoc.userName=qaaqadmin perLoc.pwd=Cfd2023@ baseimgpath =http://192.168.192.201:8991/file/ -tongbu.url=http://127.0.0.1:8094 mq.csy.data.topic=csy_docking mq.csy.data.group=scheduled_tasks_csy_docking @@ -145,6 +144,7 @@ gongJiangXueYuanProdUrl=https://gjxy.bjttsx.com gongJiangXueYuanGetImgUrl=https://wwag.qhdsafety.com/file/ # \u4E2D\u53F0 +tongbu.url=http://127.0.0.1:8094 # \u6D88\u8D39\u4E2D\u53F0\u901A\u77E5 mq.consumer.dataChange.tongbu-data-change.topic=tongbu_dataChange_docking mq.consumer.dataChange.tongbu-data-change.group=tongbu_dataChange_group From 6050e94b49e97f514ad9fcdfe2217b68af69544d Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Tue, 24 Sep 2024 18:30:22 +0800 Subject: [PATCH 20/22] =?UTF-8?q?datalistPageV3=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/datasource/firemanager/FireRecordMapper.java | 1 + .../com/zcloud/service/firemanager/FireRecordService.java | 1 + .../service/firemanager/impl/FireRecordServiceImpl.java | 5 +++++ .../mybatis/datasource/firemanager/FireRecordMapper.xml | 3 ++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java index e1de0696..20874926 100644 --- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java @@ -89,6 +89,7 @@ public interface FireRecordMapper { List datalistPageV2(Page page); + List datalistPageV3(Page page); List datalistPage(Page page); List getCheckingByCid(String fireCheckId); diff --git a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java index 982a1b70..799c900b 100644 --- a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java +++ b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java @@ -80,6 +80,7 @@ public interface FireRecordService { List getCheckListByApp(Page page); List getCheckListByAppV2(Page page); + List getCheckListByAppV3(Page page); List getCheckRecordByPid(PageData pd); /** diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java index cf278764..866c66a6 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java @@ -723,6 +723,11 @@ public class FireRecordServiceImpl implements FireRecordService { return data; } + @Override + public List getCheckListByAppV3(Page page) { + List data = fireRecordMapper.datalistPageV3(page); + return data; + } @Override public List getCheckRecordByPid(PageData pd) { return fireRecordMapper.getCheckRecordByPid(pd); diff --git a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml index 081c690b..bd0a81ec 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml @@ -1071,7 +1071,7 @@ - and cl.DEPARTMENT_ID in (${pd.supDeparIds}) + and cp.DEPARTMENT_ID in (${pd.supDeparIds}) @@ -1084,4 +1084,5 @@ FIRE_CHECK_ID order by fr. CREATTIME + From f74153542014ce72b0a1d83baf14276dc86be933 Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Sat, 12 Oct 2024 08:56:20 +0800 Subject: [PATCH 21/22] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](hy?= =?UTF-8?q?x=5F2024-9-27=5Ftongbu)=20=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/UsersController.java | 29 +++++++++++++------ .../zcloud/syncData/SyncDataAdviceAspect.java | 4 +-- .../syncData/listener/SyncDataListener.java | 10 ++++--- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 4c0ee501..225e4088 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -778,7 +778,7 @@ public class UsersController extends BaseController { } map.put("result", errInfo); map.put("code","0"); -// map.put("syncInfo", JSONUtil.toJsonStr(usersService.findById(pd))); + map.put("syncInfo", JSONUtil.toJsonStr(usersService.findById(pd))); return map; } @@ -1032,7 +1032,7 @@ public class UsersController extends BaseController { map.put("USER_ID",ID); map.put("result", errInfo); //返回结果 map.put("code", "0"); -// map.put("syncInfo", JSONUtil.toJsonStr(userinfo)); + map.put("syncInfo", JSONUtil.toJsonStr(userinfo)); } else { map.put("result", "您输入的身份证号和用户名二次校验失败，请确认后重新申请"); //返回结果 } @@ -1066,9 +1066,9 @@ public class UsersController extends BaseController { for (Object key : set) { param.put(key.toString(),pd.getString(key.toString())); } -// String UserDto = JSON.toJSONString(param); -// String result = HttpClientUtilDoGet.sendHttpPost(tongBuUrl + "/docking/core/user/addOrUpdate", UserDto,param); -// returnMap = (Map) JSON.parse(result); + String UserDto = JSON.toJSONString(param); + String result = HttpClientUtilDoGet.sendHttpPost(tongBuUrl + "/docking/core/user/addOrUpdate", UserDto,param); + returnMap = (Map) JSON.parse(result); // TODO com.alibaba.fastjson.JSONException: syntax error, pos 1 暂时不用人员中台 returnMap.put("result", "success"); } @@ -2503,12 +2503,23 @@ public class UsersController extends BaseController { return doCheck(param.get("USERNAME"),param.get("CARD_NO"),param.get("USER_ID")); } + /** + * 检查人员中台用户是否存在 + * + * @param USERNAME 用户名 + * @param CARD_NO 身份证号 + * @param USER_ID 用户id + * @return map + * @throws Exception + * @author water_xu + * @date 2024-9-29 + */ public Map doCheck(String USERNAME, String CARD_NO, String USER_ID) throws Exception { -// String result = HttpClientUtilDoGet.sendHttpGet(tongBuUrl + "/docking/core/user/getCheck"+"?USERNAME="+USERNAME+"&CARD_NO="+CARD_NO+"&USER_ID="+USER_ID); -// Map returnMap = (Map) JSON.parse(result); + String result = HttpClientUtilDoGet.sendHttpGet(tongBuUrl + "/docking/core/user/getCheck"+"?USERNAME="+USERNAME+"&CARD_NO="+CARD_NO+"&USER_ID="+USER_ID); + Map returnMap = (Map) JSON.parse(result); // 人员中台暂时不用 - Map returnMap = new HashMap<>(); - returnMap.put("result", "success"); +// Map returnMap = new HashMap<>(); +// returnMap.put("result", "success"); return returnMap; } diff --git a/src/main/java/com/zcloud/syncData/SyncDataAdviceAspect.java b/src/main/java/com/zcloud/syncData/SyncDataAdviceAspect.java index dabed28d..d50553f2 100644 --- a/src/main/java/com/zcloud/syncData/SyncDataAdviceAspect.java +++ b/src/main/java/com/zcloud/syncData/SyncDataAdviceAspect.java @@ -25,8 +25,8 @@ import java.util.Map; * 作者：water_xu * 官网：www.zcloudchina.com */ -//@Aspect -//@Component +@Aspect +@Component @SuppressWarnings("all") public class SyncDataAdviceAspect { diff --git a/src/main/java/com/zcloud/syncData/listener/SyncDataListener.java b/src/main/java/com/zcloud/syncData/listener/SyncDataListener.java index a313f873..0eebb398 100644 --- a/src/main/java/com/zcloud/syncData/listener/SyncDataListener.java +++ b/src/main/java/com/zcloud/syncData/listener/SyncDataListener.java @@ -85,10 +85,12 @@ public class SyncDataListener implements RocketMQListener { pd.putAll(tenCorpDto.getPd()); pd.put("CONSUMPTION_TIME", DateUtil.date2Str(new Date())); pd.put("CONSUMPTION_TYPE","MqQyDataListener"); - if ("qy".equals(tenCorpDto.getMessage())){ - // 在本端发的同步消息，不需要再次同步该数据 - return; - } + //2024-10-08 黄宇轩修改， + // 三端新增用户后，人员中台将用户信息同步到core_sync_user表 +// if ("qy".equals(tenCorpDto.getMessage())){ +// // 在本端发的同步消息，不需要再次同步该数据 +// return; +// } try { //拿到原路径 String url = pd.getString("url"); From 059e316156da1a9a89d8000fa99281d5c4556cd7 Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Mon, 21 Oct 2024 08:48:15 +0800 Subject: [PATCH 22/22] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](hy?= =?UTF-8?q?x=5F2024-9-27=5Ftongbu)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/system/UsersController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 225e4088..d3b50f18 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -798,7 +798,7 @@ public class UsersController extends BaseController { usersService.editUserFuns(pd); //执行修改 map.put("result", errInfo); map.put("code", "0"); -// map.put("syncInfo", JSONUtil.toJsonStr(usersService.findById(pd))); + map.put("syncInfo", JSONUtil.toJsonStr(usersService.findById(pd))); return map; } @@ -830,7 +830,7 @@ public class UsersController extends BaseController { FHLOG.save(Jurisdiction.getUsername(), "从个人资料中修改" + pd.getString("USERNAME") + "的资料"); //记录日志 map.put("result", errInfo); map.put("code", "0"); -// map.put("syncInfo", JSONUtil.toJsonStr(usersService.findById(pd))); + map.put("syncInfo", JSONUtil.toJsonStr(usersService.findById(pd))); return map; }