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

数据字典，动土与断路

pull/14/head
dearlin 2023-12-26 08:45:44 +08:00
parent ba3754c78f
commit ca90a38964
5 changed files with 99 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -512,7 +512,7 @@ public class AppGFBreakGroundController extends BaseController {
@RequestMapping(value = "/editAcceptStatus") @RequestMapping(value = "/editAcceptStatus")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation @DockAnnotation(hasAnnex = true)
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";
@ -576,9 +576,10 @@ public class AppGFBreakGroundController extends BaseController {
default: default:
break; break;
} }
GFbreakGroundLogService.save(log);
PageData dockData = new PageData(); PageData dockData = new PageData();
dockData.put("saveAcceptUserList", JSON.toJSONString(saveAcceptUserList)); dockData.put("saveAcceptUserList", JSON.toJSONString(saveAcceptUserList));
GFbreakGroundLogService.save(log);
dockData.put("logData", JSON.toJSONString(log)); dockData.put("logData", JSON.toJSONString(log));
dockData.put("STATUS", status); dockData.put("STATUS", status);
dockData.put("editData", JSON.toJSONString(pd2)); dockData.put("editData", JSON.toJSONString(pd2));

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

@ -222,6 +222,7 @@ public class AppGFCutRoadController 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";
@ -229,6 +230,7 @@ public class AppGFCutRoadController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
GFcutRoadService.delete(pd); GFcutRoadService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
return map; return map;
} }
@ -264,8 +266,9 @@ public class AppGFCutRoadController extends BaseController {
GFcutRoadService.edit(pd); GFcutRoadService.edit(pd);
GFcutRoadToMeasuresService.delete(pd); GFcutRoadToMeasuresService.delete(pd);
ArrayList<PageData> measuresdataList = new ArrayList<>();
if (pd.get("measuresList") != null) { ArrayList<PageData> measuresdataList = new ArrayList<>();
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) {
PageData measures = new PageData(); PageData measures = new PageData();
@ -277,7 +280,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); measuresdataList.add(measures);
} }
} }
if (!pd.get("APPLY_STATUS").equals("0")) { if (!pd.get("APPLY_STATUS").equals("0")) {
@ -288,6 +291,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();
@ -321,6 +325,8 @@ public class AppGFCutRoadController extends BaseController {
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;
} }
@ -333,6 +339,7 @@ public class AppGFCutRoadController 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 {
@ -342,21 +349,22 @@ public class AppGFCutRoadController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFcutRoadService.findById(pd); pd2 = GFcutRoadService.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) {
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);
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"));
sendPicturesList.add(pd2.getString("GUARDIAN_USER_SIGNER_PATH") + "@@" + fileName);
GFcutRoadService.edit(pd2); GFcutRoadService.edit(pd2);
} }
map.put("result", errInfo); map.put("result", errInfo);
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
map.put("dockData", JSON.toJSONString(pd2));
return map; return map;
} }
@ -369,6 +377,7 @@ public class AppGFCutRoadController 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 {
@ -380,6 +389,7 @@ public class AppGFCutRoadController extends BaseController {
pd2 = GFcutRoadService.findById(pd); pd2 = GFcutRoadService.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];
@ -389,11 +399,14 @@ public class AppGFCutRoadController extends BaseController {
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"));
sendPicturesList.add(pd2.getString("CONFESS_USER_SIGNER_PATH") + "@@" + fileName);
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFcutRoadService.edit(pd2); GFcutRoadService.edit(pd2);
} }
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", sendPicturesList);
return map; return map;
} }
@ -406,6 +419,7 @@ public class AppGFCutRoadController 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";
@ -418,19 +432,24 @@ public class AppGFCutRoadController 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> cutRoaduserList = 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("CUTROAD_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"), pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); saveImg(cutRoaduserList, sendPicturesList, 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(); fileList.clear();
} }
PageData dockData = new PageData();
dockData.put("cutRoaduserList", JSON.toJSONString(cutRoaduserList));
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 CUTROAD_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception { private void saveImg(ArrayList<PageData> highworkacceptuserList, ArrayList<String> sendPicturesList, 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++) {
PageData pd = new PageData(); PageData pd = new PageData();
@ -444,6 +463,7 @@ public class AppGFCutRoadController extends BaseController {
pd.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); pd.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName);
sendPicturesList.add( pd.getString("ACCEPT_CONFESS_USER_SIGNER_PATH") +"@@"+fileName);
pd.put("ISDELETE", '0'); pd.put("ISDELETE", '0');
pd.put("CORPINFO_ID", CORPINFO_ID); pd.put("CORPINFO_ID", CORPINFO_ID);
pd.put("CUTROAD_ID", CUTROAD_ID); pd.put("CUTROAD_ID", CUTROAD_ID);
@ -452,6 +472,7 @@ public class AppGFCutRoadController extends BaseController {
pd.put("ACCEPT_USER_ID", ""); pd.put("ACCEPT_USER_ID", "");
pd.put("ACCEPT_DEPARTMENT_ID", ""); pd.put("ACCEPT_DEPARTMENT_ID", "");
cutroadacceptuserService.save(pd); cutroadacceptuserService.save(pd);
highworkacceptuserList.add(pd);
} }
} }
} }
@ -465,6 +486,7 @@ public class AppGFCutRoadController extends BaseController {
@RequestMapping(value = "/editAcceptStatus") @RequestMapping(value = "/editAcceptStatus")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
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";
@ -474,7 +496,8 @@ public class AppGFCutRoadController extends BaseController {
pd2 = GFcutRoadService.findById(pd); pd2 = GFcutRoadService.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> saveAcceptUserList = new ArrayList<>();
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", "审核打回");
@ -501,7 +524,7 @@ public class AppGFCutRoadController 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"));
@ -529,11 +552,18 @@ public class AppGFCutRoadController extends BaseController {
break; break;
} }
GFcutRoadLogService.save(log); GFcutRoadLogService.save(log);
PageData dockData = new PageData();
dockData.put("saveAcceptUserList", JSON.toJSONString(saveAcceptUserList));
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();
@ -547,6 +577,7 @@ public class AppGFCutRoadController extends BaseController {
cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人 cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人
cpd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 cpd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
cpd.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); cpd.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName);
sendPicturesList.add(cpd.getString("ACCEPT_USER_SIGNER_PATH") +"@@"+fileName);
cpd.put("ISDELETE", '0'); cpd.put("ISDELETE", '0');
cpd.put("CORPINFO_ID", CORPINFO_ID); cpd.put("CORPINFO_ID", CORPINFO_ID);
cpd.put("BREAKGROUND_ID", BREAKGROUND_ID); cpd.put("BREAKGROUND_ID", BREAKGROUND_ID);
@ -555,6 +586,7 @@ public class AppGFCutRoadController 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);
cutroadacceptuserService.save(cpd); cutroadacceptuserService.save(cpd);
saveAcceptUserList.add(cpd);
} }
} }
} }
@ -586,7 +618,8 @@ public class AppGFCutRoadController extends BaseController {
log.put("CUTROAD_ID", pd.get("CUTROAD_ID")); log.put("CUTROAD_ID", pd.get("CUTROAD_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()));
ArrayList<String> sendPicturesList = new ArrayList<>();
ArrayList<PageData> toMeasuresList = new ArrayList<>();
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") + ";_;") : ";_;");
@ -603,6 +636,7 @@ public class AppGFCutRoadController 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"));
@ -637,6 +671,8 @@ 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);
toMeasuresList.add(measures);
} }
} }
// 发短信 // 发短信
@ -652,6 +688,7 @@ public class AppGFCutRoadController 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"));
@ -682,6 +719,7 @@ public class AppGFCutRoadController 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"));
@ -708,6 +746,7 @@ public class AppGFCutRoadController 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 +769,7 @@ public class AppGFCutRoadController 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"));
@ -793,7 +833,14 @@ public class AppGFCutRoadController extends BaseController {
break; break;
} }
GFcutRoadLogService.save(log); GFcutRoadLogService.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;
} }

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

@ -409,6 +409,7 @@ public class AppGFHighWorkController extends BaseController {
@RequestMapping(value="/editAcceptStatus") @RequestMapping(value="/editAcceptStatus")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
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";
@ -426,7 +427,8 @@ public class AppGFHighWorkController extends BaseController {
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()));
ArrayList<String> sendPicturesList = new ArrayList<>();
ArrayList<PageData> saveAcceptUserList = new ArrayList<>();
String status = pd.get("STATUS").toString(); String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = pd2.getString("OTHER_PROTECTIVE_MEASURES"); String OTHER_PROTECTIVE_MEASURES = pd2.getString("OTHER_PROTECTIVE_MEASURES");
if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status)) { if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status)) {
@ -452,7 +454,7 @@ public class AppGFHighWorkController 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("HIGHWORK_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); saveAcceptImg(sendPicturesList,saveAcceptUserList,fileList.toArray(fileArr),signertime,pd.getString("HIGHWORK_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"));
@ -518,10 +520,17 @@ public class AppGFHighWorkController extends BaseController {
break; break;
} }
GFhighWorkLogService.save(log); GFhighWorkLogService.save(log);
PageData dockData = new PageData();
dockData.put("saveAcceptUserList", JSON.toJSONString(saveAcceptUserList));
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 HIGHWORK_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 HIGHWORK_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();
@ -535,6 +544,7 @@ public class AppGFHighWorkController extends BaseController {
cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人 cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人
cpd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 cpd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
cpd.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); cpd.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName);
sendPicturesList.add(cpd.getString("ACCEPT_USER_SIGNER_PATH")+"@@"+fileName);
cpd.put("ISDELETE", '0'); cpd.put("ISDELETE", '0');
cpd.put("CORPINFO_ID", CORPINFO_ID); cpd.put("CORPINFO_ID", CORPINFO_ID);
cpd.put("HIGHWORK_ID", HIGHWORK_ID); cpd.put("HIGHWORK_ID", HIGHWORK_ID);
@ -543,6 +553,7 @@ public class AppGFHighWorkController 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);
highworkacceptuserService.save(cpd); highworkacceptuserService.save(cpd);
saveAcceptUserList.add(cpd);
} }
} }
} }

5
src/main/java/com/zcloud/controller/system/DictionariesController.java
View File

@ -270,7 +270,8 @@ public class DictionariesController extends BaseController {
for(int i=0;i<table.length;i++){ for(int i=0;i<table.length;i++){
pd.put("thisTable", table[i]); pd.put("thisTable", table[i]);
try { try {
if(Integer.parseInt(dictionariesService.findFromTbs(pd).get("zs").toString())>0){//判断是否被占用，是：不允许删除(去排查表检查字典表中的编码字段) if(Integer.parseInt(dictionariesService.findFromTbs(pd).get("zs").toString())>0){//判断是否被占用，是
// ：不允许删除(去排查表检查字典表中的编码字段)
errInfo = "fail"; errInfo = "fail";
break; break;
} }
@ -285,6 +286,8 @@ public class DictionariesController extends BaseController {
dictionariesService.delete(pd); //执行删除 dictionariesService.delete(pd); //执行删除
map.put("dockData", JSON.toJSONString(this.getPageData())); map.put("dockData", JSON.toJSONString(this.getPageData()));
} }
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }

36
src/main/java/com/zcloud/controller/system/LoginController.java
View File

@ -184,24 +184,24 @@ public class LoginController extends BaseController {
return map; return map;
} }
// 判断是不是沧州矿石的用户 // 判断是不是沧州矿石的用户
if (czksIdentity.equals(pd.getString("USER_IDENTITY"))) { // if (czksIdentity.equals(pd.getString("USER_IDENTITY"))) {
// 沧州矿石的用户 // // 沧州矿石的用户
// 用户标识 // // 用户标识
map.put("USER_IDENTITY", czksIdentity); // map.put("USER_IDENTITY", czksIdentity);
// 图片路径 // // 图片路径
map.put("baseImgPath", czksBaseimgpath); // map.put("baseImgPath", czksBaseimgpath);
// 后台地址 // // 后台地址
map.put("BACKENDADDR", czksBackendaddr); // map.put("BACKENDADDR", czksBackendaddr);
} // }
if ("".equals(pd.getString("USER_IDENTITY"))) { // if ("".equals(pd.getString("USER_IDENTITY"))) {
// 港股的用户 // // 港股的用户
// 用户标识 // // 用户标识
map.put("USER_IDENTITY", gwjIdentity); // map.put("USER_IDENTITY", gwjIdentity);
// 图片路径 // // 图片路径
map.put("baseImgPath", gwjBaseimgpath); // map.put("baseImgPath", gwjBaseimgpath);
// 后台地址 // // 后台地址
map.put("BACKENDADDR", gwjBackendaddr); // map.put("BACKENDADDR", gwjBackendaddr);
} // }
PageData cpd = corpinfoService.findById(pd); PageData cpd = corpinfoService.findById(pd);
//System.out.println(cpd.getString("ISUSE")); //System.out.println(cpd.getString("ISUSE"));
if (cpd != null) { if (cpd != null) {