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

应急资源管理bug修改

pull/14/head
limingyu 2024-01-04 14:20:36 +08:00
parent d4ae1c385d
commit 746285d34c
6 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.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 EmergencyDrillAttachmentController extends BaseController {
@RequestMapping(value="/add") @RequestMapping(value="/add")
@RequiresPermissions("emergencydrillbasic:add") @RequiresPermissions("emergencydrillbasic: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 EmergencyDrillAttachmentController 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> picturesList = 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 EmergencyDrillAttachmentController 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);
picturesList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(picturesList));
pd.put("DRILL_ATTACHMENT_FILE_NAME", file.getOriginalFilename()); pd.put("DRILL_ATTACHMENT_FILE_NAME", file.getOriginalFilename());
pd.put("DRILL_ATTACHMENT_FILE_PATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); pd.put("DRILL_ATTACHMENT_FILE_PATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
} }
map.put("dockData", JSON.toJSONString(pd));
emergencydrillattachmentService.save(pd); emergencydrillattachmentService.save(pd);
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
@ -84,6 +91,7 @@ public class EmergencyDrillAttachmentController 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";
@ -92,6 +100,7 @@ public class EmergencyDrillAttachmentController 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())); //修改时间
emergencydrillattachmentService.delete(pd); emergencydrillattachmentService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -103,6 +112,7 @@ public class EmergencyDrillAttachmentController extends BaseController {
@RequestMapping(value="/edit") @RequestMapping(value="/edit")
@RequiresPermissions("emergencydrillbasic:edit") @RequiresPermissions("emergencydrillbasic: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";
@ -111,6 +121,7 @@ public class EmergencyDrillAttachmentController 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> picturesList = 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";
@ -125,10 +136,13 @@ public class EmergencyDrillAttachmentController 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);
picturesList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(picturesList));
pd.put("DRILL_ATTACHMENT_FILE_NAME", file.getOriginalFilename()); pd.put("DRILL_ATTACHMENT_FILE_NAME", file.getOriginalFilename());
pd.put("DRILL_ATTACHMENT_FILE_PATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); pd.put("DRILL_ATTACHMENT_FILE_PATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
} }
emergencydrillattachmentService.edit(pd); emergencydrillattachmentService.edit(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -182,6 +196,7 @@ public class EmergencyDrillAttachmentController 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";
@ -193,6 +208,7 @@ public class EmergencyDrillAttachmentController 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));
emergencydrillattachmentService.deleteAll(pd); emergencydrillattachmentService.deleteAll(pd);
errInfo = "success"; errInfo = "success";
}else{ }else{

10
src/main/java/com/zcloud/controller/emergency/EmergencyDrillContentController.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 EmergencyDrillContentController 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 EmergencyDrillContentController 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));
emergencydrillcontentService.save(pd); emergencydrillcontentService.save(pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -61,6 +65,7 @@ public class EmergencyDrillContentController 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 EmergencyDrillContentController 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())); //修改时间
emergencydrillcontentService.delete(pd); emergencydrillcontentService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -80,6 +86,7 @@ public class EmergencyDrillContentController 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 EmergencyDrillContentController 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())); //修改时间
emergencydrillcontentService.edit(pd); emergencydrillcontentService.edit(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -140,6 +148,7 @@ public class EmergencyDrillContentController 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";
@ -152,6 +161,7 @@ public class EmergencyDrillContentController extends BaseController {
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
emergencydrillcontentService.deleteAll(pd); emergencydrillcontentService.deleteAll(pd);
map.put("dockData", JSON.toJSONString(pd));
errInfo = "success"; errInfo = "success";
}else{ }else{
errInfo = "fail"; errInfo = "fail";

10
src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgController.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 EmergencyDrillOrgController 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 EmergencyDrillOrgController 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));
emergencydrillorgService.save(pd); emergencydrillorgService.save(pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -61,6 +65,7 @@ public class EmergencyDrillOrgController 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 EmergencyDrillOrgController 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())); //修改时间
emergencydrillorgService.delete(pd); emergencydrillorgService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -80,6 +86,7 @@ public class EmergencyDrillOrgController 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 EmergencyDrillOrgController 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())); //修改时间
emergencydrillorgService.edit(pd); emergencydrillorgService.edit(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -140,6 +148,7 @@ public class EmergencyDrillOrgController 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";
@ -152,6 +161,7 @@ public class EmergencyDrillOrgController extends BaseController {
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
emergencydrillorgService.deleteAll(pd); emergencydrillorgService.deleteAll(pd);
map.put("dockData", JSON.toJSONString(pd));
errInfo = "success"; errInfo = "success";
}else{ }else{
errInfo = "fail"; errInfo = "fail";

10
src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgMemberController.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 EmergencyDrillOrgMemberController 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";
@ -50,6 +53,7 @@ public class EmergencyDrillOrgMemberController 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
emergencydrillorgmemberService.save(pd); emergencydrillorgmemberService.save(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -61,6 +65,7 @@ public class EmergencyDrillOrgMemberController 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 EmergencyDrillOrgMemberController 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())); //修改时间
emergencydrillorgmemberService.delete(pd); emergencydrillorgmemberService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -80,6 +86,7 @@ public class EmergencyDrillOrgMemberController 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 EmergencyDrillOrgMemberController 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())); //修改时间
emergencydrillorgmemberService.edit(pd); emergencydrillorgmemberService.edit(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -140,6 +148,7 @@ public class EmergencyDrillOrgMemberController 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";
@ -152,6 +161,7 @@ public class EmergencyDrillOrgMemberController extends BaseController {
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
emergencydrillorgmemberService.deleteAll(pd); emergencydrillorgmemberService.deleteAll(pd);
map.put("dockData", JSON.toJSONString(pd));
errInfo = "success"; errInfo = "success";
}else{ }else{
errInfo = "fail"; errInfo = "fail";

16
src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.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 EmergencyDrillReportController extends BaseController {
@RequestMapping(value="/add") @RequestMapping(value="/add")
@RequiresPermissions("emergencydrillbasic:add") @RequiresPermissions("emergencydrillbasic: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 EmergencyDrillReportController 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> picturesList = 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,10 +72,13 @@ public class EmergencyDrillReportController 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);
picturesList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(picturesList));
pd.put("DRILL_REPORT_FILE_NAME", file.getOriginalFilename()); pd.put("DRILL_REPORT_FILE_NAME", file.getOriginalFilename());
pd.put("DRILL_REPORT_FILE_PATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); pd.put("DRILL_REPORT_FILE_PATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
} }
emergencydrillreportService.save(pd); emergencydrillreportService.save(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -84,6 +91,7 @@ public class EmergencyDrillReportController 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";
@ -91,6 +99,7 @@ public class EmergencyDrillReportController 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));
emergencydrillreportService.delete(pd); emergencydrillreportService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
@ -103,6 +112,7 @@ public class EmergencyDrillReportController extends BaseController {
@RequestMapping(value="/edit") @RequestMapping(value="/edit")
@RequiresPermissions("emergencydrillbasic:edit") @RequiresPermissions("emergencydrillbasic: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";
@ -111,6 +121,7 @@ public class EmergencyDrillReportController 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> picturesList = 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";
@ -125,10 +136,13 @@ public class EmergencyDrillReportController 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);
picturesList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(picturesList));
pd.put("DRILL_REPORT_FILE_NAME", file.getOriginalFilename()); pd.put("DRILL_REPORT_FILE_NAME", file.getOriginalFilename());
pd.put("DRILL_REPORT_FILE_PATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); pd.put("DRILL_REPORT_FILE_PATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
} }
emergencydrillreportService.edit(pd); emergencydrillreportService.edit(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -182,6 +196,7 @@ public class EmergencyDrillReportController 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";
@ -194,6 +209,7 @@ public class EmergencyDrillReportController extends BaseController {
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
emergencydrillreportService.deleteAll(pd); emergencydrillreportService.deleteAll(pd);
map.put("dockData", JSON.toJSONString(pd));
errInfo = "success"; errInfo = "success";
}else{ }else{
errInfo = "fail"; errInfo = "fail";

10
src/main/java/com/zcloud/controller/emergency/EmergencyDrillSceneController.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 EmergencyDrillSceneController 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";
@ -50,6 +53,7 @@ public class EmergencyDrillSceneController 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
emergencydrillsceneService.save(pd); emergencydrillsceneService.save(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -61,6 +65,7 @@ public class EmergencyDrillSceneController 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 EmergencyDrillSceneController 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())); //修改时间
emergencydrillsceneService.delete(pd); emergencydrillsceneService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -80,6 +86,7 @@ public class EmergencyDrillSceneController 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 EmergencyDrillSceneController 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())); //修改时间
emergencydrillsceneService.edit(pd); emergencydrillsceneService.edit(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -140,6 +148,7 @@ public class EmergencyDrillSceneController 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";
@ -152,6 +161,7 @@ public class EmergencyDrillSceneController extends BaseController {
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
emergencydrillsceneService.deleteAll(pd); emergencydrillsceneService.deleteAll(pd);
map.put("dockData", JSON.toJSONString(pd));
errInfo = "success"; errInfo = "success";
}else{ }else{
errInfo = "fail"; errInfo = "fail";