From 52b5698a7e83813b3ff0477cbe3bef0efc23c9c7 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Tue, 2 Jan 2024 18:16:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9Aapp?=
=?UTF-8?q?=E5=AF=B9=E6=8E=A5=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AppGasAnalysisController.java | 30 ++
.../AppHotWorkApplicationController.java | 276 ++++++++++++++++++
...ppHotWorkApplicationDelayedController.java | 30 ++
.../gf/AppGFConfinedSpaceController.java | 4 +-
.../gf/AppGFConfinedSpaceGasWHController.java | 22 +-
.../gf/AppGFElectricityController.java | 9 +-
.../gf/AppGFHoistingController.java | 4 +
.../controller/gf/AppGFHotworkController.java | 27 +-
8 files changed, 379 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppGasAnalysisController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppGasAnalysisController.java
index 093acb5c..72f3ef08 100644
--- a/src/main/java/com/zcloud/controller/app/highriskwork/AppGasAnalysisController.java
+++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppGasAnalysisController.java
@@ -1,5 +1,7 @@
package com.zcloud.controller.app.highriskwork;
+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,18 +42,25 @@ public class AppGasAnalysisController extends BaseController {
*/
@RequestMapping(value="/add")
@ResponseBody
+ @DockAnnotation(isAdd = true)
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData(); // 主要对接数据
+
pd.put("CREATOR", pd.getString("loginUserId"));
pd.put("CREATTIME", DateUtil.date2Str(new Date()));
pd.put("OPERATOR",pd.getString("loginUserId"));
pd.put("OPERATTIME",DateUtil.date2Str(new Date()));
pd.put("ISDELETE","0");
pd.put("GASANALYSIS_ID", this.get32UUID()); //主键
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
gasanalysisService.save(pd);
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -62,12 +71,19 @@ public class AppGasAnalysisController 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();
+ PageData dockData = new PageData(); // 主要对接数据
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
gasanalysisService.delete(pd);
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果
return map;
}
@@ -78,12 +94,19 @@ public class AppGasAnalysisController extends BaseController {
*/
@RequestMapping(value="/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();
+ PageData dockData = new PageData(); // 主要对接数据
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
gasanalysisService.edit(pd);
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -144,11 +167,17 @@ public class AppGasAnalysisController extends BaseController {
*/
@RequestMapping(value="/deleteAll")
@ResponseBody
+ @DockAnnotation
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData(); // 主要对接数据
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(",");
@@ -157,6 +186,7 @@ public class AppGasAnalysisController extends BaseController {
}else{
errInfo = "fail";
}
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果
return map;
}
diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java
index f696040b..2a41cd86 100644
--- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java
+++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java
@@ -2,6 +2,7 @@ package com.zcloud.controller.app.highriskwork;
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;
@@ -117,11 +118,14 @@ public class AppHotWorkApplicationController extends BaseController {
@RequestMapping(value="/addTemUser")
@ResponseBody
@Transactional
+ @DockAnnotation(isAdd = true)
public Object addTemUser() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData(); // 主要对接数据
+
pd.put("SPECIALUSER_ID", this.get32UUID()); //主键
pd.put("CREATOR", pd.getString("loginUserId"));
pd.put("CREATTIME", DateUtil.date2Str(new Date()));
@@ -135,9 +139,14 @@ public class AppHotWorkApplicationController extends BaseController {
pd.put("SPARE1",pd.get("TEM_USER_DEPT_NAME")); // 人员部门
}
pd.put("USER_TYPE",pd.get("USER_TYPE")); // 人员类型
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
specialUserService.save(pd);
map.put("pd", pd);
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -147,11 +156,17 @@ public class AppHotWorkApplicationController extends BaseController {
*/
@RequestMapping(value="/deleteTem")
@ResponseBody
+ @DockAnnotation
public Object deleteTem() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData(); // 主要对接数据
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
specialUserService.deleteTem(pd);
List<PageData> imgList = imgfilesService.listAll(pd);// 获取照片记录
// if(imgList.size() == 2){
@@ -161,6 +176,7 @@ public class AppHotWorkApplicationController extends BaseController {
// imgfilesService.delete(pageData);
// }
// }
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果
return map;
}
@@ -171,11 +187,15 @@ public class AppHotWorkApplicationController 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";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData(); // 主要对接数据
+
+
pd.put("HOTWORKAPPLICATION_ID", this.get32UUID()); //主键
pd.put("CREATOR", pd.getString("APPLY_USER_ID"));
pd.put("CREATTIME", DateUtil.date2Str(new Date()));
@@ -190,6 +210,8 @@ public class AppHotWorkApplicationController extends BaseController {
// 新增新的其他措施
if (pd.get("OTHERMEASURE") != null && !pd.get("OTHERMEASURE").equals("")) {
String[] othermeasure = pd.get("OTHERMEASURE").toString().split(",");
+ Map<String, String> safetymethodrecordPdMap = new HashMap<String, String>();
+ int safetymethodrecordPdCount = 1;
for (String content : othermeasure) {
if(Tools.notEmpty(content)) {
PageData safetymethodrecordPd = new PageData();
@@ -204,13 +226,20 @@ public class AppHotWorkApplicationController extends BaseController {
safetymethodrecordPd.put("OPERATOR", pd.getString("loginUserName")); //修改人
safetymethodrecordPd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
safetymethodrecordPd.put("ISDELETE", "0"); //是否删除 1-是 0-否
+ safetymethodrecordPdMap.put("other" + safetymethodrecordPdCount, JSON.toJSONString(safetymethodrecordPd));
hotWorkSafetyMethodRecordService.save(safetymethodrecordPd);
}
}
+ dockData.put("safetymethodrecordPd", JSON.toJSONString(safetymethodrecordPdMap));
}
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
hotWorkApplicationUserService.saveUserByHot(pd.getString("HOTWORKAPPLICATION_ID"),pd);
hotworkapplicationService.save(pd);
this.sendNotice(pd); //发送通知公告
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -219,6 +248,7 @@ public class AppHotWorkApplicationController extends BaseController {
* @param out
* @throws Exception
*/
+ @DockAnnotation
@RequestMapping(value="/delete")
@ResponseBody
public Object delete() throws Exception{
@@ -226,11 +256,25 @@ public class AppHotWorkApplicationController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData(); // 主要对接数据
+
pd.put("OPERATOR", pd.get("loginUserId"));
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
+
hotworkapplicationService.delete(pd);
+
pd.put("FOREIGN_KEY",pd.get("HOTWORKAPPLICATION_ID"));
+ PageData confinedPageDataDel = new PageData(); // pd对接数据
+ confinedPageDataDel.putAll(pd);
+ dockData.put("dockDataDel", JSON.toJSONString(confinedPageDataDel));
+
hotWorkApplicationUserService.deleteByForeignKey(pd);
+
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果
return map;
}
@@ -242,13 +286,20 @@ public class AppHotWorkApplicationController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("hotworkapplication: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();
+ PageData dockData = new PageData(); // 主要对接数据
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
hotworkapplicationService.edit(pd);
this.sendNotice(pd);
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -259,11 +310,14 @@ public class AppHotWorkApplicationController extends BaseController {
*/
@RequestMapping(value="/recallEdit")
@ResponseBody
+ @DockAnnotation
public Object recallEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData(); // 主要对接数据
+
if("0".equals(pd.getString("HOT_WORK_LEVEL_INDEX"))){ // 特技动火 0 . 1 2 3
pd.put("STATE","30"); //如果是特级动火
} else {
@@ -272,6 +326,8 @@ public class AppHotWorkApplicationController extends BaseController {
// 新增新的其他措施
if (pd.get("OTHERMEASURE") != null && !pd.get("OTHERMEASURE").equals("")) {
String[] othermeasure = pd.get("OTHERMEASURE").toString().split(",");
+ Map<String, String> safetymethodrecordPdMap = new HashMap<String, String>();
+ int safetymethodrecordPdCount = 1;
for (String content : othermeasure) {
if(Tools.notEmpty(content)) {
PageData safetymethodrecordPd = new PageData();
@@ -286,15 +342,23 @@ public class AppHotWorkApplicationController extends BaseController {
safetymethodrecordPd.put("OPERATOR", pd.getString("loginUserName")); //修改人
safetymethodrecordPd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
safetymethodrecordPd.put("ISDELETE", "0"); //是否删除 1-是 0-否
+ safetymethodrecordPdMap.put("other" + safetymethodrecordPdCount, JSON.toJSONString(safetymethodrecordPd));
+ safetymethodrecordPdCount++;
hotWorkSafetyMethodRecordService.save(safetymethodrecordPd);
}
}
+ dockData.put("safetymethodrecordPd", JSON.toJSONString(safetymethodrecordPdMap));
}
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //添加时间
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
hotworkapplicationService.edit(pd);
hotWorkApplicationUserService.saveUserByHot(pd.getString("HOTWORKAPPLICATION_ID"),pd);
this.sendNotice(pd);
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -591,11 +655,18 @@ public class AppHotWorkApplicationController extends BaseController {
@RequestMapping(value="/deleteAll")
@RequiresPermissions("hotworkapplication:del")
@ResponseBody
+ @DockAnnotation
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+
+ PageData dockData = new PageData(); // 主要对接数据
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(",");
@@ -604,6 +675,7 @@ public class AppHotWorkApplicationController extends BaseController {
}else{
errInfo = "fail";
}
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果
return map;
}
@@ -798,11 +870,17 @@ public class AppHotWorkApplicationController extends BaseController {
@RequestMapping(value="/editOpinion")
@ResponseBody
@Transactional
+ @DockAnnotation(hasAnnex = true)
public Object editOpinion(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData(); // 主要对接数据
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
String type = pd.getString("TYPE"); //1 通过 2.未通过
PageData hotUserPd = new PageData();
hotUserPd.put("FOREIGN_KEY",pd.getString("HOTWORKAPPLICATION_ID")); // 动火标识
@@ -866,6 +944,11 @@ public class AppHotWorkApplicationController extends BaseController {
delPd.put("HOTWORKAPPLICATION_ID", pd.get("HOTWORKAPPLICATION_ID"));
delPd.put("OPERATOR", pd.get("loginUserName"));
delPd.put("OPERATTIME", DateUtil.date2Str(new Date()));
+
+ PageData confinedPageDatadelPd = new PageData(); // pd对接数据
+ confinedPageDatadelPd.putAll(delPd);
+ dockData.put("dockDatadelPd", JSON.toJSONString(confinedPageDatadelPd));
+
hotWorkSafetyMethodRecordService.deleteByCheck(delPd);
PageData stateData = new PageData();
stateData.put("HOTWORKAPPLICATION_ID", hot.getString("HOTWORKAPPLICATION_ID"));
@@ -873,10 +956,15 @@ public class AppHotWorkApplicationController extends BaseController {
stateData.put("STATE", state);
stateData.put("WORK_LONGITUDE", pd.get("WORK_LONGITUDE"));
stateData.put("WORK_LATITUDE", pd.get("WORK_LATITUDE"));
+
+ PageData confinedstateData = new PageData(); // pd对接数据
+ confinedstateData.putAll(stateData);
+ dockData.put("dockDatastateData", JSON.toJSONString(confinedstateData));
hotworkapplicationService.editByState(stateData); // 把动火状态修改成未通过
}else if ("2".equals(type)){
if(file !=null){
+ ArrayList<String> pictureList = new ArrayList<>();
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
errInfo = "fail";
@@ -888,6 +976,8 @@ public class AppHotWorkApplicationController extends BaseController {
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + pd.get("CORPINFO_ID").toString() + "/" + ffile);
+ pictureList.add(Const.FILEPATHYHTP + pd.get("CORPINFO_ID").toString() + "/" + ffile + "/" + fileName + "@@" + fileName);
+ map.put("sendPicturesList", JSON.toJSONString(pictureList));
hotUser.put("AUTOGRAPH",Const.FILEPATHYHTP + pd.get("CORPINFO_ID").toString() + "/" + ffile + "/" + fileName);
}
hotUser.put("TYPE","2");
@@ -903,16 +993,27 @@ public class AppHotWorkApplicationController extends BaseController {
stateData.put("HOTWORKAPPLICATION_ID", hot.getString("HOTWORKAPPLICATION_ID"));
stateData.put("loginUserId", pd.get("loginUserId"));
stateData.put("STATE", hot.get("STATE").toString());
+
+ PageData confinedstateData = new PageData(); // pd对接数据
+ confinedstateData.putAll(stateData);
+ dockData.put("dockDatastateData", JSON.toJSONString(confinedstateData));
+
hotworkapplicationService.editByState(stateData);
PageData Position = new PageData();
Position.put("WORK_LONGITUDE", pd.get("WORK_LONGITUDE"));
Position.put("WORK_LATITUDE", pd.get("WORK_LATITUDE"));
Position.put("HOTWORKAPPLICATION_ID", hot.getString("HOTWORKAPPLICATION_ID"));
+
+ PageData confinedPosition = new PageData(); // pd对接数据
+ confinedPosition.putAll(Position);
+ dockData.put("dockDataPosition", JSON.toJSONString(confinedPosition));
hotworkapplicationService.editPosition(Position); //添加定位
// hotworkapplicationService.editByState(hot.getString("HOTWORKAPPLICATION_ID"),hot.get("STATE").toString());
// 单位负责人确认时。保存主要安全措施
if("1".equals(pd.get("STATE").toString()) && pd.get("measureList") != null && Tools.notEmpty(pd.get("measureList").toString())){
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measureList").toString());
+ Map<String, String> measuresMap = new HashMap<>();
+ int measuresCount = 1;
for (JSONObject json : list) {
// 因必须选择符合，所以只存需要填的项
if(json.get("ANSWER1") != null || json.get("ANSWER2") != null || json.get("ANSWER3") != null || json.get("ANSWER4") != null){
@@ -925,14 +1026,19 @@ public class AppHotWorkApplicationController extends BaseController {
measures.put("ANSWER3", json.get("ANSWER3"));
measures.put("ANSWER4", json.get("ANSWER4"));
measures.put("STATUS", json.get("radio"));
+ measuresMap.put("other" + measuresCount, JSON.toJSONString(measures));
+ measuresCount++;
hotworkToMeasuresService.save(measures);
}
}
+ dockData.put("dockDatameasuresMap", JSON.toJSONString(measuresMap));
}
// 新增新的其他措施
if (pd.get("OTHERMEASURE") != null && !pd.get("OTHERMEASURE").equals("")) {
String[] othermeasure = pd.get("OTHERMEASURE").toString().split(",");
+ Map<String, String> safemethodrecordPdMap = new HashMap<>();
+ int count = 1;
for (String content : othermeasure) {
if(Tools.notEmpty(content)) {
PageData safetymethodrecordPd = new PageData();
@@ -947,9 +1053,12 @@ public class AppHotWorkApplicationController extends BaseController {
safetymethodrecordPd.put("OPERATOR", pd.getString("loginUserName")); //修改人
safetymethodrecordPd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
safetymethodrecordPd.put("ISDELETE", "0"); //是否删除 1-是 0-否
+ safemethodrecordPdMap.put("other" + count, JSON.toJSONString(safetymethodrecordPd));
+ count++;
hotWorkSafetyMethodRecordService.save(safetymethodrecordPd);
}
}
+ dockData.put("dockDatasafemethodrecordPdMap", JSON.toJSONString(safemethodrecordPdMap));
}
if("6".equals(pd.getString("STATE"))){ // 添加动火前
PageData leaderUser = new PageData();
@@ -963,6 +1072,11 @@ public class AppHotWorkApplicationController extends BaseController {
leaderUser.put("CREATTIME",DateUtil.date2Str(new Date()));
leaderUser.put("OPERATOR",pd.getString("loginUserId"));
leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedleaderUser = new PageData(); // pd对接数据
+ confinedleaderUser.putAll(leaderUser);
+ dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser));
+
hotWorkApplicationUserService.save(leaderUser); //
}else if("8".equals(pd.getString("STATE"))){ // 添加动火后现场负责人
PageData leaderUser = new PageData();
@@ -976,6 +1090,11 @@ public class AppHotWorkApplicationController extends BaseController {
leaderUser.put("CREATTIME",DateUtil.date2Str(new Date()));
leaderUser.put("OPERATOR",pd.getString("loginUserId"));
leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedleaderUser = new PageData(); // pd对接数据
+ confinedleaderUser.putAll(leaderUser);
+ dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser));
+
hotWorkApplicationUserService.save(leaderUser); // 添加 动火后负责人
}else if("9".equals(pd.getString("STATE"))){ // 添加 临时监火
PageData leaderUser = new PageData();
@@ -990,6 +1109,11 @@ public class AppHotWorkApplicationController extends BaseController {
leaderUser.put("CREATTIME",DateUtil.date2Str(new Date()));
leaderUser.put("OPERATOR",pd.getString("loginUserId"));
leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedleaderUser = new PageData(); // pd对接数据
+ confinedleaderUser.putAll(leaderUser);
+ dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser));
+
hotWorkApplicationUserService.save(leaderUser); // 添加 动火后负责人
} else if("10".equals(pd.getString("STATE"))){ // 延时监火完成后，进行归档
PageData leaderUser = new PageData();
@@ -1003,6 +1127,11 @@ public class AppHotWorkApplicationController extends BaseController {
leaderUser.put("CREATTIME",DateUtil.date2Str(new Date()));
leaderUser.put("OPERATOR",pd.getString("loginUserId"));
leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedleaderUser = new PageData(); // pd对接数据
+ confinedleaderUser.putAll(leaderUser);
+ dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser));
+
hotWorkApplicationUserService.save(leaderUser); // 添加 动火后负责人
} else if("30".equals(pd.getString("STATE"))){ // 特级动火 -- 选择项目主管人员
PageData leaderUser = new PageData();
@@ -1016,6 +1145,11 @@ public class AppHotWorkApplicationController extends BaseController {
leaderUser.put("CREATTIME",DateUtil.date2Str(new Date()));
leaderUser.put("OPERATOR",pd.getString("loginUserId"));
leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedleaderUser = new PageData(); // pd对接数据
+ confinedleaderUser.putAll(leaderUser);
+ dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser));
+
hotWorkApplicationUserService.save(leaderUser);
}else if("31".equals(pd.getString("STATE"))){ // 特级动火 -- 项目主管部门负责人
//防止打回后有多个意见
@@ -1030,11 +1164,21 @@ public class AppHotWorkApplicationController extends BaseController {
leaderUser.put("CREATTIME",DateUtil.date2Str(new Date()));
leaderUser.put("OPERATOR",pd.getString("loginUserId"));
leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedleaderUser = new PageData(); // pd对接数据
+ confinedleaderUser.putAll(leaderUser);
+ dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser));
+
hotWorkApplicationUserService.save(leaderUser);
}else if("32".equals(pd.getString("STATE"))){ // 特级动火
PageData back = new PageData();
back.put("STATE","33");
back.put("FOREIGN_KEY",pd.get("HOTWORKAPPLICATION_ID"));
+
+ PageData confinedback = new PageData(); // pd对接数据
+ confinedback.putAll(back);
+ dockData.put("dockDataback", JSON.toJSONString(confinedback));
+
hotWorkApplicationUserService.deleteForBack(back);
PageData leaderUser = new PageData();
leaderUser.put("HOTWORKAPPLICATIONUSER_ID", UuidUtil.get32UUID());
@@ -1047,11 +1191,21 @@ public class AppHotWorkApplicationController extends BaseController {
leaderUser.put("CREATTIME",DateUtil.date2Str(new Date()));
leaderUser.put("OPERATOR",pd.getString("loginUserId"));
leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedleaderUser = new PageData(); // pd对接数据
+ confinedleaderUser.putAll(leaderUser);
+ dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser));
+
hotWorkApplicationUserService.save(leaderUser);
}else if("33".equals(pd.getString("STATE"))){ // 特级动火
PageData back = new PageData();
back.put("STATE","34");
back.put("FOREIGN_KEY",pd.get("HOTWORKAPPLICATION_ID"));
+
+ PageData confinedback = new PageData(); // pd对接数据
+ confinedback.putAll(back);
+ dockData.put("dockDataback", JSON.toJSONString(confinedback));
+
hotWorkApplicationUserService.deleteForBack(back);
PageData leaderUser = new PageData();
leaderUser.put("HOTWORKAPPLICATIONUSER_ID", UuidUtil.get32UUID());
@@ -1064,11 +1218,21 @@ public class AppHotWorkApplicationController extends BaseController {
leaderUser.put("CREATTIME",DateUtil.date2Str(new Date()));
leaderUser.put("OPERATOR",pd.getString("loginUserId"));
leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedleaderUser = new PageData(); // pd对接数据
+ confinedleaderUser.putAll(leaderUser);
+ dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser));
+
hotWorkApplicationUserService.save(leaderUser);
}else if("34".equals(pd.getString("STATE"))){ // 特级动火
PageData back = new PageData();
back.put("STATE","35");
back.put("FOREIGN_KEY",pd.get("HOTWORKAPPLICATION_ID"));
+
+ PageData confinedback = new PageData(); // pd对接数据
+ confinedback.putAll(back);
+ dockData.put("dockDataback", JSON.toJSONString(confinedback));
+
hotWorkApplicationUserService.deleteForBack(back);
PageData leaderUser = new PageData();
leaderUser.put("HOTWORKAPPLICATIONUSER_ID", UuidUtil.get32UUID());
@@ -1081,6 +1245,11 @@ public class AppHotWorkApplicationController extends BaseController {
leaderUser.put("CREATTIME",DateUtil.date2Str(new Date()));
leaderUser.put("OPERATOR",pd.getString("loginUserId"));
leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedleaderUser = new PageData(); // pd对接数据
+ confinedleaderUser.putAll(leaderUser);
+ dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser));
+
hotWorkApplicationUserService.save(leaderUser);
if(Tools.notEmpty(pd.getString("supervision_USER_ID"))){
PageData mes = new PageData();
@@ -1089,6 +1258,11 @@ public class AppHotWorkApplicationController extends BaseController {
mes.put("SYNOPSIS", "友情提示：有一条特级动火数据需要初审"); // 站内信标题
mes.put("RECEIVER_ID", pd.getString("supervision_USER_ID")); // 接收人员ID
mes.put("CONTENT", "有一条特级动火数据在“安全监督部初审”，等您审核");// 站内信内容
+
+ PageData confinedmes = new PageData(); // pd对接数据
+ confinedmes.putAll(mes);
+ dockData.put("dockDatames", JSON.toJSONString(confinedmes));
+
noticeRegulatoryService.sendMessage(mes);
}
}else if("35".equals(pd.getString("STATE"))){ // 特级动火
@@ -1103,6 +1277,11 @@ public class AppHotWorkApplicationController extends BaseController {
leaderUser.put("CREATTIME",DateUtil.date2Str(new Date()));
leaderUser.put("OPERATOR",pd.getString("loginUserId"));
leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedleaderUser = new PageData(); // pd对接数据
+ confinedleaderUser.putAll(leaderUser);
+ dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser));
+
hotWorkApplicationUserService.save(leaderUser);
}else if("36".equals(pd.getString("STATE"))){ // 特级动火
PageData leaderUser = new PageData();
@@ -1116,6 +1295,11 @@ public class AppHotWorkApplicationController extends BaseController {
leaderUser.put("CREATTIME",DateUtil.date2Str(new Date()));
leaderUser.put("OPERATOR",pd.getString("loginUserId"));
leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedleaderUser = new PageData(); // pd对接数据
+ confinedleaderUser.putAll(leaderUser);
+ dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser));
+
hotWorkApplicationUserService.save(leaderUser);
}
}else{
@@ -1128,8 +1312,14 @@ public class AppHotWorkApplicationController extends BaseController {
*/
hotUser.put("OPERATOR",pd.getString("loginUserId"));
hotUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedhotUser = new PageData(); // pd对接数据
+ confinedhotUser.putAll(hotUser);
+ dockData.put("dockDatahotUser", JSON.toJSONString(confinedhotUser));
+
hotWorkApplicationUserService.edit(hotUser);
this.sendNotice(pd);
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -1146,11 +1336,14 @@ public class AppHotWorkApplicationController extends BaseController {
@RequestMapping(value="/delayedUser")
@ResponseBody
@Transactional
+ @DockAnnotation
public Object delayedUser() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData(); // 主要对接数据
+
if(Tools.isEmpty(pd.get("delayedUserId"))){
map.put("result", "ERROR");
map.put("msg", "延时监火人信息不全，请联系管理员");
@@ -1160,6 +1353,11 @@ public class AppHotWorkApplicationController extends BaseController {
PageData delayedUserPd = new PageData();
delayedUserPd.put("FOREIGN_KEY",pd.get("HOTWORKAPPLICATION_ID"));
delayedUserPd.put("STATE","10");
+
+ PageData confineddelayedUserPd = new PageData(); // pd对接数据
+ confineddelayedUserPd.putAll(delayedUserPd);
+ dockData.put("dockDatadelayedUserPd", JSON.toJSONString(confineddelayedUserPd));
+
hotWorkApplicationUserService.deleteByforward(delayedUserPd);
PageData delayedUser = new PageData();
@@ -1173,19 +1371,29 @@ public class AppHotWorkApplicationController extends BaseController {
delayedUser.put("CREATTIME",DateUtil.date2Str(new Date()));
delayedUser.put("OPERATOR",pd.getString("loginUserId"));
delayedUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confineddelayedUser = new PageData(); // pd对接数据
+ confineddelayedUser.putAll(delayedUser);
+ dockData.put("dockDatadelayedUser", JSON.toJSONString(confineddelayedUser));
+
hotWorkApplicationUserService.save(delayedUser); // 添加 延时监火人
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@RequestMapping(value="/superApproveUser")
@ResponseBody
@Transactional
+ @DockAnnotation
public Object superApproveUser() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+
+ PageData dockData = new PageData(); // 主要对接数据
+
if(Tools.isEmpty(pd.get("APPROVER_ID"))){
map.put("result", "ERROR");
map.put("msg", "特级动火申请人信息不全，请联系管理员");
@@ -1194,6 +1402,11 @@ public class AppHotWorkApplicationController extends BaseController {
PageData delayedUserPd = new PageData();
delayedUserPd.put("FOREIGN_KEY",pd.get("HOTWORKAPPLICATION_ID"));
delayedUserPd.put("STATE","12");
+
+ PageData confineddelayedUserPd = new PageData(); // pd对接数据
+ confineddelayedUserPd.putAll(delayedUserPd);
+ dockData.put("dockDatadelayedUserPd", JSON.toJSONString(confineddelayedUserPd));
+
hotWorkApplicationUserService.deleteByforward(delayedUserPd);
PageData superedUser = new PageData();
@@ -1208,6 +1421,11 @@ public class AppHotWorkApplicationController extends BaseController {
superedUser.put("CREATTIME",DateUtil.date2Str(new Date()));
superedUser.put("OPERATOR",pd.getString("loginUserId"));
superedUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedsuperedUser = new PageData(); // pd对接数据
+ confinedsuperedUser.putAll(superedUser);
+ dockData.put("dockDatasuperedUser", JSON.toJSONString(confinedsuperedUser));
+
hotWorkApplicationUserService.save(superedUser); // 添加 特级动火审批人
// 保存申请说明
PageData applicant = new PageData();
@@ -1217,14 +1435,25 @@ public class AppHotWorkApplicationController extends BaseController {
applicant.put("OPINION",pd.getString("description"));
applicant.put("OPERATOR",pd.getString("loginUserId"));
applicant.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedapplicant = new PageData(); // pd对接数据
+ confinedapplicant.putAll(applicant);
+ dockData.put("dockDataapplicant", JSON.toJSONString(confinedapplicant));
+
hotWorkApplicationUserService.editExplain(applicant);
PageData stateData = new PageData();
stateData.put("HOTWORKAPPLICATION_ID", pd.getString("HOTWORKAPPLICATION_ID"));
stateData.put("loginUserId", pd.get("loginUserId"));
stateData.put("STATE", "11");
+
+ PageData confinedstateData = new PageData(); // pd对接数据
+ confinedstateData.putAll(stateData);
+ dockData.put("dockDatastateData", JSON.toJSONString(confinedstateData));
+
hotworkapplicationService.editByState(stateData);
// hotworkapplicationService.editByState(pd.get("HOTWORKAPPLICATION_ID").toString(),"11");
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -1258,21 +1487,31 @@ public class AppHotWorkApplicationController extends BaseController {
@RequestMapping(value="/editOpinionByComplete")
@ResponseBody
@Transactional
+ @DockAnnotation
public Object editOpinionByComplete() throws Exception {
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData();
PageData stateData = new PageData();
stateData.put("HOTWORKAPPLICATION_ID", pd.getString("HOTWORKAPPLICATION_ID"));
stateData.put("loginUserId", pd.get("loginUserId"));
stateData.put("STATE", "-3");
+
+ PageData confinedstateData = new PageData();
+ confinedstateData.putAll(stateData);
+ dockData.put("dockDatastateData", JSON.toJSONString(confinedstateData));
hotworkapplicationService.editByState(stateData);
// hotworkapplicationService.editByState(pd.get("HOTWORKAPPLICATION_ID").toString(),"-3");
PageData cc = new PageData();
cc.put("FOREIGN_KEY", pd.getString("HOTWORKAPPLICATION_ID"));
cc.put("loginUserId", pd.getString("loginUserId"));
+
+ PageData confinedcc = new PageData();
+ confinedcc.putAll(cc);
+ dockData.put("dockDatacc", JSON.toJSONString(confinedcc));
int upstaState = hotWorkApplicationUserService.updateTypeByKeyID(cc); //此步是，在现场负责人打回时，将type修改成不通过
PageData leaderUser = new PageData();
@@ -1286,7 +1525,13 @@ public class AppHotWorkApplicationController extends BaseController {
leaderUser.put("CREATTIME",DateUtil.date2Str(new Date()));
leaderUser.put("OPERATOR",pd.getString("loginUserId"));
leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+
+ PageData confinedleaderUser = new PageData();
+ confinedleaderUser.putAll(leaderUser);
+ dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser));
+
hotWorkApplicationUserService.save(leaderUser); // 添加 动火后负责人
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -1296,17 +1541,23 @@ public class AppHotWorkApplicationController extends BaseController {
@RequestMapping(value="/editOpinionByDelay")
@ResponseBody
@Transactional
+ @DockAnnotation
public Object editOpinionByDelay() throws Exception {
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData();
// 并且删除原来数据，及其下面操作人数据
PageData stateData = new PageData();
stateData.put("HOTWORKAPPLICATION_ID", pd.getString("HOTWORKAPPLICATION_ID"));
stateData.put("loginUserId", pd.get("loginUserId"));
stateData.put("STATE", "-4");
+
+ PageData confinedstateData = new PageData();
+ confinedstateData.putAll(stateData);
+ dockData.put("dockDatastateData", JSON.toJSONString(confinedstateData));
hotworkapplicationService.editByState(stateData); //把原来的内容存起来
// hotworkapplicationService.editByState(pd.get("HOTWORKAPPLICATION_ID").toString(),"-4");
PageData oldHotWork = new PageData();
@@ -1325,12 +1576,21 @@ public class AppHotWorkApplicationController extends BaseController {
hotWork.put("SPARE",hotworkOldId); // 原来的动火id
hotWork.put("HOT_WORK_TIME_START",hotWork.get("HOT_WORK_TIME_START")); // 原来的动火开始时间
hotWork.put("HOT_WORK_TIME_END",pd.get("HOT_WORK_TIME")); // 现在的动火结束时间
+
+ PageData confinedhotWork = new PageData();
+ confinedhotWork.putAll(hotWork);
+ dockData.put("dockDatahotWork", JSON.toJSONString(confinedhotWork));
hotworkapplicationService.save(hotWork);
pd.put("FOREIGN_KEY",pd.get("HOTWORKAPPLICATION_ID").toString());
List<PageData> hotWorkUser = hotWorkApplicationUserService.listAll(pd); //添加一个新的动火申请
+ PageData confinedoldHotWork = new PageData();
+ confinedoldHotWork.putAll(oldHotWork);
+ dockData.put("dockDataoldHotWork", JSON.toJSONString(confinedoldHotWork));
hotWorkApplicationUserService.deleteByForeignKey(oldHotWork);// 删除之前动火申请下各级各级审核人数据
+ Map<String, String> hotWorkUserMap = new HashMap<>();
+ int count = 1;
for (PageData pageData:hotWorkUser){
// 不复制原来数据的 动火前现场管辖单位确认
if(pageData.get("STATE") != null && Tools.notEmpty(pageData.get("STATE").toString())
@@ -1345,9 +1605,13 @@ public class AppHotWorkApplicationController extends BaseController {
pageData.put("CREATTIME",DateUtil.date2Str(new Date()));
pageData.put("OPERATOR",pd.getString("loginUserId"));
pageData.put("OPERATTIME",DateUtil.date2Str(new Date()));
+ hotWorkUserMap.put("other" + count, JSON.toJSONString(pageData));
+ count++;
hotWorkApplicationUserService.save(pageData);
}
+ dockData.put("hotWorkUserMap", JSON.toJSONString(hotWorkUserMap));
this.sendNotice(hotWork);
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -1460,16 +1724,24 @@ public class AppHotWorkApplicationController extends BaseController {
@RequestMapping(value="/goRecall")
@ResponseBody
@Transactional
+ @DockAnnotation
public Object goRecall() throws Exception {
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData();
pd.put("STATE","-7");
+
+ PageData confinedpd = new PageData(); // pd对接数据
+ confinedpd.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedpd));
+
hotworkapplicationService.editState(pd); //修改为撤回状态
// pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
// pd.put("FOREIGN_KEY",pd.getString("HOTWORKAPPLICATION_ID"));
// hotWorkApplicationUserService.deleteByForeignKey(pd);
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -1481,11 +1753,13 @@ public class AppHotWorkApplicationController extends BaseController {
@RequestMapping(value="/addHotJobNumber")
@ResponseBody
@Transactional
+ @DockAnnotation(isAdd = true)
public Object addHotJobNumber() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData();
if(!Tools.isEmpty(pd.getString("CORPINFO_ID"))){
PageData corpinfopd = new PageData();
corpinfopd.put("CORPINFO_ID",pd.getString("CORPINFO_ID"));
@@ -1504,6 +1778,7 @@ public class AppHotWorkApplicationController extends BaseController {
Integer toDateBianma = hotworkapplicationService.getJobNumber(coprpAbb+data); // 今天新增了几个
String bianma = coprpAbb + data+String.format("%03d", toDateBianma+1);
try {
+ dockData.put("dockDatabianma", JSON.toJSONString(bianma));
hotworkapplicationService.saveJobNumber(bianma);
map.put("JOB_NUMBER", bianma);
}catch (Exception e){
@@ -1516,6 +1791,7 @@ public class AppHotWorkApplicationController extends BaseController {
map.put("msg", "未找到企业缩写，请联系管理员！");
return map;
}
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java
index 81a82b4e..db7bfbdf 100644
--- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java
+++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java
@@ -11,6 +11,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.alibaba.fastjson.JSON;
+import com.zcloud.aspect.DockAnnotation;
import com.zcloud.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -49,11 +51,14 @@ public class AppHotWorkApplicationDelayedController extends BaseController {
@RequestMapping(value="/add")
@ResponseBody
@Transactional
+ @DockAnnotation(isAdd = true)
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData(); // 主要对接数据
+
pd.put("HOTWORKAPPLICATIONDELAYED_ID", this.get32UUID()); //主键
pd.put("HOTWORKAPPLICATION_ID", pd.get("HOTWORKAPPLICATION_ID")); // 动火审批id
pd.put("USER_ID", pd.getString("delayedUserId")); //创建人id
@@ -103,7 +108,11 @@ public class AppHotWorkApplicationDelayedController extends BaseController {
// Smb.sshSftpForInput(bis, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile);
pd.put("FILEPATH",Const.FILEPATHYHTP + corpInfoId + "/" + ffile + "/" + fileName);
}
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
hotworkapplicationdelayedService.save(pd);
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -115,12 +124,19 @@ public class AppHotWorkApplicationDelayedController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("hotworkapplicationdelayed: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();
+ PageData dockData = new PageData(); // 主要对接数据
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
hotworkapplicationdelayedService.delete(pd);
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果
return map;
}
@@ -132,12 +148,19 @@ public class AppHotWorkApplicationDelayedController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("hotworkapplicationdelayed: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();
+ PageData dockData = new PageData(); // 主要对接数据
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
hotworkapplicationdelayedService.edit(pd);
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -186,11 +209,17 @@ public class AppHotWorkApplicationDelayedController extends BaseController {
@RequestMapping(value="/deleteAll")
@RequiresPermissions("hotworkapplicationdelayed:del")
@ResponseBody
+ @DockAnnotation
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData(); // 主要对接数据
+
+ PageData confinedPageData = new PageData(); // pd对接数据
+ confinedPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedPageData));
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(",");
@@ -199,6 +228,7 @@ public class AppHotWorkApplicationDelayedController extends BaseController {
}else{
errInfo = "fail";
}
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果
return map;
}
diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java
index c7822150..69b09c08 100644
--- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java
+++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java
@@ -489,7 +489,7 @@ 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);
+ pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
@@ -582,7 +582,7 @@ 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);
+ pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java
index e782ea94..065853e0 100644
--- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java
+++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java
@@ -48,20 +48,24 @@ public class AppGFConfinedSpaceGasWHController extends BaseController {
pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
- PageData confinedGasPageData = new PageData(); // pd对接数据
- confinedGasPageData.putAll(pd);
- dockData.put("dockData", JSON.toJSONString(confinedGasPageData));
PageData pd2 = new PageData();
pd2 = GFconfinedspacegaswhService.findById(pd);
if(pd2 != null && pd2.size()>0){
+ PageData confinedGasPageData = new PageData(); // pd对接数据
+ confinedGasPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedGasPageData));
GFconfinedspacegaswhService.edit(pd);
- map.put("dockData", JSON.toJSONString(dockData));
+// map.put("dockData", JSON.toJSONString(dockData));
}else{
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("CONFINEDSPACEGASWH_ID", this.get32UUID()); //主键
GFconfinedspacegaswhService.save(pd);
- map.put("dockData", JSON.toJSONString(dockData));
+ PageData confinedGasPageData = new PageData(); // pd对接数据
+ confinedGasPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedGasPageData));
+// map.put("dockData", JSON.toJSONString(dockData));
}
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -101,9 +105,14 @@ public class AppGFConfinedSpaceGasWHController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
+ PageData dockData = new PageData(); // 主要对接数据
+
+ PageData confinedGasPageData = new PageData(); // pd对接数据
+ confinedGasPageData.putAll(pd);
+ dockData.put("dockData", JSON.toJSONString(confinedGasPageData));
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
GFconfinedspacegaswhService.edit(pd);
- map.put("dockingData", JSON.toJSONString(pd));
+ map.put("dockingData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -172,6 +181,7 @@ public class AppGFConfinedSpaceGasWHController extends BaseController {
}else{
errInfo = "error";
}
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果
return map;
}
diff --git a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java
index 1d7a31ec..4acf6aca 100644
--- a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java
+++ b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java
@@ -429,6 +429,7 @@ public class AppGFElectricityController extends BaseController {
fileList.clear();
count += 1;
}
+ dockData.put("saveImgMap", JSON.toJSONString(saveImgMap));
map.put("dockData", JSON.toJSONString(dockData));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo);
@@ -526,6 +527,7 @@ public class AppGFElectricityController extends BaseController {
fileList.clear();
count++;
}
+ dockData.put("saveAcceptImg", JSON.toJSONString(saveAcceptImgMap));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
@@ -600,7 +602,7 @@ public class AppGFElectricityController extends BaseController {
electricitydockDataLog.putAll(log);
dockData.put("dockDataLog", JSON.toJSONString(electricitydockDataLog));
// map.put("dockDataLog", JSON.toJSONString(log));
-
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -1074,6 +1076,7 @@ public class AppGFElectricityController extends BaseController {
electricitydockDataLog.putAll(log);
dockData.put("dockDataLog", JSON.toJSONString(electricitydockDataLog));
// map.put("dockDataLog", JSON.toJSONString(log));
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -1342,11 +1345,11 @@ public class AppGFElectricityController extends BaseController {
pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
+ pd.put("ELECTRICITYGAS_ID", this.get32UUID()); //主键
+ pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
- pd.put("ELECTRICITYGAS_ID", this.get32UUID()); //主键
- pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
GFelectricityGasService.save(pd);
GFelectricityService.edittime(pd);
map.put("dockData", JSON.toJSONString(dockData));
diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java
index 7205f78b..c5b564e2 100644
--- a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java
+++ b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java
@@ -330,6 +330,7 @@ public class AppGFHoistingController extends BaseController {
// map.put("dockData", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
}
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
@@ -377,6 +378,7 @@ public class AppGFHoistingController extends BaseController {
fileList.clear();
count++;
}
+ dockData.put("saveImgMap", JSON.toJSONString(saveImgMap));
map.put("dockData", JSON.toJSONString(dockData));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo);
@@ -476,6 +478,7 @@ public class AppGFHoistingController extends BaseController {
fileList.clear();
count++;
}
+ dockData.put("saveAcceptImgMap", JSON.toJSONString(saveAcceptImgMap));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
@@ -554,6 +557,7 @@ public class AppGFHoistingController extends BaseController {
dockData.put("dockDataLog", JSON.toJSONString(electricitydockDataLog));
// map.put("dockDataLog", JSON.toJSONString(log));
GFhighWorkLogService.save(log);
+ map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java
index 8cb3f73a..9986e2a7 100644
--- a/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java
+++ b/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java
@@ -85,7 +85,7 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value="/add")
@ResponseBody
@Transactional
- @DockAnnotation(isAdd = true)
+// @DockAnnotation(isAdd = true)
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@@ -196,7 +196,7 @@ public class AppGFHotworkController extends BaseController {
*/
@RequestMapping(value="/delete")
@ResponseBody
- @DockAnnotation
+// @DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@@ -218,7 +218,7 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value="/edit")
@ResponseBody
@Transactional
- @DockAnnotation
+// @DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@@ -296,7 +296,7 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value="/editGuardian")
@ResponseBody
@Transactional
- @DockAnnotation(hasAnnex = true)
+// @DockAnnotation(hasAnnex = true)
public Object editGuardian(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@@ -346,7 +346,7 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value="/editConfess")
@ResponseBody
@Transactional
- @DockAnnotation(hasAnnex = true)
+// @DockAnnotation(hasAnnex = true)
public Object editConfess(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@@ -394,7 +394,7 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value="/editAcceptconfess")
@ResponseBody
@Transactional
- @DockAnnotation(hasAnnex = true)
+// @DockAnnotation(hasAnnex = true)
public Object editAcceptconfess(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@@ -473,7 +473,7 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value = "/editAcceptStatus")
@ResponseBody
@Transactional
- @DockAnnotation(hasAnnex = true)
+// @DockAnnotation(hasAnnex = true)
public Object editAcceptStatus(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@@ -654,7 +654,7 @@ public class AppGFHotworkController extends BaseController {
@RequestMapping(value="/editStatus")
@ResponseBody
@Transactional
- @DockAnnotation(hasAnnex = true)
+// @DockAnnotation(hasAnnex = true)
public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@@ -678,7 +678,7 @@ public class AppGFHotworkController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
- map.put("dockData", JSON.toJSONString(pd));
+// map.put("dockData", JSON.toJSONString(pd));
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)) {
pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
@@ -814,12 +814,15 @@ public class AppGFHotworkController 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("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"));
@@ -1366,7 +1369,7 @@ public class AppGFHotworkController extends BaseController {
*/
@PostMapping(value = "/cancel")
@ResponseBody
- @DockAnnotation
+// @DockAnnotation
public void cancel(@RequestBody PageData pd) throws Exception {
Map<String, String> map = new HashMap<String, String>();
String errInfo = "success";
@@ -1647,7 +1650,7 @@ public class AppGFHotworkController extends BaseController {
*/
@RequestMapping(value="/gas/delete")
@ResponseBody
- @DockAnnotation
+// @DockAnnotation
public Object gasDel() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@@ -1670,7 +1673,7 @@ public class AppGFHotworkController extends BaseController {
*/
@RequestMapping(value="/gas/save")
@ResponseBody
- @DockAnnotation(isAdd = true)
+// @DockAnnotation(isAdd = true)
public Object gasSave() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
From d99b4fa3967d082a81f2e3b102a187b6bf810fe0 Mon Sep 17 00:00:00 2001
From: chenxinying <1039655633@qq.com>
Date: Wed, 3 Jan 2024 09:35:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?map=20dockData=E8=80=8C=E4=B8=8D=E6=98=AFpd?=
=?UTF-8?q?=20dockData?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/zcloud/controller/bus/RiskUnitController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java
index 48fce281..a261a718 100644
--- a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java
+++ b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java
@@ -155,7 +155,7 @@ public class RiskUnitController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
riskunitService.delete(pd);
map.put("result", errInfo); //返回结果
- pd.put("dockData",JSON.toJSONString(pd));
+ map.put("dockData",JSON.toJSONString(pd));
return map;
}