guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

八项作业

pull/14/head
dearlin 2023-12-25 14:42:45 +08:00
parent c1431c47db
commit 87aee42fdb
6 changed files with 2442 additions and 2244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
1703230140663.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

16
src/main/java/com/zcloud/controller/filemanager/MfolderController.java
View File

@ -52,7 +52,7 @@ public class MfolderController extends BaseController {
@RequestMapping(value="/add") @RequestMapping(value="/add")
@RequiresPermissions("mfolder:add") @RequiresPermissions("mfolder:add")
@ResponseBody @ResponseBody
@DockAnnotation(isAdd = true) @DockAnnotation
public Object add() throws Exception{ public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
@ -80,13 +80,7 @@ public class MfolderController extends BaseController {
@RequiresPermissions("mfolder:add") @RequiresPermissions("mfolder:add")
@ResponseBody @ResponseBody
@DockAnnotation(hasAnnex = true) @DockAnnotation(hasAnnex = true)
public Object add( public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file, @RequestParam(value="NAME",required=false) String NAME, @RequestParam(value="PARENT_ID",required=false) String PARENT_ID, @RequestParam(value="REMARKS",required=false) String REMARKS, @RequestParam(value="SHARE",required=false) String SHARE) throws Exception{
@RequestParam(value="FFILE",required=false) MultipartFile file,
@RequestParam(value="NAME",required=false) String NAME,
@RequestParam(value="PARENT_ID",required=false) String PARENT_ID,
@RequestParam(value="REMARKS",required=false) String REMARKS,
@RequestParam(value="SHARE",required=false) String SHARE
) throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
ArrayList<String> pictureList = new ArrayList<>(); ArrayList<String> pictureList = new ArrayList<>();
String errInfo = "success"; String errInfo = "success";
@ -100,8 +94,6 @@ public class MfolderController extends BaseController {
map.put("msg", "文件格式不正确！"); map.put("msg", "文件格式不正确！");
return map; return map;
} }
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
Long size = file.getSize()/1024; Long size = file.getSize()/1024;
fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
@ -117,10 +109,6 @@ public class MfolderController extends BaseController {
pd.put("MFOLDER_ID", this.get32UUID()); //主键 pd.put("MFOLDER_ID", this.get32UUID()); //主键
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
mfolderService.save(pd); //存入数据库表 mfolderService.save(pd); //存入数据库表
//存自己表里的附件 使用文件全路径加文件名的方式 示例
// /uploadFiles/yhtp/8415df13cc4c46f0ac32f579462dbb8f/20231215/d3bc85d1bbe84b75b1e6e8b6182dc547.jpg
// @@
// d3bc85d1bbe84b75b1e6e8b6182dc547.jpg
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+ pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+
"@@" "@@"
+fileName); +fileName);

190
src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java
View File

@ -47,7 +47,10 @@ public class AppGFBreakGroundController extends BaseController {
private SendMessageUtil sendMessageUtil; private SendMessageUtil sendMessageUtil;
@Autowired @Autowired
private Smb smb; private Smb smb;
/**获取编码
/**
* 获取编码
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -72,7 +75,9 @@ public class AppGFBreakGroundController extends BaseController {
return map; return map;
} }
/**新增 /**
* 新增
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -162,19 +167,24 @@ public class AppGFBreakGroundController extends BaseController {
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
} }
PageData dockData = new PageData(); PageData dockData = new PageData();
dockData.put("breakGroundPageData",breakGroundPageData); dockData.put("breakGroundPageData", JSON.toJSONString(breakGroundPageData));
dockData.put("breakGroundLogPageData",breakGroundLogPageData); dockData.put("breakGroundLogPageData", JSON.toJSONString(breakGroundLogPageData));
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(dockData)); map.put("dockData", JSON.toJSONString(dockData));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map; return map;
} }
/**修改
/**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/editGuardian") @RequestMapping(value = "/editGuardian")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation
public Object editGuardian( public Object editGuardian(
@RequestParam(value = "FFILE", required = false) MultipartFile[] files @RequestParam(value = "FFILE", required = false) MultipartFile[] files
) throws Exception { ) throws Exception {
@ -186,27 +196,36 @@ public class AppGFBreakGroundController extends BaseController {
pd2 = GFbreakGroundService.findById(pd); pd2 = GFbreakGroundService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
ArrayList<String> sendPicturesList = new ArrayList<>();
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
MultipartFile file = files[0]; MultipartFile file = files[0];
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName
+ "@@" + fileName
);
pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
GFbreakGroundService.edit(pd2); GFbreakGroundService.edit(pd2);
} }
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map; return map;
} }
/**修改
/**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/editConfess") @RequestMapping(value = "/editConfess")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation
public Object editConfess( public Object editConfess(
@RequestParam(value = "FFILE", required = false) MultipartFile[] files @RequestParam(value = "FFILE", required = false) MultipartFile[] files
) throws Exception { ) throws Exception {
@ -218,27 +237,37 @@ public class AppGFBreakGroundController extends BaseController {
pd2 = GFbreakGroundService.findById(pd); pd2 = GFbreakGroundService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
ArrayList<String> sendPicturesList = new ArrayList<>();
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
MultipartFile file = files[0]; MultipartFile file = files[0];
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName
+ "@@" + fileName
);
pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
GFbreakGroundService.edit(pd2); GFbreakGroundService.edit(pd2);
} }
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map; return map;
} }
/**修改
/**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/editAcceptconfess") @RequestMapping(value = "/editAcceptconfess")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation
public Object editAcceptconfess(MultipartRequest request) throws Exception { public Object editAcceptconfess(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -251,26 +280,36 @@ public class AppGFBreakGroundController extends BaseController {
List<MultipartFile> fileList = new ArrayList<MultipartFile>(); List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = ""; String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(","); String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
PageData dockData = new PageData();
ArrayList<PageData> dataArrayList = new ArrayList<>();
for (int i = 0; i < SIGNTIME.length; i++) { for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i]; signertime = SIGNTIME[i];
fileList.add(request.getFile("file" + i)); fileList.add(request.getFile("file" + i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()]; 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")); PageData item = 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"));
dataArrayList.add(item);
fileList.clear(); fileList.clear();
} }
dockData.put("data", JSON.toJSONString(dataArrayList));
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(dockData));
return map; 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{
private PageData 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) { if (files != null && files.length > 0) {
PageData dockData = new PageData();
ArrayList<PageData> dataArrayList = new ArrayList<>();
ArrayList<String> sendPicturesList = new ArrayList<>();
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
PageData pd = new PageData(); PageData pd = this.getPageData();
pd = this.getPageData();
MultipartFile file = files[i]; MultipartFile file = files[i];
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName
+ "@@" + fileName
);
pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime);
pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); pd.put("ACCEPT_CONFESS_ID", this.get32UUID());
pd.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -283,12 +322,19 @@ public class AppGFBreakGroundController extends BaseController {
pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID); pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID);
pd.put("ACCEPT_USER_ID", ""); pd.put("ACCEPT_USER_ID", "");
pd.put("ACCEPT_DEPARTMENT_ID", ""); pd.put("ACCEPT_DEPARTMENT_ID", "");
dataArrayList.add(pd);
breakgroundacceptuserService.save(pd); breakgroundacceptuserService.save(pd);
} }
dockData.put("dataArrayList", JSON.toJSONString(dataArrayList));
dockData.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return dockData;
} }
return null;
} }
/**上传图 /**
* 上传图
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -316,7 +362,9 @@ public class AppGFBreakGroundController extends BaseController {
return map; return map;
} }
/**删除图 /**
* 删除图
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -334,12 +382,15 @@ public class AppGFBreakGroundController extends BaseController {
} }
/**删除 /**
* 删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/delete") @RequestMapping(value = "/delete")
@ResponseBody @ResponseBody
@DockAnnotation
public Object delete() throws Exception { public Object delete() throws Exception {
Map<String, String> map = new HashMap<String, String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
@ -347,16 +398,20 @@ public class AppGFBreakGroundController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
GFbreakGroundService.delete(pd); GFbreakGroundService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
return map; return map;
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/edit") @RequestMapping(value = "/edit")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object edit( public Object edit(
@RequestParam(value = "FFILE", required = false) MultipartFile[] files @RequestParam(value = "FFILE", required = false) MultipartFile[] files
) throws Exception { ) throws Exception {
@ -364,22 +419,25 @@ public class AppGFBreakGroundController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
ArrayList<String> sendPicturesList = new ArrayList<>();
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;");
pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;");
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
MultipartFile file = files[0]; MultipartFile file = files[0];
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
} }
PageData breakGroundEditData = new PageData();
PageData breakGroundlogData = new PageData();
ArrayList<PageData> measuresList = new ArrayList<>();
GFbreakGroundService.edit(pd); GFbreakGroundService.edit(pd);
GFbreakGroundToMeasuresService.delete(pd); GFbreakGroundToMeasuresService.delete(pd);
breakGroundEditData.putAll(pd);
if (pd.get("measuresList") != null) { if (pd.get("measuresList") != null) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString()); List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
for (JSONObject json : list) { for (JSONObject json : list) {
@ -392,6 +450,7 @@ public class AppGFBreakGroundController extends BaseController {
measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
GFbreakGroundToMeasuresService.save(measures); GFbreakGroundToMeasuresService.save(measures);
measuresList.add(measures);
} }
} }
if (!pd.get("APPLY_STATUS").equals("0")) { if (!pd.get("APPLY_STATUS").equals("0")) {
@ -402,7 +461,7 @@ public class AppGFBreakGroundController extends BaseController {
log.put("CREATOR", pd.get("ACTION_USER")); log.put("CREATOR", pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date())); log.put("CREATTIME", DateUtil.date2Str(new Date()));
GFbreakGroundLogService.save(log); GFbreakGroundLogService.save(log);
breakGroundlogData.putAll(log);
// 发短信 // 发短信
PageData mes = new PageData(); PageData mes = new PageData();
@ -435,17 +494,25 @@ public class AppGFBreakGroundController extends BaseController {
paramsList.add(params4); paramsList.add(params4);
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
} }
PageData dockData = new PageData();
dockData.put("breakGroundEditData", JSON.toJSONString(breakGroundEditData));
dockData.put("breakGroundlogData", JSON.toJSONString(breakGroundlogData));
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(dockData));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map; return map;
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/editAcceptStatus") @RequestMapping(value = "/editAcceptStatus")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation
public Object editAcceptStatus(MultipartRequest request) throws Exception { public Object editAcceptStatus(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -462,7 +529,6 @@ public class AppGFBreakGroundController extends BaseController {
log.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID")); log.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID"));
log.put("CREATOR", pd.get("ACTION_USER")); log.put("CREATOR", pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date())); log.put("CREATTIME", DateUtil.date2Str(new Date()));
String status = pd.get("STATUS").toString(); String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + 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") + ";_;") : ";_;"); (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
@ -471,6 +537,8 @@ public class AppGFBreakGroundController extends BaseController {
//打回清空数据 //打回清空数据
pd2.put("OTHER_PROTECTIVE_MEASURES", ""); pd2.put("OTHER_PROTECTIVE_MEASURES", "");
pd2.put("HAZARD_IDENTIFICATION", ""); pd2.put("HAZARD_IDENTIFICATION", "");
ArrayList<String> sendPicturesList = new ArrayList<>();
ArrayList<PageData> saveAcceptUserList = new ArrayList<>();
switch (status) { switch (status) {
case "6"://验收人 case "6"://验收人
@ -482,7 +550,7 @@ public class AppGFBreakGroundController extends BaseController {
signertime = SIGNTIME[i]; signertime = SIGNTIME[i];
fileList.add(request.getFile("file" + i)); fileList.add(request.getFile("file" + i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()]; 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")); saveAcceptImg(sendPicturesList,saveAcceptUserList,fileList.toArray(fileArr), signertime, pd.getString("BREAKGROUND_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_USER_ID"), pd.getString("ACCEPT_DEPARTMENT_ID"));
fileList.clear(); fileList.clear();
} }
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
@ -508,11 +576,19 @@ public class AppGFBreakGroundController extends BaseController {
default: default:
break; break;
} }
PageData dockData = new PageData();
dockData.put("saveAcceptUserList", JSON.toJSONString(saveAcceptUserList));
GFbreakGroundLogService.save(log); GFbreakGroundLogService.save(log);
dockData.put("logData", JSON.toJSONString(log));
dockData.put("STATUS", status);
dockData.put("editData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; 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{
private void saveAcceptImg(List<String> sendPicturesList,List<PageData> saveAcceptUserList,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) { if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData(); PageData cpd = new PageData();
@ -521,6 +597,8 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName+
"@@"+fileName);
cpd.put("ACCEPT_USER_SIGNER_TIME", signertime); cpd.put("ACCEPT_USER_SIGNER_TIME", signertime);
cpd.put("ACCEPT_CONFESS_ID", this.get32UUID()); cpd.put("ACCEPT_CONFESS_ID", this.get32UUID());
cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人 cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人
@ -534,17 +612,21 @@ public class AppGFBreakGroundController extends BaseController {
cpd.put("ACCEPT_CONFESS_USER_ID", ""); cpd.put("ACCEPT_CONFESS_USER_ID", "");
cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID); cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID);
breakgroundacceptuserService.save(cpd); breakgroundacceptuserService.save(cpd);
saveAcceptUserList.add(cpd);
} }
} }
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/editStatus") @RequestMapping(value = "/editStatus")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object editStatus( public Object editStatus(
@RequestParam(value = "FFILE", required = false) MultipartFile[] files @RequestParam(value = "FFILE", required = false) MultipartFile[] files
) throws Exception { ) throws Exception {
@ -556,7 +638,8 @@ public class AppGFBreakGroundController extends BaseController {
pd2 = GFbreakGroundService.findById(pd); pd2 = GFbreakGroundService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
ArrayList<String> sendPicturesList = new ArrayList<>();
ArrayList<PageData> toMeasuresList = new ArrayList<>();
PageData log = new PageData(); PageData log = new PageData();
log.put("BREAKGROUNDLOG_ID", this.get32UUID()); log.put("BREAKGROUNDLOG_ID", this.get32UUID());
// log.put("ACTION", "审核打回"); // log.put("ACTION", "审核打回");
@ -580,7 +663,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT")); pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT"));
@ -614,6 +697,7 @@ public class AppGFBreakGroundController extends BaseController {
measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
GFbreakGroundToMeasuresService.save(measures); GFbreakGroundToMeasuresService.save(measures);
toMeasuresList.add(measures);
} }
} }
// 发短信 // 发短信
@ -629,6 +713,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
pd2.put("PRODUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("PRODUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("PRODUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("PRODUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -659,6 +744,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
pd2.put("SAFETY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("SAFETY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("SAFETY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("SAFETY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -685,6 +771,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -707,6 +794,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -770,10 +858,20 @@ public class AppGFBreakGroundController extends BaseController {
break; break;
} }
GFbreakGroundLogService.save(log); GFbreakGroundLogService.save(log);
PageData dockData = new PageData();
dockData.put("logData",JSON.toJSONString(log));
dockData.put("STATUS",status);
dockData.put("saveData",JSON.toJSONString(pd2));
dockData.put("requestData",JSON.toJSONString(pd));
dockData.put("toMeasuresList",JSON.toJSONString(toMeasuresList));
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(dockData));
return map; return map;
} }
/**列表
/**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -793,7 +891,10 @@ public class AppGFBreakGroundController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**列表
/**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -813,7 +914,10 @@ public class AppGFBreakGroundController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**列表
/**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -833,7 +937,10 @@ public class AppGFBreakGroundController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**列表
/**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -854,7 +961,9 @@ public class AppGFBreakGroundController extends BaseController {
return map; return map;
} }
/**去修改页面获取数据 /**
* 去修改页面获取数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -869,7 +978,9 @@ public class AppGFBreakGroundController extends BaseController {
return map; return map;
} }
/**去修改页面获取数据 /**
* 去修改页面获取数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -889,7 +1000,9 @@ public class AppGFBreakGroundController extends BaseController {
return map; return map;
} }
/**批量删除 /**
* 批量删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -914,6 +1027,7 @@ public class AppGFBreakGroundController extends BaseController {
/** /**
* 选择短信模板 * 选择短信模板
*
* @param appStatus 阶段 * @param appStatus 阶段
* @param pd2 参数集合 * @param pd2 参数集合
* @throws Exception * @throws Exception
@ -1222,7 +1336,9 @@ public class AppGFBreakGroundController extends BaseController {
} }
} }
/**待办作业数统计 /**
* 待办作业数统计
*
* @param * @param
* @throws Exception * @throws Exception
*/ */

113
src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java
View File

@ -2,6 +2,7 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
@ -41,7 +42,10 @@ public class AppGFCutRoadController extends BaseController {
private GFCutRoadAcceptUserService cutroadacceptuserService; private GFCutRoadAcceptUserService cutroadacceptuserService;
@Autowired @Autowired
private SendMessageUtil sendMessageUtil; private SendMessageUtil sendMessageUtil;
/**获取编码
/**
* 获取编码
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -65,13 +69,16 @@ public class AppGFCutRoadController extends BaseController {
return map; return map;
} }
/**新增 /**
* 新增
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/add") @RequestMapping(value = "/add")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object add( public Object add(
@RequestParam(value = "FFILE", required = false) MultipartFile[] files @RequestParam(value = "FFILE", required = false) MultipartFile[] files
) throws Exception { ) throws Exception {
@ -88,7 +95,9 @@ public class AppGFCutRoadController extends BaseController {
pd2.put("CREATDATE", year + "-" + month + "-" + day); pd2.put("CREATDATE", year + "-" + month + "-" + day);
pd2.put("CORPINFO_ID", pd.get("CORPINFO_ID")); pd2.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
pd2 = GFcutRoadService.getCode(pd2); //根据ID读取 pd2 = GFcutRoadService.getCode(pd2); //根据ID读取
ArrayList<String> sendPicturesList = new ArrayList<>();
String code = "DL" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1)); String code = "DL" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1));
pd = this.getPageData(); pd = this.getPageData();
pd.put("CHECK_NO", code); pd.put("CHECK_NO", code);
pd.put("CUTROAD_ID", this.get32UUID()); //主键 pd.put("CUTROAD_ID", this.get32UUID()); //主键
@ -98,18 +107,17 @@ public class AppGFCutRoadController extends BaseController {
pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;");
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
MultipartFile file = files[0]; MultipartFile file = files[0];
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName +
"@@"
+ fileName);
pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
} }
GFcutRoadService.save(pd); GFcutRoadService.save(pd);
if ("1".equals(pd.get("APPLY_STATUS"))) {
if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData(); PageData log = new PageData();
log.put("CUTROADLOG_ID", this.get32UUID()); log.put("CUTROADLOG_ID", this.get32UUID());
log.put("ACTION", "提交申请"); log.put("ACTION", "提交申请");
@ -117,6 +125,7 @@ public class AppGFCutRoadController extends BaseController {
log.put("CREATOR", pd.get("ACTION_USER")); log.put("CREATOR", pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date())); log.put("CREATTIME", DateUtil.date2Str(new Date()));
GFcutRoadLogService.save(log); GFcutRoadLogService.save(log);
pd.put("logData", JSON.toJSONString(log));
// 发短信 // 发短信
PageData mes = new PageData(); PageData mes = new PageData();
@ -149,12 +158,15 @@ public class AppGFCutRoadController extends BaseController {
paramsList.add(params4); paramsList.add(params4);
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
} }
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map; return map;
} }
/**上传图 /**
* 上传图
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -182,7 +194,9 @@ public class AppGFCutRoadController extends BaseController {
return map; return map;
} }
/**删除图 /**
* 删除图
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -200,7 +214,9 @@ public class AppGFCutRoadController extends BaseController {
} }
/**删除 /**
* 删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -216,36 +232,39 @@ public class AppGFCutRoadController extends BaseController {
return map; return map;
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/edit") @RequestMapping(value = "/edit")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation
public Object edit( public Object edit(
@RequestParam(value = "FFILE", required = false) MultipartFile[] files @RequestParam(value = "FFILE", required = false) MultipartFile[] files
) throws Exception { ) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = this.getPageData();
pd = this.getPageData(); ArrayList<String> sendPicturesList = new ArrayList<>();
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;");
pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;");
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
MultipartFile file = files[0]; MultipartFile file = files[0];
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("APPLY_USER_SIGNER_PATH") + "@@" + fileName);
pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
} }
GFcutRoadService.edit(pd); GFcutRoadService.edit(pd);
GFcutRoadToMeasuresService.delete(pd); GFcutRoadToMeasuresService.delete(pd);
ArrayList<PageData> measuresdataList = new ArrayList<>();
if (pd.get("measuresList") != null) { if (pd.get("measuresList") != null) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString()); List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
for (JSONObject json : list) { for (JSONObject json : list) {
@ -258,6 +277,7 @@ public class AppGFCutRoadController extends BaseController {
measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
GFcutRoadToMeasuresService.save(measures); GFcutRoadToMeasuresService.save(measures);
measuresdataList.add(measures);
} }
} }
if (!pd.get("APPLY_STATUS").equals("0")) { if (!pd.get("APPLY_STATUS").equals("0")) {
@ -303,7 +323,10 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**修改
/**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -336,7 +359,10 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**修改
/**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -370,7 +396,10 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**修改
/**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -400,6 +429,7 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; 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 { 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) { if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
@ -426,7 +456,9 @@ public class AppGFCutRoadController extends BaseController {
} }
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -527,7 +559,9 @@ public class AppGFCutRoadController extends BaseController {
} }
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -762,7 +796,10 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**列表
/**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -782,7 +819,10 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**列表
/**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -802,7 +842,10 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**列表
/**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -822,7 +865,10 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**列表
/**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -843,7 +889,9 @@ public class AppGFCutRoadController extends BaseController {
return map; return map;
} }
/**去修改页面获取数据 /**
* 去修改页面获取数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -858,7 +906,9 @@ public class AppGFCutRoadController extends BaseController {
return map; return map;
} }
/**去修改页面获取数据 /**
* 去修改页面获取数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -878,7 +928,9 @@ public class AppGFCutRoadController extends BaseController {
return map; return map;
} }
/**批量删除 /**
* 批量删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -903,6 +955,7 @@ public class AppGFCutRoadController extends BaseController {
/** /**
* 选择短信模板 * 选择短信模板
*
* @param appStatus 阶段 * @param appStatus 阶段
* @param pd2 参数集合 * @param pd2 参数集合
* @throws Exception * @throws Exception
@ -1213,7 +1266,9 @@ public class AppGFCutRoadController extends BaseController {
} }
} }
/**待办作业数统计 /**
* 待办作业数统计
*
* @param * @param
* @throws Exception * @throws Exception
*/ */

52
src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java
View File

@ -2,6 +2,7 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
@ -76,6 +77,7 @@ public class AppGFHighWorkController extends BaseController {
@RequestMapping(value="/add") @RequestMapping(value="/add")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation
public Object add() throws Exception{ public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
@ -101,12 +103,14 @@ public class AppGFHighWorkController extends BaseController {
if(pd.get("APPLY_STATUS").equals("1")) { if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData(); PageData log = new PageData();
log.put("HIGHWORKLOG_ID", this.get32UUID()); log.put("HIGHWORKLOG_ID", this.get32UUID());
log.put("ACTION", "提交申请"); log.put("ACTION", "提交申请");
log.put("HIGHWORK_ID", pd.get("HIGHWORK_ID")); log.put("HIGHWORK_ID", pd.get("HIGHWORK_ID"));
log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date())); log.put("CREATTIME", DateUtil.date2Str(new Date()));
GFhighWorkLogService.save(log); GFhighWorkLogService.save(log);
pd.put("logData",JSON.toJSONString(log));
// 发短信 // 发短信
PageData mes = new PageData(); PageData mes = new PageData();
@ -139,6 +143,7 @@ public class AppGFHighWorkController extends BaseController {
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
} }
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }
@ -148,6 +153,7 @@ public class AppGFHighWorkController extends BaseController {
*/ */
@RequestMapping(value="/delete") @RequestMapping(value="/delete")
@ResponseBody @ResponseBody
@DockAnnotation
public Object delete() throws Exception{ public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>(); Map<String,String> map = new HashMap<String,String>();
String errInfo = "success"; String errInfo = "success";
@ -155,6 +161,7 @@ public class AppGFHighWorkController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
GFhighworkService.delete(pd); GFhighworkService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
return map; return map;
} }
@ -221,6 +228,7 @@ public class AppGFHighWorkController extends BaseController {
@RequestMapping(value="/editGuardian") @RequestMapping(value="/editGuardian")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object editGuardian( public Object editGuardian(
@RequestParam(value="FFILE",required=false) MultipartFile[] files @RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{ ) throws Exception{
@ -232,13 +240,14 @@ public class AppGFHighWorkController extends BaseController {
pd2 = GFhighworkService.findById(pd); pd2 = GFhighworkService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
ArrayList<String> sendPicturesList = new ArrayList<>();
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
MultipartFile file = files[0]; MultipartFile file = files[0];
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName+"@@"+fileName);
pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
@ -288,6 +297,8 @@ public class AppGFHighWorkController extends BaseController {
// sendMessageUtil.sendMessages(mes, paramsList); // sendMessageUtil.sendMessages(mes, paramsList);
// } // }
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map; return map;
} }
/**修改 /**修改
@ -297,6 +308,7 @@ public class AppGFHighWorkController extends BaseController {
@RequestMapping(value="/editConfess") @RequestMapping(value="/editConfess")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object editConfess( public Object editConfess(
@RequestParam(value="FFILE",required=false) MultipartFile[] files @RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{ ) throws Exception{
@ -306,6 +318,7 @@ public class AppGFHighWorkController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFhighworkService.findById(pd); pd2 = GFhighworkService.findById(pd);
ArrayList<String> sendPicturesList = new ArrayList<>();
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
@ -314,7 +327,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName+"@@"+fileName);
pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
@ -322,6 +335,8 @@ public class AppGFHighWorkController extends BaseController {
GFhighworkService.edit(pd2); GFhighworkService.edit(pd2);
} }
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map; return map;
} }
/**修改 /**修改
@ -331,11 +346,11 @@ public class AppGFHighWorkController extends BaseController {
@RequestMapping(value="/editAcceptconfess") @RequestMapping(value="/editAcceptconfess")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptconfess(MultipartRequest request) throws Exception { public Object editAcceptconfess(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = this.getPageData();
pd = this.getPageData();
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFhighworkService.findById(pd); pd2 = GFhighworkService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -343,18 +358,23 @@ public class AppGFHighWorkController extends BaseController {
List<MultipartFile> fileList = new ArrayList<MultipartFile>(); List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = ""; String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(","); String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> sendPicturesList = new ArrayList<>();
ArrayList<PageData> highworkacceptuserList = new ArrayList<>();
for (int i = 0; i < SIGNTIME.length; i++) { for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i]; signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i)); fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()]; 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")); saveImg(sendPicturesList,highworkacceptuserList,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(); fileList.clear();
} }
PageData dockData = new PageData();
dockData.put("highworkacceptuserList", JSON.toJSONString(highworkacceptuserList));
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", dockData);
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map; return map;
} }
private void saveImg(MultipartFile[] files,String signertime, String HIGHWORK_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{ private void saveImg(ArrayList<String> sendPicturesList,ArrayList<PageData> highworkacceptuserList,MultipartFile[] files,String signertime, String HIGHWORK_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
PageData pd = new PageData(); PageData pd = new PageData();
@ -363,6 +383,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName+"@@"+fileName);
pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime);
pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); pd.put("ACCEPT_CONFESS_ID", this.get32UUID());
pd.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -376,6 +397,7 @@ public class AppGFHighWorkController extends BaseController {
pd.put("ACCEPT_USER_ID",""); pd.put("ACCEPT_USER_ID","");
pd.put("ACCEPT_DEPARTMENT_ID", ""); pd.put("ACCEPT_DEPARTMENT_ID", "");
highworkacceptuserService.save(pd); highworkacceptuserService.save(pd);
highworkacceptuserList.add(pd);
} }
} }
} }
@ -532,6 +554,7 @@ public class AppGFHighWorkController extends BaseController {
@RequestMapping(value="/editStatus") @RequestMapping(value="/editStatus")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object editStatus( public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files @RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{ ) throws Exception{
@ -545,6 +568,8 @@ public class AppGFHighWorkController extends BaseController {
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
// pd2.put("OTHER_PROTECTIVE_MEASURES", pd.get("OTHER_PROTECTIVE_MEASURES")); //修改人 // pd2.put("OTHER_PROTECTIVE_MEASURES", pd.get("OTHER_PROTECTIVE_MEASURES")); //修改人
// pd2.put("HAZARD_IDENTIFICATION", pd.get("HAZARD_IDENTIFICATION")); //修改人 // pd2.put("HAZARD_IDENTIFICATION", pd.get("HAZARD_IDENTIFICATION")); //修改人
ArrayList<String> sendPicturesList = new ArrayList<>();
ArrayList<PageData> toMeasuresList = new ArrayList<>();
PageData log = new PageData(); PageData log = new PageData();
log.put("HIGHWORKLOG_ID", this.get32UUID()); log.put("HIGHWORKLOG_ID", this.get32UUID());
// log.put("ACTION", "审核打回"); // log.put("ACTION", "审核打回");
@ -577,6 +602,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -604,6 +630,7 @@ public class AppGFHighWorkController extends BaseController {
measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
GFhighWorkToMeasuresService.save(measures); GFhighWorkToMeasuresService.save(measures);
toMeasuresList.add(measures);
} }
log.put("ACTION", "作业单位通过"); log.put("ACTION", "作业单位通过");
@ -664,6 +691,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -730,6 +758,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
pd2.put("AUDIT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("AUDIT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -788,6 +817,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
pd2.put("APPROVE_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("APPROVE_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -836,6 +866,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -1026,6 +1057,13 @@ public class AppGFHighWorkController extends BaseController {
break; break;
} }
GFhighWorkLogService.save(log); GFhighWorkLogService.save(log);
PageData dockData = new PageData();
dockData.put("logData",JSON.toJSONString(log));
dockData.put("STATUS",status);
dockData.put("saveData",JSON.toJSONString(pd2));
dockData.put("requestData",JSON.toJSONString(pd));
dockData.put("toMeasuresList",JSON.toJSONString(toMeasuresList));
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }

3
src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
View File

@ -445,7 +445,8 @@ public class OutSourcedController extends BaseController {
pdImg.put("TYPE", "300"); pdImg.put("TYPE", "300");
pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID")); pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID"));
imgfilesService.save(pdImg); imgfilesService.save(pdImg);
Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,pd.getString("OUTSOURCED_ID"),"300"); Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile
,IMGFILES_ID,pd.getString("OUTSOURCED_ID"),"300");
} }