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

Merge remote-tracking branch 'origin/czks1.0' into czks1.0

pull/14/head
songwenxuan 2023-12-25 17:51:41 +08:00
parent d06234ea16 ba3754c78f
commit e8a856838a
16 changed files with 2760 additions and 2281 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")
@RequiresPermissions("mfolder:add")
@ResponseBody
@DockAnnotation(isAdd = true)
@DockAnnotation
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -80,13 +80,7 @@ public class MfolderController extends BaseController {
@RequiresPermissions("mfolder:add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
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{
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{
Map<String,Object> map = new HashMap<String,Object>();
ArrayList<String> pictureList = new ArrayList<>();
String errInfo = "success";
@ -100,8 +94,6 @@ public class MfolderController extends BaseController {
map.put("msg", "文件格式不正确！");
return map;
}
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
Long size = file.getSize()/1024;
fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
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("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
mfolderService.save(pd); //存入数据库表
//存自己表里的附件 使用文件全路径加文件名的方式 示例
// /uploadFiles/yhtp/8415df13cc4c46f0ac32f579462dbb8f/20231215/d3bc85d1bbe84b75b1e6e8b6182dc547.jpg
// @@
// d3bc85d1bbe84b75b1e6e8b6182dc547.jpg
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+
"@@"
+fileName);

90
src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java
View File

@ -109,6 +109,7 @@ public class AppGFBlindBoardController extends BaseController {
pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;");
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -117,6 +118,8 @@ public class AppGFBlindBoardController extends BaseController {
pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
}
map.put("dockData",JSON.toJSONString(pd));
GFblindboardService.save(pd);
@ -224,13 +227,16 @@ public class AppGFBlindBoardController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
}
map.put("result", errInfo);
@ -251,6 +257,7 @@ public class AppGFBlindBoardController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
smb.deleteFile(pd.getString("path"));
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -260,12 +267,14 @@ public class AppGFBlindBoardController extends BaseController {
*/
@RequestMapping(value="/delete")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFblindboardService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -277,6 +286,7 @@ public class AppGFBlindBoardController extends BaseController {
@RequestMapping(value="/edit")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object edit(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -287,6 +297,7 @@ public class AppGFBlindBoardController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;");
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -295,12 +306,17 @@ public class AppGFBlindBoardController extends BaseController {
pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
}
GFblindboardService.edit(pd);
GFblindBoardInfoService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
if(pd.get("boardList")!=null){
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("boardList").toString());
HashMap<String, String> infoMap = new HashMap<String, String>();
int count = 1;
for (JSONObject json : list) {
PageData board = new PageData();
board.put("BLINDBOARDINFO_ID", this.get32UUID()); // 主键
@ -310,13 +326,18 @@ public class AppGFBlindBoardController extends BaseController {
board.put("BOARD_SPECIFICATION", json.get("BOARD_SPECIFICATION"));
board.put("BOARD_NO", json.get("BOARD_NO"));
board.put("ISDELETE", 0);
infoMap.put("other"+count, JSON.toJSONString(board));
count+=1;
GFblindBoardInfoService.save(board);
}
map.put("infoMap", JSON.toJSONString(infoMap));
}
GFblindBoardToMeasuresService.delete(pd);
if(pd.get("measuresList")!=null){
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
HashMap<String, String> measuresMap = new HashMap<String, String>();
int count = 1;
for (JSONObject json : list) {
PageData measures = new PageData();
measures.put("BLINDBOARDTOMEASURES_ID", this.get32UUID()); // 主键
@ -325,8 +346,11 @@ public class AppGFBlindBoardController extends BaseController {
measures.put("STATUS", json.get("STATUS"));
measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
measuresMap.put("other"+count, JSON.toJSONString(measures));
count+=1;
GFblindBoardToMeasuresService.save(measures);
}
map.put("measuresMap", JSON.toJSONString(measuresMap));
}
if(!pd.get("APPLY_STATUS").equals("0")) {
@ -337,6 +361,7 @@ public class AppGFBlindBoardController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
GFblindBoardLogService.save(log);
map.put("logData", JSON.toJSONString(log));
// 发短信
@ -381,6 +406,7 @@ public class AppGFBlindBoardController extends BaseController {
@RequestMapping(value="/editStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -408,22 +434,28 @@ public class AppGFBlindBoardController extends BaseController {
switch (status) {
case "4"://作业负责人
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
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_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
log.put("ACTION", "作业负责人通过");
GFblindBoardInfoService.delete(pd);
if(pd.get("boardList")!=null){
GFblindBoardInfoService.delete(pd);
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("boardList").toString());
HashMap<String,String> boardMap = new HashMap<String,String>();
int boardCount = 1;
for (JSONObject json : list) {
PageData board = new PageData();
board.put("BLINDBOARDINFO_ID", this.get32UUID()); // 主键
@ -433,13 +465,19 @@ public class AppGFBlindBoardController extends BaseController {
board.put("BOARD_SPECIFICATION", json.get("BOARD_SPECIFICATION"));
board.put("BOARD_NO", json.get("BOARD_NO"));
board.put("ISDELETE", 0);
boardMap.put("other"+boardCount, JSON.toJSONString(board));
boardCount+=1;
GFblindBoardInfoService.save(board);
}
map.put("boardMap", JSON.toJSONString(boardMap));
}
GFblindBoardToMeasuresService.delete(pd);
map.put("pdData", JSON.toJSONString(pd));
if(pd.get("measuresList")!=null){
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
HashMap<String,String> measuresMap = new HashMap<String,String>();
int measuresCount = 1;
for (JSONObject json : list) {
PageData measures = new PageData();
measures.put("BLINDBOARDTOMEASURES_ID", this.get32UUID()); // 主键
@ -448,8 +486,11 @@ public class AppGFBlindBoardController extends BaseController {
measures.put("STATUS", json.get("STATUS"));
measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
measuresMap.put("other"+measuresCount, JSON.toJSONString(measures));
measuresCount+=1;
GFblindBoardToMeasuresService.save(measures);
}
map.put("measuresData", JSON.toJSONString(measuresMap));
}
@ -460,11 +501,14 @@ public class AppGFBlindBoardController extends BaseController {
case "5"://所在单位审核通过
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -472,6 +516,7 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
log.put("ACTION", "所在单位审核通过");
// 发短信
@ -481,18 +526,22 @@ public class AppGFBlindBoardController extends BaseController {
case "6"://验收人
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
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_CONTENT", pd.get("CONTENT"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过");
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -503,6 +552,7 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("SAFETY_CONTENT", pd.get("CONTENT"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -512,6 +562,7 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("LEADER_CONTENT", pd.get("CONTENT"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -521,6 +572,7 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -529,6 +581,7 @@ public class AppGFBlindBoardController extends BaseController {
break;
}
GFblindBoardLogService.save(log);
map.put("logData", JSON.toJSONString(log));
map.put("result", errInfo);
return map;
}
@ -597,6 +650,7 @@ public class AppGFBlindBoardController extends BaseController {
@RequestMapping(value="/editAcceptStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptStatus(MultipartRequest request) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -613,6 +667,7 @@ public class AppGFBlindBoardController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
@ -628,16 +683,19 @@ public class AppGFBlindBoardController extends BaseController {
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
for (int i = 0; i < SIGNTIME.length; i++) {
ArrayList<String> pictureList = new ArrayList<String>();
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"));
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
fileList.clear();
}
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过");
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -649,6 +707,7 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -657,11 +716,12 @@ public class AppGFBlindBoardController extends BaseController {
break;
}
GFblindBoardLogService.save(log);
map.put("logData", JSON.toJSONString(log));
map.put("result", errInfo);
return map;
}
private void saveAcceptImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{
private void saveAcceptImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData();
@ -682,6 +742,7 @@ public class AppGFBlindBoardController extends BaseController {
cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", "");
cpd.put("ACCEPT_CONFESS_USER_ID", "");
cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID);
pictureList.add(Const.FILEPATHFILE + cpd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
blindboardacceptuserService.save(cpd);
}
}
@ -695,6 +756,7 @@ public class AppGFBlindBoardController extends BaseController {
*/
@RequestMapping(value="/deleteAll")
@ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -708,6 +770,7 @@ public class AppGFBlindBoardController extends BaseController {
}else{
errInfo = "error";
}
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -886,6 +949,7 @@ public class AppGFBlindBoardController extends BaseController {
@RequestMapping(value="/editGuardian")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editGuardian(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -898,15 +962,19 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
GFblindboardService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
}
map.put("result", errInfo);
return map;
@ -979,6 +1047,7 @@ public class AppGFBlindBoardController extends BaseController {
@RequestMapping(value="/editConfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editConfess(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -991,15 +1060,19 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
GFblindboardService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
}
map.put("result", errInfo);
return map;
@ -1011,6 +1084,7 @@ public class AppGFBlindBoardController extends BaseController {
@RequestMapping(value="/editAcceptconfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptconfess(
MultipartRequest request
) throws Exception {
@ -1022,21 +1096,26 @@ public class AppGFBlindBoardController extends BaseController {
pd2 = GFblindboardService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
map.put("dockData", JSON.toJSONString(pd2));
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<String>();
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveImg(fileList.toArray(fileArr),signertime,pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
saveImg(fileList.toArray(fileArr),signertime,pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),
pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList);
fileList.clear();
}
map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo);
return map;
}
private void saveImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{
private void saveImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID,
String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData pd = new PageData();
@ -1057,6 +1136,7 @@ public class AppGFBlindBoardController extends BaseController {
pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID);
pd.put("ACCEPT_USER_ID","");
pd.put("ACCEPT_DEPARTMENT_ID", "");
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
blindboardacceptuserService.save(pd);
}
}

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

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

38
src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java
View File

@ -422,6 +422,7 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -432,8 +433,10 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
}
if(pd.get("APPLY_STATUS").equals("1")) {
@ -500,6 +503,7 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -510,8 +514,10 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
}
map.put("result", errInfo);
return map;
@ -556,7 +562,7 @@ public class AppGFConfinedSpaceController extends BaseController {
@RequestMapping(value="/editAcceptconfess")
@ResponseBody
@Transactional
@DockAnnotation
@DockAnnotation(hasAnnex = true)
public Object editAcceptconfess(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -571,18 +577,20 @@ public class AppGFConfinedSpaceController extends BaseController {
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<>();
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
saveImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList);
fileList.clear();
}
map.put("dockData", JSON.toJSONString(pd));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo);
return map;
}
private void saveImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{
private void saveImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData pd = new PageData();
@ -603,6 +611,7 @@ public class AppGFConfinedSpaceController extends BaseController {
pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID);
pd.put("ACCEPT_USER_ID","");
pd.put("ACCEPT_DEPARTMENT_ID", "");
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
confinedspaceacceptuserService.save(pd);
}
}
@ -611,7 +620,7 @@ public class AppGFConfinedSpaceController extends BaseController {
@RequestMapping(value="/editAcceptStatus")
@ResponseBody
@Transactional
@DockAnnotation
@DockAnnotation(hasAnnex = true)
public Object editAcceptStatus(MultipartRequest request) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -644,13 +653,15 @@ public class AppGFConfinedSpaceController extends BaseController {
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<>();
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"));
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList);
fileList.clear();
}
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
@ -719,7 +730,7 @@ public class AppGFConfinedSpaceController extends BaseController {
map.put("result", errInfo);
return map;
}
private void saveAcceptImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{
private void saveAcceptImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData();
@ -740,6 +751,7 @@ public class AppGFConfinedSpaceController extends BaseController {
cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", "");
cpd.put("ACCEPT_CONFESS_USER_ID", "");
cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID);
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
confinedspaceacceptuserService.save(cpd);
}
}
@ -754,7 +766,7 @@ public class AppGFConfinedSpaceController extends BaseController {
@RequestMapping(value="/editStatus")
@ResponseBody
@Transactional
@DockAnnotation
@DockAnnotation(hasAnnex = true)
public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -785,6 +797,7 @@ public class AppGFConfinedSpaceController extends BaseController {
switch (status) {
case "4"://确认
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -803,9 +816,11 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("ACCEPT_CONFESS_DEPARTMENT_ID", pd.get("ACCEPT_CONFESS_DEPARTMENT_ID"));
pd2.put("ACCEPT_CONFESS_USER_ID", pd.get("ACCEPT_CONFESS_USER_ID"));
pd2.put("EDUCATE_USER", pd.get("EDUCATE_USER"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
GFconfinedspaceToMeasuresService.delete(pd2);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
for (JSONObject json : list) {
PageData measures = new PageData();
@ -867,6 +882,7 @@ public class AppGFConfinedSpaceController extends BaseController {
case "3"://监护人确认
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -877,8 +893,10 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
log.put("ACTION", "监护人确认通过");
}
return map;
@ -995,6 +1013,7 @@ public class AppGFConfinedSpaceController extends BaseController {
case "5"://所在单位确认
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -1005,8 +1024,10 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("APPROVE_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
log.put("ACTION", "所在单位审批通过");
@ -1064,6 +1085,7 @@ public class AppGFConfinedSpaceController extends BaseController {
case "6"://验收人
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -1074,8 +1096,10 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
log.put("ACTION", "验收通过");
// 发短信

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

84
src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java
View File

@ -2,6 +2,7 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.dto.TenCorpConst;
import com.zcloud.dto.TenCorpDto;
@ -84,6 +85,7 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/add")
@ResponseBody
@Transactional
@DockAnnotation(isAdd = true)
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -105,6 +107,7 @@ public class AppGFElectricityController extends BaseController {
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
map.put("dockData", JSON.toJSONString(pd));
GFelectricityService.save(pd);
if(pd.get("APPLY_STATUS").equals("1")) {
@ -114,6 +117,7 @@ public class AppGFElectricityController extends BaseController {
log.put("ELECTRICITY_ID", pd.get("ELECTRICITY_ID"));
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockDataLog", JSON.toJSONString(log));
GFelectricityLogService.save(log);
// 发短信
@ -184,12 +188,14 @@ public class AppGFElectricityController extends BaseController {
*/
@RequestMapping(value="/delete")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFelectricityService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -201,12 +207,14 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/edit")
@ResponseBody
@Transactional
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFelectricityService.edit(pd);
map.put("dockData", JSON.toJSONString(pd));
if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData();
log.put("ELECTRICITYLOG_ID", this.get32UUID());
@ -214,6 +222,7 @@ public class AppGFElectricityController extends BaseController {
log.put("ELECTRICITY_ID", pd.get("ELECTRICITY_ID"));
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockDataLog", JSON.toJSONString(log));
GFelectricityLogService.save(log);
// 发短信
@ -267,6 +276,7 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/editGuardian")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editGuardian(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -279,21 +289,26 @@ public class AppGFElectricityController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
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_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
}
map.put("result", errInfo);
return map;
}
/**修改
* @param
* @throws Exception
@ -301,6 +316,7 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/editConfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editConfess(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -313,21 +329,26 @@ public class AppGFElectricityController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
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("GUARDIAN_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
}
map.put("result", errInfo);
return map;
}
/**修改
* @param
* @throws Exception
@ -335,6 +356,7 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/editAcceptconfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptconfess(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -348,17 +370,23 @@ public class AppGFElectricityController extends BaseController {
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<String>();
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
saveImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),
pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),
pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList);
fileList.clear();
}
map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo);
return map;
}
private void saveImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{
private void saveImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID,
String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID,
String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData pd = new PageData();
@ -379,6 +407,7 @@ public class AppGFElectricityController extends BaseController {
pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID);
pd.put("ACCEPT_USER_ID","");
pd.put("ACCEPT_DEPARTMENT_ID", "");
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
electricityacceptuserService.save(pd);
}
}
@ -390,6 +419,7 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/editAcceptStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptStatus(MultipartRequest request) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -406,6 +436,7 @@ public class AppGFElectricityController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString();
if ("2".equals(status) || "3".equals(status) || "4".equals(status)) {
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
@ -425,15 +456,20 @@ public class AppGFElectricityController extends BaseController {
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
for (int i = 0; i < SIGNTIME.length; i++) {
ArrayList<String> pictureList = new ArrayList<String>();
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"));
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),
pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),
pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
fileList.clear();
}
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过");
// 发短信
@ -462,6 +498,7 @@ public class AppGFElectricityController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData mes3 = new PageData();
mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
@ -492,12 +529,13 @@ public class AppGFElectricityController extends BaseController {
break;
}
GFelectricityLogService.save(log);
map.put("dockDataLog", JSON.toJSONString(log));
map.put("result", errInfo);
return map;
}
private void saveAcceptImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{
private void saveAcceptImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData();
@ -518,6 +556,7 @@ public class AppGFElectricityController extends BaseController {
cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", "");
cpd.put("ACCEPT_CONFESS_USER_ID", "");
cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID);
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
electricityacceptuserService.save(cpd);
}
}
@ -531,6 +570,7 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/editStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -549,6 +589,7 @@ public class AppGFElectricityController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString();
if ("2".equals(status) || "3".equals(status) || "4".equals(status)) {
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
@ -563,20 +604,27 @@ public class AppGFElectricityController extends BaseController {
switch (status) {
case "2"://作业单位
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.putAll(pd);
pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFIRM_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("CONFIRM_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFelectricityToMeasuresService.delete(pd);
map.put("dockDataDel", JSON.toJSONString(pd));
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
HashMap<String, String> measuresMap = new HashMap<String, String>();
int measuresCount = 1;
for (JSONObject json : list) {
PageData measures = new PageData();
measures.put("ELECTRICITYTOMEASURES_ID", this.get32UUID()); // 主键
@ -585,8 +633,11 @@ public class AppGFElectricityController extends BaseController {
measures.put("STATUS", json.get("STATUS"));
measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
measuresMap.put("other"+measuresCount, JSON.toJSONString(measures));
measuresCount+=1;
GFelectricityToMeasuresService.save(measures);
}
map.put("dockDatameasures", JSON.toJSONString(measuresMap));
log.put("ACTION", "作业单位通过");
// 发短信
@ -635,17 +686,21 @@ public class AppGFElectricityController extends BaseController {
case "3"://用电单位审核
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
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_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "用电单位审核通过");
// 发短信
@ -682,17 +737,21 @@ public class AppGFElectricityController extends BaseController {
case "4"://配送电单位审批
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
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_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "配送电单位审批通过");
// 发短信
@ -729,17 +788,21 @@ public class AppGFElectricityController extends BaseController {
case "5"://验收人
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
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_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过");
// 发短信
@ -768,6 +831,7 @@ public class AppGFElectricityController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("CONFIRM_CONTENT", pd.get("CONTENT"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
@ -799,6 +863,7 @@ public class AppGFElectricityController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("AUDIT_CONTENT", pd.get("CONTENT"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData mes1 = new PageData();
mes1.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
@ -829,6 +894,7 @@ public class AppGFElectricityController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("APPROVE_CONTENT", pd.get("CONTENT"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
// 发短信
PageData mes2 = new PageData();
@ -861,6 +927,7 @@ public class AppGFElectricityController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData mes3 = new PageData();
mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
@ -891,6 +958,7 @@ public class AppGFElectricityController extends BaseController {
break;
}
GFelectricityLogService.save(log);
map.put("dockDataLog", JSON.toJSONString(log));
map.put("result", errInfo);
return map;
}
@ -981,6 +1049,7 @@ public class AppGFElectricityController extends BaseController {
*/
@PostMapping(value="/cancel")
@ResponseBody
@DockAnnotation
public void cancel(@RequestBody PageData pd) throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -1004,6 +1073,7 @@ public class AppGFElectricityController extends BaseController {
if (workTime - analyzeTime >= 0) {
return;
} else {
map.put("dockData", JSON.toJSONString(pd));
GFelectricityService.cancel(pd);
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
@ -1028,12 +1098,14 @@ public class AppGFElectricityController extends BaseController {
e.printStackTrace();
}
}else{
map.put("dockData", JSON.toJSONString(pd));
GFelectricityService.cancel(pd);
PageData pd2 = new PageData();
pd2 = GFelectricityService.checkno(pd);
PageData pd3 = new PageData();
pd3.put("CHECK_NO",pd2.getString("CHECK_NO"));
pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID"));
map.put("dockDatapd2", JSON.toJSONString(pd3));
GFelectricityService.editSpecialwork(pd3);
GFelectricityService.editSpecialwork1(pd3);
GFelectricityService.editSpecialwork2(pd3);
@ -1109,12 +1181,14 @@ public class AppGFElectricityController extends BaseController {
*/
@RequestMapping(value="/gas/delete")
@ResponseBody
@DockAnnotation
public Object gasDel() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFelectricityGasService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -1125,6 +1199,7 @@ public class AppGFElectricityController extends BaseController {
*/
@RequestMapping(value="/gas/save")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object gasSave() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -1134,6 +1209,7 @@ public class AppGFElectricityController extends BaseController {
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
GFelectricityGasService.save(pd);
GFelectricityService.edittime(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}

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

77
src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java
View File

@ -2,6 +2,7 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -72,6 +73,7 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/add")
@ResponseBody
@Transactional
@DockAnnotation(isAdd = true,hasAnnex = true)
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -93,6 +95,7 @@ public class AppGFHoistingController extends BaseController {
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
map.put("dockData", JSON.toJSONString(pd));
GFhoistingService.save(pd);
if(pd.get("APPLY_STATUS").equals("1")) {
@ -102,6 +105,7 @@ public class AppGFHoistingController extends BaseController {
log.put("HOISTING_ID", pd.get("HOISTING_ID"));
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("logData", JSON.toJSONString(log));
GFhighWorkLogService.save(log);
// 发短信
@ -143,12 +147,14 @@ public class AppGFHoistingController extends BaseController {
*/
@RequestMapping(value="/delete")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFhoistingService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -160,12 +166,14 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/edit")
@ResponseBody
@Transactional
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFhoistingService.edit(pd);
map.put("dockData", JSON.toJSONString(pd));
if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData();
log.put("HOISTINGLOG_ID", this.get32UUID());
@ -174,6 +182,7 @@ public class AppGFHoistingController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
GFhighWorkLogService.save(log);
map.put("logData", JSON.toJSONString(log));
// 发短信
PageData mes = new PageData();
@ -215,6 +224,7 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/editGuardian")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editGuardian(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -227,14 +237,17 @@ public class AppGFHoistingController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
map.put("dockData", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
}
@ -248,6 +261,7 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/editConfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editConfess(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -260,16 +274,20 @@ public class AppGFHoistingController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
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("GUARDIAN_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
}
map.put("result", errInfo);
@ -282,30 +300,35 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/editAcceptconfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptconfess(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
map.put("dockData", JSON.toJSONString(pd));
PageData pd2 = new PageData();
pd2 = GFhoistingService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
map.put("dockData2", JSON.toJSONString(pd2));
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<String>();
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
saveImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList);
fileList.clear();
}
map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo);
return map;
}
private void saveImg(MultipartFile[] files,String signertime, String HOISTING_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{
private void saveImg(MultipartFile[] files,String signertime, String HOISTING_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID,ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData pd = new PageData();
@ -326,6 +349,7 @@ public class AppGFHoistingController extends BaseController {
pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID);
pd.put("ACCEPT_USER_ID","");
pd.put("ACCEPT_DEPARTMENT_ID", "");
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
hoistingacceptuserService.save(pd);
}
}
@ -338,6 +362,7 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/editAcceptStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptStatus(MultipartRequest request) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -356,6 +381,7 @@ public class AppGFHoistingController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
@ -373,15 +399,18 @@ public class AppGFHoistingController extends BaseController {
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
for (int i = 0; i < SIGNTIME.length; i++) {
ArrayList<String> pictureList = new ArrayList<String>();
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"));
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
fileList.clear();
}
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
log.put("ACTION", "验收通过");
@ -412,6 +441,7 @@ public class AppGFHoistingController extends BaseController {
log.put("ACTION", "验收人打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
@ -443,11 +473,13 @@ public class AppGFHoistingController extends BaseController {
default:
break;
}
map.put("dockDataLog", JSON.toJSONString(log));
GFhighWorkLogService.save(log);
map.put("result", errInfo);
return map;
}
private void saveAcceptImg(MultipartFile[] files,String signertime, String HOISTING_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{
private void saveAcceptImg(MultipartFile[] files,String signertime, String HOISTING_ID,
String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData();
@ -468,6 +500,7 @@ public class AppGFHoistingController extends BaseController {
cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", "");
cpd.put("ACCEPT_CONFESS_USER_ID", "");
cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID);
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
hoistingacceptuserService.save(cpd);
}
}
@ -481,6 +514,7 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/editStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -498,6 +532,7 @@ public class AppGFHoistingController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
@ -506,12 +541,15 @@ public class AppGFHoistingController extends BaseController {
switch (status) {
case "2"://作业指挥
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
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_CONTENT", pd.get("CONTENT"));
@ -527,9 +565,13 @@ public class AppGFHoistingController extends BaseController {
}
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
// pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION);
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
map.put("dockDataDel", JSON.toJSONString(pd));
GFhighWorkToMeasuresService.delete(pd);
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
HashMap<String, String> measuresMap = new HashMap<String, String>();
int measuresCount = 1;
for (JSONObject json : list) {
PageData measures = new PageData();
measures.put("HOISTINGTOMEASURES_ID", this.get32UUID()); // 主键
@ -539,8 +581,11 @@ public class AppGFHoistingController extends BaseController {
measures.put("STATUS", json.get("STATUS"));
measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
measuresMap.put("other"+measuresCount, JSON.toJSONString(measures));
measuresCount+=1;
GFhighWorkToMeasuresService.save(measures);
}
map.put("measuresData", JSON.toJSONString(measuresMap));
log.put("ACTION", "作业指挥通过");
// 发短信
@ -595,12 +640,15 @@ public class AppGFHoistingController extends BaseController {
case "3"://所在单位
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
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_CONTENT", pd.get("CONTENT"));
@ -612,6 +660,7 @@ public class AppGFHoistingController extends BaseController {
}
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
log.put("ACTION", "所在单位通过");
@ -663,12 +712,15 @@ public class AppGFHoistingController extends BaseController {
case "4"://审核部门
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
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_CONTENT", pd.get("CONTENT"));
@ -677,6 +729,7 @@ public class AppGFHoistingController extends BaseController {
}
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
log.put("ACTION", "审核部门通过");
@ -722,17 +775,21 @@ public class AppGFHoistingController extends BaseController {
case "5"://审批部门
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
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_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
log.put("ACTION", "审批部门通过");
@ -770,17 +827,21 @@ public class AppGFHoistingController extends BaseController {
case "6"://验收人
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
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_CONTENT", pd.get("CONTENT"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
log.put("ACTION", "验收通过");
@ -810,6 +871,7 @@ public class AppGFHoistingController extends BaseController {
log.put("ACTION", "作业指挥打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("LEADER_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
@ -843,6 +905,7 @@ public class AppGFHoistingController extends BaseController {
log.put("ACTION", "所在单位打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
// 发短信
@ -874,6 +937,7 @@ public class AppGFHoistingController extends BaseController {
log.put("ACTION", "审核部门打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("AUDIT_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
// 发短信
@ -905,6 +969,7 @@ public class AppGFHoistingController extends BaseController {
log.put("ACTION", "审批部门打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("APPROVE_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
// 发短信
@ -936,6 +1001,7 @@ public class AppGFHoistingController extends BaseController {
log.put("ACTION", "验收人打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
@ -967,6 +1033,7 @@ public class AppGFHoistingController extends BaseController {
default:
break;
}
map.put("dockDataLog", JSON.toJSONString(log));
GFhighWorkLogService.save(log);
map.put("result", errInfo);
return map;

12
src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -50,6 +52,7 @@ public class GFConfinedSpaceController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("confinedspace:add")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -57,6 +60,7 @@ public class GFConfinedSpaceController extends BaseController {
pd = this.getPageData();
pd.put("CONFINEDSPACE_ID", this.get32UUID()); //主键
GFconfinedspaceService.save(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -68,12 +72,14 @@ public class GFConfinedSpaceController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("confinedspace:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFconfinedspaceService.delete(pd);
map.put("pd", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -85,12 +91,14 @@ public class GFConfinedSpaceController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("confinedspace:edit")
@ResponseBody
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFconfinedspaceService.edit(pd);
map.put("pd", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -100,7 +108,7 @@ public class GFConfinedSpaceController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/list")
@RequiresPermissions("confinedspace:list")
// @RequiresPermissions("confinedspace:list")
@ResponseBody
public Object list(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
@ -155,6 +163,7 @@ public class GFConfinedSpaceController extends BaseController {
@RequestMapping(value="/deleteAll")
@RequiresPermissions("confinedspace:del")
@ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -168,6 +177,7 @@ public class GFConfinedSpaceController extends BaseController {
}else{
errInfo = "error";
}
map.put("pd", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}

8
src/main/java/com/zcloud/controller/gf/GFLimitSpaceApproveController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -40,6 +42,7 @@ public class GFLimitSpaceApproveController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("limitspaceapprove:add")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -53,6 +56,7 @@ public class GFLimitSpaceApproveController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", ""); //是否删除 1-是 0-否
GFlimitspaceapproveService.save(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -64,12 +68,14 @@ public class GFLimitSpaceApproveController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("limitspaceapprove:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFlimitspaceapproveService.delete(pd);
map.put("pd", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -150,6 +156,7 @@ public class GFLimitSpaceApproveController extends BaseController {
@RequestMapping(value="/deleteAll")
@RequiresPermissions("limitspaceapprove:del")
@ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -163,6 +170,7 @@ public class GFLimitSpaceApproveController extends BaseController {
}else{
errInfo = "error";
}
map.put("pd", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}

12
src/main/java/com/zcloud/controller/gf/GFLimitSpaceController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -46,6 +48,7 @@ public class GFLimitSpaceController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("limitspace:add")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -59,6 +62,7 @@ public class GFLimitSpaceController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", "0"); //是否删除
GFlimitspaceService.save(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -70,6 +74,7 @@ public class GFLimitSpaceController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("limitspace:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -78,6 +83,7 @@ public class GFLimitSpaceController extends BaseController {
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
GFlimitspaceService.delete(pd);
map.put("pd",JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -89,6 +95,7 @@ public class GFLimitSpaceController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("limitspace:edit")
@ResponseBody
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -97,6 +104,7 @@ public class GFLimitSpaceController extends BaseController {
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
GFlimitspaceService.edit(pd);
map.put("pd", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -106,7 +114,7 @@ public class GFLimitSpaceController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/list")
@RequiresPermissions("limitspace:list")
// @RequiresPermissions("limitspace:list")
@ResponseBody
public Object list(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
@ -157,6 +165,7 @@ public class GFLimitSpaceController extends BaseController {
@RequestMapping(value="/deleteAll")
@RequiresPermissions("limitspace:del")
@ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -173,6 +182,7 @@ public class GFLimitSpaceController extends BaseController {
}else{
errInfo = "error";
}
map.put("pd",JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
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("FOREIGN_KEY", pd.getString("OUTSOURCED_ID"));
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");
}

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

@ -68,6 +68,8 @@ public class LoginController extends BaseController {
@Autowired
private OffDutyService offdutyService;
@Autowired
private PhotoService photoService;
@Value("${czks-useridentity}")
private String czksIdentity;
@Value("${czks-baseimgpath}")
@ -81,14 +83,6 @@ public class LoginController extends BaseController {
private String gwjBaseimgpath;
@Value("${gwj-backendaddr}")
private String gwjBackendaddr;
@Autowired
private PhotoService photoService;
/**
* 请求登录验证用户接口
*
@ -208,8 +202,6 @@ public class LoginController extends BaseController {
// 后台地址
map.put("BACKENDADDR", gwjBackendaddr);
}
PageData cpd = corpinfoService.findById(pd);
//System.out.println(cpd.getString("ISUSE"));
if (cpd != null) {

20
src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml
View File

@ -73,7 +73,9 @@
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
f.ACCEPT_CONFESS_USER_SIGNER_TIME
f.ACCEPT_CONFESS_USER_SIGNER_TIME,
f.WORK_LATITUDE,
f.WORK_LONGITUDE
</sql>
<!-- 字段用于新增 -->
@ -137,7 +139,9 @@
ACCEPT_CONFESS_DEPARTMENT_ID,
ACCEPT_CONFESS_USER_ID,
ACCEPT_CONFESS_USER_SIGNER_PATH,
ACCEPT_CONFESS_USER_SIGNER_TIME
ACCEPT_CONFESS_USER_SIGNER_TIME,
WORK_LATITUDE,
WORK_LONGITUDE
</sql>
<!-- 字段值 -->
@ -202,7 +206,9 @@
#{ACCEPT_CONFESS_DEPARTMENT_ID},
#{ACCEPT_CONFESS_USER_ID},
#{ACCEPT_CONFESS_USER_SIGNER_PATH},
#{ACCEPT_CONFESS_USER_SIGNER_TIME}
#{ACCEPT_CONFESS_USER_SIGNER_TIME},
#{WORK_LATITUDE},
#{WORK_LONGITUDE}
</sql>
<!-- 新增-->
@ -487,6 +493,8 @@
f.ACCEPT_CONFESS_USER_ID,
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
f.ACCEPT_CONFESS_USER_SIGNER_TIME,
f.WORK_LATITUDE,
f.WORK_LONGITUDE,
(SELECT replace(a.ANALYZE_TIME,'-','/') from GF_CONFINEDSPACEGAS a where a.ISDELETE = '0'
AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
ORDER BY
@ -615,6 +623,8 @@
f.CONFESS_USER_SIGNER_TIME,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
f.WORK_LATITUDE,
f.WORK_LONGITUDE,
IFNULL((SELECT a.ANALYZE_TIME from GF_confinedspacegas a where a.ISDELETE = '0'
AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
ORDER BY
@ -845,6 +855,8 @@
f.CONFESS_USER_SIGNER_TIME,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
f.WORK_LATITUDE,
f.WORK_LONGITUDE,
IFNULL((SELECT replace(a.ANALYZE_TIME,'-','/') from GF_confinedspacegas a where a.ISDELETE = '0'
AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
ORDER BY
@ -1067,6 +1079,8 @@
f.CONFESS_USER_SIGNER_TIME,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
f.WORK_LATITUDE,
f.WORK_LONGITUDE,
IFNULL((SELECT a.ANALYZE_TIME from gf_confinedspacegas a where a.ISDELETE = '0'
AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
ORDER BY

2
src/main/resources/mybatis/datasource/system/UsersMapper.xml
View File

@ -252,7 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- 通过USERNAME获取数据 -->
<select id="findByUsername" parameterType="pd" resultType="pd" >
select
<include refid="Fieldf"></include> ,dept.name as deptName
<include refid="Fieldf"></include> ,f.USER_IDENTITY,dept.name as deptName
from
<include refid="tableName"></include> f
LEFT JOIN OA_DEPARTMENT dept on f.DEPARTMENT_ID = dept.DEPARTMENT_ID