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

沧州矿石数据对接临时用电、动火作业

pull/14/head
limingyu 2023-12-26 09:27:57 +08:00
parent b9622c745f
commit ea0e12e364
2 changed files with 100 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,18 +455,18 @@ public class AppGFElectricityController extends BaseController {
String signertime = ""; String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(","); String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<String>();
for (int i = 0; i < SIGNTIME.length; i++) { for (int i = 0; i < SIGNTIME.length; i++) {
ArrayList<String> pictureList = new ArrayList<String>();
signertime = SIGNTIME[i]; signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i)); fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()]; MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"), saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),
pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"), pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),
pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList); pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
fileList.clear(); fileList.clear();
} }
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2); GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2)); map.put("dockDatapd2", JSON.toJSONString(pd2));

101
src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java
View File

@ -2,6 +2,7 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.dto.TenCorpConst; import com.zcloud.dto.TenCorpConst;
import com.zcloud.dto.TenCorpDto; import com.zcloud.dto.TenCorpDto;
@ -84,6 +85,7 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value="/add") @RequestMapping(value="/add")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(isAdd = true)
public Object add() throws Exception{ public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
@ -105,6 +107,7 @@ public class AppGFHotworkController extends BaseController {
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
map.put("dockData", JSON.toJSONString(pd));
GFhotworkService.save(pd); GFhotworkService.save(pd);
if(pd.get("APPLY_STATUS").equals("1")) { if(pd.get("APPLY_STATUS").equals("1")) {
@ -114,6 +117,7 @@ public class AppGFHotworkController extends BaseController {
log.put("HOTWORK_ID", pd.get("HOTWORK_ID")); log.put("HOTWORK_ID", pd.get("HOTWORK_ID"));
log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date())); log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockDataLog", JSON.toJSONString(log));
GFhotworkLogService.save(log); GFhotworkLogService.save(log);
// 发短信 // 发短信
@ -183,11 +187,13 @@ public class AppGFHotworkController extends BaseController {
*/ */
@RequestMapping(value="/delete") @RequestMapping(value="/delete")
@ResponseBody @ResponseBody
@DockAnnotation
public Object delete() throws Exception{ public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>(); Map<String,String> map = new HashMap<String,String>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
map.put("dockData", JSON.toJSONString(pd));
GFhotworkService.delete(pd); GFhotworkService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
@ -198,11 +204,13 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value="/edit") @RequestMapping(value="/edit")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation
public Object edit() throws Exception{ public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
map.put("dockData", JSON.toJSONString(pd));
GFhotworkService.edit(pd); GFhotworkService.edit(pd);
if(pd.get("APPLY_STATUS").equals("1")) { if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData(); PageData log = new PageData();
@ -211,6 +219,7 @@ public class AppGFHotworkController extends BaseController {
log.put("HOTWORK_ID", pd.get("HOTWORK_ID")); log.put("HOTWORK_ID", pd.get("HOTWORK_ID"));
log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date())); log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockDataLog", JSON.toJSONString(log));
GFhotworkLogService.save(log); GFhotworkLogService.save(log);
@ -256,6 +265,7 @@ public class AppGFHotworkController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**修改 /**修改
* @param * @param
* @throws Exception * @throws Exception
@ -263,6 +273,7 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value="/editGuardian") @RequestMapping(value="/editGuardian")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object editGuardian( public Object editGuardian(
@RequestParam(value="FFILE",required=false) MultipartFile[] files @RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{ ) throws Exception{
@ -275,22 +286,27 @@ public class AppGFHotworkController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0]; MultipartFile file = files[0];
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
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_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
} }
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**修改 /**修改
* @param * @param
* @throws Exception * @throws Exception
@ -298,6 +314,7 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value="/editConfess") @RequestMapping(value="/editConfess")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object editConfess( public Object editConfess(
@RequestParam(value="FFILE",required=false) MultipartFile[] files @RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{ ) throws Exception{
@ -310,21 +327,26 @@ public class AppGFHotworkController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0]; MultipartFile file = files[0];
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
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_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
} }
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**修改 /**修改
* @param * @param
* @throws Exception * @throws Exception
@ -332,6 +354,7 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value="/editAcceptconfess") @RequestMapping(value="/editAcceptconfess")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptconfess(MultipartRequest request) throws Exception { public Object editAcceptconfess(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -345,19 +368,28 @@ public class AppGFHotworkController extends BaseController {
String signertime = ""; String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(","); String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<>();
HashMap<String, String> pdMap = new HashMap<String, String>();
for (int i = 0; i < SIGNTIME.length; i++) { for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i]; signertime = SIGNTIME[i];
fileList.add(request.getFile("file" + i)); fileList.add(request.getFile("file" + i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()]; MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"), pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); saveImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"),
pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"),
pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"), pictureList, pdMap);
fileList.clear(); fileList.clear();
} }
map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("dockData", JSON.toJSONString(pdMap));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
private void saveImg(MultipartFile[] files, String signertime, String HOTWORK_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception { private void saveImg(MultipartFile[] files, String signertime, String HOTWORK_ID,
String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID,
String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList, Map<String, String> pdMap) throws Exception {
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
int count = 1;
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -377,6 +409,9 @@ public class AppGFHotworkController extends BaseController {
pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID); pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID);
pd.put("ACCEPT_USER_ID",""); pd.put("ACCEPT_USER_ID","");
pd.put("ACCEPT_DEPARTMENT_ID", ""); pd.put("ACCEPT_DEPARTMENT_ID", "");
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" +fileName);
pdMap.put("other" + count, JSON.toJSONString(pd));
count += 1;
hotworkacceptuserService.save(pd); hotworkacceptuserService.save(pd);
} }
} }
@ -391,6 +426,7 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value = "/editAcceptStatus") @RequestMapping(value = "/editAcceptStatus")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptStatus(MultipartRequest request) throws Exception { public Object editAcceptStatus(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -407,6 +443,7 @@ public class AppGFHotworkController extends BaseController {
log.put("CREATOR", pd.get("ACTION_USER")); log.put("CREATOR", pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date())); log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString(); String status = pd.get("STATUS").toString();
if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status)) { if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status)) {
pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
@ -423,16 +460,26 @@ public class AppGFHotworkController extends BaseController {
String signertime = ""; String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(","); String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<>();
HashMap<String, String> pdMap = new HashMap<String, String>();
for (int i = 0; i < SIGNTIME.length; i++) { for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i]; signertime = SIGNTIME[i];
fileList.add(request.getFile("file" + i)); fileList.add(request.getFile("file" + i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()]; MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_USER_ID"), pd.getString("ACCEPT_DEPARTMENT_ID")); saveAcceptImg(fileList.toArray(fileArr), signertime,
pd.getString("HOTWORK_ID"),
pd.getString("CORPINFO_ID"),
pd.getString("ACCEPT_USER_ID"),
pd.getString("ACCEPT_DEPARTMENT_ID"),
pictureList, pdMap);
fileList.clear(); fileList.clear();
} }
map.put("pdMap", JSON.toJSONString(pdMap));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过"); log.put("ACTION", "验收通过");
// 发短信 // 发短信
@ -461,6 +508,7 @@ public class AppGFHotworkController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
// 发短信 // 发短信
PageData mes6 = new PageData(); PageData mes6 = new PageData();
@ -491,13 +539,22 @@ public class AppGFHotworkController extends BaseController {
break; break;
} }
GFhotworkLogService.save(log); GFhotworkLogService.save(log);
map.put("dockDataLog", JSON.toJSONString(log));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
private void saveAcceptImg(MultipartFile[] files,String signertime, String HOTWORK_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ private void saveAcceptImg(MultipartFile[] files,
String signertime,
String HOTWORK_ID,
String CORPINFO_ID,
String ACCEPT_USER_ID,
String ACCEPT_DEPARTMENT_ID,
ArrayList<String> pictureList,
HashMap<String, String> pdMap) throws Exception{
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
int count = 1;
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData(); PageData cpd = new PageData();
cpd = this.getPageData(); cpd = this.getPageData();
@ -517,6 +574,9 @@ public class AppGFHotworkController extends BaseController {
cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ""); cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", "");
cpd.put("ACCEPT_CONFESS_USER_ID", ""); cpd.put("ACCEPT_CONFESS_USER_ID", "");
cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID); cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID);
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
pdMap.put("other" + count, JSON.toJSONString(cpd));
count += 1;
hotworkacceptuserService.save(cpd); hotworkacceptuserService.save(cpd);
} }
} }
@ -531,6 +591,7 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value="/editStatus") @RequestMapping(value="/editStatus")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object editStatus( public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files @RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{ ) throws Exception{
@ -549,6 +610,7 @@ public class AppGFHotworkController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date())); log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString(); String status = pd.get("STATUS").toString();
if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status)) { if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status)) {
pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
@ -561,19 +623,25 @@ public class AppGFHotworkController extends BaseController {
switch (status) { switch (status) {
case "2"://确认 case "2"://确认
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0]; MultipartFile file = files[0];
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); 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_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); pd2.put("CONFIRM_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
GFhotworkToMeasuresService.delete(pd2); GFhotworkToMeasuresService.delete(pd2);
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString()); 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) { for (JSONObject json : list) {
PageData measures = new PageData(); PageData measures = new PageData();
measures.put("HOTWORKTOMEASURES_ID", this.get32UUID()); // 主键 measures.put("HOTWORKTOMEASURES_ID", this.get32UUID()); // 主键
@ -586,8 +654,11 @@ public class AppGFHotworkController extends BaseController {
measures.put("STATUS", json.get("STATUS")); measures.put("STATUS", json.get("STATUS"));
measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
measuresMap.put("other" + measuresCount, JSON.toJSONString(measures));
measuresCount += 1;
GFhotworkToMeasuresService.save(measures); GFhotworkToMeasuresService.save(measures);
} }
map.put("dockDatameasuresMap", JSON.toJSONString(measuresMap));
log.put("ACTION", "作业单位通过"); log.put("ACTION", "作业单位通过");
@ -681,6 +752,7 @@ public class AppGFHotworkController extends BaseController {
pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("LEADER_CONTENT", pd.get("CONTENT")); pd2.put("LEADER_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
log.put("ACTION", "单位负责人确认"); log.put("ACTION", "单位负责人确认");
@ -742,6 +814,7 @@ public class AppGFHotworkController extends BaseController {
pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); pd2.put("AUDIT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
log.put("ACTION", "安全部门审核通过"); log.put("ACTION", "安全部门审核通过");
@ -796,6 +869,7 @@ public class AppGFHotworkController extends BaseController {
pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); pd2.put("APPROVE_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
log.put("ACTION", "审批部门通过"); log.put("ACTION", "审批部门通过");
@ -844,6 +918,7 @@ public class AppGFHotworkController extends BaseController {
pd2.put("MONITOR_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("MONITOR_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("MONITOR_CONTENT", pd.get("CONTENT")); pd2.put("MONITOR_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
log.put("ACTION", "班长验票通过"); log.put("ACTION", "班长验票通过");
@ -911,6 +986,7 @@ public class AppGFHotworkController extends BaseController {
pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
log.put("ACTION", "验收通过"); log.put("ACTION", "验收通过");
@ -939,6 +1015,7 @@ public class AppGFHotworkController extends BaseController {
log.put("ACTION", "作业单位打回"); log.put("ACTION", "作业单位打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); pd2.put("CONFIRM_CONTENT", pd.get("CONTENT"));
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
// 发短信 // 发短信
@ -999,6 +1076,7 @@ public class AppGFHotworkController extends BaseController {
log.put("ACTION", "单位负责人打回"); log.put("ACTION", "单位负责人打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); pd2.put("AUDIT_CONTENT", pd.get("CONTENT"));
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
// 发短信 // 发短信
@ -1030,6 +1108,7 @@ public class AppGFHotworkController extends BaseController {
log.put("ACTION", "安全部门打回"); log.put("ACTION", "安全部门打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); pd2.put("APPROVE_CONTENT", pd.get("CONTENT"));
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
// 发短信 // 发短信
@ -1061,6 +1140,7 @@ public class AppGFHotworkController extends BaseController {
log.put("ACTION", "审批部门打回"); log.put("ACTION", "审批部门打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
// 发短信 // 发短信
PageData mes4 = new PageData(); PageData mes4 = new PageData();
@ -1091,6 +1171,7 @@ public class AppGFHotworkController extends BaseController {
log.put("ACTION", "班长验票打回"); log.put("ACTION", "班长验票打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
// 发短信 // 发短信
PageData mes5 = new PageData(); PageData mes5 = new PageData();
@ -1121,6 +1202,7 @@ public class AppGFHotworkController extends BaseController {
log.put("ACTION", "验收人打回"); log.put("ACTION", "验收人打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
// 发短信 // 发短信
@ -1151,6 +1233,7 @@ public class AppGFHotworkController extends BaseController {
default: default:
break; break;
} }
map.put("dockDataLog", JSON.toJSONString(log));
GFhotworkLogService.save(log); GFhotworkLogService.save(log);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -1162,12 +1245,14 @@ public class AppGFHotworkController extends BaseController {
*/ */
@PostMapping(value = "/cancel") @PostMapping(value = "/cancel")
@ResponseBody @ResponseBody
@DockAnnotation
public void cancel(@RequestBody PageData pd) throws Exception { public void cancel(@RequestBody PageData pd) throws Exception {
Map<String, String> map = new HashMap<String, String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
System.out.println(JSONObject.toJSONString(pd)); System.out.println(JSONObject.toJSONString(pd));
PageData cpd = new PageData(); PageData cpd = new PageData();
cpd = GFhotworkService.findById(pd); cpd = GFhotworkService.findById(pd);
map.put("dockDatacpd", JSON.toJSONString(cpd));
if (cpd != null && cpd.size() > 0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("MONITOR_USER_SIGNER_TIME") != null) { if (cpd != null && cpd.size() > 0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("MONITOR_USER_SIGNER_TIME") != null) {
// String WORK_START_DATE = pd.getString("WORK_START_DATE"); // String WORK_START_DATE = pd.getString("WORK_START_DATE");
// String ANALYZE_TIME = cpd.getString("ANALYZE_TIME"); // String ANALYZE_TIME = cpd.getString("ANALYZE_TIME");
@ -1216,12 +1301,14 @@ public class AppGFHotworkController extends BaseController {
// } // }
}else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") == null){ }else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") == null){
pd.put("APPLY_STATUS",-98); pd.put("APPLY_STATUS",-98);
map.put("dockData", JSON.toJSONString(pd));
GFhotworkService.cancel(pd); GFhotworkService.cancel(pd);
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFhotworkService.checkno(pd); pd2 = GFhotworkService.checkno(pd);
PageData pd3 = new PageData(); PageData pd3 = new PageData();
pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); pd3.put("CHECK_NO",pd2.getString("CHECK_NO"));
pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID"));
map.put("dockDatapd3", JSON.toJSONString(pd3));
GFhotworkService.editSpecialwork(pd3); GFhotworkService.editSpecialwork(pd3);
GFhotworkService.editSpecialwork1(pd3); GFhotworkService.editSpecialwork1(pd3);
GFhotworkService.editSpecialwork2(pd3); GFhotworkService.editSpecialwork2(pd3);
@ -1250,12 +1337,14 @@ public class AppGFHotworkController extends BaseController {
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
}else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("MONITOR_USER_SIGNER_TIME") == null){ }else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("MONITOR_USER_SIGNER_TIME") == null){
pd.put("APPLY_STATUS",-99); pd.put("APPLY_STATUS",-99);
map.put("dockData", JSON.toJSONString(pd));
GFhotworkService.cancel(pd); GFhotworkService.cancel(pd);
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFhotworkService.checkno(pd); pd2 = GFhotworkService.checkno(pd);
PageData pd3 = new PageData(); PageData pd3 = new PageData();
pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); pd3.put("CHECK_NO",pd2.getString("CHECK_NO"));
pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID"));
map.put("dockDatapd3", JSON.toJSONString(pd3));
GFhotworkService.editSpecialwork(pd3); GFhotworkService.editSpecialwork(pd3);
GFhotworkService.editSpecialwork1(pd3); GFhotworkService.editSpecialwork1(pd3);
GFhotworkService.editSpecialwork2(pd3); GFhotworkService.editSpecialwork2(pd3);
@ -1414,11 +1503,13 @@ public class AppGFHotworkController extends BaseController {
*/ */
@RequestMapping(value="/gas/delete") @RequestMapping(value="/gas/delete")
@ResponseBody @ResponseBody
@DockAnnotation
public Object gasDel() throws Exception{ public Object gasDel() throws Exception{
Map<String,String> map = new HashMap<String,String>(); Map<String,String> map = new HashMap<String,String>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
map.put("dockData", JSON.toJSONString(pd));
GFhotworkGasService.delete(pd); GFhotworkGasService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
@ -1430,6 +1521,7 @@ public class AppGFHotworkController extends BaseController {
*/ */
@RequestMapping(value="/gas/save") @RequestMapping(value="/gas/save")
@ResponseBody @ResponseBody
@DockAnnotation(isAdd = true)
public Object gasSave() throws Exception{ public Object gasSave() throws Exception{
Map<String,String> map = new HashMap<String,String>(); Map<String,String> map = new HashMap<String,String>();
String errInfo = "success"; String errInfo = "success";
@ -1437,6 +1529,7 @@ public class AppGFHotworkController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("HOTWORKGAS_ID", this.get32UUID()); //主键 pd.put("HOTWORKGAS_ID", this.get32UUID()); //主键
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
map.put("dockData", JSON.toJSONString(pd));
GFhotworkGasService.save(pd); GFhotworkGasService.save(pd);
GFhotworkService.edittime(pd); GFhotworkService.edittime(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果