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

八项作业app bug修改

pull/14/head
limingyu 2024-01-02 09:44:01 +08:00
parent 404bb8547a
commit 178f531c3e
10 changed files with 1029 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/zcloud/controller/emergency/EmergencyDrillBasicController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.emergency; package com.zcloud.controller.emergency;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
@ -37,6 +39,7 @@ public class EmergencyDrillBasicController extends BaseController {
@RequestMapping(value="/add") @RequestMapping(value="/add")
@RequiresPermissions("emergencydrillbasic:add") @RequiresPermissions("emergencydrillbasic:add")
@ResponseBody @ResponseBody
@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";
@ -49,6 +52,7 @@ public class EmergencyDrillBasicController extends BaseController {
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-否
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
map.put("dockData", JSON.toJSONString(pd));
emergencydrillbasicService.save(pd); emergencydrillbasicService.save(pd);
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
@ -62,6 +66,7 @@ public class EmergencyDrillBasicController extends BaseController {
@RequestMapping(value="/delete") @RequestMapping(value="/delete")
@RequiresPermissions("emergencydrillbasic:del") @RequiresPermissions("emergencydrillbasic:del")
@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";
@ -69,6 +74,7 @@ public class EmergencyDrillBasicController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
map.put("dockData", JSON.toJSONString(pd));
emergencydrillbasicService.delete(pd); emergencydrillbasicService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
@ -81,6 +87,7 @@ public class EmergencyDrillBasicController extends BaseController {
@RequestMapping(value="/edit") @RequestMapping(value="/edit")
@RequiresPermissions("emergencydrillbasic:edit") @RequiresPermissions("emergencydrillbasic:edit")
@ResponseBody @ResponseBody
@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";
@ -88,6 +95,7 @@ public class EmergencyDrillBasicController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
map.put("dockData", JSON.toJSONString(pd));
emergencydrillbasicService.edit(pd); emergencydrillbasicService.edit(pd);
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
@ -142,6 +150,7 @@ public class EmergencyDrillBasicController extends BaseController {
@RequestMapping(value="/deleteAll") @RequestMapping(value="/deleteAll")
@RequiresPermissions("emergencydrillbasic:del") @RequiresPermissions("emergencydrillbasic:del")
@ResponseBody @ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{ public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
@ -153,6 +162,7 @@ public class EmergencyDrillBasicController extends BaseController {
if(Tools.notEmpty(DATA_IDS)){ if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(","); String ArrayDATA_IDS[] = DATA_IDS.split(",");
pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids
map.put("dockData", JSON.toJSONString(pd));
emergencydrillbasicService.deleteAll(pd); emergencydrillbasicService.deleteAll(pd);
errInfo = "success"; errInfo = "success";
}else{ }else{

10
src/main/java/com/zcloud/controller/emergency/EmergencyEquipmentController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.emergency; package com.zcloud.controller.emergency;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
@ -37,6 +39,7 @@ public class EmergencyEquipmentController extends BaseController {
@RequestMapping(value="/add") @RequestMapping(value="/add")
@RequiresPermissions("emergencyequipment:add") @RequiresPermissions("emergencyequipment:add")
@ResponseBody @ResponseBody
@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";
@ -49,6 +52,7 @@ public class EmergencyEquipmentController extends BaseController {
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-否
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
map.put("dockData", JSON.toJSONString(pd));
emergencyequipmentService.save(pd); emergencyequipmentService.save(pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -61,6 +65,7 @@ public class EmergencyEquipmentController extends BaseController {
@RequestMapping(value="/delete") @RequestMapping(value="/delete")
@RequiresPermissions("emergencyequipment:del") @RequiresPermissions("emergencyequipment:del")
@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";
@ -68,6 +73,7 @@ public class EmergencyEquipmentController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
map.put("dockData", JSON.toJSONString(pd));
emergencyequipmentService.delete(pd); emergencyequipmentService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
@ -80,6 +86,7 @@ public class EmergencyEquipmentController extends BaseController {
@RequestMapping(value="/edit") @RequestMapping(value="/edit")
@RequiresPermissions("emergencyequipment:edit") @RequiresPermissions("emergencyequipment:edit")
@ResponseBody @ResponseBody
@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";
@ -87,6 +94,7 @@ public class EmergencyEquipmentController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
map.put("dockData", JSON.toJSONString(pd));
emergencyequipmentService.edit(pd); emergencyequipmentService.edit(pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -140,6 +148,7 @@ public class EmergencyEquipmentController extends BaseController {
@RequestMapping(value="/deleteAll") @RequestMapping(value="/deleteAll")
@RequiresPermissions("emergencyequipment:del") @RequiresPermissions("emergencyequipment:del")
@ResponseBody @ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{ public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
@ -151,6 +160,7 @@ public class EmergencyEquipmentController extends BaseController {
if(Tools.notEmpty(DATA_IDS)){ if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(","); String ArrayDATA_IDS[] = DATA_IDS.split(",");
pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids
map.put("dockData", JSON.toJSONString(pd));
emergencyequipmentService.deleteAll(pd); emergencyequipmentService.deleteAll(pd);
errInfo = "success"; errInfo = "success";
}else{ }else{

16
src/main/java/com/zcloud/controller/emergency/EmergencyPlanController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.emergency; package com.zcloud.controller.emergency;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
@ -41,6 +43,7 @@ public class EmergencyPlanController extends BaseController {
@RequestMapping(value="/add") @RequestMapping(value="/add")
@RequiresPermissions("emergencyplan:add") @RequiresPermissions("emergencyplan:add")
@ResponseBody @ResponseBody
@DockAnnotation(isAdd = true,hasAnnex = true)
public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
@ -54,6 +57,7 @@ public class EmergencyPlanController extends BaseController {
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
if (null != file && !file.isEmpty()) { if (null != file && !file.isEmpty()) {
ArrayList<String> pictureList = new ArrayList<String>();
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); 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)) { if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
errInfo = "fail"; errInfo = "fail";
@ -68,9 +72,12 @@ public class EmergencyPlanController extends BaseController {
//服务器 //服务器
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 + Jurisdiction.getCORPINFO_ID() + "/" + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd.put("PLAN_ATTACH_NAME", file.getOriginalFilename()); pd.put("PLAN_ATTACH_NAME", file.getOriginalFilename());
pd.put("PLAN_ATTACH_IDS", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); pd.put("PLAN_ATTACH_IDS", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
} }
map.put("dockData", JSON.toJSONString(pd));
emergencyplanService.save(pd); emergencyplanService.save(pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("pd", pd); map.put("pd", pd);
@ -83,6 +90,7 @@ public class EmergencyPlanController extends BaseController {
@RequestMapping(value="/delete") @RequestMapping(value="/delete")
@RequiresPermissions("emergencyplan:del") @RequiresPermissions("emergencyplan:del")
@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";
@ -90,6 +98,7 @@ public class EmergencyPlanController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
map.put("dockData", JSON.toJSONString(pd));
emergencyplanService.delete(pd); emergencyplanService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
@ -102,6 +111,7 @@ public class EmergencyPlanController extends BaseController {
@RequestMapping(value="/edit") @RequestMapping(value="/edit")
@RequiresPermissions("emergencyplan:edit") @RequiresPermissions("emergencyplan:edit")
@ResponseBody @ResponseBody
@DockAnnotation(hasAnnex = true)
public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
@ -110,6 +120,7 @@ public class EmergencyPlanController extends BaseController {
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (null != file && !file.isEmpty()) { if (null != file && !file.isEmpty()) {
ArrayList<String> pictureList = new ArrayList<String>();
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); 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)) { if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
errInfo = "fail"; errInfo = "fail";
@ -124,9 +135,12 @@ public class EmergencyPlanController extends BaseController {
//服务器 //服务器
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 + Jurisdiction.getCORPINFO_ID() + "/" + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd.put("PLAN_ATTACH_NAME", file.getOriginalFilename()); pd.put("PLAN_ATTACH_NAME", file.getOriginalFilename());
pd.put("PLAN_ATTACH_IDS", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); pd.put("PLAN_ATTACH_IDS", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
} }
map.put("dockData", JSON.toJSONString(pd));
emergencyplanService.edit(pd); emergencyplanService.edit(pd);
map.put("result", errInfo); map.put("result", errInfo);
@ -181,6 +195,7 @@ public class EmergencyPlanController extends BaseController {
@RequestMapping(value="/deleteAll") @RequestMapping(value="/deleteAll")
@RequiresPermissions("emergencyplan:del") @RequiresPermissions("emergencyplan:del")
@ResponseBody @ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{ public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
@ -192,6 +207,7 @@ public class EmergencyPlanController extends BaseController {
if(Tools.notEmpty(DATA_IDS)){ if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(","); String ArrayDATA_IDS[] = DATA_IDS.split(",");
pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids
map.put("dockData", JSON.toJSONString(pd));
emergencyplanService.deleteAll(pd); emergencyplanService.deleteAll(pd);
errInfo = "success"; errInfo = "success";
}else{ }else{

10
src/main/java/com/zcloud/controller/emergency/EmergencyTeamController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.emergency; package com.zcloud.controller.emergency;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
@ -37,6 +39,7 @@ public class EmergencyTeamController extends BaseController {
@RequestMapping(value="/add") @RequestMapping(value="/add")
@RequiresPermissions("emergencyteam:add") @RequiresPermissions("emergencyteam:add")
@ResponseBody @ResponseBody
@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";
@ -49,6 +52,7 @@ public class EmergencyTeamController extends BaseController {
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-否
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
map.put("dockData", JSON.toJSONString(pd));
emergencyteamService.save(pd); emergencyteamService.save(pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -61,6 +65,7 @@ public class EmergencyTeamController extends BaseController {
@RequestMapping(value="/delete") @RequestMapping(value="/delete")
@RequiresPermissions("emergencyteam:del") @RequiresPermissions("emergencyteam:del")
@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";
@ -68,6 +73,7 @@ public class EmergencyTeamController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
map.put("dockData", JSON.toJSONString(pd));
emergencyteamService.delete(pd); emergencyteamService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
@ -80,6 +86,7 @@ public class EmergencyTeamController extends BaseController {
@RequestMapping(value="/edit") @RequestMapping(value="/edit")
@RequiresPermissions("emergencyteam:edit") @RequiresPermissions("emergencyteam:edit")
@ResponseBody @ResponseBody
@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";
@ -87,6 +94,7 @@ public class EmergencyTeamController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
map.put("dockData", JSON.toJSONString(pd));
emergencyteamService.edit(pd); emergencyteamService.edit(pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -140,6 +148,7 @@ public class EmergencyTeamController extends BaseController {
@RequestMapping(value="/deleteAll") @RequestMapping(value="/deleteAll")
@RequiresPermissions("emergencyteam:del") @RequiresPermissions("emergencyteam:del")
@ResponseBody @ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{ public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
@ -151,6 +160,7 @@ public class EmergencyTeamController extends BaseController {
if(Tools.notEmpty(DATA_IDS)){ if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(","); String ArrayDATA_IDS[] = DATA_IDS.split(",");
pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids
map.put("dockData", JSON.toJSONString(pd));
emergencyteamService.deleteAll(pd); emergencyteamService.deleteAll(pd);
errInfo = "success"; errInfo = "success";
}else{ }else{

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

@ -121,7 +121,12 @@ public class AppGFBlindBoardController extends BaseController {
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
} }
map.put("dockData",JSON.toJSONString(pd)); PageData dockData = new PageData(); // 主要对接数据
PageData blindPageData = new PageData(); // pd对接数据
blindPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(blindPageData));
GFblindboardService.save(pd); GFblindboardService.save(pd);
GFblindBoardInfoService.delete(pd); GFblindBoardInfoService.delete(pd);
@ -142,7 +147,10 @@ public class AppGFBlindBoardController extends BaseController {
count+=1; count+=1;
GFblindBoardInfoService.save(board); GFblindBoardInfoService.save(board);
} }
map.put("infoMap",JSON.toJSONString(infoMap)); PageData blindInfoMap = new PageData();
blindInfoMap.putAll(infoMap);
dockData.put("infoMap", JSON.toJSONString(blindInfoMap));
// map.put("infoMap",JSON.toJSONString(infoMap));
} }
GFblindBoardToMeasuresService.delete(pd); GFblindBoardToMeasuresService.delete(pd);
@ -158,11 +166,14 @@ public class AppGFBlindBoardController 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"));
toMeasuresMap.put("count"+count, JSON.toJSONString(measures)); toMeasuresMap.put("other"+count, JSON.toJSONString(measures));
count+=1; count+=1;
GFblindBoardToMeasuresService.save(measures); GFblindBoardToMeasuresService.save(measures);
} }
map.put("toMeasuresMap",JSON.toJSONString(toMeasuresMap)); PageData blindtoMeasuresMap = new PageData();
blindtoMeasuresMap.putAll(toMeasuresMap);
dockData.put("toMeasuresMap", JSON.toJSONString(toMeasuresMap));
// map.put("toMeasuresMap",JSON.toJSONString(toMeasuresMap));
} }
if(pd.get("APPLY_STATUS").equals("1")) { if(pd.get("APPLY_STATUS").equals("1")) {
@ -173,7 +184,10 @@ public class AppGFBlindBoardController 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()));
GFblindBoardLogService.save(log); GFblindBoardLogService.save(log);
map.put("logData", JSON.toJSONString(log)); PageData blindtologDataMap = new PageData();
blindtologDataMap.putAll(log);
dockData.put("logData", JSON.toJSONString(log));
// map.put("logData", JSON.toJSONString(log));
// 发短信 // 发短信
PageData mes = new PageData(); PageData mes = new PageData();
@ -207,6 +221,7 @@ public class AppGFBlindBoardController extends BaseController {
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -226,6 +241,7 @@ public class AppGFBlindBoardController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData();
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>(); ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0]; MultipartFile file = files[0];
@ -236,9 +252,9 @@ public class AppGFBlindBoardController extends BaseController {
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
map.put("dockData", JSON.toJSONString(dockData));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
} }
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -257,7 +273,11 @@ public class AppGFBlindBoardController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
smb.deleteFile(pd.getString("path")); smb.deleteFile(pd.getString("path"));
map.put("dockData", JSON.toJSONString(pd)); PageData dockData = new PageData();
PageData blindPageData = new PageData();
blindPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(blindPageData));
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -274,7 +294,12 @@ public class AppGFBlindBoardController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
GFblindboardService.delete(pd); GFblindboardService.delete(pd);
map.put("dockData", JSON.toJSONString(pd)); PageData dockData = new PageData();
PageData blindPageData = new PageData();
blindPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(blindPageData));
map.put("dockData", JSON.toJSONString(dockData));
// map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -312,7 +337,12 @@ public class AppGFBlindBoardController extends BaseController {
GFblindboardService.edit(pd); GFblindboardService.edit(pd);
GFblindBoardInfoService.delete(pd); GFblindBoardInfoService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
PageData dockData = new PageData();
PageData blindPageData = new PageData();
blindPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(blindPageData));
// map.put("dockData", JSON.toJSONString(pd));
if(pd.get("boardList")!=null){ if(pd.get("boardList")!=null){
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("boardList").toString()); List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("boardList").toString());
HashMap<String, String> infoMap = new HashMap<String, String>(); HashMap<String, String> infoMap = new HashMap<String, String>();
@ -330,7 +360,10 @@ public class AppGFBlindBoardController extends BaseController {
count+=1; count+=1;
GFblindBoardInfoService.save(board); GFblindBoardInfoService.save(board);
} }
map.put("infoMap", JSON.toJSONString(infoMap)); PageData blindInfoMap = new PageData();
blindInfoMap.putAll(infoMap);
dockData.put("infoMap", JSON.toJSONString(blindInfoMap));
// map.put("infoMap", JSON.toJSONString(infoMap));
} }
GFblindBoardToMeasuresService.delete(pd); GFblindBoardToMeasuresService.delete(pd);
@ -350,7 +383,10 @@ public class AppGFBlindBoardController extends BaseController {
count+=1; count+=1;
GFblindBoardToMeasuresService.save(measures); GFblindBoardToMeasuresService.save(measures);
} }
map.put("measuresMap", JSON.toJSONString(measuresMap)); PageData blindMeasuresMap = new PageData();
blindMeasuresMap.putAll(measuresMap);
dockData.put("measuresMap", JSON.toJSONString(blindMeasuresMap));
// map.put("measuresMap", JSON.toJSONString(measuresMap));
} }
if(!pd.get("APPLY_STATUS").equals("0")) { if(!pd.get("APPLY_STATUS").equals("0")) {
@ -361,7 +397,10 @@ public class AppGFBlindBoardController 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()));
GFblindBoardLogService.save(log); GFblindBoardLogService.save(log);
map.put("logData", JSON.toJSONString(log)); PageData blindLogData = new PageData();
blindLogData.putAll(log);
dockData.put("logData", JSON.toJSONString(blindLogData));
// map.put("logData", JSON.toJSONString(log));
// 发短信 // 发短信
@ -395,6 +434,8 @@ public class AppGFBlindBoardController extends BaseController {
paramsList.add(params4); paramsList.add(params4);
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -425,6 +466,12 @@ public class AppGFBlindBoardController 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()));
PageData dockData = new PageData();// 主要对接数据
PageData blindPageData = new PageData();// pd对接数据
blindPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(blindPageData));
String status = pd.get("STATUS").toString(); String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
@ -449,7 +496,11 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
GFblindboardService.edit(pd2); GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
PageData blindpd2DataMap = new PageData();
blindpd2DataMap.putAll(pd2);
dockData.put("pd2Data", JSON.toJSONString(blindpd2DataMap));
// map.put("pd2Data", JSON.toJSONString(pd2));
log.put("ACTION", "作业负责人通过"); log.put("ACTION", "作业负责人通过");
if(pd.get("boardList")!=null){ if(pd.get("boardList")!=null){
GFblindBoardInfoService.delete(pd); GFblindBoardInfoService.delete(pd);
@ -469,11 +520,17 @@ public class AppGFBlindBoardController extends BaseController {
boardCount+=1; boardCount+=1;
GFblindBoardInfoService.save(board); GFblindBoardInfoService.save(board);
} }
map.put("boardMap", JSON.toJSONString(boardMap)); PageData blindboardMap = new PageData();
blindboardMap.putAll(boardMap);
dockData.put("boardMap", JSON.toJSONString(blindboardMap));
// map.put("boardMap", JSON.toJSONString(boardMap));
} }
GFblindBoardToMeasuresService.delete(pd); GFblindBoardToMeasuresService.delete(pd);
map.put("pdData", JSON.toJSONString(pd)); PageData blindpdData = new PageData();
blindpdData.putAll(pd);
dockData.put("pdData", JSON.toJSONString(blindpdData));
// map.put("pdData", JSON.toJSONString(pd));
if(pd.get("measuresList")!=null){ if(pd.get("measuresList")!=null){
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString()); List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
HashMap<String,String> measuresMap = new HashMap<String,String>(); HashMap<String,String> measuresMap = new HashMap<String,String>();
@ -490,7 +547,10 @@ public class AppGFBlindBoardController extends BaseController {
measuresCount+=1; measuresCount+=1;
GFblindBoardToMeasuresService.save(measures); GFblindBoardToMeasuresService.save(measures);
} }
map.put("measuresData", JSON.toJSONString(measuresMap)); PageData blindmeasuresDataMap = new PageData();
blindmeasuresDataMap.putAll(measuresMap);
dockData.put("measuresData", JSON.toJSONString(blindmeasuresDataMap));
// map.put("measuresData", JSON.toJSONString(measuresMap));
} }
@ -516,7 +576,10 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFblindboardService.edit(pd2); GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2)); PageData blindpd2DataMap = new PageData();
blindpd2DataMap.putAll(pd2);
dockData.put("pd2Data", JSON.toJSONString(blindpd2DataMap));
// map.put("pd2Data", JSON.toJSONString(pd2));
log.put("ACTION", "所在单位审核通过"); log.put("ACTION", "所在单位审核通过");
// 发短信 // 发短信
@ -541,7 +604,10 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFblindboardService.edit(pd2); GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2)); PageData blindpd2DataMap = new PageData();
blindpd2DataMap.putAll(pd2);
dockData.put("pd2Data", JSON.toJSONString(blindpd2DataMap));
// map.put("pd2Data", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过"); log.put("ACTION", "验收通过");
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -552,7 +618,10 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("SAFETY_CONTENT", pd.get("CONTENT")); pd2.put("SAFETY_CONTENT", pd.get("CONTENT"));
GFblindboardService.edit(pd2); GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2)); PageData blindpd2DataMap = new PageData();
blindpd2DataMap.putAll(pd2);
dockData.put("pd2Data", JSON.toJSONString(blindpd2DataMap));
// map.put("pd2Data", JSON.toJSONString(pd2));
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -562,7 +631,10 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("LEADER_CONTENT", pd.get("CONTENT")); pd2.put("LEADER_CONTENT", pd.get("CONTENT"));
GFblindboardService.edit(pd2); GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2)); PageData blindpd2DataMap1 = new PageData();
blindpd2DataMap1.putAll(pd2);
dockData.put("pd2Data", JSON.toJSONString(blindpd2DataMap1));
// map.put("pd2Data", JSON.toJSONString(pd2));
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -572,7 +644,10 @@ public class AppGFBlindBoardController 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"));
GFblindboardService.edit(pd2); GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2)); PageData blindpd2DataMap2 = new PageData();
blindpd2DataMap2.putAll(pd2);
dockData.put("pd2Data", JSON.toJSONString(blindpd2DataMap2));
// map.put("pd2Data", JSON.toJSONString(pd2));
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -581,7 +656,11 @@ public class AppGFBlindBoardController extends BaseController {
break; break;
} }
GFblindBoardLogService.save(log); GFblindBoardLogService.save(log);
map.put("logData", JSON.toJSONString(log)); PageData blindlogDataMap = new PageData();
blindlogDataMap.putAll(log);
dockData.put("logData", JSON.toJSONString(blindlogDataMap));
// map.put("logData", JSON.toJSONString(log));
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -667,7 +746,13 @@ public class AppGFBlindBoardController 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)); PageData dockData = new PageData();// 主要对接数据
PageData blindPageData = new PageData();// pd对接数据
blindPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(blindPageData));
// map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString(); String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
@ -682,20 +767,38 @@ public class AppGFBlindBoardController extends BaseController {
String signertime = ""; String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(","); String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<String>();
HashMap<String, String> saveAcceptImgMap = new HashMap<String, String>();
int fileCount = 1;
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("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList); saveAcceptImg(fileList.toArray(fileArr),
map.put("sendPicturesList", JSON.toJSONString(pictureList)); signertime,pd.getString("BLINDBOARD_ID"),
pd.getString("CORPINFO_ID"),
pd.getString("ACCEPT_USER_ID"),
pd.getString("ACCEPT_DEPARTMENT_ID"),
pictureList,saveAcceptImgMap,fileCount);
fileList.clear(); fileList.clear();
fileCount += 1;
} }
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); PageData blindsaveAcceptImgMap = new PageData();
blindsaveAcceptImgMap.putAll(saveAcceptImgMap);
dockData.put("saveAcceptImgMap", JSON.toJSONString(blindsaveAcceptImgMap));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFblindboardService.edit(pd2); GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
PageData blindpd2DataMap = new PageData();
blindpd2DataMap.putAll(pd2);
dockData.put("pd2Data", JSON.toJSONString(blindpd2DataMap));
// map.put("pd2Data", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过"); log.put("ACTION", "验收通过");
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -707,7 +810,11 @@ public class AppGFBlindBoardController 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"));
GFblindboardService.edit(pd2); GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
PageData blindpd2DataMap1 = new PageData();
blindpd2DataMap1.putAll(pd2);
dockData.put("pd2Data", JSON.toJSONString(blindpd2DataMap1));
// map.put("pd2Data", JSON.toJSONString(pd2));
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -716,12 +823,26 @@ public class AppGFBlindBoardController extends BaseController {
break; break;
} }
GFblindBoardLogService.save(log); GFblindBoardLogService.save(log);
map.put("logData", JSON.toJSONString(log));
PageData blindlogDataMap = new PageData();
blindlogDataMap.putAll(log);
dockData.put("logData", JSON.toJSONString(blindlogDataMap));
// map.put("logData", JSON.toJSONString(log));
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
private void saveAcceptImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{ private void saveAcceptImg(MultipartFile[] files,
String signertime,
String BLINDBOARD_ID,
String CORPINFO_ID,
String ACCEPT_USER_ID,
String ACCEPT_DEPARTMENT_ID,
ArrayList<String> pictureList,
HashMap<String, String> saveAcceptImgMap,
int fileCount) throws Exception{
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData(); PageData cpd = new PageData();
@ -742,8 +863,10 @@ public class AppGFBlindBoardController 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 + cpd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); saveAcceptImgMap.put("other" + fileCount,JSON.toJSONString(cpd));
fileCount+=1;
blindboardacceptuserService.save(cpd); blindboardacceptuserService.save(cpd);
pictureList.add(Const.FILEPATHFILE + cpd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
} }
} }
} }
@ -770,7 +893,13 @@ public class AppGFBlindBoardController extends BaseController {
}else{ }else{
errInfo = "error"; errInfo = "error";
} }
map.put("dockData", JSON.toJSONString(pd)); PageData dockData = new PageData();// 主要对接数据
PageData blindPageData = new PageData();// pd对接数据
blindPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(blindPageData));
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -974,7 +1103,14 @@ public class AppGFBlindBoardController extends BaseController {
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"));
GFblindboardService.edit(pd2); GFblindboardService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
PageData dockData = new PageData();// 主要对接数据
PageData blindPageData = new PageData();// pd对接数据
blindPageData.putAll(pd2);
dockData.put("dockData", JSON.toJSONString(blindPageData));
map.put("dockData", JSON.toJSONString(dockData));
} }
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -1072,7 +1208,13 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
GFblindboardService.edit(pd2); GFblindboardService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2)); PageData dockData = new PageData();// 主要对接数据
PageData blindPageData = new PageData();// pd对接数据
blindPageData.putAll(pd2);
dockData.put("dockData", JSON.toJSONString(blindPageData));
map.put("dockData", JSON.toJSONString(dockData));
} }
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -1096,26 +1238,45 @@ public class AppGFBlindBoardController extends BaseController {
pd2 = GFblindboardService.findById(pd); pd2 = GFblindboardService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
map.put("dockData", JSON.toJSONString(pd2)); PageData dockData = new PageData();// 主要对接数据
PageData blindPageData = new PageData();// pd对接数据
blindPageData.putAll(pd2);
dockData.put("dockData", JSON.toJSONString(blindPageData));
// map.put("dockData", JSON.toJSONString(pd2));
List<MultipartFile> fileList = new ArrayList<MultipartFile>(); List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = ""; String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(","); String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<String>(); ArrayList<String> pictureList = new ArrayList<String>();
HashMap<String,String> saveImgMap = new HashMap<String,String>();
int saveImgCount = 1;
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("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"), saveImg(fileList.toArray(fileArr),signertime,
pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList); pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),
pd.getString("ACCEPT_CONFESS_USER_ID"),
pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),
pictureList, saveImgMap, saveImgCount);
fileList.clear(); fileList.clear();
saveImgCount += 1;
} }
PageData blindsaveImgMap = new PageData();
blindsaveImgMap.putAll(saveImgMap);
dockData.put("saveImgMap", JSON.toJSONString(blindsaveImgMap));
map.put("dockData", JSON.toJSONString(dockData));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
private void saveImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, private void saveImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID,
String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{ String ACCEPT_CONFESS_USER_ID,
String ACCEPT_CONFESS_DEPARTMENT_ID,
ArrayList<String> pictureList,
HashMap<String,String> saveImgMap, int saveImgCount) throws Exception{
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
PageData pd = new PageData(); PageData pd = new PageData();
@ -1136,8 +1297,10 @@ public class AppGFBlindBoardController 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); saveImgMap.put("other" + saveImgCount, JSON.toJSONString(pd));
saveImgCount += 1;
blindboardacceptuserService.save(pd); blindboardacceptuserService.save(pd);
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
} }
} }
} }

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

@ -108,7 +108,14 @@ public class AppGFConfinedSpaceController extends BaseController {
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-否
GFconfinedspaceService.save(pd); GFconfinedspaceService.save(pd);
map.put("dockData", JSON.toJSONString(pd));
PageData dockData = new PageData(); // 主要对接数据
PageData confinedPageData = new PageData(); // pd对接数据
confinedPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedPageData));
// map.put("dockData", JSON.toJSONString(pd));
if(pd.get("APPLY_STATUS").equals("1")) { if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData(); PageData log = new PageData();
@ -118,7 +125,11 @@ public class AppGFConfinedSpaceController 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()));
GFconfinedspaceLogService.save(log); GFconfinedspaceLogService.save(log);
map.put("logDockData",JSON.toJSONString(log));
PageData confinedlogDockData = new PageData(); // pd对接数据
confinedlogDockData.putAll(log);
dockData.put("logDockData", JSON.toJSONString(confinedlogDockData));
// map.put("logDockData",JSON.toJSONString(log));
// 发短信 // 发短信
PageData mes = new PageData(); PageData mes = new PageData();
@ -178,6 +189,7 @@ public class AppGFConfinedSpaceController extends BaseController {
tenCorpDto.setData(pd); tenCorpDto.setData(pd);
tenCorpDto.setMark_name("CONFINEDSPACE_ID"); tenCorpDto.setMark_name("CONFINEDSPACE_ID");
mqClient.SendDelayQueue(tenCorpDto); mqClient.SendDelayQueue(tenCorpDto);
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -195,7 +207,13 @@ public class AppGFConfinedSpaceController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
GFconfinedspaceService.delete(pd); GFconfinedspaceService.delete(pd);
map.put("dockData", JSON.toJSONString(pd)); PageData dockData = new PageData(); // 主要对接数据
PageData confinedPageData = new PageData(); // pd对接数据
confinedPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedPageData));
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -214,7 +232,13 @@ public class AppGFConfinedSpaceController extends BaseController {
System.out.println(JSONObject.toJSONString(pd)); System.out.println(JSONObject.toJSONString(pd));
PageData cpd = new PageData(); PageData cpd = new PageData();
cpd = GFconfinedspaceService.findById(pd); cpd = GFconfinedspaceService.findById(pd);
map.put("dockData", JSON.toJSONString(pd));
PageData dockData = new PageData(); // 主要对接数据
PageData confinedPageData = new PageData(); // pd对接数据
confinedPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedPageData));
// map.put("dockData", JSON.toJSONString(pd));
if(cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") != null){ if(cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_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");
@ -263,6 +287,11 @@ public class AppGFConfinedSpaceController 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);
GFconfinedspaceService.cancel(pd); GFconfinedspaceService.cancel(pd);
PageData confinedpdPageData = new PageData(); // pd对接数据
confinedpdPageData.putAll(pd);
dockData.put("dockDatapd", JSON.toJSONString(confinedpdPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFconfinedspaceService.checkno(pd); pd2 = GFconfinedspaceService.checkno(pd);
PageData pd3 = new PageData(); PageData pd3 = new PageData();
@ -276,6 +305,10 @@ public class AppGFConfinedSpaceController extends BaseController {
GFconfinedspaceService.editSpecialwork5(pd3); GFconfinedspaceService.editSpecialwork5(pd3);
GFconfinedspaceService.editSpecialwork6(pd3); GFconfinedspaceService.editSpecialwork6(pd3);
GFconfinedspaceService.editSpecialwork7(pd3); GFconfinedspaceService.editSpecialwork7(pd3);
PageData confinedpd3PageData = new PageData(); // pd对接数据
confinedpd3PageData.putAll(pd);
dockData.put("dockDatapd3", JSON.toJSONString(confinedpd3PageData));
PageData mes = new PageData(); PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
mes.put("templateCode", "YX_ZF1");// 短信模板编码 mes.put("templateCode", "YX_ZF1");// 短信模板编码
@ -297,6 +330,10 @@ public class AppGFConfinedSpaceController extends BaseController {
}else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") == null){ }else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") == null){
pd.put("APPLY_STATUS",-99); pd.put("APPLY_STATUS",-99);
GFconfinedspaceService.cancel(pd); GFconfinedspaceService.cancel(pd);
PageData confinedpdPageData = new PageData(); // pd对接数据
confinedpdPageData.putAll(pd);
dockData.put("dockDatapd", JSON.toJSONString(confinedpdPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFconfinedspaceService.checkno(pd); pd2 = GFconfinedspaceService.checkno(pd);
PageData pd3 = new PageData(); PageData pd3 = new PageData();
@ -310,6 +347,10 @@ public class AppGFConfinedSpaceController extends BaseController {
GFconfinedspaceService.editSpecialwork5(pd3); GFconfinedspaceService.editSpecialwork5(pd3);
GFconfinedspaceService.editSpecialwork6(pd3); GFconfinedspaceService.editSpecialwork6(pd3);
GFconfinedspaceService.editSpecialwork7(pd3); GFconfinedspaceService.editSpecialwork7(pd3);
PageData confinedpd3PageData = new PageData(); // pd对接数据
confinedpd3PageData.putAll(pd);
dockData.put("dockDatapd3", JSON.toJSONString(confinedpd3PageData));
PageData mes = new PageData(); PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
mes.put("templateCode", "YX_ZF2");// 短信模板编码 mes.put("templateCode", "YX_ZF2");// 短信模板编码
@ -329,6 +370,7 @@ public class AppGFConfinedSpaceController extends BaseController {
paramsList.add(params2); paramsList.add(params2);
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return ; return ;
} }
@ -348,7 +390,12 @@ public class AppGFConfinedSpaceController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
GFconfinedspaceService.edit(pd); GFconfinedspaceService.edit(pd);
map.put("dockData", JSON.toJSONString(pd)); PageData dockData = new PageData(); // 主要对接数据
PageData confinedPageData = new PageData(); // pd对接数据
confinedPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedPageData));
// map.put("dockData", JSON.toJSONString(pd));
if(pd.get("APPLY_STATUS").equals("1")) { if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData(); PageData log = new PageData();
log.put("CONFINEDSPACELOG_ID", this.get32UUID()); log.put("CONFINEDSPACELOG_ID", this.get32UUID());
@ -357,7 +404,10 @@ public class AppGFConfinedSpaceController 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()));
GFconfinedspaceLogService.save(log); GFconfinedspaceLogService.save(log);
map.put("logDockData", JSON.toJSONString(pd)); PageData confinedlogDockData = new PageData(); // pd对接数据
confinedlogDockData.putAll(log);
dockData.put("logDockData", JSON.toJSONString(confinedlogDockData));
// map.put("logDockData", JSON.toJSONString(pd));
// 发短信 // 发短信
@ -398,6 +448,7 @@ public class AppGFConfinedSpaceController extends BaseController {
tenCorpDto.setData(pd); tenCorpDto.setData(pd);
tenCorpDto.setMark_name("CONFINEDSPACE_ID"); tenCorpDto.setMark_name("CONFINEDSPACE_ID");
mqClient.SendDelayQueue(tenCorpDto); mqClient.SendDelayQueue(tenCorpDto);
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -417,6 +468,11 @@ public class AppGFConfinedSpaceController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData confinedPageData = new PageData(); // pd对接数据
confinedPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFconfinedspaceService.findById(pd); pd2 = GFconfinedspaceService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -435,7 +491,10 @@ public class AppGFConfinedSpaceController extends BaseController {
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2); GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2)); PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
} }
@ -447,7 +506,10 @@ public class AppGFConfinedSpaceController 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()));
GFconfinedspaceLogService.save(log); GFconfinedspaceLogService.save(log);
map.put("logDockData", JSON.toJSONString(log)); PageData confinedlogDockData = new PageData(); // pd对接数据
confinedlogDockData.putAll(log);
dockData.put("logDockData", JSON.toJSONString(confinedlogDockData));
// map.put("logDockData", JSON.toJSONString(log));
// // 发短信 // // 发短信
@ -480,6 +542,7 @@ public class AppGFConfinedSpaceController extends BaseController {
// paramsList.add(params4); // paramsList.add(params4);
// sendMessageUtil.sendMessages(mes, paramsList); // sendMessageUtil.sendMessages(mes, paramsList);
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -498,6 +561,11 @@ public class AppGFConfinedSpaceController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData confinedPageData = new PageData(); // pd对接数据
confinedPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFconfinedspaceService.findById(pd); pd2 = GFconfinedspaceService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -516,9 +584,13 @@ public class AppGFConfinedSpaceController extends BaseController {
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2); GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2)); PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -568,6 +640,11 @@ public class AppGFConfinedSpaceController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData confinedPageData = new PageData(); // pd对接数据
confinedPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFconfinedspaceService.findById(pd); pd2 = GFconfinedspaceService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -578,19 +655,38 @@ public class AppGFConfinedSpaceController extends BaseController {
String SIGNTIME[] = pd.getString("SIGNTIME").split(","); String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<>(); ArrayList<String> pictureList = new ArrayList<>();
HashMap<String, String> saveImgMap = new HashMap<String, String>();
int count = 1;
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("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList); saveImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),
pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),
pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),
pictureList, saveImgMap, count);
fileList.clear(); fileList.clear();
count += 1;
} }
map.put("dockData", JSON.toJSONString(pd)); PageData confinedsaveImgMap = new PageData();
confinedsaveImgMap.putAll(saveImgMap);
dockData.put("saveImgMap", JSON.toJSONString(confinedsaveImgMap));
map.put("dockData", JSON.toJSONString(dockData));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
private void saveImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{ private void saveImg(MultipartFile[] files,
String signertime,
String CONFINEDSPACE_ID,
String CORPINFO_ID,
String ACCEPT_CONFESS_USER_ID,
String ACCEPT_CONFESS_DEPARTMENT_ID,
ArrayList<String> pictureList,
HashMap<String, String> saveImgMap,
int count) throws Exception{
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
PageData pd = new PageData(); PageData pd = new PageData();
@ -611,8 +707,10 @@ public class AppGFConfinedSpaceController 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); saveImgMap.put("other" + count, JSON.toJSONString(pd));
count += 1;
confinedspaceacceptuserService.save(pd); confinedspaceacceptuserService.save(pd);
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
} }
} }
} }
@ -626,6 +724,11 @@ public class AppGFConfinedSpaceController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData confinedPageData = new PageData(); // pd对接数据
confinedPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFconfinedspaceService.findById(pd); pd2 = GFconfinedspaceService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -654,19 +757,35 @@ public class AppGFConfinedSpaceController extends BaseController {
String SIGNTIME[] = pd.getString("SIGNTIME").split(","); String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<>(); ArrayList<String> pictureList = new ArrayList<>();
HashMap<String, String> saveAcceptImgMap = new HashMap<String, String>();
int count = 1;
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("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList); saveAcceptImg(fileList.toArray(fileArr),signertime,
pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),
pd.getString("ACCEPT_USER_ID"),
pd.getString("ACCEPT_DEPARTMENT_ID"),
pictureList,saveAcceptImgMap,count);
fileList.clear(); fileList.clear();
count += 1;
} }
PageData confinedsaveAcceptImgMap = new PageData(); // pd对接数据
confinedsaveAcceptImgMap.putAll(saveAcceptImgMap);
dockData.put("saveAcceptImgMap", JSON.toJSONString(confinedsaveAcceptImgMap));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
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"));
GFconfinedspaceService.edit(pd2); GFconfinedspaceService.edit(pd2);
map.put("pd2", JSON.toJSONString(pd2));
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过"); log.put("ACTION", "验收通过");
// 发短信 // 发短信
@ -694,7 +813,10 @@ public class AppGFConfinedSpaceController 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"));
GFconfinedspaceService.edit(pd2); GFconfinedspaceService.edit(pd2);
map.put("pd2", JSON.toJSONString(pd2)); PageData confineddockDatapd21 = new PageData(); // pd对接数据
confineddockDatapd21.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd21));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
// 发短信 // 发短信
PageData mes4 = new PageData(); PageData mes4 = new PageData();
@ -725,12 +847,21 @@ public class AppGFConfinedSpaceController extends BaseController {
break; break;
} }
GFconfinedspaceLogService.save(log); GFconfinedspaceLogService.save(log);
map.put("log", JSON.toJSONString(log)); PageData confineddockDatalog = new PageData(); // pd对接数据
confineddockDatalog.putAll(log);
dockData.put("dockDatalog", JSON.toJSONString(confineddockDatalog));
// map.put("log", JSON.toJSONString(log));
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
private void saveAcceptImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{ private void saveAcceptImg(MultipartFile[] files,String signertime,
String CONFINEDSPACE_ID, String CORPINFO_ID,
String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID,
ArrayList<String> pictureList,
HashMap<String, String> saveAcceptImgMap,
int count) throws Exception{
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData(); PageData cpd = new PageData();
@ -751,8 +882,10 @@ public class AppGFConfinedSpaceController 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); saveAcceptImgMap.put("other" + count, JSON.toJSONString(cpd));
count += 1;
confinedspaceacceptuserService.save(cpd); confinedspaceacceptuserService.save(cpd);
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
} }
} }
} }
@ -774,6 +907,11 @@ public class AppGFConfinedSpaceController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData confinedPageData = new PageData(); // pd对接数据
confinedPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFconfinedspaceService.findById(pd); pd2 = GFconfinedspaceService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -819,9 +957,15 @@ public class AppGFConfinedSpaceController extends BaseController {
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2); GFconfinedspaceService.edit(pd2);
GFconfinedspaceToMeasuresService.delete(pd2); GFconfinedspaceToMeasuresService.delete(pd2);
map.put("dockData", JSON.toJSONString(pd2));
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
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("CONFINEDSPACETOMEASURES_ID", this.get32UUID()); // 主键 measures.put("CONFINEDSPACETOMEASURES_ID", this.get32UUID()); // 主键
@ -833,9 +977,15 @@ public class AppGFConfinedSpaceController 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;
GFconfinedspaceToMeasuresService.save(measures); GFconfinedspaceToMeasuresService.save(measures);
map.put("measuresDockData", JSON.toJSONString(measures));
} }
PageData confinedmeasuresMap = new PageData(); // pd对接数据
confinedmeasuresMap.putAll(measuresMap);
dockData.put("measuresMap", JSON.toJSONString(confinedmeasuresMap));
// map.put("measuresDockData", JSON.toJSONString(measures));
log.put("ACTION", "作业单位通过"); log.put("ACTION", "作业单位通过");
@ -895,10 +1045,16 @@ public class AppGFConfinedSpaceController extends BaseController {
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2); GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
log.put("ACTION", "监护人确认通过"); log.put("ACTION", "监护人确认通过");
} }
map.put("dockData", JSON.toJSONString(dockData));
return map; return map;
// //
@ -1026,7 +1182,12 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2); GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
log.put("ACTION", "所在单位审批通过"); log.put("ACTION", "所在单位审批通过");
@ -1098,7 +1259,12 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2); GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
log.put("ACTION", "验收通过"); log.put("ACTION", "验收通过");
@ -1128,7 +1294,12 @@ public class AppGFConfinedSpaceController extends BaseController {
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"));
GFconfinedspaceService.edit(pd2); GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
// map.put("dockData", JSON.toJSONString(pd2));
// 发短信 // 发短信
PageData mes = new PageData(); PageData mes = new PageData();
@ -1220,7 +1391,12 @@ public class AppGFConfinedSpaceController extends BaseController {
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"));
GFconfinedspaceService.edit(pd2); GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
PageData confineddockDatapd21 = new PageData(); // pd对接数据
confineddockDatapd21.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd21));
// map.put("dockData", JSON.toJSONString(pd2));
// 发短信 // 发短信
PageData mes3 = new PageData(); PageData mes3 = new PageData();
@ -1252,7 +1428,12 @@ public class AppGFConfinedSpaceController 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"));
GFconfinedspaceService.edit(pd2); GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
PageData confineddockDatapd22 = new PageData(); // pd对接数据
confineddockDatapd22.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd22));
// map.put("dockData", JSON.toJSONString(pd2));
// 发短信 // 发短信
PageData mes4 = new PageData(); PageData mes4 = new PageData();
@ -1283,7 +1464,13 @@ public class AppGFConfinedSpaceController extends BaseController {
break; break;
} }
GFconfinedspaceLogService.save(log); GFconfinedspaceLogService.save(log);
map.put("logDockData", JSON.toJSONString(log));
PageData confinedlogDockData = new PageData(); // pd对接数据
confinedlogDockData.putAll(log);
dockData.put("logDockData", JSON.toJSONString(confinedlogDockData));
// map.put("logDockData", JSON.toJSONString(log));
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -1440,8 +1627,13 @@ public class AppGFConfinedSpaceController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData confinedPageData = new PageData(); // pd对接数据
confinedPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedPageData));
GFconfinedspaceGasService.delete(pd); GFconfinedspaceGasService.delete(pd);
map.put("dockData",JSON.toJSONString(pd)); map.put("dockData",JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -1458,12 +1650,19 @@ public class AppGFConfinedSpaceController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
pd.put("CONFINEDSPACEGAS_ID", this.get32UUID()); //主键 pd.put("CONFINEDSPACEGAS_ID", this.get32UUID()); //主键
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
GFconfinedspaceGasService.save(pd); GFconfinedspaceGasService.save(pd);
confinedspacegaswhService.edittime(pd); confinedspacegaswhService.edittime(pd);
map.put("dockData",JSON.toJSONString(pd));
PageData confinedPageData = new PageData(); // pd对接数据
confinedPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedPageData));
map.put("dockData",JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }

23
src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java
View File

@ -46,16 +46,21 @@ public class AppGFConfinedSpaceGasWHController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); 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(); PageData pd2 = new PageData();
pd2 = GFconfinedspacegaswhService.findById(pd); pd2 = GFconfinedspacegaswhService.findById(pd);
if(pd2 != null && pd2.size()>0){ if(pd2 != null && pd2.size()>0){
GFconfinedspacegaswhService.edit(pd); GFconfinedspacegaswhService.edit(pd);
map.put("dockData", JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(dockData));
}else{ }else{
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("CONFINEDSPACEGASWH_ID", this.get32UUID()); //主键 pd.put("CONFINEDSPACEGASWH_ID", this.get32UUID()); //主键
GFconfinedspacegaswhService.save(pd); GFconfinedspacegaswhService.save(pd);
map.put("dockData", JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(dockData));
} }
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -73,8 +78,13 @@ public class AppGFConfinedSpaceGasWHController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData confinedGasPageData = new PageData(); // pd对接数据
confinedGasPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedGasPageData));
GFconfinedspacegaswhService.delete(pd); GFconfinedspacegaswhService.delete(pd);
map.put("dockData", JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -148,11 +158,16 @@ public class AppGFConfinedSpaceGasWHController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData confinedGasPageData = new PageData(); // pd对接数据
confinedGasPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedGasPageData));
String DATA_IDS = pd.getString("DATA_IDS"); String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){ if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(","); String ArrayDATA_IDS[] = DATA_IDS.split(",");
GFconfinedspacegaswhService.deleteAll(ArrayDATA_IDS); GFconfinedspacegaswhService.deleteAll(ArrayDATA_IDS);
map.put("dockData", JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(dockData));
errInfo = "success"; errInfo = "success";
}else{ }else{
errInfo = "error"; errInfo = "error";

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

@ -107,7 +107,12 @@ public class AppGFElectricityController 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)); // map.put("dockData", JSON.toJSONString(pd));
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
GFelectricityService.save(pd); GFelectricityService.save(pd);
if(pd.get("APPLY_STATUS").equals("1")) { if(pd.get("APPLY_STATUS").equals("1")) {
@ -117,7 +122,10 @@ public class AppGFElectricityController extends BaseController {
log.put("ELECTRICITY_ID", pd.get("ELECTRICITY_ID")); log.put("ELECTRICITY_ID", pd.get("ELECTRICITY_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)); // map.put("dockDataLog", JSON.toJSONString(log));
PageData electricitydockDataLog = new PageData(); // pd对接数据
electricitydockDataLog.putAll(log);
dockData.put("dockDataLog", JSON.toJSONString(electricitydockDataLog));
GFelectricityLogService.save(log); GFelectricityLogService.save(log);
// 发短信 // 发短信
@ -180,6 +188,7 @@ public class AppGFElectricityController extends BaseController {
paramsList1.add(params6); paramsList1.add(params6);
sendMessageUtil.sendMessages(mes1, paramsList1); sendMessageUtil.sendMessages(mes1, paramsList1);
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -194,8 +203,13 @@ public class AppGFElectricityController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
GFelectricityService.delete(pd); GFelectricityService.delete(pd);
map.put("dockData", JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -214,7 +228,12 @@ public class AppGFElectricityController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
GFelectricityService.edit(pd); GFelectricityService.edit(pd);
map.put("dockData", JSON.toJSONString(pd)); PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
// map.put("dockData", JSON.toJSONString(pd));
if(pd.get("APPLY_STATUS").equals("1")) { if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData(); PageData log = new PageData();
log.put("ELECTRICITYLOG_ID", this.get32UUID()); log.put("ELECTRICITYLOG_ID", this.get32UUID());
@ -222,7 +241,10 @@ public class AppGFElectricityController extends BaseController {
log.put("ELECTRICITY_ID", pd.get("ELECTRICITY_ID")); log.put("ELECTRICITY_ID", pd.get("ELECTRICITY_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)); // map.put("dockDataLog", JSON.toJSONString(log));
PageData electricitydockDataLog = new PageData(); // pd对接数据
electricitydockDataLog.putAll(log);
dockData.put("dockDataLog", JSON.toJSONString(electricitydockDataLog));
GFelectricityLogService.save(log); GFelectricityLogService.save(log);
// 发短信 // 发短信
@ -266,6 +288,7 @@ public class AppGFElectricityController extends BaseController {
mqClient.SendDelayQueue(tenCorpDto); mqClient.SendDelayQueue(tenCorpDto);
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -284,6 +307,11 @@ public class AppGFElectricityController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFelectricityService.findById(pd); pd2 = GFelectricityService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -303,8 +331,12 @@ public class AppGFElectricityController extends BaseController {
// 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"));
GFelectricityService.edit(pd2); GFelectricityService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2)); PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
// map.put("dockData", JSON.toJSONString(pd2));
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -324,6 +356,11 @@ public class AppGFElectricityController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFelectricityService.findById(pd); pd2 = GFelectricityService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -343,8 +380,12 @@ public class AppGFElectricityController extends BaseController {
// 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"));
GFelectricityService.edit(pd2); GFelectricityService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2)); PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
// map.put("dockData", JSON.toJSONString(pd2));
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -362,6 +403,11 @@ public class AppGFElectricityController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFelectricityService.findById(pd); pd2 = GFelectricityService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -371,22 +417,27 @@ public class AppGFElectricityController extends BaseController {
String SIGNTIME[] = pd.getString("SIGNTIME").split(","); String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<String>(); ArrayList<String> pictureList = new ArrayList<String>();
Map<String,String> saveImgMap = new HashMap<String,String>();
int count = 1;
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("ELECTRICITY_ID"), saveImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),
pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"), pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),
pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList); pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList,saveImgMap,count);
fileList.clear(); fileList.clear();
count += 1;
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
private void saveImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID, private void saveImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID,
String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID,
String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{ String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList,
Map<String,String> saveImgMap,int count) throws Exception{
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
PageData pd = new PageData(); PageData pd = new PageData();
@ -407,8 +458,10 @@ public class AppGFElectricityController 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); saveImgMap.put("other" + count, JSON.toJSONString(pd));
count += 1;
electricityacceptuserService.save(pd); electricityacceptuserService.save(pd);
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
} }
} }
} }
@ -425,6 +478,11 @@ public class AppGFElectricityController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFelectricityService.findById(pd); pd2 = GFelectricityService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -436,7 +494,7 @@ public class AppGFElectricityController 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)); // 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)) { if ("2".equals(status) || "3".equals(status) || "4".equals(status)) {
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
@ -456,20 +514,26 @@ public class AppGFElectricityController extends BaseController {
String SIGNTIME[] = pd.getString("SIGNTIME").split(","); String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<String>(); ArrayList<String> pictureList = new ArrayList<String>();
Map<String,String> saveAcceptImgMap = new HashMap<String,String>();
int count = 1;
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("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,saveAcceptImgMap,count);
fileList.clear(); fileList.clear();
count++;
} }
map.put("sendPicturesList", JSON.toJSONString(pictureList)); 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"));
GFelectricityService.edit(pd2); GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过"); log.put("ACTION", "验收通过");
// 发短信 // 发短信
@ -498,7 +562,10 @@ public class AppGFElectricityController 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"));
GFelectricityService.edit(pd2); GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData electricitydockDatapd21 = new PageData(); // pd对接数据
electricitydockDatapd21.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd21));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData mes3 = new PageData(); PageData mes3 = new PageData();
mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
@ -529,13 +596,18 @@ public class AppGFElectricityController extends BaseController {
break; break;
} }
GFelectricityLogService.save(log); GFelectricityLogService.save(log);
map.put("dockDataLog", JSON.toJSONString(log)); PageData electricitydockDataLog = new PageData(); // pd对接数据
electricitydockDataLog.putAll(log);
dockData.put("dockDataLog", JSON.toJSONString(electricitydockDataLog));
// 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 ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{ private void saveAcceptImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID,
String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID,
ArrayList<String> pictureList,Map<String,String> saveAcceptImgMap,int count) throws Exception{
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData(); PageData cpd = new PageData();
@ -556,8 +628,10 @@ public class AppGFElectricityController 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); saveAcceptImgMap.put("other" + count, JSON.toJSONString(cpd));
count++;
electricityacceptuserService.save(cpd); electricityacceptuserService.save(cpd);
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
} }
} }
} }
@ -578,6 +652,11 @@ public class AppGFElectricityController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFelectricityService.findById(pd); pd2 = GFelectricityService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -589,7 +668,7 @@ public class AppGFElectricityController 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)); // 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)) { if ("2".equals(status) || "3".equals(status) || "4".equals(status)) {
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
@ -618,10 +697,19 @@ public class AppGFElectricityController extends BaseController {
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"));
GFelectricityService.edit(pd2); GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
GFelectricityToMeasuresService.delete(pd); GFelectricityToMeasuresService.delete(pd);
map.put("dockDataDel", JSON.toJSONString(pd)); PageData electricitydockDataDel = new PageData(); // pd对接数据
electricitydockDataDel.putAll(pd);
dockData.put("dockDataDel", JSON.toJSONString(electricitydockDataDel));
// map.put("dockDataDel", JSON.toJSONString(pd));
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>(); HashMap<String, String> measuresMap = new HashMap<String, String>();
int measuresCount = 1; int measuresCount = 1;
@ -637,7 +725,10 @@ public class AppGFElectricityController extends BaseController {
measuresCount+=1; measuresCount+=1;
GFelectricityToMeasuresService.save(measures); GFelectricityToMeasuresService.save(measures);
} }
map.put("dockDatameasures", JSON.toJSONString(measuresMap)); PageData electricitydockDatameasures = new PageData(); // pd对接数据
electricitydockDatameasures.putAll(measuresMap);
dockData.put("dockDatameasures", JSON.toJSONString(electricitydockDatameasures));
// map.put("dockDatameasures", JSON.toJSONString(measuresMap));
log.put("ACTION", "作业单位通过"); log.put("ACTION", "作业单位通过");
// 发短信 // 发短信
@ -700,7 +791,10 @@ public class AppGFElectricityController extends BaseController {
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"));
GFelectricityService.edit(pd2); GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "用电单位审核通过"); log.put("ACTION", "用电单位审核通过");
// 发短信 // 发短信
@ -751,7 +845,10 @@ public class AppGFElectricityController extends BaseController {
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"));
GFelectricityService.edit(pd2); GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "配送电单位审批通过"); log.put("ACTION", "配送电单位审批通过");
// 发短信 // 发短信
@ -802,7 +899,10 @@ public class AppGFElectricityController extends BaseController {
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"));
GFelectricityService.edit(pd2); GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过"); log.put("ACTION", "验收通过");
// 发短信 // 发短信
@ -831,7 +931,10 @@ public class AppGFElectricityController extends BaseController {
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"));
GFelectricityService.edit(pd2); GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData mes = new PageData(); PageData mes = new PageData();
mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
@ -863,7 +966,10 @@ public class AppGFElectricityController extends BaseController {
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"));
GFelectricityService.edit(pd2); GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData electricitydockDatapd21 = new PageData(); // pd对接数据
electricitydockDatapd21.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd21));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData mes1 = new PageData(); PageData mes1 = new PageData();
mes1.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid mes1.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
@ -894,7 +1000,10 @@ public class AppGFElectricityController extends BaseController {
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"));
GFelectricityService.edit(pd2); GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData electricitydockDatapd22 = new PageData(); // pd对接数据
electricitydockDatapd22.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd22));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
// 发短信 // 发短信
PageData mes2 = new PageData(); PageData mes2 = new PageData();
@ -927,7 +1036,10 @@ public class AppGFElectricityController 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"));
GFelectricityService.edit(pd2); GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData electricitydockDatapd23 = new PageData(); // pd对接数据
electricitydockDatapd23.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd23));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData mes3 = new PageData(); PageData mes3 = new PageData();
mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
@ -958,7 +1070,10 @@ public class AppGFElectricityController extends BaseController {
break; break;
} }
GFelectricityLogService.save(log); GFelectricityLogService.save(log);
map.put("dockDataLog", JSON.toJSONString(log)); PageData electricitydockDataLog = new PageData(); // pd对接数据
electricitydockDataLog.putAll(log);
dockData.put("dockDataLog", JSON.toJSONString(electricitydockDataLog));
// map.put("dockDataLog", JSON.toJSONString(log));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -1055,6 +1170,11 @@ public class AppGFElectricityController extends BaseController {
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();
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
cpd = GFelectricityService.findById(pd); cpd = GFelectricityService.findById(pd);
if(cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null){ if(cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null){
String WORK_START_DATE = pd.getString("WORK_START_DATE"); String WORK_START_DATE = pd.getString("WORK_START_DATE");
@ -1073,7 +1193,10 @@ public class AppGFElectricityController extends BaseController {
if (workTime - analyzeTime >= 0) { if (workTime - analyzeTime >= 0) {
return; return;
} else { } else {
map.put("dockData", JSON.toJSONString(pd)); PageData electricityPageData1 = new PageData(); // pd对接数据
electricityPageData1.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData1));
// map.put("dockData", JSON.toJSONString(pd));
GFelectricityService.cancel(pd); GFelectricityService.cancel(pd);
PageData mes = new PageData(); PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
@ -1098,14 +1221,20 @@ public class AppGFElectricityController extends BaseController {
e.printStackTrace(); e.printStackTrace();
} }
}else{ }else{
map.put("dockData", JSON.toJSONString(pd)); PageData electricityPageData1 = new PageData(); // pd对接数据
electricityPageData1.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData1));
// map.put("dockData", JSON.toJSONString(pd));
GFelectricityService.cancel(pd); GFelectricityService.cancel(pd);
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFelectricityService.checkno(pd); pd2 = GFelectricityService.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("dockDatapd2", JSON.toJSONString(pd3)); PageData electricitydockDatapd3 = new PageData(); // pd对接数据
electricitydockDatapd3.putAll(pd3);
dockData.put("dockDatapd3", JSON.toJSONString(electricitydockDatapd3));
// map.put("dockDatapd3", JSON.toJSONString(pd3));
GFelectricityService.editSpecialwork(pd3); GFelectricityService.editSpecialwork(pd3);
GFelectricityService.editSpecialwork1(pd3); GFelectricityService.editSpecialwork1(pd3);
GFelectricityService.editSpecialwork2(pd3); GFelectricityService.editSpecialwork2(pd3);
@ -1133,6 +1262,7 @@ public class AppGFElectricityController extends BaseController {
paramsList.add(params2); paramsList.add(params2);
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return ; return ;
} }
@ -1187,8 +1317,13 @@ public class AppGFElectricityController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
GFelectricityGasService.delete(pd); GFelectricityGasService.delete(pd);
map.put("dockData", JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -1205,11 +1340,16 @@ public class AppGFElectricityController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
pd.put("ELECTRICITYGAS_ID", this.get32UUID()); //主键 pd.put("ELECTRICITYGAS_ID", this.get32UUID()); //主键
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
GFelectricityGasService.save(pd); GFelectricityGasService.save(pd);
GFelectricityService.edittime(pd); GFelectricityService.edittime(pd);
map.put("dockData", JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }

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

@ -95,7 +95,12 @@ public class AppGFHoistingController 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)); // map.put("dockData", JSON.toJSONString(pd));
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
GFhoistingService.save(pd); GFhoistingService.save(pd);
if(pd.get("APPLY_STATUS").equals("1")) { if(pd.get("APPLY_STATUS").equals("1")) {
@ -105,7 +110,10 @@ public class AppGFHoistingController extends BaseController {
log.put("HOISTING_ID", pd.get("HOISTING_ID")); log.put("HOISTING_ID", pd.get("HOISTING_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("logData", JSON.toJSONString(log)); // map.put("logData", JSON.toJSONString(log));
PageData electricitylogData = new PageData(); // pd对接数据
electricitylogData.putAll(log);
dockData.put("logData", JSON.toJSONString(electricitylogData));
GFhighWorkLogService.save(log); GFhighWorkLogService.save(log);
// 发短信 // 发短信
@ -138,6 +146,7 @@ public class AppGFHoistingController extends BaseController {
paramsList.add(params4); paramsList.add(params4);
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -153,8 +162,13 @@ public class AppGFHoistingController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
GFhoistingService.delete(pd); GFhoistingService.delete(pd);
map.put("dockData", JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -172,8 +186,13 @@ public class AppGFHoistingController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
GFhoistingService.edit(pd); GFhoistingService.edit(pd);
map.put("dockData", JSON.toJSONString(pd)); // map.put("dockData", JSON.toJSONString(pd));
if(pd.get("APPLY_STATUS").equals("1")) { if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData(); PageData log = new PageData();
log.put("HOISTINGLOG_ID", this.get32UUID()); log.put("HOISTINGLOG_ID", this.get32UUID());
@ -182,7 +201,10 @@ public class AppGFHoistingController 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()));
GFhighWorkLogService.save(log); GFhighWorkLogService.save(log);
map.put("logData", JSON.toJSONString(log)); PageData electricitylogData = new PageData(); // pd对接数据
electricitylogData.putAll(log);
dockData.put("logData", JSON.toJSONString(electricitylogData));
// map.put("logData", JSON.toJSONString(log));
// 发短信 // 发短信
PageData mes = new PageData(); PageData mes = new PageData();
@ -214,6 +236,7 @@ public class AppGFHoistingController extends BaseController {
paramsList.add(params4); paramsList.add(params4);
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -232,6 +255,11 @@ public class AppGFHoistingController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFhoistingService.findById(pd); pd2 = GFhoistingService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -247,10 +275,14 @@ public class AppGFHoistingController extends BaseController {
map.put("sendPicturesList", JSON.toJSONString(pictureList)); 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"));
map.put("dockData", JSON.toJSONString(pd2));
PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -269,6 +301,11 @@ public class AppGFHoistingController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFhoistingService.findById(pd); pd2 = GFhoistingService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -287,7 +324,10 @@ public class AppGFHoistingController extends BaseController {
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)); PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
// map.put("dockData", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
} }
map.put("result", errInfo); map.put("result", errInfo);
@ -306,29 +346,47 @@ public class AppGFHoistingController extends BaseController {
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)); PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
// map.put("dockData", JSON.toJSONString(pd));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2 = GFhoistingService.findById(pd); pd2 = GFhoistingService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
map.put("dockData2", JSON.toJSONString(pd2)); PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
List<MultipartFile> fileList = new ArrayList<MultipartFile>(); List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = ""; String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(","); String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<String>(); ArrayList<String> pictureList = new ArrayList<String>();
Map<String, String> saveImgMap = new HashMap<String, String>();
int count = 1;
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("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList); saveImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),
pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),
pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList, saveImgMap,count);
fileList.clear(); fileList.clear();
count++;
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
private void saveImg(MultipartFile[] files,String signertime, String HOISTING_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID,ArrayList<String> pictureList) throws Exception{ private void saveImg(MultipartFile[] files,String signertime, String HOISTING_ID,
String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID,
String ACCEPT_CONFESS_DEPARTMENT_ID,
ArrayList<String> pictureList,
Map<String, String> saveImgMap,int count) throws Exception{
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
PageData pd = new PageData(); PageData pd = new PageData();
@ -349,6 +407,8 @@ public class AppGFHoistingController 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", "");
saveImgMap.put("other" + count, JSON.toJSONString(pd));
count++;
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName); pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
hoistingacceptuserService.save(pd); hoistingacceptuserService.save(pd);
} }
@ -381,7 +441,12 @@ public class AppGFHoistingController 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)); PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
// map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString(); String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
@ -398,19 +463,27 @@ public class AppGFHoistingController extends BaseController {
String signertime = ""; String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(","); String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
Map<String, String> saveAcceptImgMap = new HashMap<String, String>();
int count = 1;
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("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList); saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),
map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),
pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList, saveAcceptImgMap,count);
fileList.clear(); fileList.clear();
count++;
} }
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData2", JSON.toJSONString(pd2)); // map.put("dockData2", JSON.toJSONString(pd2));
PageData electricitydockData2 = new PageData(); // pd对接数据
electricitydockData2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockData2));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
log.put("ACTION", "验收通过"); log.put("ACTION", "验收通过");
@ -441,7 +514,10 @@ public class AppGFHoistingController 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("dockData2", JSON.toJSONString(pd2)); // map.put("dockData2", JSON.toJSONString(pd2));
PageData electricitydockData23 = new PageData(); // pd对接数据
electricitydockData23.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockData23));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
@ -473,13 +549,17 @@ public class AppGFHoistingController extends BaseController {
default: default:
break; break;
} }
map.put("dockDataLog", JSON.toJSONString(log)); PageData electricitydockDataLog = new PageData(); // pd对接数据
electricitydockDataLog.putAll(log);
dockData.put("dockDataLog", JSON.toJSONString(electricitydockDataLog));
// map.put("dockDataLog", JSON.toJSONString(log));
GFhighWorkLogService.save(log); GFhighWorkLogService.save(log);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
private void saveAcceptImg(MultipartFile[] files,String signertime, String HOISTING_ID, private void saveAcceptImg(MultipartFile[] files,String signertime, String HOISTING_ID,
String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{ String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID,
ArrayList<String> pictureList, Map<String, String> saveAcceptImgMap,int count) throws Exception{
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData(); PageData cpd = new PageData();
@ -500,6 +580,8 @@ public class AppGFHoistingController 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);
saveAcceptImgMap.put("other" + count,JSON.toJSONString(cpd));
count++;
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName); pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
hoistingacceptuserService.save(cpd); hoistingacceptuserService.save(cpd);
} }
@ -532,7 +614,12 @@ public class AppGFHoistingController 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)); PageData dockData = new PageData(); // 主要对接数据
PageData electricityPageData = new PageData(); // pd对接数据
electricityPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(electricityPageData));
// map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString(); String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
@ -565,10 +652,18 @@ public class AppGFHoistingController extends BaseController {
} }
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
// pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION); // pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION);
map.put("dockData2", JSON.toJSONString(pd2)); // map.put("dockData2", JSON.toJSONString(pd2));
PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
map.put("dockDataDel", JSON.toJSONString(pd));
PageData electricitydockDataDel = new PageData(); // pd对接数据
electricitydockDataDel.putAll(pd);
dockData.put("dockDataDel", JSON.toJSONString(electricitydockDataDel));
// map.put("dockDataDel", JSON.toJSONString(pd));
GFhighWorkToMeasuresService.delete(pd); GFhighWorkToMeasuresService.delete(pd);
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>(); HashMap<String, String> measuresMap = new HashMap<String, String>();
int measuresCount = 1; int measuresCount = 1;
@ -585,7 +680,10 @@ public class AppGFHoistingController extends BaseController {
measuresCount+=1; measuresCount+=1;
GFhighWorkToMeasuresService.save(measures); GFhighWorkToMeasuresService.save(measures);
} }
map.put("measuresData", JSON.toJSONString(measuresMap)); PageData electricitydockmeasuresData = new PageData(); // pd对接数据
electricitydockmeasuresData.putAll(measuresMap);
dockData.put("measuresData", JSON.toJSONString(electricitydockmeasuresData));
// map.put("measuresData", JSON.toJSONString(measuresMap));
log.put("ACTION", "作业指挥通过"); log.put("ACTION", "作业指挥通过");
// 发短信 // 发短信
@ -660,7 +758,10 @@ public class AppGFHoistingController extends BaseController {
} }
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData2", JSON.toJSONString(pd2)); // map.put("dockData2", JSON.toJSONString(pd2));
PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
log.put("ACTION", "所在单位通过"); log.put("ACTION", "所在单位通过");
@ -729,7 +830,10 @@ public class AppGFHoistingController extends BaseController {
} }
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData2", JSON.toJSONString(pd2)); // map.put("dockData2", JSON.toJSONString(pd2));
PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
log.put("ACTION", "审核部门通过"); log.put("ACTION", "审核部门通过");
@ -789,7 +893,10 @@ public class AppGFHoistingController extends BaseController {
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"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
map.put("dockData2", JSON.toJSONString(pd2)); // map.put("dockData2", JSON.toJSONString(pd2));
PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
log.put("ACTION", "审批部门通过"); log.put("ACTION", "审批部门通过");
@ -841,7 +948,10 @@ public class AppGFHoistingController extends BaseController {
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData2", JSON.toJSONString(pd2)); // map.put("dockData2", JSON.toJSONString(pd2));
PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
log.put("ACTION", "验收通过"); log.put("ACTION", "验收通过");
@ -871,7 +981,10 @@ public class AppGFHoistingController 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("LEADER_CONTENT", pd.get("CONTENT")); pd2.put("LEADER_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2)); // map.put("dockData2", JSON.toJSONString(pd2));
PageData electricitydockDatapd2 = new PageData(); // pd对接数据
electricitydockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd2));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
@ -905,7 +1018,10 @@ public class AppGFHoistingController 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("CONSTRUCTION_CONTENT", pd.get("CONTENT")); pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2)); // map.put("dockData2", JSON.toJSONString(pd2));
PageData electricitydockDatapd21 = new PageData(); // pd对接数据
electricitydockDatapd21.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd21));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
// 发短信 // 发短信
@ -937,7 +1053,10 @@ public class AppGFHoistingController 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("dockData2", JSON.toJSONString(pd2)); // map.put("dockData2", JSON.toJSONString(pd2));
PageData electricitydockDatapd22 = new PageData(); // pd对接数据
electricitydockDatapd22.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd22));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
// 发短信 // 发短信
@ -969,7 +1088,10 @@ public class AppGFHoistingController 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("dockData2", JSON.toJSONString(pd2)); // map.put("dockData2", JSON.toJSONString(pd2));
PageData electricitydockDatapd23 = new PageData(); // pd对接数据
electricitydockDatapd23.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd23));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
// 发短信 // 发短信
@ -1001,7 +1123,10 @@ public class AppGFHoistingController 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("dockData2", JSON.toJSONString(pd2)); // map.put("dockData2", JSON.toJSONString(pd2));
PageData electricitydockDatapd24 = new PageData(); // pd对接数据
electricitydockDatapd24.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(electricitydockDatapd24));
GFhoistingService.edit(pd2); GFhoistingService.edit(pd2);
@ -1033,8 +1158,12 @@ public class AppGFHoistingController extends BaseController {
default: default:
break; break;
} }
map.put("dockDataLog", JSON.toJSONString(log)); PageData electricitydockDataLog = new PageData(); // pd对接数据
electricitydockDataLog.putAll(log);
dockData.put("dockDataLog", JSON.toJSONString(electricitydockDataLog));
// map.put("dockDataLog", JSON.toJSONString(log));
GFhighWorkLogService.save(log); GFhighWorkLogService.save(log);
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }

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

@ -107,7 +107,12 @@ 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)); PageData dockData = new PageData(); // 主要对接数据
PageData confinedGasPageData = new PageData(); // pd对接数据
confinedGasPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedGasPageData));
// 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")) {
@ -117,7 +122,10 @@ 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)); // map.put("dockDataLog", JSON.toJSONString(log));
PageData confinedGasdockDataLog = new PageData(); // pd对接数据
confinedGasdockDataLog.putAll(log);
dockData.put("dockDataLog", JSON.toJSONString(confinedGasdockDataLog));
GFhotworkLogService.save(log); GFhotworkLogService.save(log);
// 发短信 // 发短信
@ -179,6 +187,7 @@ public class AppGFHotworkController extends BaseController {
tenCorpDto.setMessage(TenCorpConst.hotWork); tenCorpDto.setMessage(TenCorpConst.hotWork);
mqClient.SendDelayQueue(tenCorpDto); mqClient.SendDelayQueue(tenCorpDto);
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -193,8 +202,13 @@ public class AppGFHotworkController extends BaseController {
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)); PageData dockData = new PageData(); // 主要对接数据
PageData confinedGasPageData = new PageData(); // pd对接数据
confinedGasPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedGasPageData));
GFhotworkService.delete(pd); GFhotworkService.delete(pd);
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -210,7 +224,12 @@ public class AppGFHotworkController extends BaseController {
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)); // map.put("dockData", JSON.toJSONString(pd));
PageData dockData = new PageData(); // 主要对接数据
PageData confinedGasPageData = new PageData(); // pd对接数据
confinedGasPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedGasPageData));
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();
@ -219,7 +238,10 @@ 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)); // map.put("dockDataLog", JSON.toJSONString(log));
PageData confineddockDataLog = new PageData(); // pd对接数据
confineddockDataLog.putAll(log);
dockData.put("dockDataLog", JSON.toJSONString(confineddockDataLog));
GFhotworkLogService.save(log); GFhotworkLogService.save(log);
@ -262,6 +284,7 @@ public class AppGFHotworkController extends BaseController {
tenCorpDto.setMessage(TenCorpConst.hotWork); tenCorpDto.setMessage(TenCorpConst.hotWork);
mqClient.SendDelayQueue(tenCorpDto); mqClient.SendDelayQueue(tenCorpDto);
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -281,6 +304,11 @@ public class AppGFHotworkController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); 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(); PageData pd2 = new PageData();
pd2 = GFhotworkService.findById(pd); pd2 = GFhotworkService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -299,10 +327,14 @@ public class AppGFHotworkController extends BaseController {
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)); PageData confinedGasdockDatapd2 = new PageData(); // pd对接数据
confinedGasdockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confinedGasdockDatapd2));
// map.put("dockData", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -322,6 +354,11 @@ public class AppGFHotworkController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); 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(); PageData pd2 = new PageData();
pd2 = GFhotworkService.findById(pd); pd2 = GFhotworkService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -340,7 +377,10 @@ public class AppGFHotworkController extends BaseController {
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)); // map.put("dockData", JSON.toJSONString(pd2));
PageData confinedGasdockDatapd2 = new PageData(); // pd对接数据
confinedGasdockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confinedGasdockDatapd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
} }
map.put("result", errInfo); map.put("result", errInfo);
@ -360,6 +400,11 @@ public class AppGFHotworkController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); 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(); PageData pd2 = new PageData();
pd2 = GFhotworkService.findById(pd); pd2 = GFhotworkService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -370,26 +415,28 @@ public class AppGFHotworkController extends BaseController {
ArrayList<String> pictureList = new ArrayList<>(); ArrayList<String> pictureList = new ArrayList<>();
HashMap<String, String> pdMap = new HashMap<String, String>(); HashMap<String, String> pdMap = new HashMap<String, String>();
int count = 1;
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"), saveImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"),
pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"),
pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"), pictureList, pdMap); pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"), pictureList, pdMap, count);
fileList.clear(); fileList.clear();
count++;
} }
dockData.put("pdMap", JSON.toJSONString(pdMap));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("dockData", JSON.toJSONString(pdMap)); map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
private void saveImg(MultipartFile[] files, String signertime, String HOTWORK_ID, private void saveImg(MultipartFile[] files, String signertime, String HOTWORK_ID,
String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID,
String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList, Map<String, String> pdMap) throws Exception { String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList, Map<String, String> pdMap,int count) 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();
@ -432,6 +479,11 @@ public class AppGFHotworkController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); 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(); PageData pd2 = new PageData();
pd2 = GFhotworkService.findById(pd); pd2 = GFhotworkService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -443,7 +495,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)); // 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") : "") +
@ -462,6 +514,7 @@ public class AppGFHotworkController extends BaseController {
ArrayList<String> pictureList = new ArrayList<>(); ArrayList<String> pictureList = new ArrayList<>();
HashMap<String, String> pdMap = new HashMap<String, String>(); HashMap<String, String> pdMap = new HashMap<String, String>();
int count = 1;
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));
@ -471,15 +524,20 @@ public class AppGFHotworkController extends BaseController {
pd.getString("CORPINFO_ID"), pd.getString("CORPINFO_ID"),
pd.getString("ACCEPT_USER_ID"), pd.getString("ACCEPT_USER_ID"),
pd.getString("ACCEPT_DEPARTMENT_ID"), pd.getString("ACCEPT_DEPARTMENT_ID"),
pictureList, pdMap); pictureList, pdMap, count);
fileList.clear(); fileList.clear();
count++;
} }
map.put("pdMap", JSON.toJSONString(pdMap)); dockData.put("pdMap", JSON.toJSONString(pdMap));
// map.put("pdMap", JSON.toJSONString(pdMap));
map.put("sendPicturesList", JSON.toJSONString(pictureList)); 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)); PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过"); log.put("ACTION", "验收通过");
// 发短信 // 发短信
@ -508,7 +566,10 @@ 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 confineddockDatapd21 = new PageData(); // pd对接数据
confineddockDatapd21.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd21));
// map.put("dockDatapd2", JSON.toJSONString(pd2));
// 发短信 // 发短信
PageData mes6 = new PageData(); PageData mes6 = new PageData();
@ -539,7 +600,10 @@ public class AppGFHotworkController extends BaseController {
break; break;
} }
GFhotworkLogService.save(log); GFhotworkLogService.save(log);
map.put("dockDataLog", JSON.toJSONString(log)); PageData confineddockDataLog = new PageData(); // pd对接数据
confineddockDataLog.putAll(log);
dockData.put("dockDataLog", JSON.toJSONString(confineddockDataLog));
// map.put("dockDataLog", JSON.toJSONString(log));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -552,9 +616,8 @@ public class AppGFHotworkController extends BaseController {
String ACCEPT_USER_ID, String ACCEPT_USER_ID,
String ACCEPT_DEPARTMENT_ID, String ACCEPT_DEPARTMENT_ID,
ArrayList<String> pictureList, ArrayList<String> pictureList,
HashMap<String, String> pdMap) throws Exception{ HashMap<String, String> pdMap,int count) 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();
@ -599,6 +662,11 @@ public class AppGFHotworkController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); 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(); PageData pd2 = new PageData();
pd2 = GFhotworkService.findById(pd); pd2 = GFhotworkService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -636,7 +704,10 @@ public class AppGFHotworkController extends BaseController {
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)); PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
// 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());
@ -658,7 +729,8 @@ public class AppGFHotworkController extends BaseController {
measuresCount += 1; measuresCount += 1;
GFhotworkToMeasuresService.save(measures); GFhotworkToMeasuresService.save(measures);
} }
map.put("dockDatameasuresMap", JSON.toJSONString(measuresMap)); dockData.put("dockDatameasuresMap", JSON.toJSONString(measuresMap));
// map.put("dockDatameasuresMap", JSON.toJSONString(measuresMap));
log.put("ACTION", "作业单位通过"); log.put("ACTION", "作业单位通过");
@ -752,7 +824,10 @@ 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)); // map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
log.put("ACTION", "单位负责人确认"); log.put("ACTION", "单位负责人确认");
@ -804,17 +879,23 @@ public class AppGFHotworkController extends BaseController {
case "5"://审批人审批 case "5"://审批人审批
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("AUDIT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("AUDIT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
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)); // map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
log.put("ACTION", "安全部门审核通过"); log.put("ACTION", "安全部门审核通过");
@ -859,17 +940,23 @@ public class AppGFHotworkController extends BaseController {
case "6"://审批部门 case "6"://审批部门
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("APPROVE_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("APPROVE_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
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)); // map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
log.put("ACTION", "审批部门通过"); log.put("ACTION", "审批部门通过");
@ -908,18 +995,24 @@ public class AppGFHotworkController extends BaseController {
case "7"://班长 case "7"://班长
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("MONITOR_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("MONITOR_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
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)); // map.put("dockDatapd2", JSON.toJSONString(pd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
log.put("ACTION", "班长验票通过"); log.put("ACTION", "班长验票通过");
// 发短信 // 发短信
@ -976,17 +1069,23 @@ public class AppGFHotworkController extends BaseController {
case "8"://验收人 case "8"://验收人
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("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
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)); // map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
log.put("ACTION", "验收通过"); log.put("ACTION", "验收通过");
@ -1015,7 +1114,10 @@ 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)); // map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData confineddockDatapd2 = new PageData(); // pd对接数据
confineddockDatapd2.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd2));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
// 发短信 // 发短信
@ -1076,7 +1178,10 @@ 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)); // map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData confineddockDatapd21 = new PageData(); // pd对接数据
confineddockDatapd21.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd21));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
// 发短信 // 发短信
@ -1108,7 +1213,10 @@ 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)); // map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData confineddockDatapd22 = new PageData(); // pd对接数据
confineddockDatapd22.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd22));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
// 发短信 // 发短信
@ -1140,7 +1248,10 @@ 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)); // map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData confineddockDatapd23 = new PageData(); // pd对接数据
confineddockDatapd23.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd23));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
// 发短信 // 发短信
PageData mes4 = new PageData(); PageData mes4 = new PageData();
@ -1171,7 +1282,10 @@ 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)); // map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData confineddockDatapd24 = new PageData(); // pd对接数据
confineddockDatapd24.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd24));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
// 发短信 // 发短信
PageData mes5 = new PageData(); PageData mes5 = new PageData();
@ -1202,7 +1316,10 @@ 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)); // map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData confineddockDatapd25 = new PageData(); // pd对接数据
confineddockDatapd25.putAll(pd2);
dockData.put("dockDatapd2", JSON.toJSONString(confineddockDatapd25));
GFhotworkService.edit(pd2); GFhotworkService.edit(pd2);
// 发短信 // 发短信
@ -1233,8 +1350,12 @@ public class AppGFHotworkController extends BaseController {
default: default:
break; break;
} }
map.put("dockDataLog", JSON.toJSONString(log)); PageData confineddockDataLog = new PageData(); // pd对接数据
confineddockDataLog.putAll(log);
dockData.put("dockDataLog", JSON.toJSONString(confineddockDataLog));
// map.put("dockDataLog", JSON.toJSONString(log));
GFhotworkLogService.save(log); GFhotworkLogService.save(log);
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -1251,8 +1372,17 @@ public class AppGFHotworkController extends BaseController {
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();
PageData dockData = new PageData(); // 主要对接数据
PageData confinedGasPageData = new PageData(); // pd对接数据
confinedGasPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedGasPageData));
cpd = GFhotworkService.findById(pd); cpd = GFhotworkService.findById(pd);
map.put("dockDatacpd", JSON.toJSONString(cpd));
PageData confineddockDatacpd = new PageData(); // pd对接数据
confineddockDatacpd.putAll(cpd);
dockData.put("dockDatacpd", JSON.toJSONString(confineddockDatacpd));
// 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");
@ -1301,14 +1431,21 @@ 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));
PageData confineddockData1 = new PageData(); // pd对接数据
confineddockData1.putAll(pd);
dockData.put("dockData1", JSON.toJSONString(confineddockData1));
// map.put("dockData1", 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)); // map.put("dockDatapd3", JSON.toJSONString(pd3));
PageData confineddockDatapd3 = new PageData(); // pd对接数据
confineddockDatapd3.putAll(pd3);
dockData.put("dockDatapd3", JSON.toJSONString(confineddockDatapd3));
GFhotworkService.editSpecialwork(pd3); GFhotworkService.editSpecialwork(pd3);
GFhotworkService.editSpecialwork1(pd3); GFhotworkService.editSpecialwork1(pd3);
GFhotworkService.editSpecialwork2(pd3); GFhotworkService.editSpecialwork2(pd3);
@ -1337,14 +1474,20 @@ 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)); // map.put("dockData", JSON.toJSONString(pd));
PageData confineddockData1 = new PageData(); // pd对接数据
confineddockData1.putAll(pd);
dockData.put("dockData1", JSON.toJSONString(confineddockData1));
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)); // map.put("dockDatapd3", JSON.toJSONString(pd3));
PageData confineddockDatapd3 = new PageData(); // pd对接数据
confineddockDatapd3.putAll(pd3);
dockData.put("dockDatapd3", JSON.toJSONString(confineddockDatapd3));
GFhotworkService.editSpecialwork(pd3); GFhotworkService.editSpecialwork(pd3);
GFhotworkService.editSpecialwork1(pd3); GFhotworkService.editSpecialwork1(pd3);
GFhotworkService.editSpecialwork2(pd3); GFhotworkService.editSpecialwork2(pd3);
@ -1373,6 +1516,7 @@ public class AppGFHotworkController extends BaseController {
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
} }
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return ; return ;
} }
@ -1509,8 +1653,13 @@ public class AppGFHotworkController extends BaseController {
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)); PageData dockData = new PageData(); // 主要对接数据
PageData confinedGasPageData = new PageData(); // pd对接数据
confinedGasPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedGasPageData));
GFhotworkGasService.delete(pd); GFhotworkGasService.delete(pd);
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -1527,11 +1676,16 @@ public class AppGFHotworkController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData dockData = new PageData(); // 主要对接数据
PageData confinedGasPageData = new PageData(); // pd对接数据
confinedGasPageData.putAll(pd);
dockData.put("dockData", JSON.toJSONString(confinedGasPageData));
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("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }