From 491d640c878dfe07128b05ed683b55723cf7ed0b Mon Sep 17 00:00:00 2001 From: z Date: Wed, 20 Dec 2023 11:13:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../keyProjects/OutSourcedController.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java index 6fcdf97c..3dff07ad 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java @@ -59,7 +59,7 @@ public class OutSourcedController extends BaseController { @RequestMapping(value = "/add") @RequiresPermissions("outsourced:add") @ResponseBody - @DockAnnotation(isAdd = true) + @DockAnnotation(isAdd = true,hasAnnex = true) public Object add(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "file1", required = false) MultipartFile file1, @RequestParam(value = "file2", required = false) MultipartFile file2, @@ -85,7 +85,7 @@ public class OutSourcedController extends BaseController { //pd.put("INVOLVING_CORPS", Jurisdiction.getCORPINFO_ID()); //理单位名称 pd.put("IS_CORP_TYPE", "1"); //是否企业重点工程0监管重点工程;1企业重点工程 - + ArrayList strings = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -98,6 +98,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile); pd.put("UNITS_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); } if (null != file1 && !file1.isEmpty()) { String suffixName = file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -111,6 +112,8 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file1, fileName, Const.FILEPATHFILE + ffile); pd.put("MEASURES", Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); + } if (null != file2 && !file2.isEmpty()) { String suffixName = file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -124,6 +127,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file2, fileName, Const.FILEPATHFILE + ffile); pd.put("MANAGE_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); } if (null != file3 && !file3.isEmpty()) { String suffixName = file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -137,6 +141,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file3, fileName, Const.FILEPATHFILE + ffile); pd.put("DESIGE", Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); } if (null != file4 && !file4.isEmpty()) { String suffixName = file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -150,6 +155,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file4, fileName, Const.FILEPATHFILE + ffile); pd.put("ATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); } if (null != file5 && !file5.isEmpty()) { String suffixName = file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -163,6 +169,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file5, fileName, Const.FILEPATHFILE + ffile); pd.put("RECORDS", Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); } if (null != file6 && !file6.isEmpty()) { String suffixName = file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -176,6 +183,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file6, fileName, Const.FILEPATHFILE + ffile); pd.put("SHEET", Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); } if (null != file7 && !file7.isEmpty()) { String suffixName = file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -189,6 +197,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file7, fileName, Const.FILEPATHFILE + ffile); pd.put("EXAMINATION", Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); } if (null != file8 && !file8.isEmpty()) { String suffixName = file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -202,6 +211,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file8, fileName, Const.FILEPATHFILE + ffile); pd.put("OATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); } if (null != file9 && file9.length > 0) { @@ -220,14 +230,15 @@ public class OutSourcedController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID() + file9One.getOriginalFilename(). substring(file9One.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile); PageData pdImg = new PageData(); String fileUpdateName = file9One.getOriginalFilename(); - pdImg.put("IMGFILES_ID", this.get32UUID()); + String IMGFILES_ID = this.get32UUID(); + pdImg.put("IMGFILES_ID", IMGFILES_ID); pdImg.put("FILE_NAME", fileUpdateName); pdImg.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); pdImg.put("TYPE", "300"); pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID")); + Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,pd.getString("OUTSOURCED_ID"),"300"); imgfilesService.save(pdImg); } } @@ -239,6 +250,7 @@ public class OutSourcedController extends BaseController { //} pd.put("INVOLVING_CORPS", Jurisdiction.getCORPINFO_ID()); outsourcedService.save(pd); + pd.put("pictList",strings); map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; From 65b2c2fa5c2fdbff8cb4c30a5326cf92aa30ac2e Mon Sep 17 00:00:00 2001 From: z Date: Wed, 20 Dec 2023 17:10:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/keyProjects/KeyprojectCheckController.java | 3 +++ .../keyProjects/app/AppKeyprojectCheckController.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java index 309d9af1..eae3b74a 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java @@ -2,6 +2,7 @@ package com.zcloud.controller.keyProjects; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -43,6 +44,7 @@ public class KeyprojectCheckController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -111,6 +113,7 @@ public class KeyprojectCheckController extends BaseController { pd.put("hiddenList", hiddenList); } map.put("pd", pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java index 9b5ce3a1..d9b7f91b 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.keyProjects.app; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -55,6 +56,7 @@ public class AppKeyprojectCheckController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -117,6 +119,7 @@ public class AppKeyprojectCheckController extends BaseController { hidden.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) hidden.put("POSITIONDESC",json.getString("POSITIONDESC"));// 隐患位置描述 + keyprojectHiddenService.save(hidden); hiddenList.add(hidden); time = DateUtil.calculateDateSecond(time, 1); @@ -174,6 +177,7 @@ public class AppKeyprojectCheckController extends BaseController { e.printStackTrace(); }finally { map.put("pd", pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); } return map;