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

八项作业

pull/14/head
dearlin 2023-12-25 14:42:45 +08:00
parent c1431c47db
commit 87aee42fdb
6 changed files with 2442 additions and 2244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
1703230140663.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

16
src/main/java/com/zcloud/controller/filemanager/MfolderController.java
View File

@ -52,7 +52,7 @@ public class MfolderController extends BaseController {
@RequestMapping(value="/add") @RequestMapping(value="/add")
@RequiresPermissions("mfolder:add") @RequiresPermissions("mfolder:add")
@ResponseBody @ResponseBody
@DockAnnotation(isAdd = true) @DockAnnotation
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";
@ -80,13 +80,7 @@ public class MfolderController extends BaseController {
@RequiresPermissions("mfolder:add") @RequiresPermissions("mfolder:add")
@ResponseBody @ResponseBody
@DockAnnotation(hasAnnex = true) @DockAnnotation(hasAnnex = true)
public Object add( public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file, @RequestParam(value="NAME",required=false) String NAME, @RequestParam(value="PARENT_ID",required=false) String PARENT_ID, @RequestParam(value="REMARKS",required=false) String REMARKS, @RequestParam(value="SHARE",required=false) String SHARE) throws Exception{
@RequestParam(value="FFILE",required=false) MultipartFile file,
@RequestParam(value="NAME",required=false) String NAME,
@RequestParam(value="PARENT_ID",required=false) String PARENT_ID,
@RequestParam(value="REMARKS",required=false) String REMARKS,
@RequestParam(value="SHARE",required=false) String SHARE
) throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
ArrayList<String> pictureList = new ArrayList<>(); ArrayList<String> pictureList = new ArrayList<>();
String errInfo = "success"; String errInfo = "success";
@ -100,8 +94,6 @@ public class MfolderController extends BaseController {
map.put("msg", "文件格式不正确！"); map.put("msg", "文件格式不正确！");
return map; return map;
} }
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
Long size = file.getSize()/1024; Long size = file.getSize()/1024;
fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); 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);
@ -117,10 +109,6 @@ public class MfolderController extends BaseController {
pd.put("MFOLDER_ID", this.get32UUID()); //主键 pd.put("MFOLDER_ID", this.get32UUID()); //主键
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
mfolderService.save(pd); //存入数据库表 mfolderService.save(pd); //存入数据库表
//存自己表里的附件 使用文件全路径加文件名的方式 示例
// /uploadFiles/yhtp/8415df13cc4c46f0ac32f579462dbb8f/20231215/d3bc85d1bbe84b75b1e6e8b6182dc547.jpg
// @@
// d3bc85d1bbe84b75b1e6e8b6182dc547.jpg
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+ pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+
"@@" "@@"
+fileName); +fileName);

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

File diff suppressed because it is too large Load Diff

373
src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java
View File

@ -2,6 +2,7 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
@ -41,54 +42,62 @@ public class AppGFCutRoadController extends BaseController {
private GFCutRoadAcceptUserService cutroadacceptuserService; private GFCutRoadAcceptUserService cutroadacceptuserService;
@Autowired @Autowired
private SendMessageUtil sendMessageUtil; private SendMessageUtil sendMessageUtil;
/**获取编码
/**
* 获取编码
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/getCode") @RequestMapping(value = "/getCode")
@ResponseBody @ResponseBody
public Object getCode() throws Exception{ public Object getCode() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
DecimalFormat dft=new DecimalFormat("00"); DecimalFormat dft = new DecimalFormat("00");
int year = calendar.get(Calendar.YEAR); int year = calendar.get(Calendar.YEAR);
String month = dft.format(calendar.get(Calendar.MONTH) + 1); String month = dft.format(calendar.get(Calendar.MONTH) + 1);
String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH)); String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH));
pd.put("CREATDATE",year + "-" + month + "-" + day); pd.put("CREATDATE", year + "-" + month + "-" + day);
pd = GFcutRoadService.getCode(pd); //根据ID读取 pd = GFcutRoadService.getCode(pd); //根据ID读取
String code = "DL"+year + month + day + dft.format((Integer.parseInt(pd.get("code").toString())+1)); String code = "DL" + year + month + day + dft.format((Integer.parseInt(pd.get("code").toString()) + 1));
map.put("code", code); map.put("code", code);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**新增 /**
* 新增
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/add") @RequestMapping(value = "/add")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object add( public Object add(
@RequestParam(value="FFILE",required=false) MultipartFile[] files @RequestParam(value = "FFILE", required = false) MultipartFile[] files
) throws Exception{ ) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData pd2 = new PageData(); PageData pd2 = new PageData();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
DecimalFormat dft=new DecimalFormat("00"); DecimalFormat dft = new DecimalFormat("00");
int year = calendar.get(Calendar.YEAR); int year = calendar.get(Calendar.YEAR);
String month = dft.format(calendar.get(Calendar.MONTH) + 1); String month = dft.format(calendar.get(Calendar.MONTH) + 1);
String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH)); String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH));
pd2.put("CREATDATE",year + "-" + month + "-" + day); pd2.put("CREATDATE", year + "-" + month + "-" + day);
pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID")); pd2.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
pd2 = GFcutRoadService.getCode(pd2); //根据ID读取 pd2 = GFcutRoadService.getCode(pd2); //根据ID读取
String code = "DL"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); ArrayList<String> sendPicturesList = new ArrayList<>();
String code = "DL" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1));
pd = this.getPageData(); pd = this.getPageData();
pd.put("CHECK_NO", code); pd.put("CHECK_NO", code);
pd.put("CUTROAD_ID", this.get32UUID()); //主键 pd.put("CUTROAD_ID", this.get32UUID()); //主键
@ -98,25 +107,25 @@ public class AppGFCutRoadController extends BaseController {
pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;");
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
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);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName +
"@@"
+ fileName);
pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
} }
GFcutRoadService.save(pd); GFcutRoadService.save(pd);
if ("1".equals(pd.get("APPLY_STATUS"))) {
if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData(); PageData log = new PageData();
log.put("CUTROADLOG_ID", this.get32UUID()); log.put("CUTROADLOG_ID", this.get32UUID());
log.put("ACTION", "提交申请"); log.put("ACTION", "提交申请");
log.put("CUTROAD_ID", pd.get("CUTROAD_ID")); log.put("CUTROAD_ID", pd.get("CUTROAD_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()));
GFcutRoadLogService.save(log); GFcutRoadLogService.save(log);
pd.put("logData", JSON.toJSONString(log));
// 发短信 // 发短信
PageData mes = new PageData(); PageData mes = new PageData();
@ -149,22 +158,25 @@ public class AppGFCutRoadController extends BaseController {
paramsList.add(params4); paramsList.add(params4);
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
} }
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map; return map;
} }
/**上传图 /**
* 上传图
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/uploadImg") @RequestMapping(value = "/uploadImg")
@ResponseBody @ResponseBody
@Transactional @Transactional
public Object uploadImg( public Object uploadImg(
@RequestParam(value="FFILE",required=false) MultipartFile[] files @RequestParam(value = "FFILE", required = false) MultipartFile[] files
) throws Exception{ ) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -172,7 +184,7 @@ public class AppGFCutRoadController extends BaseController {
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);
map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
@ -182,15 +194,17 @@ public class AppGFCutRoadController extends BaseController {
return map; return map;
} }
/**删除图 /**
* 删除图
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/deleteImg") @RequestMapping(value = "/deleteImg")
@ResponseBody @ResponseBody
@Transactional @Transactional
public Object deleteImg() throws Exception{ public Object deleteImg() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -200,14 +214,16 @@ public class AppGFCutRoadController extends BaseController {
} }
/**删除 /**
* 删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/delete") @RequestMapping(value = "/delete")
@ResponseBody @ResponseBody
public Object delete() throws Exception{ public Object delete() throws Exception {
Map<String,String> map = new HashMap<String,String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -216,37 +232,40 @@ public class AppGFCutRoadController extends BaseController {
return map; return map;
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/edit") @RequestMapping(value = "/edit")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation
public Object edit( public Object edit(
@RequestParam(value="FFILE",required=false) MultipartFile[] files @RequestParam(value = "FFILE", required = false) MultipartFile[] files
) throws Exception{ ) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = this.getPageData();
pd = this.getPageData(); ArrayList<String> sendPicturesList = new ArrayList<>();
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;");
pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;");
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
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);
pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("APPLY_USER_SIGNER_PATH") + "@@" + fileName);
pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
} }
GFcutRoadService.edit(pd); GFcutRoadService.edit(pd);
GFcutRoadToMeasuresService.delete(pd); GFcutRoadToMeasuresService.delete(pd);
if(pd.get("measuresList")!=null){ ArrayList<PageData> measuresdataList = new ArrayList<>();
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());
for (JSONObject json : list) { for (JSONObject json : list) {
PageData measures = new PageData(); PageData measures = new PageData();
@ -258,14 +277,15 @@ public class AppGFCutRoadController extends BaseController {
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"));
GFcutRoadToMeasuresService.save(measures); GFcutRoadToMeasuresService.save(measures);
measuresdataList.add(measures);
} }
} }
if(!pd.get("APPLY_STATUS").equals("0")) { if (!pd.get("APPLY_STATUS").equals("0")) {
PageData log = new PageData(); PageData log = new PageData();
log.put("CUTROADLOG_ID", this.get32UUID()); log.put("CUTROADLOG_ID", this.get32UUID());
log.put("ACTION", "修改申请,重新提交"); log.put("ACTION", "修改申请,重新提交");
log.put("CUTROAD_ID", pd.get("CUTROAD_ID")); log.put("CUTROAD_ID", pd.get("CUTROAD_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()));
GFcutRoadLogService.save(log); GFcutRoadLogService.save(log);
@ -303,17 +323,20 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**修改
/**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/editGuardian") @RequestMapping(value = "/editGuardian")
@ResponseBody @ResponseBody
@Transactional @Transactional
public Object editGuardian( public Object editGuardian(
@RequestParam(value="FFILE",required=false) MultipartFile[] files @RequestParam(value = "FFILE", required = false) MultipartFile[] files
) throws Exception{ ) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -325,7 +348,7 @@ public class AppGFCutRoadController extends BaseController {
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);
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);
@ -336,17 +359,20 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**修改
/**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/editConfess") @RequestMapping(value = "/editConfess")
@ResponseBody @ResponseBody
@Transactional @Transactional
public Object editConfess( public Object editConfess(
@RequestParam(value="FFILE",required=false) MultipartFile[] files @RequestParam(value = "FFILE", required = false) MultipartFile[] files
) throws Exception{ ) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -358,7 +384,7 @@ public class AppGFCutRoadController extends BaseController {
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);
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);
@ -370,11 +396,14 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**修改
/**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/editAcceptconfess") @RequestMapping(value = "/editAcceptconfess")
@ResponseBody @ResponseBody
@Transactional @Transactional
public Object editAcceptconfess(MultipartRequest request) throws Exception { public Object editAcceptconfess(MultipartRequest request) throws Exception {
@ -392,23 +421,24 @@ public class AppGFCutRoadController extends BaseController {
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("CUTROAD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); saveImg(fileList.toArray(fileArr), signertime, pd.getString("CUTROAD_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"), pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
fileList.clear(); fileList.clear();
} }
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
private void saveImg(MultipartFile[] files,String signertime, String CUTROAD_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{
private void saveImg(MultipartFile[] files, String signertime, String CUTROAD_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception {
if (files != null && files.length > 0) { 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();
pd = this.getPageData(); pd = this.getPageData();
MultipartFile file = files[i]; MultipartFile file = files[i];
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 + CORPINFO_ID + "/" + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile);
pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime);
pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); pd.put("ACCEPT_CONFESS_ID", this.get32UUID());
pd.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -419,22 +449,24 @@ public class AppGFCutRoadController extends BaseController {
pd.put("CUTROAD_ID", CUTROAD_ID); pd.put("CUTROAD_ID", CUTROAD_ID);
pd.put("ACCEPT_CONFESS_USER_ID", ACCEPT_CONFESS_USER_ID); pd.put("ACCEPT_CONFESS_USER_ID", ACCEPT_CONFESS_USER_ID);
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", "");
cutroadacceptuserService.save(pd); cutroadacceptuserService.save(pd);
} }
} }
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/editAcceptStatus") @RequestMapping(value = "/editAcceptStatus")
@ResponseBody @ResponseBody
@Transactional @Transactional
public Object editAcceptStatus(MultipartRequest request) throws Exception{ public Object editAcceptStatus(MultipartRequest request) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -447,7 +479,7 @@ public class AppGFCutRoadController extends BaseController {
log.put("CUTROADLOG_ID", this.get32UUID()); log.put("CUTROADLOG_ID", this.get32UUID());
// log.put("ACTION", "审核打回"); // log.put("ACTION", "审核打回");
log.put("CUTROAD_ID", pd.get("CUTROAD_ID")); log.put("CUTROAD_ID", pd.get("CUTROAD_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()));
String status = pd.get("STATUS").toString(); String status = pd.get("STATUS").toString();
@ -467,9 +499,9 @@ public class AppGFCutRoadController extends BaseController {
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("BREAKGROUND_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); saveAcceptImg(fileList.toArray(fileArr), signertime, pd.getString("BREAKGROUND_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_USER_ID"), pd.getString("ACCEPT_DEPARTMENT_ID"));
fileList.clear(); fileList.clear();
} }
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
@ -481,7 +513,7 @@ public class AppGFCutRoadController extends BaseController {
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2);
break; break;
@ -491,7 +523,7 @@ public class AppGFCutRoadController extends BaseController {
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
GFcutRoadService.edit(pd2); GFcutRoadService.edit(pd2);
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2);
break; break;
default: default:
break; break;
@ -501,15 +533,15 @@ public class AppGFCutRoadController extends BaseController {
return map; return map;
} }
private void saveAcceptImg(MultipartFile[] files,String signertime, String BREAKGROUND_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ private void saveAcceptImg(MultipartFile[] files, String signertime, String BREAKGROUND_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception {
if (files != null && files.length > 0) { 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();
cpd = this.getPageData(); cpd = this.getPageData();
MultipartFile file = files[i]; MultipartFile file = files[i];
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 + CORPINFO_ID + "/" + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile);
cpd.put("ACCEPT_USER_SIGNER_TIME", signertime); cpd.put("ACCEPT_USER_SIGNER_TIME", signertime);
cpd.put("ACCEPT_CONFESS_ID", this.get32UUID()); cpd.put("ACCEPT_CONFESS_ID", this.get32UUID());
cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人 cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人
@ -527,17 +559,19 @@ public class AppGFCutRoadController extends BaseController {
} }
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/editStatus") @RequestMapping(value = "/editStatus")
@ResponseBody @ResponseBody
@Transactional @Transactional
public Object editStatus( public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files @RequestParam(value = "FFILE", required = false) MultipartFile[] files
) throws Exception{ ) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -550,7 +584,7 @@ public class AppGFCutRoadController extends BaseController {
log.put("CUTROADLOG_ID", this.get32UUID()); log.put("CUTROADLOG_ID", this.get32UUID());
// log.put("ACTION", "审核打回"); // log.put("ACTION", "审核打回");
log.put("CUTROAD_ID", pd.get("CUTROAD_ID")); log.put("CUTROAD_ID", pd.get("CUTROAD_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()));
String status = pd.get("STATUS").toString(); String status = pd.get("STATUS").toString();
@ -567,7 +601,7 @@ public class AppGFCutRoadController extends BaseController {
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);
pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
@ -591,7 +625,7 @@ public class AppGFCutRoadController extends BaseController {
GFcutRoadService.edit(pd2); GFcutRoadService.edit(pd2);
log.put("ACTION", "作业负责单位通过"); log.put("ACTION", "作业负责单位通过");
GFcutRoadToMeasuresService.delete(pd); GFcutRoadToMeasuresService.delete(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());
for (JSONObject json : list) { for (JSONObject json : list) {
PageData measures = new PageData(); PageData measures = new PageData();
@ -606,7 +640,7 @@ public class AppGFCutRoadController extends BaseController {
} }
} }
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2);
} }
break; break;
@ -616,7 +650,7 @@ public class AppGFCutRoadController extends BaseController {
// 保存文件 // 保存文件
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);
pd2.put("PRODUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("PRODUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
@ -637,7 +671,7 @@ public class AppGFCutRoadController extends BaseController {
log.put("ACTION", "所在单位通过"); log.put("ACTION", "所在单位通过");
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2);
} }
break; break;
@ -646,7 +680,7 @@ public class AppGFCutRoadController extends BaseController {
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);
pd2.put("SAFETY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("SAFETY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
@ -663,7 +697,7 @@ public class AppGFCutRoadController extends BaseController {
log.put("ACTION", "安全部门通过"); log.put("ACTION", "安全部门通过");
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2);
} }
break; break;
@ -672,7 +706,7 @@ public class AppGFCutRoadController extends BaseController {
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);
pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
@ -685,7 +719,7 @@ public class AppGFCutRoadController extends BaseController {
log.put("ACTION", "审批部门通过"); log.put("ACTION", "审批部门通过");
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2);
} }
break; break;
@ -694,7 +728,7 @@ public class AppGFCutRoadController extends BaseController {
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);
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);
@ -708,7 +742,7 @@ public class AppGFCutRoadController extends BaseController {
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2);
} }
break; break;
case "-2"://作业负责单位 case "-2"://作业负责单位
@ -718,7 +752,7 @@ public class AppGFCutRoadController extends BaseController {
GFcutRoadService.edit(pd2); GFcutRoadService.edit(pd2);
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2);
break; break;
case "-3"://所在单位打回 case "-3"://所在单位打回
log.put("ACTION", "所在单位打回"); log.put("ACTION", "所在单位打回");
@ -727,7 +761,7 @@ public class AppGFCutRoadController extends BaseController {
GFcutRoadService.edit(pd2); GFcutRoadService.edit(pd2);
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2);
break; break;
case "-4"://安全部门打回 case "-4"://安全部门打回
log.put("ACTION", "安全部门打回"); log.put("ACTION", "安全部门打回");
@ -736,7 +770,7 @@ public class AppGFCutRoadController extends BaseController {
GFcutRoadService.edit(pd2); GFcutRoadService.edit(pd2);
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2);
break; break;
case "-5"://审批打回 case "-5"://审批打回
log.put("ACTION", "审批部门打回"); log.put("ACTION", "审批部门打回");
@ -745,7 +779,7 @@ public class AppGFCutRoadController extends BaseController {
GFcutRoadService.edit(pd2); GFcutRoadService.edit(pd2);
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2);
break; break;
case "-6"://审批打回 case "-6"://审批打回
log.put("ACTION", "验收人打回"); log.put("ACTION", "验收人打回");
@ -753,7 +787,7 @@ public class AppGFCutRoadController extends BaseController {
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
GFcutRoadService.edit(pd2); GFcutRoadService.edit(pd2);
// 发短信 // 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2);
break; break;
default: default:
break; break;
@ -762,19 +796,22 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**列表
/**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/jhlist") @RequestMapping(value = "/jhlist")
@ResponseBody @ResponseBody
public Object jhlist(Page page) throws Exception{ public Object jhlist(Page page) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd); page.setPd(pd);
List<PageData> varList = GFcutRoadService.jhlist(page); //列出confinedspace列表 List<PageData> varList = GFcutRoadService.jhlist(page); //列出confinedspace列表
map.put("varList", varList); map.put("varList", varList);
@ -782,19 +819,22 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**列表
/**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/aqlist") @RequestMapping(value = "/aqlist")
@ResponseBody @ResponseBody
public Object aqlist(Page page) throws Exception{ public Object aqlist(Page page) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd); page.setPd(pd);
List<PageData> varList = GFcutRoadService.aqlist(page); //列出confinedspace列表 List<PageData> varList = GFcutRoadService.aqlist(page); //列出confinedspace列表
map.put("varList", varList); map.put("varList", varList);
@ -802,19 +842,22 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**列表
/**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/jslist") @RequestMapping(value = "/jslist")
@ResponseBody @ResponseBody
public Object jslist(Page page) throws Exception{ public Object jslist(Page page) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd); page.setPd(pd);
List<PageData> varList = GFcutRoadService.jslist(page); //列出confinedspace列表 List<PageData> varList = GFcutRoadService.jslist(page); //列出confinedspace列表
map.put("varList", varList); map.put("varList", varList);
@ -822,19 +865,22 @@ public class AppGFCutRoadController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**列表
/**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/list") @RequestMapping(value = "/list")
@ResponseBody @ResponseBody
public Object list(Page page) throws Exception{ public Object list(Page page) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd); page.setPd(pd);
List<PageData> varList = GFcutRoadService.list(page); //列出CutRoad列表 List<PageData> varList = GFcutRoadService.list(page); //列出CutRoad列表
map.put("varList", varList); map.put("varList", varList);
@ -843,14 +889,16 @@ public class AppGFCutRoadController extends BaseController {
return map; return map;
} }
/**去修改页面获取数据 /**
* 去修改页面获取数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/goAdd") @RequestMapping(value = "/goAdd")
@ResponseBody @ResponseBody
public Object goAdd() throws Exception{ public Object goAdd() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
map.put("measuresList", GFcutRoadService.listAllMeasures(pd)); map.put("measuresList", GFcutRoadService.listAllMeasures(pd));
@ -858,43 +906,47 @@ public class AppGFCutRoadController extends BaseController {
return map; return map;
} }
/**去修改页面获取数据 /**
* 去修改页面获取数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/goEdit") @RequestMapping(value = "/goEdit")
@ResponseBody @ResponseBody
public Object goEdit() throws Exception{ public Object goEdit() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd = GFcutRoadService.findById(pd); //根据ID读取 pd = GFcutRoadService.findById(pd); //根据ID读取
map.put("pd", pd); map.put("pd", pd);
map.put("measuresList", GFcutRoadService.listAllMeasures(pd)); map.put("measuresList", GFcutRoadService.listAllMeasures(pd));
map.put("imgList",cutroadacceptuserService.findByIds(pd)); map.put("imgList", cutroadacceptuserService.findByIds(pd));
map.put("imgList1",cutroadacceptuserService.findById(pd)); map.put("imgList1", cutroadacceptuserService.findById(pd));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**批量删除 /**
* 批量删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/deleteAll") @RequestMapping(value = "/deleteAll")
@ResponseBody @ResponseBody
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";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
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(",");
GFcutRoadService.deleteAll(ArrayDATA_IDS); GFcutRoadService.deleteAll(ArrayDATA_IDS);
errInfo = "success"; errInfo = "success";
}else{ } else {
errInfo = "error"; errInfo = "error";
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
@ -903,6 +955,7 @@ public class AppGFCutRoadController extends BaseController {
/** /**
* 选择短信模板 * 选择短信模板
*
* @param appStatus 阶段 * @param appStatus 阶段
* @param pd2 参数集合 * @param pd2 参数集合
* @throws Exception * @throws Exception
@ -919,27 +972,27 @@ public class AppGFCutRoadController extends BaseController {
switch (appStatus) { switch (appStatus) {
case "2"://作业负责单位 case "2"://作业负责单位
System.out.println(pd2.get("APPLY_STATUS")); System.out.println(pd2.get("APPLY_STATUS"));
if("2".equals(pd2.get("APPLY_STATUS"))){ if ("2".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("PRODUCTION_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("PRODUCTION_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y02");// 短信模板编码 mes.put("templateCode", "DL_Y02");// 短信模板编码
mes.put("SMSCode", "SMS_227245922");// 短信模板编码 mes.put("SMSCode", "SMS_227245922");// 短信模板编码
mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
}else if("3".equals(pd2.get("APPLY_STATUS"))){ } else if ("3".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("SAFETY_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("SAFETY_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y03");// 短信模板编码 mes.put("templateCode", "DL_Y03");// 短信模板编码
mes.put("SMSCode", "SMS_227245922");// 短信模板编码 mes.put("SMSCode", "SMS_227245922");// 短信模板编码
mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
}else if("4".equals(pd2.get("APPLY_STATUS"))){ } else if ("4".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y04");// 短信模板编码 mes.put("templateCode", "DL_Y04");// 短信模板编码
mes.put("SMSCode", "SMS_227245922");// 短信模板编码 mes.put("SMSCode", "SMS_227245922");// 短信模板编码
mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
}else if("5".equals(pd2.get("APPLY_STATUS"))){ } else if ("5".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y05");// 短信模板编码 mes.put("templateCode", "DL_Y05");// 短信模板编码
mes.put("SMSCode", "SMS_227245922");// 短信模板编码 mes.put("SMSCode", "SMS_227245922");// 短信模板编码
mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
}else if("6".equals(pd2.get("APPLY_STATUS"))){ } else if ("6".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y06");// 短信模板编码 mes.put("templateCode", "DL_Y06");// 短信模板编码
mes.put("SMSCode", "SMS_227250920");// 短信模板编码 mes.put("SMSCode", "SMS_227250920");// 短信模板编码
@ -970,22 +1023,22 @@ public class AppGFCutRoadController extends BaseController {
case "3"://所在单位 case "3"://所在单位
// 发短信 // 发短信
if("3".equals(pd2.get("APPLY_STATUS"))){ if ("3".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("SAFETY_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("SAFETY_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y03");// 短信模板编码 mes.put("templateCode", "DL_Y03");// 短信模板编码
mes.put("SMSCode", "SMS_227245922");// 短信模板编码 mes.put("SMSCode", "SMS_227245922");// 短信模板编码
mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
}else if("4".equals(pd2.get("APPLY_STATUS"))){ } else if ("4".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y04");// 短信模板编码 mes.put("templateCode", "DL_Y04");// 短信模板编码
mes.put("SMSCode", "SMS_227245922");// 短信模板编码 mes.put("SMSCode", "SMS_227245922");// 短信模板编码
mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
}else if("5".equals(pd2.get("APPLY_STATUS"))){ } else if ("5".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y05");// 短信模板编码 mes.put("templateCode", "DL_Y05");// 短信模板编码
mes.put("SMSCode", "SMS_227245922");// 短信模板编码 mes.put("SMSCode", "SMS_227245922");// 短信模板编码
mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
}else if("6".equals(pd2.get("APPLY_STATUS"))){ } else if ("6".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y06");// 短信模板编码 mes.put("templateCode", "DL_Y06");// 短信模板编码
mes.put("SMSCode", "SMS_227250920");// 短信模板编码 mes.put("SMSCode", "SMS_227250920");// 短信模板编码
@ -1014,17 +1067,17 @@ public class AppGFCutRoadController extends BaseController {
case "4"://安全部门 case "4"://安全部门
// 发短信 // 发短信
if("4".equals(pd2.get("APPLY_STATUS"))){ if ("4".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y04");// 短信模板编码 mes.put("templateCode", "DL_Y04");// 短信模板编码
mes.put("SMSCode", "SMS_227245922");// 短信模板编码 mes.put("SMSCode", "SMS_227245922");// 短信模板编码
mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
}else if("5".equals(pd2.get("APPLY_STATUS"))){ } else if ("5".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y05");// 短信模板编码 mes.put("templateCode", "DL_Y05");// 短信模板编码
mes.put("SMSCode", "SMS_227245922");// 短信模板编码 mes.put("SMSCode", "SMS_227245922");// 短信模板编码
mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
}else if("6".equals(pd2.get("APPLY_STATUS"))){ } else if ("6".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y06");// 短信模板编码 mes.put("templateCode", "DL_Y06");// 短信模板编码
mes.put("SMSCode", "SMS_227250920");// 短信模板编码 mes.put("SMSCode", "SMS_227250920");// 短信模板编码
@ -1053,12 +1106,12 @@ public class AppGFCutRoadController extends BaseController {
case "5"://审批部门 case "5"://审批部门
// 发短信 // 发短信
if("4".equals(pd2.get("APPLY_STATUS"))){ if ("4".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y05");// 短信模板编码 mes.put("templateCode", "DL_Y05");// 短信模板编码
mes.put("SMSCode", "SMS_227245922");// 短信模板编码 mes.put("SMSCode", "SMS_227245922");// 短信模板编码
mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
}else if("5".equals(pd2.get("APPLY_STATUS"))){ } else if ("5".equals(pd2.get("APPLY_STATUS"))) {
mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes.put("templateCode", "DL_Y06");// 短信模板编码 mes.put("templateCode", "DL_Y06");// 短信模板编码
mes.put("SMSCode", "SMS_227250920");// 短信模板编码 mes.put("SMSCode", "SMS_227250920");// 短信模板编码
@ -1213,14 +1266,16 @@ public class AppGFCutRoadController extends BaseController {
} }
} }
/**待办作业数统计 /**
* 待办作业数统计
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/countCheck") @RequestMapping(value = "/countCheck")
@ResponseBody @ResponseBody
public Object countCheck() throws Exception{ public Object countCheck() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();

52
src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java
View File

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

3
src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
View File

@ -445,7 +445,8 @@ public class OutSourcedController extends BaseController {
pdImg.put("TYPE", "300"); pdImg.put("TYPE", "300");
pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID")); pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID"));
imgfilesService.save(pdImg); imgfilesService.save(pdImg);
Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,pd.getString("OUTSOURCED_ID"),"300"); Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile
,IMGFILES_ID,pd.getString("OUTSOURCED_ID"),"300");
} }