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

Merge remote-tracking branch 'origin/czks1.0' into czks1.0 

# Conflicts:
#	src/main/java/com/zcloud/controller/app/AppImgFilesController.java
#	src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
pull/14/head
z 2023-12-28 10:27:54 +08:00
parent 77bdb85662 9becfa6a9f
commit 3575a5fc28
80 changed files with 4440 additions and 2793 deletions
src/main
java/com/zcloud
aspect
controller
app
bus
filemanager
firemanager
gf
inspection
keyProjects
onlinexxks
system
tzsb
mapper
datasource/bus
dsno2/fireresources
service
util
resources/mybatis

BIN
1703230140663.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

24
src/main/java/com/zcloud/aspect/DockingAspect.java
View File

@ -3,12 +3,15 @@ package com.zcloud.aspect;
import com.alibaba.fastjson.JSON;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.entity.PageData;
import com.zcloud.entity.system.User;
import com.zcloud.service.docking.DockingRelationService;
import com.zcloud.service.mq.DockSendMessageService;
import com.zcloud.service.mq.SendMessageService;
import com.zcloud.util.Const;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.Tools;
import com.zcloud.util.UuidUtil;
import org.apache.shiro.session.Session;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@ -164,6 +167,10 @@ public class DockingAspect {
login_user.put("NAME", Jurisdiction.getName());
login_user.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE());
login_user.put("POST_ID", Jurisdiction.getPOST_ID());
login_user.put("IS_MAIN", Jurisdiction.getIS_MAIN());
Session session = Jurisdiction.getSession();
User user = (User)session.getAttribute(Const.SESSION_USER);
login_user.put("user",JSON.toJSONString(user));
sendData.put("LOGIN_USER", login_user);
} else {
// 手机app 会传递值。
@ -179,20 +186,21 @@ public class DockingAspect {
sendData.put("sendPicturesList", proceed.get("sendPicturesList"));
proceed.remove("sendPicturesList");
}
// 有dockData
if (Tools.notEmpty(proceed.get("dockData"))) {
sendData.put("dockData", proceed.get("dockData"));
proceed.remove("dockData");
} else {
sendData.put("dockData", "手动添加的dockData");
}
TenCorpDto tenCorpDto = new TenCorpDto();
tenCorpDto.setMessage("沧州矿石数据同步消息");
tenCorpDto.setData(sendData);
tenCorpDto.setId(UuidUtil.get32UUID());
tenCorpDto.setTopic("docking");
tenCorpDto.setProducer_name("qa-prevention-czks");
sendMessageService.sendMessage(tenCorpDto);
// 有dockData
if (Tools.notEmpty(proceed.get("dockData"))) {
sendData.put("dockData", proceed.get("dockData"));
proceed.remove("dockData");
sendMessageService.sendMessage(tenCorpDto);
} else {
System.out.println("------------------------无dockData不发消息------------------------");
}
System.out.println("------------------------切面方法结束------------------------");
}

9
src/main/java/com/zcloud/controller/app/AppCheckRecordController.java
View File

@ -1,11 +1,13 @@
package com.zcloud.controller.app;
import java.sql.Array;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.service.bus.*;
import com.zcloud.util.*;
import com.zcloud.util.message.MessageService;
@ -77,6 +79,7 @@ public class AppCheckRecordController extends BaseController {
@RequestMapping(value = "/add")
@ResponseBody
@Transactional
@DockAnnotation
public Object add() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -134,6 +137,7 @@ public class AppCheckRecordController extends BaseController {
hiddenService.updateAll(hiddens);
}
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}
@ -146,6 +150,7 @@ public class AppCheckRecordController extends BaseController {
@RequestMapping(value = "/finish")
@ResponseBody
@Transactional
@DockAnnotation
public Object finish() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -199,6 +204,7 @@ public class AppCheckRecordController extends BaseController {
checkuserService.delete(pd);
if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) {
List<JSONObject> list1 = (List<JSONObject>) JSON.parse(pd.get("OTHER").toString());
ArrayList<PageData> otherList = new ArrayList<>();
for (JSONObject json : list1) {
if (json.get("DEPARTMENT_ID") != null && json.get("DEPARTMENT_ID") != "" && json.get("USER_ID") != null
&& json.get("USER_ID") != "") {
@ -207,9 +213,11 @@ public class AppCheckRecordController extends BaseController {
other.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID"));
other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID"));
other.put("USER_ID", json.get("USER_ID"));
otherList.add(other);
checkuserService.save(other);
}
}
pd.put("otherList", otherList);
}
hiddenService.submit(pd);// 清单内隐患提交
hiddenService.submitList(pd);// 其他隐患提交
@ -226,6 +234,7 @@ public class AppCheckRecordController extends BaseController {
}
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}

33
src/main/java/com/zcloud/controller/app/AppHiddenController.java
View File

@ -22,6 +22,7 @@ import com.zcloud.util.*;
import com.zcloud.util.event.DeviceHiddenEvent;
import com.zcloud.util.message.MessageService;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.crypto.hash.Hash;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Controller;
@ -263,6 +264,7 @@ public class AppHiddenController extends BaseController {
*/
@RequestMapping(value = "/add")
@ResponseBody
@DockAnnotation
public Object add() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -292,7 +294,9 @@ public class AppHiddenController extends BaseController {
pd.put("RISK_POSITION", item.get("POSITIONNAME"));
pd.put("LEVEL", item.get("DNAME5"));
}
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("other").toString()); // 隐患发现人
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("other").toString()); // 隐患发现
HashMap<String, String> hiddenconUserMap = new HashMap<>();
int count = 1;
for (JSONObject json : list) {
PageData hiddenconUserAdd = new PageData();
hiddenconUserAdd.put("HIDDENUSER_ID", UuidUtil.get32UUID());
@ -300,8 +304,11 @@ public class AppHiddenController extends BaseController {
hiddenconUserAdd.put("USER_ID", json.get("USER_ID"));
hiddenconUserAdd.put("TYPE", "1");
hiddenconUserAdd.put("IS_MAIN", "0");
hiddenconUserMap.put("hiddenconUser"+count,JSON.toJSONString(hiddenconUserAdd));
count++;
hiddenUserService.save(hiddenconUserAdd); // 添加隐患发现人
}
pd.put("hiddenconUserMap",JSON.toJSONString(hiddenconUserMap));
if (pd.getString("HIDDENLEVEL").equals("jdyh001") || pd.getString("HIDDENLEVEL").equals("hiddenLevel2002")) {//判断是否是重大隐患
PageData userpd = new PageData();
userpd.put("USER_ID", pd.getString("CREATOR"));
@ -344,7 +351,8 @@ public class AppHiddenController extends BaseController {
before.put("spare4", pd.getString("RECTIFICATIONDEPT"));
before.put("CREATOR", pd.getString("loginUserId"));
before.put("OPERATOR", pd.getString("loginUserId"));
hiddenExamineService.saveApp(before);
PageData pageData = hiddenExamineService.saveApp(before);
pd.put("examine", JSON.toJSONString(pageData));
hiddenService.save(pd);
if (!pd.getString("STATE").equals("0")) {
messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患需要确认", pd.getString("CORPINFO_ID"), pd.getString("CONFIRM_USER"), pd.getString("HIDDEN_ID"),
@ -364,10 +372,10 @@ public class AppHiddenController extends BaseController {
imgFilesService.delete(i);
}
}
}
map.put("result", errInfo);
map.put("pd", pd);
map.put("dockData",JSON.toJSONString(pd));
return map;
}
@ -412,10 +420,10 @@ public class AppHiddenController extends BaseController {
before.put("spare4", pd.getString("RECTIFICATIONDEPT"));
before.put("CREATOR", pd.getString("loginUserId"));
before.put("OPERATOR", pd.getString("loginUserId"));
hiddenExamineService.saveApp(before);
PageData hiddenExamine = hiddenExamineService.saveApp(before);
pd.put("hiddenExamine", JSON.toJSONString(hiddenExamine));
PageData hiddenExaminePageData = new PageData();
hiddenExaminePageData.putAll(before);
if (pd.get("RISKITEM_ID") != null && Tools.notEmpty(pd.get("RISKITEM_ID").toString())) {
if ("2".equals(pd.getString("SOURCE"))) {
PageData item = new PageData();
@ -955,6 +963,7 @@ public class AppHiddenController extends BaseController {
@RequestMapping(value = "/rectify")
@ResponseBody
@Transactional
@DockAnnotation
public Object rectify() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -989,6 +998,7 @@ public class AppHiddenController extends BaseController {
if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("OTHER").toString());
List<PageData> otherList = new ArrayList<>();
for (JSONObject json : list) {
// if (json.get("DEPARTMENT_ID") != null && json.get("DEPARTMENT_ID") != "" && json.get("USER_ID") != null
// && json.get("USER_ID") != "") {
@ -999,6 +1009,7 @@ public class AppHiddenController extends BaseController {
other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID"));
other.put("USER_ID", json.get("USER_ID"));
other.put("STATUS", "0");
otherList.add(other);
hiddenCheckService.save(other);
PageData hiddenPd = hiddenService.findById(pd);
messageService.sendMessageByParameter("HIDDEN_MAIL_004", "友情提示：有一条隐患需要验收",
@ -1006,9 +1017,11 @@ public class AppHiddenController extends BaseController {
hiddenPd.getString("HIDDENDESCR"), "隐患验收", "验收", "", "");
}
}
pd.put("otherList",JSON.toJSONString(otherList));
}
map.put("result", errInfo);
map.put("HIDDENSCHEME_ID", pd.get("HIDDENSCHEME_ID"));
map.put("dockData",JSON.toJSONString(pd));
return map;
}
@ -1068,6 +1081,7 @@ public class AppHiddenController extends BaseController {
*/
@RequestMapping(value = "/check")
@ResponseBody
@DockAnnotation
public Object check() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -1141,11 +1155,13 @@ public class AppHiddenController extends BaseController {
/** 验收打回 **/
hiddenApiService.repulseCheck(pd.getString("HIDDEN_ID"));
/** 记录打回 **/
hiddenExamineApiService.saveRepulseCheckApp(pd.getString("HIDDEN_ID"), pd.getString("CONTENT"), pd.getString("CHECKOR"));
PageData pageData = hiddenExamineApiService.saveRepulseCheckApp(pd.getString("HIDDEN_ID"), pd.getString("CONTENT"), pd.getString("CHECKOR"));
pd.put("pageData", JSON.toJSONString(pageData));
}
hiddenMailService.apphiddneCheckAdopt(pd);
map.put("check", pd);
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}
@ -1470,6 +1486,7 @@ public class AppHiddenController extends BaseController {
*/
@RequestMapping(value = "/confirm")
@ResponseBody
@DockAnnotation
public Object confirmUpdate() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -1626,6 +1643,7 @@ public class AppHiddenController extends BaseController {
*/
@RequestMapping(value = "/assign")
@ResponseBody
@DockAnnotation
public Object assign() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -1667,6 +1685,7 @@ public class AppHiddenController extends BaseController {
*/
@RequestMapping(value = "/finalcheck")
@ResponseBody
@DockAnnotation
public Object finalcheck() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -1738,6 +1757,7 @@ public class AppHiddenController extends BaseController {
@RequestMapping(value = "/repulseHidden")
//@RequiresPermissions("hidden:edit")
@ResponseBody
@DockAnnotation
public Object repulseHidden() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -1750,6 +1770,7 @@ public class AppHiddenController extends BaseController {
hiddenExamineService.saverepulse(pd);
hiddenMailService.reject(pd);
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}

7
src/main/java/com/zcloud/controller/app/AppHiddenExamineController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.app;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -216,6 +218,7 @@ public class AppHiddenExamineController extends BaseController {
*/
@RequestMapping(value = "/delayedExamine")
@ResponseBody
@DockAnnotation
public Object delayedExamine() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -263,6 +266,7 @@ public class AppHiddenExamineController extends BaseController {
@RequestMapping(value = "/delayed")
@ResponseBody
@Transactional
@DockAnnotation
public Object delayed(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -292,6 +296,7 @@ public class AppHiddenExamineController extends BaseController {
pd.put("CREATOR", pd.getString("loginUserId"));
pd.put("OPERATOR",pd.getString("loginUserId"));
examine = hiddenexamineService.saveApp(examine);
pd.put("examine", JSON.toJSONString(examine));
PageData hiddenpd = hiddenService.findById(pd);
messageService.sendMessageByParameter("HIDDEN_MAIL_007","友情提示：有一条隐患需要延期审核",
hiddenpd.getString("CORPINFO_ID"),hiddenpd.getString("CONFIRM_USER"),hiddenpd.getString("HIDDEN_ID"),
@ -300,6 +305,7 @@ public class AppHiddenExamineController extends BaseController {
map.put("result", errInfo);
map.put("msg", "隐患延期申成功。请通知隐患确认人进行延期确认操作！");
map.put("dockData",JSON.toJSONString(pd));
return map;
}
/**
@ -345,6 +351,7 @@ public class AppHiddenExamineController extends BaseController {
*/
@RequestMapping(value = "/specialExamine")
@ResponseBody
@DockAnnotation
public Object specialExamine(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";

2
src/main/java/com/zcloud/controller/app/AppRiskPointController.java
View File

@ -5,6 +5,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.zcloud.aspect.DockAnnotation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -86,6 +87,7 @@ public class AppRiskPointController extends BaseController{
*/
@RequestMapping(value="/editLonAndLat")
@ResponseBody
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";

18
src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.app.inspection;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -85,7 +87,8 @@ public class AppSafetyEnvironmentalController extends BaseController {
*/
@RequestMapping(value="/add")
@ResponseBody
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
@DockAnnotation
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
@ -118,6 +121,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
pd.put("hiddenList", hiddenList);
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@ -163,6 +167,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
*/
@RequestMapping(value="/edit")
@ResponseBody
@DockAnnotation
public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -191,6 +196,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
pd.put("hiddenList", hiddenList);
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@ -201,11 +207,13 @@ public class AppSafetyEnvironmentalController extends BaseController {
@RequestMapping(value="/explain")
//@RequiresPermissions("safetyenvironmental:edit")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object explain(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
ArrayList<String> strings = new ArrayList<>();
if (files != null && files.length > 0) {
MultipartFile file = files[0];
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@ -215,18 +223,20 @@ public class AppSafetyEnvironmentalController extends BaseController {
map.put("msg", "文件格式不正确！");
return map;
}
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("INSPECTION_ORIGINATOR_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
strings.add(pd.getString("INSPECTION_ORIGINATOR_SIGN_IMG")+"@@"+fileName);
}
safetyenvironmentalService.explain(pd);
PageData log = safetyenvironmentalService.explain(pd);
pd.put("log",JSON.toJSONString(log));
pd.put("inspector",pd.getString("OPERATOR"));
noticeCorpUtil.FailPleadind(pd);
map.put("pd", pd);
map.put("result", errInfo);
map.put("sendPicturesList",JSON.toJSONString(strings));
map.put("dockData",JSON.toJSONString(pd));
return map;
}

10
src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.app.inspection;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -78,6 +80,7 @@ public class AppSafetyEnvironmentalExplainController extends BaseController {
*/
@RequestMapping(value = "/add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object add(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -91,6 +94,7 @@ public class AppSafetyEnvironmentalExplainController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("VALID","1");
pd.put("ISPASS","0");
ArrayList<String> strings = new ArrayList<>();
if (null != file && !file.isEmpty()) {
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)) {
@ -103,11 +107,15 @@ public class AppSafetyEnvironmentalExplainController extends BaseController {
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("INSPECTED_SITEUSER_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
strings.add(pd.getString("INSPECTED_SITEUSER_SIGN_IMG")+"@@"+fileName);
}
safetyenvironmentalexplainService.save(pd);
PageData log = safetyenvironmentalexplainService.save(pd);
pd.put("logData", log);
noticeCorpUtil.SE_PleadingStepUtil(pd);
map.put("pd", pd);
map.put("result", errInfo);
map.put("sendPicturesList",JSON.toJSONString(strings));
map.put("dockData", JSON.toJSONString(pd));
return map;
}

12
src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalInspectorController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.app.inspection;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -63,6 +65,7 @@ public class AppSafetyEnvironmentalInspectorController extends BaseController {
*/
@RequestMapping(value = "/verify")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object verify(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -75,6 +78,7 @@ public class AppSafetyEnvironmentalInspectorController extends BaseController {
uBean.put("OPERATOR", pd.getString("OPERATOR")); //修改人
uBean.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
uBean.put("ACTION_USER", pd.getString("ACTION_USER")); //操作人
ArrayList<String> strings = new ArrayList<>();
if (files != null && files.length > 0) {
MultipartFile file = files[0];
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@ -88,12 +92,16 @@ public class AppSafetyEnvironmentalInspectorController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
uBean.put("INSPECTION_USER_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
strings.add(uBean.getString("INSPECTION_USER_SIGN_IMG")+"@@"+fileName);
}
safetyenvironmentalinspectorService.verify(uBean);
pd.put("uBean", JSON.toJSONString(uBean));
PageData verify = safetyenvironmentalinspectorService.verify(uBean);
pd.put("verify",JSON.toJSONString(verify));
map.put("pd", pd);
map.put("result", errInfo);
map.put("sendPicturesList",JSON.toJSONString(strings));
map.put("dockData", JSON.toJSONString(pd));
return map;
}

10
src/main/java/com/zcloud/controller/bus/ArchivesFilesController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.bus;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.PageData;
import com.zcloud.service.bus.ArchivesFilesService;
@ -38,6 +40,7 @@ public class ArchivesFilesController extends BaseController {
*/
@RequestMapping(value="/add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object add(
@RequestParam(value="FFILE",required=false) MultipartFile[] files,
@RequestParam(value="TYPE",required=false) String TYPE,
@ -52,7 +55,7 @@ public class ArchivesFilesController extends BaseController {
pd.put("TYPE", TYPE);
pd.put("YEAR", YEAR);
pd.put("STUDYTASK_ID", STUDYTASK_ID);
ArrayList<String> sendPicturesList = new ArrayList<>();
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@ -72,11 +75,14 @@ public class ArchivesFilesController extends BaseController {
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("FILE_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("FILE_PATH")+"@@"+fileName);
}
}
archivesfilesService.save(pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map;
}
/**删除
@ -85,6 +91,7 @@ public class ArchivesFilesController extends BaseController {
*/
@RequestMapping(value="/delete")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -93,6 +100,7 @@ public class ArchivesFilesController extends BaseController {
Smb.deleteFile(pd.getString("FILE_PATH"));
archivesfilesService.delete(pd);
map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
return map;
}

13
src/main/java/com/zcloud/controller/bus/CorpInfoController.java
View File

@ -127,6 +127,19 @@ public class CorpInfoController extends BaseController {
return map;
}
@RequestMapping(value = "/getSelectByCorpInfo")
@ResponseBody
public Object getSelectByCorpInfo() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
List<PageData> varList = corpinfoService.getSelectByCorpInfo(pd);
JSONArray corpInfoJson = JSONArray.fromObject(varList);
map.put("corpInfoJson", corpInfoJson.toString());
map.put("result", errInfo);
return map;
}
/**删除
* @param out
* @throws Exception

50
src/main/java/com/zcloud/controller/bus/CorpPromiseController.java
View File

@ -2,6 +2,7 @@ package com.zcloud.controller.bus;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -11,6 +12,7 @@ import com.zcloud.service.bus.CorpPromiseService;
import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.ReturnMap;
import com.zcloud.util.Tools;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -46,7 +48,13 @@ public class CorpPromiseController extends BaseController {
*/
@RequestMapping(value = "/add")
@ResponseBody
@DockAnnotation
public Object add() throws Exception {
PageData dockData = new PageData();
ArrayList<PageData> corpPromiseDetails = new ArrayList<>();
ArrayList<PageData> corpPromisePeoples = new ArrayList<>();
ArrayList<PageData> coverPeoples = new ArrayList<>();
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
@ -63,6 +71,7 @@ public class CorpPromiseController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //创建时间
pd.put("RELEASE_PLATFORM", "1");//企业端发布
corpPromiseService.save(pd);
dockData.put("corpPromiseSave",JSON.toJSONString(pd));
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("DETAIL")); //副文内容
if (list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
@ -72,7 +81,9 @@ public class CorpPromiseController extends BaseController {
promise.put("COLLATERAL", list.get(i).get("value"));
promise.put("SORTINDEX", list.get(i).get("index"));
corpPromiseDetailsService.save(promise);
corpPromiseDetails.add(promise);
}
dockData.put("corpPromiseDetailsSave",JSON.toJSONString(corpPromiseDetails));
}
if (people.size() > 0) { //承诺人数据
int num = 0;
@ -90,12 +101,15 @@ public class CorpPromiseController extends BaseController {
promise.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
promise.put("ISPROMISE_PEOPLE", "0");
corpPromisePeopleService.save(promise);
corpPromisePeoples.add(promise);
num++;
}
dockData.put("corpPromisePeopleSave",JSON.toJSONString(corpPromisePeoples));
}
}
pd.put("PEOPLENUM_INVOLVED", num);
corpPromiseService.editpeople(pd);
dockData.put("editPeople",JSON.toJSONString(pd));
}
List<JSONObject> coverpeople = (List<JSONObject>) JSON.parse(pd.getString("coverpeople"));
if (coverpeople.size() > 0) { //被承诺人数据
@ -113,12 +127,14 @@ public class CorpPromiseController extends BaseController {
promise.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
promise.put("ISPROMISE_PEOPLE", "1");
corpPromisePeopleService.save(promise);
coverPeoples.add(promise);
}
dockData.put("coverPeopleList",JSON.toJSONString(coverPeoples));
}
}
}
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(dockData));
return map;
}
@ -169,13 +185,22 @@ public class CorpPromiseController extends BaseController {
*/
@RequestMapping(value = "/editdelete")
@ResponseBody
@DockAnnotation
public Object editdelete() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
if (Tools.notEmpty(pd.getString("dockData"))) {
// 咱们的对接流程 如有异常 使用 throw new BizException();
PageData dockData = JSON.parseObject(pd.getString("dockData"), PageData.class);
corpPromiseService.editdelete(dockData);
// 正常返回
return ReturnMap.ok();
}
corpPromiseService.editdelete(pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@ -244,12 +269,17 @@ public class CorpPromiseController extends BaseController {
*/
@RequestMapping(value = "/edit")
@ResponseBody
@DockAnnotation
public Object edit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //创建时间
PageData dockData = new PageData();
ArrayList<PageData> corpPromiseDetails = new ArrayList<>();
ArrayList<PageData> corpPromisePeoples = new ArrayList<>();
ArrayList<PageData> coverPeoples = new ArrayList<>();
corpPromiseService.edit(pd);
corpPromiseDetailsService.deletePromiseId(pd);
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("DETAIL"));
@ -261,9 +291,12 @@ public class CorpPromiseController extends BaseController {
promise.put("COLLATERAL", list.get(i).get("value"));
promise.put("SORTINDEX", list.get(i).get("index"));
corpPromiseDetailsService.save(promise);
corpPromiseDetails.add(promise);
}
dockData.put("corpPromiseDetails",JSON.toJSONString(corpPromiseDetails));
}
corpPromisePeopleService.deletePromiseId(pd); //先删除承诺人数据，再新增
dockData.put("baseData",JSON.toJSONString(pd));
List<JSONObject> people = (List<JSONObject>) JSON.parse(pd.getString("people"));
if (people.size() > 0) { //承诺人数据
int num = 0;
@ -282,11 +315,15 @@ public class CorpPromiseController extends BaseController {
promise.put("ISPROMISE_PEOPLE", "0");
corpPromisePeopleService.save(promise);
num++;
corpPromisePeoples.add(promise);
}
dockData.put("corpPromisePeoples",JSON.toJSONString(corpPromisePeoples));
}
}
pd.put("PEOPLENUM_INVOLVED", num);
corpPromiseService.editpeople(pd);
dockData.put("editData",JSON.toJSONString(pd));
}
List<JSONObject> coverpeople = (List<JSONObject>) JSON.parse(pd.getString("coverpeople"));
if (coverpeople.size() > 0) { //被承诺人数据
@ -304,11 +341,14 @@ public class CorpPromiseController extends BaseController {
promise.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
promise.put("ISPROMISE_PEOPLE", "1");
corpPromisePeopleService.save(promise);
coverPeoples.add(promise);
}
dockData.put("coverPeoples",JSON.toJSONString(coverPeoples));
}
}
}
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(dockData));
return map;
}
@ -432,18 +472,24 @@ public class CorpPromiseController extends BaseController {
*/
@RequestMapping(value = "/delete")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData dockData = new PageData();
List<PageData> corpPromisePeopleList = new ArrayList<>();
List<PageData> promiseList = corpPromisePeopleService.getListAllByPromiseId(pd);
for (PageData pageData : promiseList) {
corpPromisePeopleService.delete(pageData);
corpPromisePeopleList.add(pageData);
}
corpPromiseService.delete(pd);
dockData.put("removeData",JSON.toJSONString(pd));
dockData.put("corpPromisePeopleList",JSON.toJSONString(corpPromisePeopleList));
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(dockData));
return map;
}
}

13
src/main/java/com/zcloud/controller/bus/HiddenController.java
View File

@ -2151,6 +2151,7 @@ public class HiddenController extends BaseController {
@RequestMapping(value = "/confirmUpdate")
@RequiresPermissions("hidden:edit")
@ResponseBody
@DockAnnotation
public Object confirmUpdate(@RequestParam(value = "FFILE", required = false) MultipartFile file,
@RequestParam(value = "FFILETwo", required = false) MultipartFile fileTwo
@ -2180,6 +2181,7 @@ public class HiddenController extends BaseController {
List<PageData> deptHeadmanAllList = usersService.listUserBYids(deptHeadmanIds.split(","));
if (deptHeadmanAllList.size() == 0) {
map.put("exception", "未查询到管理单位负责人需要重新维护");
map.put("dockData",JSON.toJSONString(pd));
return map;
} else {
messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患需要核实",
@ -2234,7 +2236,8 @@ public class HiddenController extends BaseController {
return map;
}
PageData examine = new PageData();
examine.put("IMGFILES_ID", this.get32UUID());
String IMGFILES_ID = this.get32UUID();
examine.put("IMGFILES_ID", IMGFILES_ID);
examine.put("FOREIGN_KEY", pd.getString("HIDDEN_ID"));
if (pd.getString("STATE").equals("12")) {
examine.put("TYPE", "107");//补充重大隐患信息与临时处置信息
@ -2243,7 +2246,7 @@ public class HiddenController extends BaseController {
}
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,pd.getString("HIDDEN_ID"),examine.getString("TYPE"));
examine.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
imgFilesService.save(examine);//保存上传的PDF
}
@ -2256,7 +2259,8 @@ public class HiddenController extends BaseController {
return map;
}
PageData examine = new PageData();
examine.put("IMGFILES_ID", this.get32UUID());
String IMGFILES_ID = this.get32UUID();
examine.put("IMGFILES_ID", IMGFILES_ID);
examine.put("FOREIGN_KEY", pd.getString("HIDDEN_ID"));
if (pd.getString("STATE").equals("11")) {
examine.put("TYPE", "112");//补充重大隐患信息与临时处置信息
@ -2265,7 +2269,7 @@ public class HiddenController extends BaseController {
}
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + fileTwo.getOriginalFilename().substring(fileTwo.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(fileTwo, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
Smb.sshSftp(fileTwo, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,pd.getString("HIDDEN_ID"),examine.getString("TYPE"));
examine.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
imgFilesService.save(examine);//保存上传的PDF
}
@ -2284,6 +2288,7 @@ public class HiddenController extends BaseController {
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}

8
src/main/java/com/zcloud/controller/bus/ImgFilesController.java
View File

@ -7,6 +7,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -126,13 +127,14 @@ public class ImgFilesController extends BaseController {
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName,Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
PageData pd = new PageData();
pd.put("IMGFILES_ID", this.get32UUID());
String IMGFILES_ID = this.get32UUID();
pd.put("IMGFILES_ID", IMGFILES_ID);
pd.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
pd.put("TYPE", TYPE);
pd.put("FOREIGN_KEY", FOREIGN_KEY);
imgfilesService.save(pd);
Smb.sshSftp(file, fileName,Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,FOREIGN_KEY,TYPE);
imgfilesService.save(pd);
}
}

56
src/main/java/com/zcloud/controller/bus/PersonObtainEvidenceController.java
View File

@ -6,6 +6,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@ -34,7 +36,7 @@ import com.zcloud.service.system.DepartmentService;
import com.zcloud.service.system.PostService;
import com.zcloud.service.system.UsersService;
/**
/**
* 说明：人员取证情况
* 作者：luoxiaobao
* 时间：2020-12-29
@ -52,7 +54,7 @@ public class PersonObtainEvidenceController extends BaseController {
private DepartmentService departmentService;
@Autowired
private PostService postService;
/**新增
* @param
* @throws Exception
@ -60,6 +62,7 @@ public class PersonObtainEvidenceController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("personobtainevidence:add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -72,6 +75,7 @@ public class PersonObtainEvidenceController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
List<String> fileList = new ArrayList<>();
if (null != file && !file.isEmpty()) {
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)) {
@ -84,12 +88,15 @@ public class PersonObtainEvidenceController extends BaseController {
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName,Const.FILEPATHIMG + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("IMGPATH", Const.FILEPATHIMG + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
fileList.add(Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
}
personobtainevidenceService.save(pd);
map.put("dockData", pd);
map.put("sendPicturesList", JSON.toJSONString(fileList));
map.put("result", errInfo);
return map;
}
/**删除
* @param out
* @throws Exception
@ -97,8 +104,9 @@ public class PersonObtainEvidenceController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("personobtainevidence:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
@ -106,9 +114,10 @@ public class PersonObtainEvidenceController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
personobtainevidenceService.delete(pd);
map.put("result", errInfo); //返回结果
map.put("dockData", pd);
return map;
}
/**修改
* @param
* @throws Exception
@ -116,6 +125,7 @@ public class PersonObtainEvidenceController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("personobtainevidence:edit")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -123,6 +133,7 @@ public class PersonObtainEvidenceController extends BaseController {
pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
List<String> fileList = new ArrayList<>();
if (null != file && !file.isEmpty()) {
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)) {
@ -135,12 +146,15 @@ public class PersonObtainEvidenceController extends BaseController {
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName,Const.FILEPATHIMG + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("IMGPATH", Const.FILEPATHIMG + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
fileList.add(Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
}
personobtainevidenceService.edit(pd);
map.put("dockData", pd);
map.put("sendPicturesList", JSON.toJSONString(fileList));
map.put("result", errInfo);
return map;
}
/**列表
* @param page
* @throws Exception
@ -163,7 +177,7 @@ public class PersonObtainEvidenceController extends BaseController {
map.put("result", errInfo);
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
@ -184,7 +198,7 @@ public class PersonObtainEvidenceController extends BaseController {
// PageData dept = new PageData();
// dept.put("DEPARTMENT_ID",ZDEPARTMENT_ID);
// dept=departmentService.findById(dept);
//获取部门下拉树
List<PageData> zdepartmentPdList = new ArrayList<PageData>();
@ -192,7 +206,7 @@ public class PersonObtainEvidenceController extends BaseController {
dept.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
dept=this.departmentService.findByCorpId(dept);
String ZDEPARTMENT_ID = dept.getString("DEPARTMENT_ID");
PageData node = new PageData();
node.put("id", dept.get("DEPARTMENT_ID"));
node.put("parentId", dept.get("PARENT_ID"));
@ -211,13 +225,13 @@ public class PersonObtainEvidenceController extends BaseController {
PageData post = new PageData();
post.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID"));
post.put("STATUS", 0);
List<PageData> postList = postService.listAll(post);
List<PageData> postList = postService.listAll(post);
map.put("postList", postList);
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
}
/**获取部门下拉树
* @param
@ -242,7 +256,7 @@ public class PersonObtainEvidenceController extends BaseController {
// PageData dept = new PageData();
// dept.put("DEPARTMENT_ID",ZDEPARTMENT_ID);
// dept=this.departmentService.findById(dept);
PageData node = new PageData();
node.put("id", dept.get("DEPARTMENT_ID"));
node.put("parentId", dept.get("PARENT_ID"));
@ -251,7 +265,7 @@ public class PersonObtainEvidenceController extends BaseController {
zdepartmentPdList.add(node);
JSONArray arr = JSONArray.fromObject(departmentService.listAllDepartmentToSelect(ZDEPARTMENT_ID,zdepartmentPdList));
map.put("zTreeNodes", (null == arr ?"":"{\"treeNodes\":" + arr.toString() + "}"));
PageData loginDept = new PageData();
loginDept.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
loginDept = departmentService.findById(loginDept);
@ -259,7 +273,7 @@ public class PersonObtainEvidenceController extends BaseController {
// PageData post = new PageData();
// post.put("DEPARTMENT_ID", ZDEPARTMENT_ID);
// post.put("STATUS", 0);
// List<PageData> postList = this.postService.listAll(post);
// List<PageData> postList = this.postService.listAll(post);
// map.put("postList", postList);
map.put("result", errInfo);
@ -267,9 +281,9 @@ public class PersonObtainEvidenceController extends BaseController {
map.put("USER_ID", Jurisdiction.getUSER_ID());
map.put("DEPT_NAME", loginDept.get("NAME"));
return map;
}
}
/**批量删除
* @param
* @throws Exception
@ -280,7 +294,7 @@ public class PersonObtainEvidenceController extends BaseController {
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
@ -293,7 +307,7 @@ public class PersonObtainEvidenceController extends BaseController {
map.put("result", errInfo); //返回结果
return map;
}
/**导出到excel
* @param
* @throws Exception
@ -352,5 +366,5 @@ public class PersonObtainEvidenceController extends BaseController {
mv = new ModelAndView(erv,dataMap);
return mv;
}
}

127
src/main/java/com/zcloud/controller/bus/PromiseController.java
View File

@ -1,10 +1,8 @@
package com.zcloud.controller.bus;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.util.Jurisdiction;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -38,150 +36,175 @@ public class PromiseController extends BaseController {
@Autowired
private CorpPromisePeopleService corpPromisePeopleService;
/**新增
/**
* 新增
*
* @param
* @throws Exception
*/
@RequestMapping(value="/add")
@RequestMapping(value = "/add")
@ResponseBody
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
@DockAnnotation
public Object add() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("PROMISE_ID", this.get32UUID()); //主键
pd.put("ISDELETE",0);
pd.put("CREATOR", "admin"); //创建人
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间
pd.put("OPERATOR", "admin"); //创建人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //创建时间
pd.put("PROMISE_ID", this.get32UUID()); //主键
pd.put("ISDELETE", 0);
pd.put("CREATOR", "admin"); //创建人
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间
pd.put("OPERATOR", "admin"); //创建人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //创建时间
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
promiseService.save(pd);
ArrayList<PageData> promiseDetailList = new ArrayList<>();
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("DETAIL"));
if(list.size()>0){
for (int i=0;i<list.size();i++) {
if (list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
PageData promise = new PageData();
promise.put("PROMISEDETAIL_ID", this.get32UUID()); //主键
promise.put("PROMISE_ID", pd.getString("PROMISE_ID")); //外键ID
promise.put("COLLATERAL",list.get(i).get("value"));
promise.put("SORTINDEX",list.get(i).get("index"));
promise.put("COLLATERAL", list.get(i).get("value"));
promise.put("SORTINDEX", list.get(i).get("index"));
promiseDetailsService.save(promise);
promiseDetailList.add(promise);
}
pd.put("promiseDetailList", JSON.toJSONString(promiseDetailList));
}
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
/**列表
/**
* 列表
*
* @param page
* @throws Exception
*/
@RequestMapping(value="/list")
@RequestMapping(value = "/list")
@ResponseBody
public Object list(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
public Object list(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> varList = promiseService.list(page); //列出Notice列表
List<PageData> varList = promiseService.list(page); //列出Notice列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**启用禁用
/**
* 启用禁用
*
* @param
* @throws Exception
*/
@RequestMapping(value="/editdelete")
@RequestMapping(value = "/editdelete")
@ResponseBody
public Object editdelete() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
@DockAnnotation
public Object editdelete() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
promiseService.editdelete(pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
/**查看
/**
* 查看
*
* @param
* @throws Exception
*/
@RequestMapping(value="/goEdit")
@RequestMapping(value = "/goEdit")
@ResponseBody
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
public Object goEdit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData promise = promiseService.findById(pd);
PageData promise = promiseService.findById(pd);
List<PageData> promistDetail = promiseDetailsService.findByPromiseId(pd);
map.put("promistDetail",promistDetail);
map.put("promistDetail", promistDetail);
map.put("varList", promise);
map.put("result", errInfo);
return map;
}
/**查看
/**
* 查看
*
* @param
* @throws Exception
*/
@RequestMapping(value="/edit")
@RequestMapping(value = "/edit")
@ResponseBody
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
@DockAnnotation
public Object edit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //创建时间
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //创建时间
promiseService.edit(pd);
promiseDetailsService.deletePromiseId(pd);
ArrayList<PageData> promiseDetailList = new ArrayList<>();
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("DETAIL"));
if(list.size()>0){
for (int i=0;i<list.size();i++) {
if (list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
PageData promise = new PageData();
promise.put("PROMISEDETAIL_ID", this.get32UUID()); //主键
promise.put("PROMISE_ID", pd.getString("PROMISE_ID")); //外键ID
promise.put("COLLATERAL",list.get(i).get("value"));
promise.put("SORTINDEX",list.get(i).get("index"));
promise.put("COLLATERAL", list.get(i).get("value"));
promise.put("SORTINDEX", list.get(i).get("index"));
promiseDetailsService.save(promise);
promiseDetailList.add(promise);
}
}
pd.put("promiseDetailList",JSON.toJSONString(promiseDetailList));
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
/**启用禁用
/**
* 启用禁用
*
* @param
* @throws Exception
*/
@RequestMapping(value="/delete")
@RequestMapping(value = "/delete")
@ResponseBody
public Object delete() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
public Object delete() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
// b3f6c82e51774b4b82e2a87363c8f1cf
List<PageData> coverpeople = corpPromisePeopleService.findByCoverPromiseId(pd); //被承诺人
List<PageData> people = corpPromisePeopleService.findByPromiseId(pd);//承诺人
if(coverpeople.size()>0){
if (coverpeople.size() > 0) {
map.put("result", "fail");
map.put("msg", "该承诺书有被承诺人,删除失败!");
return map;
}else if(people.size()>0){
} else if (people.size() > 0) {
map.put("result", "fail");
map.put("msg", "该承诺书有承诺人,删除失败!");
return map;
}else{
promiseService.delete(pd); // 删除
} else {
promiseService.delete(pd); // 删除
}
map.put("result", errInfo);
return map;

6
src/main/java/com/zcloud/controller/bus/QualificationsController.java
View File

@ -8,6 +8,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@ -48,6 +50,7 @@ public class QualificationsController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("qualifications:add")
@ResponseBody
@DockAnnotation
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -63,6 +66,7 @@ public class QualificationsController extends BaseController {
qualificationsService.save(pd);
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@ -73,6 +77,7 @@ public class QualificationsController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("qualifications:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -103,6 +108,7 @@ public class QualificationsController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("qualifications:edit")
@ResponseBody
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";

36
src/main/java/com/zcloud/controller/bus/RiskWarningController.java
View File

@ -8,6 +8,8 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@ -31,7 +33,7 @@ import com.zcloud.util.Tools;
import com.zcloud.entity.PageData;
import com.zcloud.service.bus.RiskWarningService;
/**
/**
* 说明：风险提示
* 作者：luoxiaobao
* 时间：2021-04-27
@ -40,10 +42,10 @@ import com.zcloud.service.bus.RiskWarningService;
@Controller
@RequestMapping("/riskwarning")
public class RiskWarningController extends BaseController {
@Autowired
private RiskWarningService riskwarningService;
/**新增
* @param
* @throws Exception
@ -51,6 +53,7 @@ public class RiskWarningController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("riskwarning:add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -62,7 +65,8 @@ public class RiskWarningController extends BaseController {
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
ArrayList<String> strings = new ArrayList<>();
if (null != file && !file.isEmpty()) {
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)) {
@ -80,12 +84,15 @@ public class RiskWarningController extends BaseController {
//pd.put("FILESIZE", FileUtil.getFilesize(Const.HTTPFILEURL + Const.FILEPATHFXSST + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName)); //文件大小
pd.put("FILESIZE",size);
pd.put("FILEPATH", Const.FILEPATHFXSST + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
strings.add(pd.getString("FILEPATH")+"@@"+fileName);
}
riskwarningService.save(pd);
map.put("result", errInfo);
map.put("sendPicturesList", JSON.toJSONString(strings));
map.put("dockData",JSON.toJSONString(pd));
return map;
}
/**删除
* @param out
* @throws Exception
@ -93,6 +100,7 @@ public class RiskWarningController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("riskwarning:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -102,7 +110,7 @@ public class RiskWarningController extends BaseController {
map.put("result", errInfo); //返回结果
return map;
}
/**修改
* @param
* @throws Exception
@ -119,7 +127,7 @@ public class RiskWarningController extends BaseController {
map.put("result", errInfo);
return map;
}
/**列表
* @param page
* @throws Exception
@ -134,7 +142,7 @@ public class RiskWarningController extends BaseController {
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> varList = riskwarningService.list(page); //列出RiskWarning列表
map.put("varList", varList);
@ -142,7 +150,7 @@ public class RiskWarningController extends BaseController {
map.put("result", errInfo);
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
@ -159,8 +167,8 @@ public class RiskWarningController extends BaseController {
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
}
/**批量删除
* @param
* @throws Exception
@ -171,7 +179,7 @@ public class RiskWarningController extends BaseController {
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
@ -184,7 +192,7 @@ public class RiskWarningController extends BaseController {
map.put("result", errInfo); //返回结果
return map;
}
/**下载
* @param
* @throws Exception
@ -239,5 +247,5 @@ public class RiskWarningController extends BaseController {
mv = new ModelAndView(erv,dataMap);
return mv;
}
}

6
src/main/java/com/zcloud/controller/bus/ShiftWorkRulesController.java
View File

@ -2,6 +2,7 @@ package com.zcloud.controller.bus;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -45,6 +46,7 @@ public class ShiftWorkRulesController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("shiftworkrules:add")
@ResponseBody
@DockAnnotation
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -60,6 +62,7 @@ public class ShiftWorkRulesController extends BaseController {
if (Tools.notEmpty(pd.getString("ISCUSTOM")) && "1".equals(pd.getString("ISCUSTOM"))
&& pd.get("periodList") != null && !pd.get("periodList").equals("")) {
List<JSONObject> periodList = (List<JSONObject>) JSON.parse(pd.get("periodList").toString());
ArrayList<PageData> periodLists = new ArrayList<>();
for (int i = 0; i < periodList.size(); i++) {
PageData period = new PageData();
period.put("SHIFTWORKPERIOD_ID",this.get32UUID());
@ -74,11 +77,14 @@ public class ShiftWorkRulesController extends BaseController {
period.put("SHIFTWORKRULES_ID", pd.get("SHIFTWORKRULES_ID"));
period.put("SORT", i+1);
period.put("ISEND", i < periodList.size()-1 ? 0 : 1);
periodLists.add(period);
shiftWorkPeriodService.save(period);
}
pd.put("periodList",JSON.toJSONString(periodLists));
}
shiftworkrulesService.save(pd);
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}

459
src/main/java/com/zcloud/controller/bus/StudySectionController.java
View File

@ -6,6 +6,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@ -28,7 +30,7 @@ import com.zcloud.util.Tools;
import com.zcloud.entity.PageData;
import com.zcloud.service.bus.StudySectionService;
/**
/**
* 说明：学习园地
* 作者：luoxiaobao
* 时间：2021-01-07
@ -37,225 +39,244 @@ import com.zcloud.service.bus.StudySectionService;
@Controller
@RequestMapping("/studysection")
public class StudySectionController extends BaseController {
@Autowired
private StudySectionService studysectionService;
/**新增
* @param
* @throws Exception
*/
@RequestMapping(value="/add")
@RequiresPermissions("studysection:add")
@ResponseBody
public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("STUDYSECTION_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUsername()); //添加人
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
if (null != file && !file.isEmpty()) {
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
map.put("msg", "文件格式不正确！");
return map;
}
String ffile = DateUtil.getDays();
@Autowired
private StudySectionService studysectionService;
/**
* 新增
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/add")
@RequiresPermissions("studysection:add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object add(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
ArrayList<String> sendPicturesList = new ArrayList<>();
pd.put("STUDYSECTION_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUsername()); //添加人
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
if (null != file && !file.isEmpty()) {
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
map.put("msg", "文件格式不正确！");
return map;
}
String ffile = DateUtil.getDays();
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
}
studysectionService.save(pd);
map.put("result", errInfo);
return map;
}
/**删除
* @param out
* @throws Exception
*/
@RequestMapping(value="/delete")
@RequiresPermissions("studysection:del")
@ResponseBody
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
studysectionService.delete(pd);
map.put("result", errInfo); //返回结果
return map;
}
/**修改
* @param
* @throws Exception
*/
@RequestMapping(value="/edit")
@RequiresPermissions("studysection:edit")
@ResponseBody
public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("FILEPATH") + "@@" + fileName);
}
studysectionService.save(pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map;
}
/**
* 删除
*
* @param out
* @throws Exception
*/
@RequestMapping(value = "/delete")
@RequiresPermissions("studysection:del")
@ResponseBody
public Object delete() throws Exception {
Map<String, String> map = new HashMap<String, String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
studysectionService.delete(pd);
map.put("result", errInfo); //返回结果
return map;
}
/**
* 修改
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/edit")
@RequiresPermissions("studysection:edit")
@ResponseBody
public Object edit(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (null != file && !file.isEmpty()) {
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
map.put("msg", "文件格式不正确！");
return map;
}
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
}
studysectionService.edit(pd);
map.put("result", errInfo);
return map;
}
/**
* 列表
*
* @param page
* @throws Exception
*/
@RequestMapping(value = "/list")
@RequiresPermissions("studysection:list")
@ResponseBody
public Object list(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> varList = studysectionService.list(page); //列出StudySection列表
if (varList != null && varList.size() > 0) {
for (PageData var : varList) {
if (var.get("FILEPATH") != null && Tools.notEmpty(var.getString("FILEPATH").toString())) {
String suffix = var.get("FILEPATH").toString().substring(var.get("FILEPATH").toString().lastIndexOf(".") + 1);
var.put("extension_name", suffix);
}
}
}
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
* 去修改页面获取数据
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/goEdit")
@RequiresPermissions("studysection:edit")
@ResponseBody
public Object goEdit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = studysectionService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**
* 批量删除
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/deleteAll")
@RequiresPermissions("studysection:del")
@ResponseBody
public Object deleteAll() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if (Tools.notEmpty(DATA_IDS)) {
String ArrayDATA_IDS[] = DATA_IDS.split(",");
studysectionService.deleteAll(ArrayDATA_IDS);
errInfo = "success";
} else {
errInfo = "fail";
}
map.put("result", errInfo); //返回结果
return map;
}
/**
* 导出到excel
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/excel")
@RequiresPermissions("toExcel")
public ModelAndView exportExcel() throws Exception {
ModelAndView mv = new ModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
Map<String, Object> dataMap = new HashMap<String, Object>();
List<String> titles = new ArrayList<String>();
titles.add("所属行业"); //1
titles.add("所属专业"); //2
titles.add("所属小专业"); //3
titles.add("类型"); //4
titles.add("标题"); //5
titles.add("内容"); //6
titles.add("附件路径"); //7
titles.add("企业ID"); //8
titles.add("添加人"); //9
titles.add("添加时间"); //10
titles.add("修改人"); //11
titles.add("修改时间"); //12
titles.add("是否删除 1-是 0-否"); //13
dataMap.put("titles", titles);
List<PageData> varOList = studysectionService.listAll(pd);
List<PageData> varList = new ArrayList<PageData>();
for (int i = 0; i < varOList.size(); i++) {
PageData vpd = new PageData();
vpd.put("var1", varOList.get(i).getString("INDUSTRY")); //1
vpd.put("var2", varOList.get(i).getString("CORP_TYPE")); //2
vpd.put("var3", varOList.get(i).getString("CORP_TYPE_SMALL")); //3
vpd.put("var4", varOList.get(i).getString("TYPE")); //4
vpd.put("var5", varOList.get(i).getString("TITLE")); //5
vpd.put("var6", varOList.get(i).getString("CONTENT")); //6
vpd.put("var7", varOList.get(i).getString("FILEPATH")); //7
vpd.put("var8", varOList.get(i).getString("CORPINFO_ID")); //8
vpd.put("var9", varOList.get(i).getString("CREATOR")); //9
vpd.put("var10", varOList.get(i).getString("CREATTIME")); //10
vpd.put("var11", varOList.get(i).getString("OPERATOR")); //11
vpd.put("var12", varOList.get(i).getString("OPERATTIME")); //12
vpd.put("var13", varOList.get(i).getString("ISDELETE")); //13
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv, dataMap);
return mv;
}
pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (null != file && !file.isEmpty()) {
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
map.put("msg", "文件格式不正确！");
return map;
}
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
}
studysectionService.edit(pd);
map.put("result", errInfo);
return map;
}
/**列表
* @param page
* @throws Exception
*/
@RequestMapping(value="/list")
@RequiresPermissions("studysection:list")
@ResponseBody
public Object list(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> varList = studysectionService.list(page); //列出StudySection列表
if(varList != null && varList.size() > 0) {
for(PageData var : varList) {
if(var.get("FILEPATH") != null && Tools.notEmpty(var.getString("FILEPATH").toString())) {
String suffix = var.get("FILEPATH").toString().substring(var.get("FILEPATH").toString().lastIndexOf(".") + 1);
var.put("extension_name", suffix);
}
}
}
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
*/
@RequestMapping(value="/goEdit")
@RequiresPermissions("studysection:edit")
@ResponseBody
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = studysectionService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**批量删除
* @param
* @throws Exception
*/
@RequestMapping(value="/deleteAll")
@RequiresPermissions("studysection:del")
@ResponseBody
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(",");
studysectionService.deleteAll(ArrayDATA_IDS);
errInfo = "success";
}else{
errInfo = "fail";
}
map.put("result", errInfo); //返回结果
return map;
}
/**导出到excel
* @param
* @throws Exception
*/
@RequestMapping(value="/excel")
@RequiresPermissions("toExcel")
public ModelAndView exportExcel() throws Exception{
ModelAndView mv = new ModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
Map<String,Object> dataMap = new HashMap<String,Object>();
List<String> titles = new ArrayList<String>();
titles.add("所属行业"); //1
titles.add("所属专业"); //2
titles.add("所属小专业"); //3
titles.add("类型"); //4
titles.add("标题"); //5
titles.add("内容"); //6
titles.add("附件路径"); //7
titles.add("企业ID"); //8
titles.add("添加人"); //9
titles.add("添加时间"); //10
titles.add("修改人"); //11
titles.add("修改时间"); //12
titles.add("是否删除 1-是 0-否"); //13
dataMap.put("titles", titles);
List<PageData> varOList = studysectionService.listAll(pd);
List<PageData> varList = new ArrayList<PageData>();
for(int i=0;i<varOList.size();i++){
PageData vpd = new PageData();
vpd.put("var1", varOList.get(i).getString("INDUSTRY")); //1
vpd.put("var2", varOList.get(i).getString("CORP_TYPE")); //2
vpd.put("var3", varOList.get(i).getString("CORP_TYPE_SMALL")); //3
vpd.put("var4", varOList.get(i).getString("TYPE")); //4
vpd.put("var5", varOList.get(i).getString("TITLE")); //5
vpd.put("var6", varOList.get(i).getString("CONTENT")); //6
vpd.put("var7", varOList.get(i).getString("FILEPATH")); //7
vpd.put("var8", varOList.get(i).getString("CORPINFO_ID")); //8
vpd.put("var9", varOList.get(i).getString("CREATOR")); //9
vpd.put("var10", varOList.get(i).getString("CREATTIME")); //10
vpd.put("var11", varOList.get(i).getString("OPERATOR")); //11
vpd.put("var12", varOList.get(i).getString("OPERATTIME")); //12
vpd.put("var13", varOList.get(i).getString("ISDELETE")); //13
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap);
return mv;
}
}

46
src/main/java/com/zcloud/controller/bus/TrainingInfoController.java
View File

@ -6,6 +6,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@ -28,7 +30,7 @@ import com.zcloud.util.Tools;
import com.zcloud.entity.PageData;
import com.zcloud.service.bus.TrainingInfoService;
/**
/**
* 说明：培训情况
* 作者：luoxiaobao
* 时间：2020-12-29
@ -37,10 +39,10 @@ import com.zcloud.service.bus.TrainingInfoService;
@Controller
@RequestMapping("/traininginfo")
public class TrainingInfoController extends BaseController {
@Autowired
private TrainingInfoService traininginfoService;
/**新增
* @param
* @throws Exception
@ -48,6 +50,7 @@ public class TrainingInfoController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("traininginfo:add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -60,6 +63,7 @@ public class TrainingInfoController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
List<String> fileLst = new ArrayList<>();
if (null != file && !file.isEmpty()) {
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)) {
@ -70,14 +74,17 @@ public class TrainingInfoController extends BaseController {
}
String ffile = DateUtil.getDays();
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);
pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
fileLst.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
}
traininginfoService.save(pd);
map.put("result", errInfo);
map.put("dockData", pd);
map.put("sendPicturesList", fileLst);
return map;
}
/**删除
* @param out
* @throws Exception
@ -85,8 +92,9 @@ public class TrainingInfoController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("traininginfo:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
@ -94,9 +102,10 @@ public class TrainingInfoController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
traininginfoService.delete(pd);
map.put("result", errInfo); //返回结果
map.put("dockData", pd);
return map;
}
/**修改
* @param
* @throws Exception
@ -104,6 +113,7 @@ public class TrainingInfoController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("traininginfo:edit")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -111,6 +121,7 @@ public class TrainingInfoController extends BaseController {
pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
List<String> fileLst = new ArrayList<>();
if (null != file && !file.isEmpty()) {
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)) {
@ -121,14 +132,17 @@ public class TrainingInfoController extends BaseController {
}
String ffile = DateUtil.getDays();
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);
pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
fileLst.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
}
traininginfoService.edit(pd);
map.put("result", errInfo);
map.put("dockData", pd);
map.put("sendPicturesList", JSON.toJSONString(fileLst));
return map;
}
/**列表
* @param page
* @throws Exception
@ -154,7 +168,7 @@ public class TrainingInfoController extends BaseController {
String suffix = var.get("FILEPATH").toString().substring(var.get("FILEPATH").toString().lastIndexOf(".") + 1);
var.put("extension_name", suffix);
}
}
}
map.put("varList", varList);
@ -162,7 +176,7 @@ public class TrainingInfoController extends BaseController {
map.put("result", errInfo);
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
@ -179,8 +193,8 @@ public class TrainingInfoController extends BaseController {
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
}
/**批量删除
* @param
* @throws Exception
@ -191,7 +205,7 @@ public class TrainingInfoController extends BaseController {
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
@ -204,7 +218,7 @@ public class TrainingInfoController extends BaseController {
map.put("result", errInfo); //返回结果
return map;
}
/**导出到excel
* @param
* @throws Exception
@ -255,5 +269,5 @@ public class TrainingInfoController extends BaseController {
mv = new ModelAndView(erv,dataMap);
return mv;
}
}

51
src/main/java/com/zcloud/controller/bus/TrainingPlanController.java
View File

@ -7,6 +7,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@ -30,7 +33,7 @@ import com.zcloud.util.Tools;
import com.zcloud.entity.PageData;
import com.zcloud.service.bus.TrainingPlanService;
/**
/**
* 说明：培训计划
* 作者：luoxiaobao
* 时间：2020-12-28
@ -39,10 +42,10 @@ import com.zcloud.service.bus.TrainingPlanService;
@Controller
@RequestMapping("/trainingplan")
public class TrainingPlanController extends BaseController {
@Autowired
private TrainingPlanService trainingplanService;
/**新增
* @param
* @throws Exception
@ -50,6 +53,7 @@ public class TrainingPlanController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("trainingplan:add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -62,6 +66,7 @@ public class TrainingPlanController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
List<String> fileList = new ArrayList<>();
if (null != file && !file.isEmpty()) {
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)) {
@ -72,14 +77,17 @@ public class TrainingPlanController extends BaseController {
}
String ffile = DateUtil.getDays();
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);
pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
}
trainingplanService.save(pd);
map.put("dockData", pd);
map.put("sendPicturesList", JSON.toJSONString(fileList));
map.put("result", errInfo);
return map;
}
/**删除
* @param out
* @throws Exception
@ -87,8 +95,9 @@ public class TrainingPlanController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("trainingplan:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
@ -96,9 +105,10 @@ public class TrainingPlanController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
trainingplanService.delete(pd);
map.put("result", errInfo); //返回结果
map.put("dockDate", pd);
return map;
}
/**修改
* @param
* @throws Exception
@ -106,6 +116,7 @@ public class TrainingPlanController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("trainingplan:edit")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -114,6 +125,7 @@ public class TrainingPlanController extends BaseController {
pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
List<String> fileList = new ArrayList<>();
if (null != file && !file.isEmpty()) {
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)) {
@ -126,14 +138,17 @@ public class TrainingPlanController extends BaseController {
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
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);
pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
}
trainingplanService.edit(pd);
map.put("dockData", pd);
map.put("result", errInfo);
map.put("sendPicturesList", JSON.toJSONString(fileList));
return map;
}
/**列表
* @param page
* @throws Exception
@ -157,7 +172,7 @@ public class TrainingPlanController extends BaseController {
String suffix = var.get("FILEPATH").toString().substring(var.get("FILEPATH").toString().lastIndexOf(".") + 1);
var.put("extension_name", suffix);
}
}
}
map.put("varList", varList);
@ -165,7 +180,7 @@ public class TrainingPlanController extends BaseController {
map.put("result", errInfo);
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
@ -182,8 +197,8 @@ public class TrainingPlanController extends BaseController {
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
}
/**批量删除
* @param
* @throws Exception
@ -194,7 +209,7 @@ public class TrainingPlanController extends BaseController {
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
@ -207,7 +222,7 @@ public class TrainingPlanController extends BaseController {
map.put("result", errInfo); //返回结果
return map;
}
/**导出到excel
* @param
* @throws Exception
@ -258,9 +273,9 @@ public class TrainingPlanController extends BaseController {
mv = new ModelAndView(erv,dataMap);
return mv;
}
/**列表
* @param page
* @throws Exception
@ -278,5 +293,5 @@ public class TrainingPlanController extends BaseController {
map.put("result", errInfo);
return map;
}
}

8
src/main/java/com/zcloud/controller/bus/TrainingScheduleController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.bus;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -39,6 +41,7 @@ public class TrainingScheduleController extends BaseController {
*/
@RequestMapping(value="/add")
@ResponseBody
@DockAnnotation
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -53,6 +56,7 @@ public class TrainingScheduleController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
trainingscheduleService.save(pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@ -62,6 +66,7 @@ public class TrainingScheduleController extends BaseController {
*/
@RequestMapping(value="/delete")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -69,6 +74,7 @@ public class TrainingScheduleController extends BaseController {
pd = this.getPageData();
trainingscheduleService.delete(pd);
map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
return map;
}
@ -78,6 +84,7 @@ public class TrainingScheduleController extends BaseController {
*/
@RequestMapping(value="/edit")
@ResponseBody
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -87,6 +94,7 @@ public class TrainingScheduleController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
trainingscheduleService.edit(pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}

44
src/main/java/com/zcloud/controller/bus/VideoController.java
View File

@ -6,6 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.zcloud.aspect.DockAnnotation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -28,7 +29,7 @@ import com.zcloud.util.PathUtil;
import com.zcloud.util.Smb;
import com.zcloud.util.Tools;
/**
/**
* 说明：视频管理
* 作者：luoxiaobao
* 时间：2021-01-15
@ -37,10 +38,10 @@ import com.zcloud.util.Tools;
@Controller
@RequestMapping("/video")
public class VideoController extends BaseController {
@Autowired
private VideoService videoService;
/**新增
* @param
* @throws Exception
@ -48,6 +49,7 @@ public class VideoController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("video:add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -60,6 +62,7 @@ public class VideoController extends BaseController {
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
pd.put("TYPE", "0"); //是否置顶 0否 1是
// pd.put("CORPINFO_TYPE", "1"); //上传状态（管理员上传 0企业上传1）
List<String> fileList = new ArrayList<>();
if (null != file && !file.isEmpty()) {
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)) {
@ -76,13 +79,16 @@ public class VideoController extends BaseController {
//pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
Smb.sshSftp(file, fileName,Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("FILEPATH", Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
fileList.add(Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
}
videoService.save(pd);
map.put("dockData", pd);
map.put("sendPicturesList", fileList);
map.put("result", errInfo);
return map;
}
/**删除
* @param out
* @throws Exception
@ -90,16 +96,18 @@ public class VideoController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("video:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
videoService.delete(pd);
map.put("result", errInfo); //返回结果
map.put("dockData", pd);
return map;
}
/**修改
* @param
* @throws Exception
@ -107,6 +115,7 @@ public class VideoController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("video:edit")
@ResponseBody
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -114,9 +123,10 @@ public class VideoController extends BaseController {
pd = this.getPageData();
videoService.edit(pd);
map.put("result", errInfo);
map.put("dockData", pd);
return map;
}
/**列表
* @param page
* @throws Exception
@ -142,7 +152,7 @@ public class VideoController extends BaseController {
map.put("result", errInfo);
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
@ -150,6 +160,7 @@ public class VideoController extends BaseController {
@RequestMapping(value="/goEdit")
@RequiresPermissions("video:edit")
@ResponseBody
@DockAnnotation
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -157,10 +168,11 @@ public class VideoController extends BaseController {
pd = this.getPageData();
pd = videoService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("dockData", pd);
map.put("result", errInfo);
return map;
}
}
/**列表 数据置顶
* @param
* @throws Exception
@ -168,6 +180,7 @@ public class VideoController extends BaseController {
@RequestMapping(value="/editZhiding")
@RequiresPermissions("video:edit")
@ResponseBody
@DockAnnotation
public Object editZhiding() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -185,9 +198,10 @@ public class VideoController extends BaseController {
pd.put("TYPE", "1");
videoService.editZhiding(pd);//置顶信息
map.put("pd", pd);
map.put("dockData", pd);
map.put("result", errInfo);
return map;
}
}
/**批量删除
* @param
* @throws Exception
@ -198,7 +212,7 @@ public class VideoController extends BaseController {
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
@ -211,7 +225,7 @@ public class VideoController extends BaseController {
map.put("result", errInfo); //返回结果
return map;
}
/**导出到excel
* @param
* @throws Exception
@ -275,7 +289,7 @@ public class VideoController extends BaseController {
pd.put("CORPINFO_TYPE", "2");
pd.put("TYPE", "1");
List<PageData> ptVarList = videoService.listAll(pd); //平台视频
map.put("ptVarList", ptVarList);
map.put("cpvarList", cpvarList);
map.put("result", errInfo);

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

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

87
src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java
View File

@ -1,12 +1,11 @@
package com.zcloud.controller.filemanager;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -31,18 +30,18 @@ import com.zcloud.util.Tools;
import net.sf.json.JSONArray;
/**
/**
* 说明：文件管理
* 作者：zCloud
* 作者：zCloud
* 官网：
*/
@Controller
@RequestMapping("/mfolderStipulate")
public class MfolderStipulateController extends BaseController {
@Autowired
private MfolderStipulateService mfolderService;
/**创建目录
* @param
* @throws Exception
@ -50,6 +49,7 @@ public class MfolderStipulateController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("mfolderStipulate:add")
@ResponseBody
@DockAnnotation
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -61,12 +61,13 @@ public class MfolderStipulateController extends BaseController {
pd.put("UNAME", Jurisdiction.getName()); //上传者
pd.put("MASTER", Jurisdiction.getUsername()); //所属人
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
pd.put("FILESIZE", "");
pd.put("FILESIZE", "");
mfolderService.save(pd);
map.put("dockData", pd);
map.put("result", errInfo);
return map;
}
/**上传文件
* @param
* @throws Exception
@ -74,6 +75,7 @@ public class MfolderStipulateController extends BaseController {
@RequestMapping(value="/upload")
@RequiresPermissions("mfolderStipulate:add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object add(
@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
@ -93,7 +95,9 @@ public class MfolderStipulateController extends BaseController {
// fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); //文件路径
pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
List<String> fileList = new ArrayList<>();
fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
//pd.put("NAME", NAME); //文件名
//pd.put("PARENT_ID", PARENT_ID); //目录ID
pd.put("CTIME", DateUtil.date2Str(new Date())); //创建时间
@ -103,9 +107,11 @@ public class MfolderStipulateController extends BaseController {
//pd.put("REMARKS", REMARKS); //备注
//pd.put("SHARE", SHARE); //是否共享
//pd.put("TYPE", TYPE); //数据类型 1.文件夹 2.文件
pd.put("MFOLDER_ID", this.get32UUID()); //主键
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
map.put("dockData", pd);
map.put("sendPicturesList", JSON.toJSONString(fileList));
mfolderService.save(pd); //存入数据库表
}else{
errInfo = "fail";
@ -113,7 +119,7 @@ public class MfolderStipulateController extends BaseController {
map.put("result", errInfo); //返回结果
return map;
}
/**上传文件
* @param
* @throws Exception
@ -121,6 +127,7 @@ public class MfolderStipulateController extends BaseController {
@RequestMapping(value="/editUpload")
@RequiresPermissions("mfolderStipulate:add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object editUpload(
@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
@ -128,6 +135,7 @@ public class MfolderStipulateController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
String ffile = DateUtil.getDays(), fileName = "";
List<String> fileList = new ArrayList<>();
if (null != file && !file.isEmpty()) {
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)) {
@ -141,6 +149,8 @@ public class MfolderStipulateController extends BaseController {
fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); //文件路径
fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
//pd.put("NAME", NAME); //文件名
//pd.put("PARENT_ID", PARENT_ID); //目录ID
pd.put("UNAME", Jurisdiction.getName()); //上传者,当前用户的姓名
@ -149,15 +159,19 @@ public class MfolderStipulateController extends BaseController {
//pd.put("REMARKS", REMARKS); //备注
//pd.put("SHARE", SHARE); //是否共享
//pd.put("TYPE", TYPE); //数据类型 1.文件夹 2.文件
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
}
mfolderService.edit(pd); //存入数据库表
map.put("dockData", pd);
if (fileList.size() > 0) {
map.put("sendPicturesList", JSON.toJSONString(fileList));
}
map.put("result", errInfo); //返回结果
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
@ -174,14 +188,15 @@ public class MfolderStipulateController extends BaseController {
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
}
/**上传文件
* @param
* @throws Exception
*/
@RequestMapping(value="/uploadAll")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object uploadAll(
@RequestParam(value="file",required=false) MultipartFile file,
@RequestParam(value="FH_ID",required=false) String MFOLDER_ID
@ -201,8 +216,10 @@ public class MfolderStipulateController extends BaseController {
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
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);
pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); //文件路径
List<String> fileList = new ArrayList<>();
fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
String realName = file.getOriginalFilename();
String[] fileFullNames = realName.split("\\.");//上传文件全名
String extension =fileFullNames[fileFullNames.length-1];//上传文件文件后缀
@ -218,6 +235,8 @@ public class MfolderStipulateController extends BaseController {
pd.put("MFOLDER_ID", this.get32UUID()); //主键
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
mfolderService.save(pd); //存入数据库表
map.put("dockData", pd);
map.put("sendPicturesList", JSON.toJSONString(fileList));
}else{
errInfo = "fail";
}
@ -231,8 +250,9 @@ public class MfolderStipulateController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("mfolderStipulate:del")
@ResponseBody
@DockAnnotation
public Object delete(@RequestParam String MFOLDER_ID,@RequestParam String FILEPATH) throws Exception{
Map<String,String> map = new HashMap<String,String>();
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd.put("parentId", MFOLDER_ID);
@ -244,11 +264,12 @@ public class MfolderStipulateController extends BaseController {
}
pd.put("MFOLDER_ID", MFOLDER_ID);
mfolderService.delete(pd);
map.put("dockData", pd);
}
map.put("result", errInfo); //返回结果
return map;
}
/**修改
* @param
* @throws Exception
@ -256,16 +277,18 @@ public class MfolderStipulateController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("mfolderStipulate:edit")
@ResponseBody
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
mfolderService.edit(pd);
map.put("dockData", pd);
map.put("result", errInfo);
return map;
}
/**列表
* @param page
* @throws Exception
@ -285,7 +308,7 @@ public class MfolderStipulateController extends BaseController {
MFOLDER_ID = null == pd.get("MFOLDER_ID")?"":pd.get("MFOLDER_ID").toString();
pd.put("MFOLDER_ID", MFOLDER_ID); //当作上级ID
}
// if(Tools.notEmpty(SHARE) && "yes".equals(SHARE)) {
// pd.put("SHARE", "yes");
// }else {
@ -337,7 +360,7 @@ public class MfolderStipulateController extends BaseController {
fileType = "video"; //视频文件类型
}
varList.get(i).put("extension_name", extension_name); //文件拓展名
varList.get(i).put("fileType", fileType); //用于文件图标
varList.get(i).put("fileType", fileType); //用于文件图标
}
map.put("varList", varList);
map.put("page", page);
@ -370,9 +393,9 @@ public class MfolderStipulateController extends BaseController {
map.put("result", errInfo);
return map;
}
/**预览txt,java,php,等文本文件
* @return
* @return
*/
@RequestMapping(value="/viewTxt")
@ResponseBody
@ -388,7 +411,7 @@ public class MfolderStipulateController extends BaseController {
map.put("result", errInfo);
return map;
}
/**批量操作
* @param
* @throws Exception
@ -399,7 +422,7 @@ public class MfolderStipulateController extends BaseController {
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
@ -413,7 +436,7 @@ public class MfolderStipulateController extends BaseController {
map.put("result", errInfo); //返回结果
return map;
}
/**下载
* @param response
* @throws Exception
@ -431,7 +454,7 @@ public class MfolderStipulateController extends BaseController {
throw new NofileStiException("=========要下载的文件已经没有了=========");
}
}
}
/*
@ -440,7 +463,7 @@ public class MfolderStipulateController extends BaseController {
class NofileStiException extends Exception {
private static final long serialVersionUID = 1L;
public NofileStiException() {
super();
}
@ -456,5 +479,5 @@ class NofileStiException extends Exception {
public NofileStiException(Throwable cause) {
super(cause);
}
}

15
src/main/java/com/zcloud/controller/firemanager/FireCheckListController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.firemanager;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -159,12 +161,15 @@ public class FireCheckListController extends BaseController {
*/
@RequestMapping("/upd4PcById")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object upd4PcById() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = getPageData();
fireCheckListService.upd4PcById(pd);
Map<String, String> fireCheckMap = fireCheckListService.upd4PcById(pd);
pd.put("fireCheckMap",JSON.toJSONString(fireCheckMap));
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@ -178,12 +183,15 @@ public class FireCheckListController extends BaseController {
@LogOperation(value = "新增点检表成功", exceptionInformation = "新增点检表失败")
@RequestMapping(value = "/saveInfo")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object saveInfo() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = getPageData();
fireCheckListService.saveInfo(pd);
ArrayList<PageData> pageData = fireCheckListService.saveInfo(pd);
pd.put("pageDataList", JSON.toJSONString(pageData));
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}
@ -197,6 +205,7 @@ public class FireCheckListController extends BaseController {
@LogOperation(value = "删除点检表成功", exceptionInformation = "删除点检表失败",isDelete = true)
@RequestMapping("/delByIds")
@ResponseBody
@DockAnnotation
public Object delByIds() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -222,6 +231,7 @@ public class FireCheckListController extends BaseController {
*/
@RequestMapping("/setDelStateByIds")
@ResponseBody
@DockAnnotation
public Object setDelStateByIds() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -298,6 +308,7 @@ public class FireCheckListController extends BaseController {
@LogOperation(value = "禁用点检表成功", exceptionInformation = "禁用点检表失败")
@RequestMapping("/closeCheck")
@ResponseBody
@DockAnnotation
public Object closeCheck() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";

5
src/main/java/com/zcloud/controller/firemanager/FireCheckStandardController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.firemanager;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -188,6 +190,7 @@ public class FireCheckStandardController extends BaseController {
@LogOperation(value = "新增消防器材检查标准成功", exceptionInformation = "新增改消防器材检查标准失败")
@RequestMapping(value = "/add")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object saveInfo() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -200,6 +203,7 @@ public class FireCheckStandardController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
fireCheckStandardService.saveInfo(pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
/**
@ -212,6 +216,7 @@ public class FireCheckStandardController extends BaseController {
@LogOperation(value = "删除消防器材检查标准成功", exceptionInformation = "删除改消防器材检查标准失败",isDelete = true)
@RequestMapping("/delByIds")
@ResponseBody
@DockAnnotation
public Object delByIds() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";

6
src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java
View File

@ -3,6 +3,8 @@ package com.zcloud.controller.firemanager;
import java.text.SimpleDateFormat;
import java.util.*;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.entity.system.Dictionaries;
import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.service.system.DepartmentService;
@ -106,6 +108,7 @@ public class FireDeviceController extends BaseController {
@LogOperation(value = "修改消防设备成功", exceptionInformation = "修改消防设备失败", isUpdate = true, updateId = "FIRE_DEVICE_ID")
@RequestMapping("/updFireDeviceById")
@ResponseBody
@DockAnnotation
public Object updFirePointById() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -127,6 +130,7 @@ public class FireDeviceController extends BaseController {
*/
@RequestMapping("/removeFireDeviceByIds")
@ResponseBody
@DockAnnotation
public Object removeFireDeviceByIds() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -174,6 +178,7 @@ public class FireDeviceController extends BaseController {
@LogOperation(value = "新增消防器材成功", exceptionInformation = "新增消防器材失败")
@RequestMapping(value = "/saveDeviceInfo")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object saveInfo() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -186,6 +191,7 @@ public class FireDeviceController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
fireDeviceService.saveDeviceInfo(pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}

9
src/main/java/com/zcloud/controller/firemanager/FirePointController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.firemanager;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -148,6 +150,7 @@ public class FirePointController extends BaseController {
@LogOperation(value = "修改消防风险点位成功", exceptionInformation = "修改消防风险点位失败", isUpdate = true, updateId = "FIRE_POINT_ID")
@RequestMapping("/updFireRegionById")
@ResponseBody
@DockAnnotation
public Object updFirePointById(@RequestParam(value = "files",required = false) MultipartFile[] files) {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -185,6 +188,7 @@ public class FirePointController extends BaseController {
@RequestMapping("/removeFirePointByIds")
@ResponseBody
@DockAnnotation
public Object removeFirePointByIds() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -207,17 +211,20 @@ public class FirePointController extends BaseController {
@LogOperation(value = "新增消防风险点位成功", exceptionInformation = "新增消防风险点位失败")
@RequestMapping(value = "/savePointInfo")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object saveInfo(@RequestParam(value = "files",required = false) MultipartFile[] files) {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = getPageData();
String uuid = this.get32UUID();
pd.put("FIRE_POINT_ID", uuid);
initPageDataUtil.initSave(pd);
PageData initData = initPageDataUtil.initSave(pd);
pd.put("initData", JSON.toJSONString(initData));
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
firePointService.savePointInfo(pd);
imgFilesService.uploadPicture(files,"118",pd.getString("FIRE_POINT_ID"));
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}

4
src/main/java/com/zcloud/controller/firemanager/FireRecordController.java
View File

@ -2,6 +2,7 @@ package com.zcloud.controller.firemanager;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -223,6 +224,7 @@ public class FireRecordController extends BaseController {
@LogOperation(value = "删除点检记录成功", exceptionInformation = "删除点检记录失败", isDelete = true)
@RequestMapping("/delByIds")
@ResponseBody
@DockAnnotation
public Object delByIds() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -233,6 +235,4 @@ public class FireRecordController extends BaseController {
map.put("result", errInfo);
return map;
}
}

9
src/main/java/com/zcloud/controller/firemanager/FireRegionController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.firemanager;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.xml.bind.util.JAXBSource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -91,6 +94,7 @@ public class FireRegionController extends BaseController {
@LogOperation(value = "修改消防风险区域成功", exceptionInformation = "修改消防风险区域失败", isUpdate = true, updateId = "FIRE_REGION_ID")
@RequestMapping("/updFireRegionById")
@ResponseBody
@DockAnnotation
public Object updFireRegionById() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -126,12 +130,14 @@ public class FireRegionController extends BaseController {
@LogOperation(value = "删除消防风险区域成功", exceptionInformation = "删除消防风险区域失败", isDelete = true)
@RequestMapping("/delFireRegionByIds")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object delFireRegionByIds() {
Map<String, Object> map = new HashMap<String, Object>();
PageData pd = getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername());
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
fireRegionService.delByIds(map, pd);
map.put("dockData",JSON.toJSONString(pd));
return map;
}
@ -145,6 +151,7 @@ public class FireRegionController extends BaseController {
@RequestMapping(value = "/saveInfo")
@ResponseBody
@LogOperation(value = "保存新的消防风险区域成功", exceptionInformation = "保存新的消防风险区域失败")
@DockAnnotation(isAdd = true)
public Object saveInfo() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -156,6 +163,7 @@ public class FireRegionController extends BaseController {
pd.put("CREATTIME", DateUtil.date2Str(new Date()));
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
fireRegionService.saveInfo(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -170,6 +178,7 @@ public class FireRegionController extends BaseController {
@LogOperation(value = "修改消防风险区域禁用启用状态成功", exceptionInformation = "修改消防风险区域禁用启用状态失败", isUpdate = true, updateId = "FIRE_REGION_ID")
@RequestMapping(value = "/udpStateById")
@ResponseBody
@DockAnnotation
public Object udpStateById() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";

7
src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java
View File

@ -1,5 +1,8 @@
package com.zcloud.controller.firemanager;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -53,6 +56,7 @@ public class FireResourcesController extends BaseController {
@RequestMapping(value = "/add")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -64,11 +68,13 @@ public class FireResourcesController extends BaseController {
pd.put("ISDELETE", "0");
fireResourcesService.save(pd,files);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@RequestMapping(value = "/edit")
@ResponseBody
@DockAnnotation
public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -83,6 +89,7 @@ public class FireResourcesController extends BaseController {
@RequestMapping(value = "/delete")
@ResponseBody
@DockAnnotation
public Object delete(Page page) {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";

7
src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
View File

@ -326,7 +326,12 @@ public class AppFireRecordController extends BaseController {
itemCheckData.putAll(itemCheck);
itemCheckData.put("FOREIGN_KEY", itemCheck.getString("EQUIPMENT_RECORD_ID"));
itemCheckData.put("TYPE", "14");
List<PageData> data = imgFilesService.listAll(itemCheckData);
List<PageData> data = null;
try {
data = imgFilesService.listAll(itemCheckData);
} catch (Exception e) {
throw new RuntimeException(e);
}
// 不合格
if (!"0".equals(itemCheckData.getString("ISNORMAL"))) {
// 删除合格得照片

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

@ -109,6 +109,7 @@ public class AppGFBlindBoardController extends BaseController {
pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;");
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -117,6 +118,8 @@ public class AppGFBlindBoardController extends BaseController {
pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
}
map.put("dockData",JSON.toJSONString(pd));
GFblindboardService.save(pd);
@ -224,13 +227,16 @@ public class AppGFBlindBoardController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
}
map.put("result", errInfo);
@ -251,6 +257,7 @@ public class AppGFBlindBoardController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
smb.deleteFile(pd.getString("path"));
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -260,12 +267,14 @@ public class AppGFBlindBoardController extends BaseController {
*/
@RequestMapping(value="/delete")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFblindboardService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -277,6 +286,7 @@ public class AppGFBlindBoardController extends BaseController {
@RequestMapping(value="/edit")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object edit(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -287,6 +297,7 @@ public class AppGFBlindBoardController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;");
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -295,12 +306,17 @@ public class AppGFBlindBoardController extends BaseController {
pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
}
GFblindboardService.edit(pd);
GFblindBoardInfoService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
if(pd.get("boardList")!=null){
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("boardList").toString());
HashMap<String, String> infoMap = new HashMap<String, String>();
int count = 1;
for (JSONObject json : list) {
PageData board = new PageData();
board.put("BLINDBOARDINFO_ID", this.get32UUID()); // 主键
@ -310,13 +326,18 @@ public class AppGFBlindBoardController extends BaseController {
board.put("BOARD_SPECIFICATION", json.get("BOARD_SPECIFICATION"));
board.put("BOARD_NO", json.get("BOARD_NO"));
board.put("ISDELETE", 0);
infoMap.put("other"+count, JSON.toJSONString(board));
count+=1;
GFblindBoardInfoService.save(board);
}
map.put("infoMap", JSON.toJSONString(infoMap));
}
GFblindBoardToMeasuresService.delete(pd);
if(pd.get("measuresList")!=null){
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
HashMap<String, String> measuresMap = new HashMap<String, String>();
int count = 1;
for (JSONObject json : list) {
PageData measures = new PageData();
measures.put("BLINDBOARDTOMEASURES_ID", this.get32UUID()); // 主键
@ -325,8 +346,11 @@ public class AppGFBlindBoardController extends BaseController {
measures.put("STATUS", json.get("STATUS"));
measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
measuresMap.put("other"+count, JSON.toJSONString(measures));
count+=1;
GFblindBoardToMeasuresService.save(measures);
}
map.put("measuresMap", JSON.toJSONString(measuresMap));
}
if(!pd.get("APPLY_STATUS").equals("0")) {
@ -337,6 +361,7 @@ public class AppGFBlindBoardController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
GFblindBoardLogService.save(log);
map.put("logData", JSON.toJSONString(log));
// 发短信
@ -381,6 +406,7 @@ public class AppGFBlindBoardController extends BaseController {
@RequestMapping(value="/editStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -408,22 +434,28 @@ public class AppGFBlindBoardController extends BaseController {
switch (status) {
case "4"://作业负责人
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("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_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
log.put("ACTION", "作业负责人通过");
GFblindBoardInfoService.delete(pd);
if(pd.get("boardList")!=null){
GFblindBoardInfoService.delete(pd);
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("boardList").toString());
HashMap<String,String> boardMap = new HashMap<String,String>();
int boardCount = 1;
for (JSONObject json : list) {
PageData board = new PageData();
board.put("BLINDBOARDINFO_ID", this.get32UUID()); // 主键
@ -433,13 +465,19 @@ public class AppGFBlindBoardController extends BaseController {
board.put("BOARD_SPECIFICATION", json.get("BOARD_SPECIFICATION"));
board.put("BOARD_NO", json.get("BOARD_NO"));
board.put("ISDELETE", 0);
boardMap.put("other"+boardCount, JSON.toJSONString(board));
boardCount+=1;
GFblindBoardInfoService.save(board);
}
map.put("boardMap", JSON.toJSONString(boardMap));
}
GFblindBoardToMeasuresService.delete(pd);
map.put("pdData", JSON.toJSONString(pd));
if(pd.get("measuresList")!=null){
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
HashMap<String,String> measuresMap = new HashMap<String,String>();
int measuresCount = 1;
for (JSONObject json : list) {
PageData measures = new PageData();
measures.put("BLINDBOARDTOMEASURES_ID", this.get32UUID()); // 主键
@ -448,8 +486,11 @@ public class AppGFBlindBoardController extends BaseController {
measures.put("STATUS", json.get("STATUS"));
measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
measuresMap.put("other"+measuresCount, JSON.toJSONString(measures));
measuresCount+=1;
GFblindBoardToMeasuresService.save(measures);
}
map.put("measuresData", JSON.toJSONString(measuresMap));
}
@ -460,11 +501,14 @@ public class AppGFBlindBoardController extends BaseController {
case "5"://所在单位审核通过
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -472,6 +516,7 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
log.put("ACTION", "所在单位审核通过");
// 发短信
@ -481,18 +526,22 @@ public class AppGFBlindBoardController extends BaseController {
case "6"://验收人
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("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_CONTENT", pd.get("CONTENT"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过");
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -503,6 +552,7 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("SAFETY_CONTENT", pd.get("CONTENT"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -512,6 +562,7 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("LEADER_CONTENT", pd.get("CONTENT"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -521,6 +572,7 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -529,6 +581,7 @@ public class AppGFBlindBoardController extends BaseController {
break;
}
GFblindBoardLogService.save(log);
map.put("logData", JSON.toJSONString(log));
map.put("result", errInfo);
return map;
}
@ -597,6 +650,7 @@ public class AppGFBlindBoardController extends BaseController {
@RequestMapping(value="/editAcceptStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptStatus(MultipartRequest request) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -613,6 +667,7 @@ public class AppGFBlindBoardController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
@ -628,16 +683,19 @@ public class AppGFBlindBoardController extends BaseController {
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
for (int i = 0; i < SIGNTIME.length; i++) {
ArrayList<String> pictureList = new ArrayList<String>();
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"));
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
fileList.clear();
}
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过");
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -649,6 +707,7 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
GFblindboardService.edit(pd2);
map.put("pd2Data", JSON.toJSONString(pd2));
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
@ -657,11 +716,12 @@ public class AppGFBlindBoardController extends BaseController {
break;
}
GFblindBoardLogService.save(log);
map.put("logData", JSON.toJSONString(log));
map.put("result", errInfo);
return map;
}
private void saveAcceptImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{
private void saveAcceptImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData();
@ -682,6 +742,7 @@ public class AppGFBlindBoardController extends BaseController {
cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", "");
cpd.put("ACCEPT_CONFESS_USER_ID", "");
cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID);
pictureList.add(Const.FILEPATHFILE + cpd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
blindboardacceptuserService.save(cpd);
}
}
@ -695,6 +756,7 @@ public class AppGFBlindBoardController extends BaseController {
*/
@RequestMapping(value="/deleteAll")
@ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -708,6 +770,7 @@ public class AppGFBlindBoardController extends BaseController {
}else{
errInfo = "error";
}
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -886,6 +949,7 @@ public class AppGFBlindBoardController extends BaseController {
@RequestMapping(value="/editGuardian")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editGuardian(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -898,15 +962,19 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
GFblindboardService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
}
map.put("result", errInfo);
return map;
@ -979,6 +1047,7 @@ public class AppGFBlindBoardController extends BaseController {
@RequestMapping(value="/editConfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editConfess(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -991,15 +1060,19 @@ public class AppGFBlindBoardController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
GFblindboardService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
}
map.put("result", errInfo);
return map;
@ -1011,6 +1084,7 @@ public class AppGFBlindBoardController extends BaseController {
@RequestMapping(value="/editAcceptconfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptconfess(
MultipartRequest request
) throws Exception {
@ -1022,21 +1096,26 @@ public class AppGFBlindBoardController extends BaseController {
pd2 = GFblindboardService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
map.put("dockData", JSON.toJSONString(pd2));
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<String>();
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveImg(fileList.toArray(fileArr),signertime,pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
saveImg(fileList.toArray(fileArr),signertime,pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),
pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList);
fileList.clear();
}
map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo);
return map;
}
private void saveImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{
private void saveImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID,
String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData pd = new PageData();
@ -1057,6 +1136,7 @@ public class AppGFBlindBoardController extends BaseController {
pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID);
pd.put("ACCEPT_USER_ID","");
pd.put("ACCEPT_DEPARTMENT_ID", "");
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
blindboardacceptuserService.save(pd);
}
}

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

File diff suppressed because it is too large Load Diff

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

@ -422,6 +422,7 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -432,8 +433,10 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
}
if(pd.get("APPLY_STATUS").equals("1")) {
@ -500,6 +503,7 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -510,8 +514,10 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
}
map.put("result", errInfo);
return map;
@ -556,7 +562,7 @@ public class AppGFConfinedSpaceController extends BaseController {
@RequestMapping(value="/editAcceptconfess")
@ResponseBody
@Transactional
@DockAnnotation
@DockAnnotation(hasAnnex = true)
public Object editAcceptconfess(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -571,18 +577,20 @@ public class AppGFConfinedSpaceController extends BaseController {
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<>();
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
saveImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList);
fileList.clear();
}
map.put("dockData", JSON.toJSONString(pd));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo);
return map;
}
private void saveImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{
private void saveImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData pd = new PageData();
@ -603,6 +611,7 @@ public class AppGFConfinedSpaceController extends BaseController {
pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID);
pd.put("ACCEPT_USER_ID","");
pd.put("ACCEPT_DEPARTMENT_ID", "");
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
confinedspaceacceptuserService.save(pd);
}
}
@ -611,7 +620,7 @@ public class AppGFConfinedSpaceController extends BaseController {
@RequestMapping(value="/editAcceptStatus")
@ResponseBody
@Transactional
@DockAnnotation
@DockAnnotation(hasAnnex = true)
public Object editAcceptStatus(MultipartRequest request) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -644,13 +653,15 @@ public class AppGFConfinedSpaceController extends BaseController {
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<>();
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"));
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList);
fileList.clear();
}
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
@ -719,7 +730,7 @@ public class AppGFConfinedSpaceController extends BaseController {
map.put("result", errInfo);
return map;
}
private void saveAcceptImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{
private void saveAcceptImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData();
@ -740,6 +751,7 @@ public class AppGFConfinedSpaceController extends BaseController {
cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", "");
cpd.put("ACCEPT_CONFESS_USER_ID", "");
cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID);
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
confinedspaceacceptuserService.save(cpd);
}
}
@ -754,7 +766,7 @@ public class AppGFConfinedSpaceController extends BaseController {
@RequestMapping(value="/editStatus")
@ResponseBody
@Transactional
@DockAnnotation
@DockAnnotation(hasAnnex = true)
public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -785,6 +797,7 @@ public class AppGFConfinedSpaceController extends BaseController {
switch (status) {
case "4"://确认
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -803,9 +816,11 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("ACCEPT_CONFESS_DEPARTMENT_ID", pd.get("ACCEPT_CONFESS_DEPARTMENT_ID"));
pd2.put("ACCEPT_CONFESS_USER_ID", pd.get("ACCEPT_CONFESS_USER_ID"));
pd2.put("EDUCATE_USER", pd.get("EDUCATE_USER"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
GFconfinedspaceToMeasuresService.delete(pd2);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
for (JSONObject json : list) {
PageData measures = new PageData();
@ -867,6 +882,7 @@ public class AppGFConfinedSpaceController extends BaseController {
case "3"://监护人确认
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -877,8 +893,10 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
log.put("ACTION", "监护人确认通过");
}
return map;
@ -995,6 +1013,7 @@ public class AppGFConfinedSpaceController extends BaseController {
case "5"://所在单位确认
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -1005,8 +1024,10 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("APPROVE_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
log.put("ACTION", "所在单位审批通过");
@ -1064,6 +1085,7 @@ public class AppGFConfinedSpaceController extends BaseController {
case "6"://验收人
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -1074,8 +1096,10 @@ public class AppGFConfinedSpaceController extends BaseController {
pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
GFconfinedspaceService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
log.put("ACTION", "验收通过");
// 发短信

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

File diff suppressed because it is too large Load Diff

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

@ -2,6 +2,7 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.dto.TenCorpConst;
import com.zcloud.dto.TenCorpDto;
@ -84,6 +85,7 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/add")
@ResponseBody
@Transactional
@DockAnnotation(isAdd = true)
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -105,6 +107,7 @@ public class AppGFElectricityController extends BaseController {
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
map.put("dockData", JSON.toJSONString(pd));
GFelectricityService.save(pd);
if(pd.get("APPLY_STATUS").equals("1")) {
@ -114,6 +117,7 @@ public class AppGFElectricityController extends BaseController {
log.put("ELECTRICITY_ID", pd.get("ELECTRICITY_ID"));
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockDataLog", JSON.toJSONString(log));
GFelectricityLogService.save(log);
// 发短信
@ -184,12 +188,14 @@ public class AppGFElectricityController extends BaseController {
*/
@RequestMapping(value="/delete")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFelectricityService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -201,12 +207,14 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/edit")
@ResponseBody
@Transactional
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFelectricityService.edit(pd);
map.put("dockData", JSON.toJSONString(pd));
if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData();
log.put("ELECTRICITYLOG_ID", this.get32UUID());
@ -214,6 +222,7 @@ public class AppGFElectricityController extends BaseController {
log.put("ELECTRICITY_ID", pd.get("ELECTRICITY_ID"));
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockDataLog", JSON.toJSONString(log));
GFelectricityLogService.save(log);
// 发短信
@ -267,6 +276,7 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/editGuardian")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editGuardian(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -279,21 +289,26 @@ public class AppGFElectricityController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("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_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
}
map.put("result", errInfo);
return map;
}
/**修改
* @param
* @throws Exception
@ -301,6 +316,7 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/editConfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editConfess(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -313,21 +329,26 @@ public class AppGFElectricityController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockData", JSON.toJSONString(pd2));
}
map.put("result", errInfo);
return map;
}
/**修改
* @param
* @throws Exception
@ -335,6 +356,7 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/editAcceptconfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptconfess(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -348,17 +370,23 @@ public class AppGFElectricityController extends BaseController {
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<String>();
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
saveImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),
pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),
pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList);
fileList.clear();
}
map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo);
return map;
}
private void saveImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{
private void saveImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID,
String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID,
String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData pd = new PageData();
@ -379,6 +407,7 @@ public class AppGFElectricityController extends BaseController {
pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID);
pd.put("ACCEPT_USER_ID","");
pd.put("ACCEPT_DEPARTMENT_ID", "");
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
electricityacceptuserService.save(pd);
}
}
@ -390,6 +419,7 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/editAcceptStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptStatus(MultipartRequest request) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -406,6 +436,7 @@ public class AppGFElectricityController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString();
if ("2".equals(status) || "3".equals(status) || "4".equals(status)) {
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
@ -424,16 +455,21 @@ public class AppGFElectricityController extends BaseController {
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<String>();
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"));
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),
pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),
pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList);
fileList.clear();
}
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过");
// 发短信
@ -462,6 +498,7 @@ public class AppGFElectricityController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData mes3 = new PageData();
mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
@ -492,12 +529,13 @@ public class AppGFElectricityController extends BaseController {
break;
}
GFelectricityLogService.save(log);
map.put("dockDataLog", JSON.toJSONString(log));
map.put("result", errInfo);
return map;
}
private void saveAcceptImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{
private void saveAcceptImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData();
@ -518,6 +556,7 @@ public class AppGFElectricityController extends BaseController {
cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", "");
cpd.put("ACCEPT_CONFESS_USER_ID", "");
cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID);
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
electricityacceptuserService.save(cpd);
}
}
@ -531,6 +570,7 @@ public class AppGFElectricityController extends BaseController {
@RequestMapping(value="/editStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -549,6 +589,7 @@ public class AppGFElectricityController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString();
if ("2".equals(status) || "3".equals(status) || "4".equals(status)) {
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
@ -563,20 +604,27 @@ public class AppGFElectricityController extends BaseController {
switch (status) {
case "2"://作业单位
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.putAll(pd);
pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFIRM_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("CONFIRM_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
GFelectricityToMeasuresService.delete(pd);
map.put("dockDataDel", JSON.toJSONString(pd));
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
HashMap<String, String> measuresMap = new HashMap<String, String>();
int measuresCount = 1;
for (JSONObject json : list) {
PageData measures = new PageData();
measures.put("ELECTRICITYTOMEASURES_ID", this.get32UUID()); // 主键
@ -585,8 +633,11 @@ public class AppGFElectricityController extends BaseController {
measures.put("STATUS", json.get("STATUS"));
measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
measuresMap.put("other"+measuresCount, JSON.toJSONString(measures));
measuresCount+=1;
GFelectricityToMeasuresService.save(measures);
}
map.put("dockDatameasures", JSON.toJSONString(measuresMap));
log.put("ACTION", "作业单位通过");
// 发短信
@ -635,17 +686,21 @@ public class AppGFElectricityController extends BaseController {
case "3"://用电单位审核
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("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_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "用电单位审核通过");
// 发短信
@ -682,17 +737,21 @@ public class AppGFElectricityController extends BaseController {
case "4"://配送电单位审批
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("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_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "配送电单位审批通过");
// 发短信
@ -729,17 +788,21 @@ public class AppGFElectricityController extends BaseController {
case "5"://验收人
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("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_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
log.put("ACTION", "验收通过");
// 发短信
@ -768,6 +831,7 @@ public class AppGFElectricityController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("CONFIRM_CONTENT", pd.get("CONTENT"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
@ -799,6 +863,7 @@ public class AppGFElectricityController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("AUDIT_CONTENT", pd.get("CONTENT"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData mes1 = new PageData();
mes1.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
@ -829,6 +894,7 @@ public class AppGFElectricityController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("APPROVE_CONTENT", pd.get("CONTENT"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
// 发短信
PageData mes2 = new PageData();
@ -861,6 +927,7 @@ public class AppGFElectricityController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
GFelectricityService.edit(pd2);
map.put("dockDatapd2", JSON.toJSONString(pd2));
PageData mes3 = new PageData();
mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
@ -891,6 +958,7 @@ public class AppGFElectricityController extends BaseController {
break;
}
GFelectricityLogService.save(log);
map.put("dockDataLog", JSON.toJSONString(log));
map.put("result", errInfo);
return map;
}
@ -981,6 +1049,7 @@ public class AppGFElectricityController extends BaseController {
*/
@PostMapping(value="/cancel")
@ResponseBody
@DockAnnotation
public void cancel(@RequestBody PageData pd) throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -1004,6 +1073,7 @@ public class AppGFElectricityController extends BaseController {
if (workTime - analyzeTime >= 0) {
return;
} else {
map.put("dockData", JSON.toJSONString(pd));
GFelectricityService.cancel(pd);
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
@ -1028,12 +1098,14 @@ public class AppGFElectricityController extends BaseController {
e.printStackTrace();
}
}else{
map.put("dockData", JSON.toJSONString(pd));
GFelectricityService.cancel(pd);
PageData pd2 = new PageData();
pd2 = GFelectricityService.checkno(pd);
PageData pd3 = new PageData();
pd3.put("CHECK_NO",pd2.getString("CHECK_NO"));
pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID"));
map.put("dockDatapd2", JSON.toJSONString(pd3));
GFelectricityService.editSpecialwork(pd3);
GFelectricityService.editSpecialwork1(pd3);
GFelectricityService.editSpecialwork2(pd3);
@ -1109,12 +1181,14 @@ public class AppGFElectricityController extends BaseController {
*/
@RequestMapping(value="/gas/delete")
@ResponseBody
@DockAnnotation
public Object gasDel() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFelectricityGasService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -1125,6 +1199,7 @@ public class AppGFElectricityController extends BaseController {
*/
@RequestMapping(value="/gas/save")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object gasSave() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -1134,6 +1209,7 @@ public class AppGFElectricityController extends BaseController {
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
GFelectricityGasService.save(pd);
GFelectricityService.edittime(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}

69
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.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -76,6 +77,7 @@ public class AppGFHighWorkController extends BaseController {
@RequestMapping(value="/add")
@ResponseBody
@Transactional
@DockAnnotation
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -101,12 +103,14 @@ public class AppGFHighWorkController extends BaseController {
if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData();
log.put("HIGHWORKLOG_ID", this.get32UUID());
log.put("ACTION", "提交申请");
log.put("HIGHWORK_ID", pd.get("HIGHWORK_ID"));
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
GFhighWorkLogService.save(log);
pd.put("logData",JSON.toJSONString(log));
// 发短信
PageData mes = new PageData();
@ -139,6 +143,7 @@ public class AppGFHighWorkController extends BaseController {
sendMessageUtil.sendMessages(mes, paramsList);
}
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@ -148,6 +153,7 @@ public class AppGFHighWorkController extends BaseController {
*/
@RequestMapping(value="/delete")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -155,6 +161,7 @@ public class AppGFHighWorkController extends BaseController {
pd = this.getPageData();
GFhighworkService.delete(pd);
map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
return map;
}
@ -221,6 +228,7 @@ public class AppGFHighWorkController extends BaseController {
@RequestMapping(value="/editGuardian")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editGuardian(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -232,13 +240,14 @@ public class AppGFHighWorkController extends BaseController {
pd2 = GFhighworkService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
ArrayList<String> sendPicturesList = new ArrayList<>();
if (files != null && files.length > 0) {
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
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_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
@ -288,6 +297,8 @@ public class AppGFHighWorkController extends BaseController {
// sendMessageUtil.sendMessages(mes, paramsList);
// }
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map;
}
/**修改
@ -297,6 +308,7 @@ public class AppGFHighWorkController extends BaseController {
@RequestMapping(value="/editConfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editConfess(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -306,6 +318,7 @@ public class AppGFHighWorkController extends BaseController {
pd = this.getPageData();
PageData pd2 = new PageData();
pd2 = GFhighworkService.findById(pd);
ArrayList<String> sendPicturesList = new ArrayList<>();
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
@ -314,7 +327,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
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_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
@ -322,6 +335,8 @@ public class AppGFHighWorkController extends BaseController {
GFhighworkService.edit(pd2);
}
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map;
}
/**修改
@ -331,11 +346,11 @@ public class AppGFHighWorkController extends BaseController {
@RequestMapping(value="/editAcceptconfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptconfess(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData pd = this.getPageData();
PageData pd2 = new PageData();
pd2 = GFhighworkService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -343,18 +358,23 @@ public class AppGFHighWorkController extends BaseController {
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> sendPicturesList = new ArrayList<>();
ArrayList<PageData> highworkacceptuserList = new ArrayList<>();
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
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();
}
PageData dockData = new PageData();
dockData.put("highworkacceptuserList", JSON.toJSONString(highworkacceptuserList));
map.put("result", errInfo);
map.put("dockData", dockData);
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
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) {
for (int i = 0; i < files.length; i++) {
PageData pd = new PageData();
@ -363,6 +383,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
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_ID", this.get32UUID());
pd.put("OPERATOR", pd.get("OPERATOR")); //修改人
@ -376,6 +397,7 @@ public class AppGFHighWorkController extends BaseController {
pd.put("ACCEPT_USER_ID","");
pd.put("ACCEPT_DEPARTMENT_ID", "");
highworkacceptuserService.save(pd);
highworkacceptuserList.add(pd);
}
}
}
@ -387,6 +409,7 @@ public class AppGFHighWorkController extends BaseController {
@RequestMapping(value="/editAcceptStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptStatus(MultipartRequest request) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -404,7 +427,8 @@ public class AppGFHighWorkController extends BaseController {
log.put("HIGHWORK_ID", pd.get("HIGHWORK_ID"));
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
ArrayList<String> sendPicturesList = new ArrayList<>();
ArrayList<PageData> saveAcceptUserList = new ArrayList<>();
String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = pd2.getString("OTHER_PROTECTIVE_MEASURES");
if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status)) {
@ -430,7 +454,7 @@ public class AppGFHighWorkController extends BaseController {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("HIGHWORK_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"));
saveAcceptImg(sendPicturesList,saveAcceptUserList,fileList.toArray(fileArr),signertime,pd.getString("HIGHWORK_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"));
fileList.clear();
}
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
@ -496,10 +520,17 @@ public class AppGFHighWorkController extends BaseController {
break;
}
GFhighWorkLogService.save(log);
PageData dockData = new PageData();
dockData.put("saveAcceptUserList", JSON.toJSONString(saveAcceptUserList));
dockData.put("logData", JSON.toJSONString(log));
dockData.put("STATUS", status);
dockData.put("editData", JSON.toJSONString(pd2));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
map.put("dockData", JSON.toJSONString(dockData));
map.put("result", errInfo);
return map;
}
private void saveAcceptImg(MultipartFile[] files,String signertime, String HIGHWORK_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{
private void saveAcceptImg(List<String> sendPicturesList,List<PageData> saveAcceptUserList,MultipartFile[] files,String signertime, String HIGHWORK_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData();
@ -513,6 +544,7 @@ public class AppGFHighWorkController extends BaseController {
cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人
cpd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
cpd.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName);
sendPicturesList.add(cpd.getString("ACCEPT_USER_SIGNER_PATH")+"@@"+fileName);
cpd.put("ISDELETE", '0');
cpd.put("CORPINFO_ID", CORPINFO_ID);
cpd.put("HIGHWORK_ID", HIGHWORK_ID);
@ -521,6 +553,7 @@ public class AppGFHighWorkController extends BaseController {
cpd.put("ACCEPT_CONFESS_USER_ID", "");
cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID);
highworkacceptuserService.save(cpd);
saveAcceptUserList.add(cpd);
}
}
}
@ -532,6 +565,7 @@ public class AppGFHighWorkController extends BaseController {
@RequestMapping(value="/editStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -545,6 +579,8 @@ public class AppGFHighWorkController extends BaseController {
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
// pd2.put("OTHER_PROTECTIVE_MEASURES", pd.get("OTHER_PROTECTIVE_MEASURES")); //修改人
// pd2.put("HAZARD_IDENTIFICATION", pd.get("HAZARD_IDENTIFICATION")); //修改人
ArrayList<String> sendPicturesList = new ArrayList<>();
ArrayList<PageData> toMeasuresList = new ArrayList<>();
PageData log = new PageData();
log.put("HIGHWORKLOG_ID", this.get32UUID());
// log.put("ACTION", "审核打回");
@ -577,6 +613,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
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_TIME", pd.get("SIGNER_TIME"));
@ -604,6 +641,7 @@ public class AppGFHighWorkController extends BaseController {
measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
GFhighWorkToMeasuresService.save(measures);
toMeasuresList.add(measures);
}
log.put("ACTION", "作业单位通过");
@ -664,6 +702,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
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_TIME", pd.get("SIGNER_TIME"));
@ -730,6 +769,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
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_TIME", pd.get("SIGNER_TIME"));
@ -788,6 +828,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
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_TIME", pd.get("SIGNER_TIME"));
@ -836,6 +877,7 @@ public class AppGFHighWorkController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
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_TIME", pd.get("SIGNER_TIME"));
@ -1026,6 +1068,13 @@ public class AppGFHighWorkController extends BaseController {
break;
}
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);
return map;
}

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

@ -2,6 +2,7 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -72,6 +73,7 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/add")
@ResponseBody
@Transactional
@DockAnnotation(isAdd = true,hasAnnex = true)
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -93,6 +95,7 @@ public class AppGFHoistingController extends BaseController {
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
map.put("dockData", JSON.toJSONString(pd));
GFhoistingService.save(pd);
if(pd.get("APPLY_STATUS").equals("1")) {
@ -102,6 +105,7 @@ public class AppGFHoistingController extends BaseController {
log.put("HOISTING_ID", pd.get("HOISTING_ID"));
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("logData", JSON.toJSONString(log));
GFhighWorkLogService.save(log);
// 发短信
@ -143,12 +147,14 @@ public class AppGFHoistingController extends BaseController {
*/
@RequestMapping(value="/delete")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFhoistingService.delete(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -160,12 +166,14 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/edit")
@ResponseBody
@Transactional
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFhoistingService.edit(pd);
map.put("dockData", JSON.toJSONString(pd));
if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData();
log.put("HOISTINGLOG_ID", this.get32UUID());
@ -174,6 +182,7 @@ public class AppGFHoistingController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
GFhighWorkLogService.save(log);
map.put("logData", JSON.toJSONString(log));
// 发短信
PageData mes = new PageData();
@ -215,6 +224,7 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/editGuardian")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editGuardian(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -227,14 +237,17 @@ public class AppGFHoistingController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
map.put("dockData", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
}
@ -248,6 +261,7 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/editConfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editConfess(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -260,16 +274,20 @@ public class AppGFHoistingController extends BaseController {
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT"));
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
}
map.put("result", errInfo);
@ -282,30 +300,35 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/editAcceptconfess")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptconfess(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
map.put("dockData", JSON.toJSONString(pd));
PageData pd2 = new PageData();
pd2 = GFhoistingService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
map.put("dockData2", JSON.toJSONString(pd2));
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
ArrayList<String> pictureList = new ArrayList<String>();
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
saveImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList);
fileList.clear();
}
map.put("sendPicturesList", JSON.toJSONString(pictureList));
map.put("result", errInfo);
return map;
}
private void saveImg(MultipartFile[] files,String signertime, String HOISTING_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{
private void saveImg(MultipartFile[] files,String signertime, String HOISTING_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID,ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData pd = new PageData();
@ -326,6 +349,7 @@ public class AppGFHoistingController extends BaseController {
pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID);
pd.put("ACCEPT_USER_ID","");
pd.put("ACCEPT_DEPARTMENT_ID", "");
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
hoistingacceptuserService.save(pd);
}
}
@ -338,6 +362,7 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/editAcceptStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editAcceptStatus(MultipartRequest request) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -356,6 +381,7 @@ public class AppGFHoistingController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
@ -373,15 +399,18 @@ public class AppGFHoistingController extends BaseController {
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
for (int i = 0; i < SIGNTIME.length; i++) {
ArrayList<String> pictureList = new ArrayList<String>();
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"));
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
fileList.clear();
}
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
log.put("ACTION", "验收通过");
@ -412,6 +441,7 @@ public class AppGFHoistingController extends BaseController {
log.put("ACTION", "验收人打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
@ -443,11 +473,13 @@ public class AppGFHoistingController extends BaseController {
default:
break;
}
map.put("dockDataLog", JSON.toJSONString(log));
GFhighWorkLogService.save(log);
map.put("result", errInfo);
return map;
}
private void saveAcceptImg(MultipartFile[] files,String signertime, String HOISTING_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{
private void saveAcceptImg(MultipartFile[] files,String signertime, String HOISTING_ID,
String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList<String> pictureList) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData();
@ -468,6 +500,7 @@ public class AppGFHoistingController extends BaseController {
cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", "");
cpd.put("ACCEPT_CONFESS_USER_ID", "");
cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID);
pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName);
hoistingacceptuserService.save(cpd);
}
}
@ -481,6 +514,7 @@ public class AppGFHoistingController extends BaseController {
@RequestMapping(value="/editStatus")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
@ -498,6 +532,7 @@ public class AppGFHoistingController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
@ -506,12 +541,15 @@ public class AppGFHoistingController extends BaseController {
switch (status) {
case "2"://作业指挥
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("LEADER_CONTENT", pd.get("CONTENT"));
@ -527,9 +565,13 @@ public class AppGFHoistingController extends BaseController {
}
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
// pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION);
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
map.put("dockDataDel", JSON.toJSONString(pd));
GFhighWorkToMeasuresService.delete(pd);
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
HashMap<String, String> measuresMap = new HashMap<String, String>();
int measuresCount = 1;
for (JSONObject json : list) {
PageData measures = new PageData();
measures.put("HOISTINGTOMEASURES_ID", this.get32UUID()); // 主键
@ -539,8 +581,11 @@ public class AppGFHoistingController extends BaseController {
measures.put("STATUS", json.get("STATUS"));
measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
measuresMap.put("other"+measuresCount, JSON.toJSONString(measures));
measuresCount+=1;
GFhighWorkToMeasuresService.save(measures);
}
map.put("measuresData", JSON.toJSONString(measuresMap));
log.put("ACTION", "作业指挥通过");
// 发短信
@ -595,12 +640,15 @@ public class AppGFHoistingController extends BaseController {
case "3"://所在单位
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("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_CONTENT", pd.get("CONTENT"));
@ -612,6 +660,7 @@ public class AppGFHoistingController extends BaseController {
}
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
log.put("ACTION", "所在单位通过");
@ -663,12 +712,15 @@ public class AppGFHoistingController extends BaseController {
case "4"://审核部门
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("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_CONTENT", pd.get("CONTENT"));
@ -677,6 +729,7 @@ public class AppGFHoistingController extends BaseController {
}
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
log.put("ACTION", "审核部门通过");
@ -722,17 +775,21 @@ public class AppGFHoistingController extends BaseController {
case "5"://审批部门
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("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_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
log.put("ACTION", "审批部门通过");
@ -770,17 +827,21 @@ public class AppGFHoistingController extends BaseController {
case "6"://验收人
if (files != null && files.length > 0) {
ArrayList<String> pictureList = new ArrayList<String>();
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName);
map.put("sendPicturesList", JSON.toJSONString(pictureList));
pd2.put("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_CONTENT", pd.get("CONTENT"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
log.put("ACTION", "验收通过");
@ -810,6 +871,7 @@ public class AppGFHoistingController extends BaseController {
log.put("ACTION", "作业指挥打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("LEADER_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
@ -843,6 +905,7 @@ public class AppGFHoistingController extends BaseController {
log.put("ACTION", "所在单位打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
// 发短信
@ -874,6 +937,7 @@ public class AppGFHoistingController extends BaseController {
log.put("ACTION", "审核部门打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("AUDIT_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
// 发短信
@ -905,6 +969,7 @@ public class AppGFHoistingController extends BaseController {
log.put("ACTION", "审批部门打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("APPROVE_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
// 发短信
@ -936,6 +1001,7 @@ public class AppGFHoistingController extends BaseController {
log.put("ACTION", "验收人打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
map.put("dockData2", JSON.toJSONString(pd2));
GFhoistingService.edit(pd2);
@ -967,6 +1033,7 @@ public class AppGFHoistingController extends BaseController {
default:
break;
}
map.put("dockDataLog", JSON.toJSONString(log));
GFhighWorkLogService.save(log);
map.put("result", errInfo);
return map;

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

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

12
src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -50,6 +52,7 @@ public class GFConfinedSpaceController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("confinedspace:add")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -57,6 +60,7 @@ public class GFConfinedSpaceController extends BaseController {
pd = this.getPageData();
pd.put("CONFINEDSPACE_ID", this.get32UUID()); //主键
GFconfinedspaceService.save(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -68,12 +72,14 @@ public class GFConfinedSpaceController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("confinedspace:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFconfinedspaceService.delete(pd);
map.put("pd", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -85,12 +91,14 @@ public class GFConfinedSpaceController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("confinedspace:edit")
@ResponseBody
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFconfinedspaceService.edit(pd);
map.put("pd", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -100,7 +108,7 @@ public class GFConfinedSpaceController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/list")
@RequiresPermissions("confinedspace:list")
// @RequiresPermissions("confinedspace:list")
@ResponseBody
public Object list(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
@ -155,6 +163,7 @@ public class GFConfinedSpaceController extends BaseController {
@RequestMapping(value="/deleteAll")
@RequiresPermissions("confinedspace:del")
@ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -168,6 +177,7 @@ public class GFConfinedSpaceController extends BaseController {
}else{
errInfo = "error";
}
map.put("pd", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}

8
src/main/java/com/zcloud/controller/gf/GFLimitSpaceApproveController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -40,6 +42,7 @@ public class GFLimitSpaceApproveController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("limitspaceapprove:add")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -53,6 +56,7 @@ public class GFLimitSpaceApproveController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", ""); //是否删除 1-是 0-否
GFlimitspaceapproveService.save(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -64,12 +68,14 @@ public class GFLimitSpaceApproveController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("limitspaceapprove:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
GFlimitspaceapproveService.delete(pd);
map.put("pd", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -150,6 +156,7 @@ public class GFLimitSpaceApproveController extends BaseController {
@RequestMapping(value="/deleteAll")
@RequiresPermissions("limitspaceapprove:del")
@ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -163,6 +170,7 @@ public class GFLimitSpaceApproveController extends BaseController {
}else{
errInfo = "error";
}
map.put("pd", JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}

12
src/main/java/com/zcloud/controller/gf/GFLimitSpaceController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -46,6 +48,7 @@ public class GFLimitSpaceController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("limitspace:add")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -59,6 +62,7 @@ public class GFLimitSpaceController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", "0"); //是否删除
GFlimitspaceService.save(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -70,6 +74,7 @@ public class GFLimitSpaceController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("limitspace:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -78,6 +83,7 @@ public class GFLimitSpaceController extends BaseController {
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
GFlimitspaceService.delete(pd);
map.put("pd",JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}
@ -89,6 +95,7 @@ public class GFLimitSpaceController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("limitspace:edit")
@ResponseBody
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -97,6 +104,7 @@ public class GFLimitSpaceController extends BaseController {
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
GFlimitspaceService.edit(pd);
map.put("pd", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -106,7 +114,7 @@ public class GFLimitSpaceController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/list")
@RequiresPermissions("limitspace:list")
// @RequiresPermissions("limitspace:list")
@ResponseBody
public Object list(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
@ -157,6 +165,7 @@ public class GFLimitSpaceController extends BaseController {
@RequestMapping(value="/deleteAll")
@RequiresPermissions("limitspace:del")
@ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -173,6 +182,7 @@ public class GFLimitSpaceController extends BaseController {
}else{
errInfo = "error";
}
map.put("pd",JSON.toJSONString(pd));
map.put("result", errInfo); //返回结果
return map;
}

7
src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java
View File

@ -272,7 +272,7 @@ public class SafetyEnvironmentalController extends BaseController {
@RequestMapping(value = "/add")
@RequiresPermissions("safetyenvironmental:add")
@ResponseBody
@DockAnnotation(isAdd = true)
@DockAnnotation(hasAnnex = true)
public Object add() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -287,6 +287,7 @@ public class SafetyEnvironmentalController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("CORPINFO_ID", "1".equals(Jurisdiction.getUSER_ID()) ? "" : Jurisdiction.getCORPINFO_ID()); //企业ID
pd.put("ACTION_USER", Jurisdiction.getName()); //操作人
ArrayList<String> strings = new ArrayList<>();
if (StringUtils.isNotBlank(pd.getString("CONFIRM_MESSAGE_SIGN"))) {
MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("CONFIRM_MESSAGE_SIGN"));
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@ -300,10 +301,12 @@ public class SafetyEnvironmentalController extends BaseController {
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
strings.add(pd.getString("CONFIRM_MESSAGE_SIGN_ROUTE")+"@@"+fileName);
}
List<PageData> hiddenList = safetyenvironmentalService.save(pd);
pd.put("hiddenList", hiddenList);
map.put("pd", pd);
map.put("sendPicturesList",JSON.toJSONString(strings));
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
@ -359,6 +362,7 @@ public class SafetyEnvironmentalController extends BaseController {
@RequestMapping(value = "/edit")
@RequiresPermissions("safetyenvironmental:edit")
@ResponseBody
@DockAnnotation
public Object edit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -387,6 +391,7 @@ public class SafetyEnvironmentalController extends BaseController {
pd.put("hiddenList", hiddenList);
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}

7
src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalExplainController.java
View File

@ -100,7 +100,7 @@ public class SafetyEnvironmentalExplainController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("safetyenvironmentalexplain:add")
@ResponseBody
@DockAnnotation(isAdd = true)
@DockAnnotation(hasAnnex = true)
public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -116,6 +116,7 @@ public class SafetyEnvironmentalExplainController extends BaseController {
pd.put("ACTION_USER", Jurisdiction.getName()); //操作人
pd.put("VALID","1");
pd.put("ISPASS","0");
ArrayList<String> strings = new ArrayList<>();
if (StringUtils.isNotBlank(pd.getString("INSPECTED_SITEUSER_SIGN_IMG"))) {
MultipartFile img = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("INSPECTED_SITEUSER_SIGN_IMG"));
String suffixName = img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@ -128,8 +129,8 @@ public class SafetyEnvironmentalExplainController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(img, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("INSPECTED_SITEUSER_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
strings.add(pd.getString("INSPECTED_SITEUSER_SIGN_IMG")+"@@"+fileName);
}
if (null != file && !file.isEmpty()) {
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@ -145,6 +146,7 @@ public class SafetyEnvironmentalExplainController extends BaseController {
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("INSPECTED_EXPLAIN_FILENAME", file.getOriginalFilename());
pd.put("INSPECTED_EXPLAIN_FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
strings.add(pd.getString("INSPECTED_EXPLAIN_FILEPATH")+"@@"+fileName);
}
PageData logData = safetyenvironmentalexplainService.save(pd);
pd.put("logData",JSON.toJSONString(logData));
@ -152,6 +154,7 @@ public class SafetyEnvironmentalExplainController extends BaseController {
noticeCorpUtil.SE_PleadingStepUtil(pd);
map.put("pd", pd);
map.put("result", errInfo);
map.put("sendPicturesList",JSON.toJSONString(strings));
map.put("dockData", JSON.toJSONString(pd));
return map;
}

7
src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java
View File

@ -84,7 +84,7 @@ public class SafetyEnvironmentalInspectorController extends BaseController {
@RequestMapping(value="/verify")
@RequiresPermissions("safetyenvironmentalinspector:add")
@ResponseBody
@DockAnnotation(isAdd = true)
@DockAnnotation(hasAnnex = true)
public Object verify() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -97,7 +97,7 @@ public class SafetyEnvironmentalInspectorController extends BaseController {
uBean.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
uBean.put("INSPECTION_STATUS", pd.getString("INSPECTION_STATUS")); //检查进度状态
uBean.put("ACTION_USER", Jurisdiction.getName()); //检查进度状态
ArrayList<String> strings = new ArrayList<>();
if (StringUtils.isNotBlank(pd.getString("INSPECTION_USER_SIGN_IMG"))) {
MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("INSPECTION_USER_SIGN_IMG"));
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@ -110,14 +110,15 @@ public class SafetyEnvironmentalInspectorController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
uBean.put("INSPECTION_USER_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
strings.add(uBean.getString("INSPECTION_USER_SIGN_IMG")+"@@"+fileName);
}
pd.put("uBean",JSON.toJSONString(uBean));
PageData verify = safetyenvironmentalinspectorService.verify(uBean);
pd.put("verify",JSON.toJSONString(verify));
map.put("pd", pd);
map.put("result", errInfo);
map.put("sendPicturesList",JSON.toJSONString(strings));
map.put("dockData", JSON.toJSONString(pd));
return map;
}

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

@ -110,7 +110,7 @@ public class OutSourcedController extends BaseController {
String fileName = this.get32UUID() + file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file1, fileName, Const.FILEPATHFILE + ffile);
pd.put("MEASURES", Const.FILEPATHFILE + ffile + "/" + fileName);
strings.add(Const.FILEPATHFILE + ffile + "/" + fileName);
strings.add(Const.FILEPATHFILE + ffile + "/" + fileName+"@@"+fileName);
}
if (null != file2 && !file2.isEmpty()) {
@ -248,7 +248,7 @@ public class OutSourcedController extends BaseController {
//}
pd.put("INVOLVING_CORPS", Jurisdiction.getCORPINFO_ID());
outsourcedService.save(pd);
pd.put("pictList", strings);
pd.put("pictList",strings);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
@ -736,47 +736,47 @@ public class OutSourcedController extends BaseController {
pd = this.getPageData();
//校验当前重点工程是否存在未完成的隐患 （包含未整改，未处罚，ai报警未处置的）
PageData pageData = outsourcedService.jieshuOutSourced(pd);
if (!StringUtils.equals("0", pageData.getString("qr"))) {
if(!StringUtils.equals("0",pageData.getString("qr"))){
map.put("result", errInfo);
map.put("msg", "当前重点工程还有" + pageData.getString("qr") + "项待确认安全环保检查,请处理以后再结束");
map.put("code", "500");
map.put("msg","当前重点工程还有"+pageData.getString("qr")+"项待确认安全环保检查,请处理以后再结束");
map.put("code","500");
return map;
}
if (!StringUtils.equals("0", pageData.getString("zg"))) {
if(!StringUtils.equals("0",pageData.getString("zg"))){
map.put("result", errInfo);
map.put("msg", "当前重点工程还有" + pageData.getString("zg") + "项需整改的隐患,请处理以后再结束");
map.put("code", "500");
map.put("msg","当前重点工程还有"+pageData.getString("zg")+"项需整改的隐患,请处理以后再结束");
map.put("code","500");
return map;
}
if (!StringUtils.equals("0", pageData.getString("ys"))) {
if(!StringUtils.equals("0",pageData.getString("ys"))){
map.put("result", errInfo);
map.put("msg", "当前重点工程还有" + pageData.getString("ys") + "项待验收隐患,请处理以后再结束");
map.put("code", "500");
map.put("msg","当前重点工程还有"+pageData.getString("ys")+"项待验收隐患,请处理以后再结束");
map.put("code","500");
return map;
}
if (!StringUtils.equals("0", pageData.getString("cf"))) {
if(!StringUtils.equals("0",pageData.getString("cf"))){
map.put("result", errInfo);
map.put("msg", "当前重点工程还有" + pageData.getString("cf") + "项待处罚隐患,请处理以后再结束");
map.put("code", "500");
map.put("msg","当前重点工程还有"+pageData.getString("cf")+"项待处罚隐患,请处理以后再结束");
map.put("code","500");
return map;
}
if (!StringUtils.equals("0", pageData.getString("fk"))) {
if(!StringUtils.equals("0",pageData.getString("fk"))){
map.put("result", errInfo);
map.put("msg", "当前重点工程还有" + pageData.getString("fk") + "项处罚待反馈隐患,请处理以后再结束");
map.put("code", "500");
map.put("msg","当前重点工程还有"+pageData.getString("fk")+"项处罚待反馈隐患,请处理以后再结束");
map.put("code","500");
return map;
}
if (!StringUtils.equals("0", pageData.getString("ai"))) {
if(!StringUtils.equals("0",pageData.getString("ai"))){
map.put("result", errInfo);
map.put("msg", "当前重点工程还有" + pageData.getString("ai") + "项AI报警待处置,请处理以后再结束");
map.put("code", "500");
map.put("msg","当前重点工程还有"+pageData.getString("ai")+"项AI报警待处置,请处理以后再结束");
map.put("code","500");
return map;
}
pd = outsourcedService.findById(pd);
outsourcedService.jie(pd);
//清空摄像头与重点工程的关联关系
videoManagerService.updateAiByOUTSOURCED_ID(pd);
map.put("code", "0");
map.put("code","0");
map.put("result", errInfo); //返回结果
return map;
}

14
src/main/java/com/zcloud/controller/onlinexxks/CurriculumController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.onlinexxks;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -46,11 +48,13 @@ public class CurriculumController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("curriculum:add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile FFILE) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
ArrayList<String> sendPicturesList = new ArrayList<>();
pd.put("CURRICULUM_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUsername()); //添加人
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
@ -74,10 +78,13 @@ public class CurriculumController extends BaseController {
String fileName = this.get32UUID()+FFILE.getOriginalFilename().substring(FFILE.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(FFILE, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("CAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("CAPTURE")+"@@"+fileName);
}
curriculumService.save(pd);
map.put("pd", pd);
map.put("result", errInfo);
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@ -88,6 +95,7 @@ public class CurriculumController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("curriculum:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -104,6 +112,7 @@ public class CurriculumController extends BaseController {
}
curriculumService.delete(pd);
map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
return map;
}
@ -114,11 +123,13 @@ public class CurriculumController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("curriculum:edit")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile FFILE) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
ArrayList<String> sendPicturesList = new ArrayList<>();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (null != FFILE && !FFILE.isEmpty()) {
@ -137,10 +148,13 @@ public class CurriculumController extends BaseController {
String fileName = this.get32UUID()+FFILE.getOriginalFilename().substring(FFILE.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(FFILE, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("CAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("CAPTURE")+"@@"+fileName);
}
curriculumService.edit(pd);
map.put("pd", pd);
map.put("result", errInfo);
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
map.put("dockData",JSON.toJSONString(pd));
return map;
}

19
src/main/java/com/zcloud/controller/onlinexxks/DataCoursewareController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.onlinexxks;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -42,12 +44,14 @@ public class DataCoursewareController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("courseware:add")
@ResponseBody
@DockAnnotation
public Object add(@RequestParam(value="cfile",required=false) MultipartFile cfile,
@RequestParam(value="ccfile",required=false) MultipartFile ccfile) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
ArrayList<String> sendPicturesList = new ArrayList<>();
pd.put("DATACOURSEWARE_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUsername()); //添加人
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
@ -72,6 +76,7 @@ public class DataCoursewareController extends BaseController {
String fileName = this.get32UUID()+cfile.getOriginalFilename().substring(cfile.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(cfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("COURSEWAREFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("COURSEWAREFILES")+"@@"+fileName);
}
if (null != ccfile && !ccfile.isEmpty()) {
String suffixName = ccfile.getOriginalFilename().substring(ccfile.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@ -89,9 +94,12 @@ public class DataCoursewareController extends BaseController {
String fileName = this.get32UUID()+ccfile.getOriginalFilename().substring(ccfile.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(ccfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("COURSEWARECAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("COURSEWARECAPTURE")+"@@"+fileName);
}
datacoursewareService.save(pd);
map.put("pd", pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
map.put("result", errInfo);
return map;
}
@ -103,6 +111,7 @@ public class DataCoursewareController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("courseware:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -126,6 +135,7 @@ public class DataCoursewareController extends BaseController {
questionService.deleteByCoursewareIds(pd);
datacoursewareService.delete(pd);
map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
return map;
}
@ -136,13 +146,14 @@ public class DataCoursewareController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("courseware:edit")
@ResponseBody
@DockAnnotation
public Object edit(@RequestParam(value="cfile",required=false) MultipartFile cfile,
@RequestParam(value="ccfile",required=false) MultipartFile ccfile) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
ArrayList<String> sendPicturesList = new ArrayList<>();
PageData d = datacoursewareService.findById(pd);
//已经不修改了，还删附件是什么意思
// Smb.deleteFile(d.getString("COURSEWAREFILES"));
@ -165,6 +176,7 @@ public class DataCoursewareController extends BaseController {
String fileName = this.get32UUID()+cfile.getOriginalFilename().substring(cfile.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(cfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("COURSEWAREFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("COURSEWAREFILES")+"@@"+fileName);
}
if (null != ccfile) {
String suffixName = ccfile.getOriginalFilename().substring(ccfile.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@ -182,10 +194,13 @@ public class DataCoursewareController extends BaseController {
String fileName = this.get32UUID()+ccfile.getOriginalFilename().substring(ccfile.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(ccfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("COURSEWARECAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("COURSEWARECAPTURE")+"@@"+fileName);
}
datacoursewareService.edit(pd);
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map;
}
@ -355,6 +370,7 @@ public class DataCoursewareController extends BaseController {
@RequestMapping(value="/editState")
@RequiresPermissions("courseware:edit")
@ResponseBody
@DockAnnotation
public Object editState() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -364,6 +380,7 @@ public class DataCoursewareController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
datacoursewareService.editByState(pd);
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}
}

23
src/main/java/com/zcloud/controller/onlinexxks/QuestionController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.onlinexxks;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -42,6 +44,7 @@ public class QuestionController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions( value = {"question:add" , "courseware:add"}, logical = Logical.OR)
@ResponseBody
@DockAnnotation
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -56,6 +59,7 @@ public class QuestionController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
questionService.save(pd);
map.put("pd", pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -67,6 +71,7 @@ public class QuestionController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions( value = {"question:del" , "courseware:del"}, logical = Logical.OR)
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -76,6 +81,7 @@ public class QuestionController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
questionService.delete(pd);
map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
return map;
}
@ -86,11 +92,19 @@ public class QuestionController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions( value = {"question:edit" , "courseware:edit"}, logical = Logical.OR)
@ResponseBody
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
if (Tools.notEmpty(pd.getString("dockData"))) {
// 咱们的对接流程 如有异常 使用 throw new BizException();
PageData dockData = JSON.parseObject(pd.getString("dockData"), PageData.class);
// 正常返回
return ReturnMap.ok();
}
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
questionService.edit(pd);
@ -147,6 +161,7 @@ public class QuestionController extends BaseController {
@RequestMapping(value="/deleteAll")
@RequiresPermissions( value = {"question:del" , "courseware:del"}, logical = Logical.OR)
@ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -160,6 +175,8 @@ public class QuestionController extends BaseController {
pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids
questionService.deleteAll(pd);
errInfo = "success";
map.put("dockData", JSON.toJSONString(pd)); //返回结果
}else{
errInfo = "fail";
}
@ -293,13 +310,14 @@ public class QuestionController extends BaseController {
@SuppressWarnings("unchecked")
@ResponseBody
@Transactional
@DockAnnotation
public Object readExcel2(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
StringBuffer errorStr = new StringBuffer();
PageData pd = new PageData();
pd = this.getPageData(); // COURSEWAREID
ArrayList<PageData> dataArrayList = new ArrayList<>();
if (null != file && !file.isEmpty()) {
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
if (!"xls".equals(suffixName)) {
@ -446,6 +464,7 @@ public class QuestionController extends BaseController {
pageData.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
questionService.save(pageData);
dataArrayList.add(pageData);
}
errorStr.append("成功导入"+listAll.size()+"条数据!");
}else {
@ -472,6 +491,8 @@ public class QuestionController extends BaseController {
map.put("msg",errorStr.toString()); //返回结果
map.put("isExcel","1"); //返回类型
map.put("resultStr", errorStr.toString());
pd.put("dataArrayList",dataArrayList);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
}

9
src/main/java/com/zcloud/controller/onlinexxks/StageexampaperInputController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.onlinexxks;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -40,6 +42,7 @@ public class StageexampaperInputController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions( value = {"stageexampaper:add", "curriculum:add"}, logical = Logical.OR)
@ResponseBody
@DockAnnotation
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -58,6 +61,7 @@ public class StageexampaperInputController extends BaseController {
List<PageData> saveStageList = stageexampaperinputService.getSaveStage(pd);
if(null != saveStageList){
pd.put("saveStageList",saveStageList);
stageexampaperinputService.save(pd);
stageExamPaperInputQuestionService.saveAll(pd, saveStageList);
}else{
@ -65,6 +69,7 @@ public class StageexampaperInputController extends BaseController {
map.put("msg", "培训行业类型或岗位培训类型对应的习题数量不足，无法生成试卷，请重新选择！");
}
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@ -75,6 +80,7 @@ public class StageexampaperInputController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions( value = {"stageexampaper:del", "curriculum:del"}, logical = Logical.OR)
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -82,6 +88,7 @@ public class StageexampaperInputController extends BaseController {
pd = this.getPageData();
stageexampaperinputService.delete(pd);
map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
return map;
}
@ -257,6 +264,7 @@ public class StageexampaperInputController extends BaseController {
@RequestMapping(value="/editState")
@RequiresPermissions( value = {"stageexampaper:edit", "curriculum:edit"}, logical = Logical.OR)
@ResponseBody
@DockAnnotation
public Object editState() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -266,6 +274,7 @@ public class StageexampaperInputController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //操作时间
stageexampaperinputService.editState(pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
}

4
src/main/java/com/zcloud/controller/onlinexxks/StudyTaskController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.onlinexxks;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -44,6 +46,7 @@ public class StudyTaskController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("studytask:add")
@ResponseBody
@DockAnnotation
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -73,6 +76,7 @@ public class StudyTaskController extends BaseController {
stageStudentRelationService.saveFromPagerV2(pd); // 任务-人员
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}

14
src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java
View File

@ -57,6 +57,7 @@ public class VideoCoursewareController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
ArrayList<String> sendPicturesList = new ArrayList<>();
pd.put("VIDEOCOURSEWARE_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUsername()); //添加人
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
@ -81,6 +82,7 @@ public class VideoCoursewareController extends BaseController {
String fileName = this.get32UUID() + vfile.getOriginalFilename().substring(vfile.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(vfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("VIDEOFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("VIDEOFILES")+"@@"+fileName);
// 将MultipartFile file转换成为File
File f_file = FileUtil.MultipartFileToFile(vfile);
MultimediaObject instance = new MultimediaObject(f_file);
@ -107,10 +109,12 @@ public class VideoCoursewareController extends BaseController {
String fileName = this.get32UUID() + vcfile.getOriginalFilename().substring(vcfile.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(vcfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("VIDEOCAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("VIDEOCAPTURE")+"@@"+fileName);
}
videocoursewareService.save(pd);
map.put("pd", pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
map.put("result", errInfo);
return map;
}
@ -124,6 +128,7 @@ public class VideoCoursewareController extends BaseController {
@RequestMapping(value = "/delete")
@RequiresPermissions("courseware:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception {
Map<String, String> map = new HashMap<String, String>();
String errInfo = "success";
@ -148,6 +153,7 @@ public class VideoCoursewareController extends BaseController {
questionService.deleteByCoursewareIds(pd);
videocoursewareService.delete(pd);
map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
return map;
}
@ -160,6 +166,7 @@ public class VideoCoursewareController extends BaseController {
@RequestMapping(value = "/edit")
@RequiresPermissions("courseware:edit")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object edit(@RequestParam(value = "vfile", required = false) MultipartFile vfile,
@RequestParam(value = "vcfile", required = false) MultipartFile vcfile) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
@ -167,6 +174,7 @@ public class VideoCoursewareController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
PageData d = videocoursewareService.findById(pd);
ArrayList<String> sendPicturesList = new ArrayList<>();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (null != vfile) {
@ -185,6 +193,7 @@ public class VideoCoursewareController extends BaseController {
String fileName = this.get32UUID() + vfile.getOriginalFilename().substring(vfile.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(vfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("VIDEOFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("VIDEOFILES")+"@@"+fileName);
// 将MultipartFile file转换成为File
File f_file = FileUtil.MultipartFileToFile(vfile);
MultimediaObject instance = new MultimediaObject(f_file);
@ -211,9 +220,12 @@ public class VideoCoursewareController extends BaseController {
String fileName = this.get32UUID() + vcfile.getOriginalFilename().substring(vcfile.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(vcfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("VIDEOCAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("VIDEOCAPTURE")+"@@"+fileName);
}
videocoursewareService.edit(pd);
map.put("pd", pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
map.put("result", errInfo);
return map;
}
@ -379,6 +391,7 @@ public class VideoCoursewareController extends BaseController {
@RequestMapping(value = "/editState")
@RequiresPermissions("courseware:edit")
@ResponseBody
@DockAnnotation
public Object editState() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -388,6 +401,7 @@ public class VideoCoursewareController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
videocoursewareService.editByState(pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
}

5
src/main/java/com/zcloud/controller/system/DictionariesController.java
View File

@ -270,7 +270,8 @@ public class DictionariesController extends BaseController {
for(int i=0;i<table.length;i++){
pd.put("thisTable", table[i]);
try {
if(Integer.parseInt(dictionariesService.findFromTbs(pd).get("zs").toString())>0){//判断是否被占用，是：不允许删除(去排查表检查字典表中的编码字段)
if(Integer.parseInt(dictionariesService.findFromTbs(pd).get("zs").toString())>0){//判断是否被占用，是
// ：不允许删除(去排查表检查字典表中的编码字段)
errInfo = "fail";
break;
}
@ -285,6 +286,8 @@ public class DictionariesController extends BaseController {
dictionariesService.delete(pd); //执行删除
map.put("dockData", JSON.toJSONString(this.getPageData()));
}
map.put("result", errInfo);
return map;
}

48
src/main/java/com/zcloud/controller/system/LoginController.java
View File

@ -68,6 +68,8 @@ public class LoginController extends BaseController {
@Autowired
private OffDutyService offdutyService;
@Autowired
private PhotoService photoService;
@Value("${czks-useridentity}")
private String czksIdentity;
@Value("${czks-baseimgpath}")
@ -81,14 +83,6 @@ public class LoginController extends BaseController {
private String gwjBaseimgpath;
@Value("${gwj-backendaddr}")
private String gwjBackendaddr;
@Autowired
private PhotoService photoService;
/**
* 请求登录验证用户接口
*
@ -190,26 +184,24 @@ public class LoginController extends BaseController {
return map;
}
// 判断是不是沧州矿石的用户
if (czksIdentity.equals(pd.getString("USER_IDENTITY"))) {
// 沧州矿石的用户
// 用户标识
map.put("USER_IDENTITY", czksIdentity);
// 图片路径
map.put("baseImgPath", czksBaseimgpath);
// 后台地址
map.put("BACKENDADDR", czksBackendaddr);
}
if ("".equals(pd.getString("USER_IDENTITY"))) {
// 港股的用户
// 用户标识
map.put("USER_IDENTITY", gwjIdentity);
// 图片路径
map.put("baseImgPath", gwjBaseimgpath);
// 后台地址
map.put("BACKENDADDR", gwjBackendaddr);
}
// if (czksIdentity.equals(pd.getString("USER_IDENTITY"))) {
// // 沧州矿石的用户
// // 用户标识
// map.put("USER_IDENTITY", czksIdentity);
// // 图片路径
// map.put("baseImgPath", czksBaseimgpath);
// // 后台地址
// map.put("BACKENDADDR", czksBackendaddr);
// }
// if ("".equals(pd.getString("USER_IDENTITY"))) {
// // 港股的用户
// // 用户标识
// map.put("USER_IDENTITY", gwjIdentity);
// // 图片路径
// map.put("baseImgPath", gwjBaseimgpath);
// // 后台地址
// map.put("BACKENDADDR", gwjBackendaddr);
// }
PageData cpd = corpinfoService.findById(pd);
//System.out.println(cpd.getString("ISUSE"));
if (cpd != null) {

4
src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentAqxjController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.tzsb;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.controller.bus.ImgFilesController;
import com.zcloud.entity.Page;
@ -45,6 +47,7 @@ public class SpecialEquipmentAqxjController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("specialequipmentaqxj:add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile[] FILES,
@RequestParam(value="TYPE",required=false) String[] TYPE) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
@ -75,6 +78,7 @@ public class SpecialEquipmentAqxjController extends BaseController {
imgFilesController.finish(fileList.toArray(fileArr),type,pd.getString("SPECIALEQUIPMENTAQXJ_ID"));
}
map.put("pd", pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}

29
src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.tzsb;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -49,11 +51,13 @@ public class SpecialEquipmentController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("specialequipment:add")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
ArrayList<String> sendPicturesList = new ArrayList<>();
pd.put("SPECIALEQUIPMENT_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUsername()); //添加人
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
@ -78,8 +82,11 @@ public class SpecialEquipmentController extends BaseController {
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("TECHNICALFILENAME", file.getOriginalFilename());
pd.put("TECHNICALFILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("TECHNICALFILEPATH")+"@@"+fileName);
}
PageData dockData = new PageData();
specialequipmentService.save(pd);
dockData.putAll(pd);
map.put("pd", pd);
PageData changeData = new PageData();
@ -137,7 +144,10 @@ public class SpecialEquipmentController extends BaseController {
// changeData.put("REMARKS_BEFORE", pd.getString("REMARKS")); //备注（前）
changeData.put("REMARKS_AFTER", pd.getString("REMARKS")); //备注（后）
specialequipmentchangeService.save(changeData);
dockData.put("changeData",changeData);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(dockData));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map;
}
@ -148,6 +158,7 @@ public class SpecialEquipmentController extends BaseController {
@RequestMapping(value="/delete")
@RequiresPermissions("specialequipment:del")
@ResponseBody
@DockAnnotation
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
@ -192,7 +203,9 @@ public class SpecialEquipmentController extends BaseController {
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
specialequipmentService.delete(pd);
pd.put("changeData",changeData);
map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
return map;
}
@ -203,13 +216,14 @@ public class SpecialEquipmentController extends BaseController {
@RequestMapping(value="/edit")
@RequiresPermissions("specialequipment:edit")
@ResponseBody
@DockAnnotation(hasAnnex = true)
public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData updateBefour = specialequipmentService.findById(pd);
ArrayList<String> sendPicturesList = new ArrayList<>();
PageData changeData = new PageData();
changeData.put("SPECIALEQUIPMENTCHANGE_ID", this.get32UUID()); //主键
changeData.put("SPECIALEQUIPMENT_ID", updateBefour.getString("SPECIALEQUIPMENT_ID")); //主键
@ -262,6 +276,7 @@ public class SpecialEquipmentController extends BaseController {
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("TECHNICALFILENAME", file.getOriginalFilename());
pd.put("TECHNICALFILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("TECHNICALFILEPATH") + "@@"+ fileName);
}
specialequipmentService.edit(pd);
changeData.put("EQUIPMENTNAME_AFTER", pd.getString("EQUIPMENTNAME")); //设备名称（后）
@ -294,8 +309,13 @@ public class SpecialEquipmentController extends BaseController {
changeData.put("TECHNICALFILEPATH_AFTER", pd.getString("TECHNICALFILEPATH")); //设备技术档案（附件）路径（后）
changeData.put("REMARKS_AFTER", pd.getString("REMARKS")); //备注（后）
specialequipmentchangeService.save(changeData);
PageData dockData = new PageData();
dockData.putAll(pd);
dockData.put("changeData",changeData);
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(dockData));
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
return map;
}
@ -347,6 +367,7 @@ public class SpecialEquipmentController extends BaseController {
@RequestMapping(value="/deleteAll")
@RequiresPermissions("specialequipment:del")
@ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -355,6 +376,7 @@ public class SpecialEquipmentController extends BaseController {
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
String DATA_IDS = pd.getString("DATA_IDS");
ArrayList<PageData> changeDataList = new ArrayList<>();
if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(",");
pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids
@ -397,10 +419,15 @@ public class SpecialEquipmentController extends BaseController {
changeData.put("TECHNICALFILEPATH_AFTER", updateBefour.getString("TECHNICALFILEPATH")); //设备技术档案（附件）路径（前）
changeData.put("REMARKS_AFTER", updateBefour.getString("REMARKS")); //备注（前）
specialequipmentchangeService.save(changeData);
changeDataList.add(changeData);
}
specialequipmentService.deleteAll(pd);
errInfo = "success";
pd.put("changeDataList",changeDataList);
map.put("dockData", JSON.toJSONString(pd)); //返回结果
map.put("result", errInfo); //返回结果
}else{
errInfo = "fail";
}

2
src/main/java/com/zcloud/mapper/datasource/bus/CorpInfoMapper.java
View File

@ -76,5 +76,7 @@ public interface CorpInfoMapper{
//从公司端修改企业用户信息 新
void editCorpUserNew(PageData pd);
List<PageData> getSelectByCorpInfo(PageData pd);
}

2
src/main/java/com/zcloud/mapper/datasource/fireresources/FireResourcesMapper.java → src/main/java/com/zcloud/mapper/dsno2/fireresources/FireResourcesMapper.java
View File

@ -1,4 +1,4 @@
package com.zcloud.mapper.datasource.fireresources;
package com.zcloud.mapper.dsno2.fireresources;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;

2
src/main/java/com/zcloud/service/bimap/impl/BiMapServiceImpl.java
View File

@ -5,7 +5,7 @@ import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.bimap.BiMapMapper;
import com.zcloud.mapper.datasource.bus.CorpInfoMapper;
import com.zcloud.mapper.datasource.fireresources.FireResourcesMapper;
import com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper;
import com.zcloud.mapper.datasource.keyProjects.PlatformvideomanagementMapper;
import com.zcloud.service.bimap.BiMapService;
import com.zcloud.util.biMapFactory.AbsFireSourcesHandel;

2
src/main/java/com/zcloud/service/bus/CorpInfoService.java
View File

@ -88,5 +88,7 @@ public interface CorpInfoService{
* @throws Exception
*/
void editCorpUserNew(PageData pd)throws Exception;
List<PageData> getSelectByCorpInfo(PageData pd);
}

2
src/main/java/com/zcloud/service/bus/ImgFilesService.java
View File

@ -47,7 +47,7 @@ public interface ImgFilesService{
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd);
public List<PageData> listAll(PageData pd) throws Exception;
/**通过id获取数据
* @param pd

5
src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java
View File

@ -121,5 +121,10 @@ public class CorpInfoServiceImpl implements CorpInfoService{
public void editCorpUserNew(PageData pd) throws Exception {
corpinfoMapper.editCorpUserNew(pd);
}
@Override
public List<PageData> getSelectByCorpInfo(PageData pd) {
return corpinfoMapper.getSelectByCorpInfo(pd);
}
}

4
src/main/java/com/zcloud/service/bus/impl/HiddenExamineServiceImpl.java
View File

@ -141,7 +141,9 @@ public class HiddenExamineServiceImpl implements HiddenExamineService {
return hiddenexamineMapper.findByIdAndHidden(pd);
}
public PageData saveApp(PageData pd)throws Exception{
pd.put("HIDDENEXAMINE_ID", UuidUtil.get32UUID());
if (pd.get("HIDDENEXAMINE_ID")==null) {
pd.put("HIDDENEXAMINE_ID", UuidUtil.get32UUID());
}
pd.put("CREATTIME", DateUtil.date2Str(new Date()));
pd.put("OPERATTIME",DateUtil.date2Str(new Date()));
hiddenexamineMapper.save(pd);

13
src/main/java/com/zcloud/service/bus/impl/ImgFilesServiceImpl.java
View File

@ -210,16 +210,17 @@ public class ImgFilesServiceImpl implements ImgFilesService{
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
String fileName = UuidUtil.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
try {
Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
} catch (Exception e) {
throw new RuntimeException(e);
}
PageData pd = new PageData();
pd.put("IMGFILES_ID", UuidUtil.get32UUID());
String uuid = UuidUtil.get32UUID();
pd.put("IMGFILES_ID", uuid);
pd.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
pd.put("TYPE", TYPE);
pd.put("FOREIGN_KEY", FOREIGN_KEY);
try {
Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile, uuid,FOREIGN_KEY,TYPE);
} catch (Exception e) {
throw new RuntimeException(e);
}
try {
save(pd);
} catch (Exception e) {

7
src/main/java/com/zcloud/service/firemanager/FireCheckListService.java
View File

@ -3,7 +3,9 @@ package com.zcloud.service.firemanager;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 说明：清单列表
@ -39,13 +41,14 @@ public interface FireCheckListService {
void updById(PageData pd) throws Exception;
/**
* @return
* @Description: 保存
* @Author: dearLin
* @Date: 2023/3/8/008 17:12
* @Param: [com.zcloud.entity.PageData] [pd]
* @Return: void
*/
void saveInfo(PageData pd) throws Exception;
ArrayList<PageData> saveInfo(PageData pd) throws Exception;
/**
* @Description: 删除
@ -112,7 +115,7 @@ public interface FireCheckListService {
List<PageData> getFireCheckListCountByAppV2(PageData pageData);
void upd4PcById(PageData pd);
Map<String, String> upd4PcById(PageData pd);
void setDelStateByIds(PageData pd);
}

21
src/main/java/com/zcloud/service/firemanager/impl/FireCheckListServiceImpl.java
View File

@ -82,6 +82,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
}
/**
* @return
* @Description: 保存
* @Author: dearLin
* @Date: 2023/3/8/008 17:15
@ -90,8 +91,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void saveInfo(PageData pd) throws Exception {
public ArrayList<PageData> saveInfo(PageData pd) throws Exception {
// 处理一下检查表器材的检查项
PageData pageData = JSON.parseObject((String) pd.get("from"), PageData.class);
JSONArray userId = (JSONArray) pageData.get("USER_ID");
@ -99,12 +99,15 @@ public class FireCheckListServiceImpl implements FireCheckListService {
StringBuilder stringBuilder = new StringBuilder();
String dataJson = JSON.toJSONString(dataList);
LinkedList<PageData> logPageLinkedList = new LinkedList<>();
ArrayList<PageData> fireCheckList = new ArrayList<>();
String OPERATOR = Jurisdiction.getUSER_ID();
String OPERATOR_CORPINFO_ID = Jurisdiction.getCORPINFO_ID();
String OPERATOR_NAME = Jurisdiction.getName();
// 给每个人初始化点检表
userId.forEach(USERID -> {
PageData saveData = new PageData();
PageData logPageData = new PageData();
PageData fireCheck = new PageData();
List<PageData> preDataList = new ArrayList<>();
String fire_check_id = UuidUtil.get32UUID();
pd.put("FIRE_CHECK_TYPE", pageData.get("FIRE_CHECK_TYPE"));
@ -120,6 +123,8 @@ public class FireCheckListServiceImpl implements FireCheckListService {
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
//检查表
fireCheckListMapper.saveInfo(pd);
fireCheck.putAll(pd);
saveData.put("fireCheck",JSON.toJSONString(fireCheck));
try {
FHLOG.save(Jurisdiction.getUsername(), "保存点检表信息FIRE_CHECK_ID为" + fire_check_id);
} catch (Exception e) {
@ -147,6 +152,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
data.put("OPERATTIME", DateUtil.date2Str(new Date()));
preDataList.add(data);
}
saveData.put("preDataList",JSON.toJSONString(preDataList));
// 清单的器材
firePreparedCheckListService.saveInfo(preDataList);
List<PageData> prePointHiddenDataList = new ArrayList<>();
@ -159,6 +165,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
pdPOINT.put("CORPINFO_ID", OPERATOR_CORPINFO_ID);
prePointHiddenDataList.add(pdPOINT);
});
saveData.put("prePointHiddenDataList",JSON.toJSONString(prePointHiddenDataList));
// 消防点位表用于点检的
firePointPreparedService.saveBatch(prePointHiddenDataList);
logPageData.put("CARRYINGDATA", dataJson);
@ -171,9 +178,12 @@ public class FireCheckListServiceImpl implements FireCheckListService {
.append("。的消防点检表。");
pageData.put("SKETCH", stringBuilder.toString());
stringBuilder.setLength(0);
saveData.put("logPageData",JSON.toJSONString(logPageData));
logPageLinkedList.add(logPageData);
fireCheckList.add(saveData);
});
fireChangeLogMapper.saveBatch(logPageLinkedList);
return fireCheckList;
}
/**
@ -458,7 +468,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
@Override
@Transactional(rollbackFor = Exception.class)
public void upd4PcById(PageData pd) {
public Map<String, String> upd4PcById(PageData pd) {
// 修改 针对于点检表只会修改 "FIRE_CHECK_STANDARD_NAME":"0914表-012","FIRE_CHECK_TYPE":"checkPeriod0001"
// bus_fire_point_prepared 中点位 需要传过来的表单去计算要删除哪个，要新增哪个
// bus_fire_device_prepared 的器材会传过来
@ -492,6 +502,8 @@ public class FireCheckListServiceImpl implements FireCheckListService {
});
LinkedList<PageData> DEVICE_PREPARED_DATA = new LinkedList<>();
List<JSONObject> dataList = (List<JSONObject>) postData.get("DATA");
Map<String,String> deviceInfoMap = new HashMap<>();
int count = 1;
for (JSONObject item : dataList) {
FIRE_PREPARED_DEVICE_TABLE.put(item.getString("FIRE_POINT_ID"), 1);
if (Tools.isEmpty(item.getString("FIRE_PREPARED_ID"))) {
@ -505,6 +517,8 @@ public class FireCheckListServiceImpl implements FireCheckListService {
device_prepared_info.put("OPERATOR", OPERATOR);
device_prepared_info.put("CREATTIME", DateUtil.date2Str(new Date()));
device_prepared_info.put("OPERATTIME", DateUtil.date2Str(new Date()));
deviceInfoMap.put("deviceInfo"+count,JSON.toJSONString(device_prepared_info));
count++;
DEVICE_PREPARED_DATA.add(device_prepared_info);
}
}
@ -610,6 +624,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
fireRecordService.updCheckedByRidPid(checkedPageData);
}
}
return deviceInfoMap;
}
@Override

2
src/main/java/com/zcloud/service/fireresources/impl/FireResourcesServiceImpl.java
View File

@ -2,7 +2,7 @@ package com.zcloud.service.fireresources.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.fireresources.FireResourcesMapper;
import com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper;
import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.service.fireresources.FireResourcesService;
import com.zcloud.util.Tools;

3
src/main/java/com/zcloud/service/hiddenApi/HiddenExamineApiService.java
View File

@ -139,10 +139,11 @@ public interface HiddenExamineApiService {
public int adoptExamine(String hiddenexamineId ,String examine)throws Exception;
/**
* 隐患打回
*
* @param hiddenId
* @param EXAMINE
* @throws Exception
*/
public int saveRepulseCheckApp(String hiddenId ,String EXAMINE,String loginUserId)throws Exception;
public PageData saveRepulseCheckApp(String hiddenId , String EXAMINE, String loginUserId)throws Exception;
}

6
src/main/java/com/zcloud/service/hiddenApi/impl/HiddenExamineApiServiceImpl.java
View File

@ -242,7 +242,7 @@ public class HiddenExamineApiServiceImpl implements HiddenExamineApiService {
exam.put("EXAMINE",examine);
return hiddenExamineApiMapper.adoptExamine(exam);
}
public int saveRepulseCheckApp(String hiddenId ,String EXAMINE,String loginUserId)throws Exception{
public PageData saveRepulseCheckApp(String hiddenId , String EXAMINE, String loginUserId)throws Exception{
PageData exam = new PageData();// 添加隐患初始信息
exam.put("HIDDENEXAMINE_ID",UuidUtil.get32UUID());
exam.put("CREATOR",loginUserId);
@ -253,7 +253,9 @@ public class HiddenExamineApiServiceImpl implements HiddenExamineApiService {
exam.put("STATE",-1);//验收打回变成初始状态-1
exam.put("EXAMINE",EXAMINE);//打回意见
exam.put("HIDDEN_ID",hiddenId);//隐患ID
return hiddenExamineApiMapper.save(exam);
int save = hiddenExamineApiMapper.save(exam);
exam.put("result",save);
return exam;
}
}

15
src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java
View File

@ -65,7 +65,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
* @param pd
* @throws Exception
*/
public List<PageData> save(PageData pd)throws Exception{
public List<PageData> save(PageData pd)throws Exception {
List<PageData> hiddenList = new ArrayList<PageData>();
String currentTime = DateUtil.date2Str(new Date());
if (Tools.notEmpty(pd.getString("SITUATIONJSON"))) {
@ -290,6 +290,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
}
}
}
pd.put("inspector",JSON.toJSONString(inspector));
safetyenvironmentalinspectorService.save(inspector);
if (note_flag) noticeCorpUtil.SE_OneStepUtil(inspector);
time = DateUtil.calculateDateSecond(time, 1);
@ -331,6 +332,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
if (Tools.notEmpty(pd.getString("SITUATIONJSON"))) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("SITUATIONJSON"));
String time = currentTime;
ArrayList<PageData> situationList = new ArrayList<>();
for (JSONObject json : list) {
PageData situationPd = new PageData();
if (Tools.isEmpty(json.getString("INSPECTION_SITUATION_ID"))) {
@ -343,6 +345,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
situationPd.put("OPERATOR", pd.getString("OPERATOR")); //修改人
situationPd.put("OPERATTIME", time); //修改时间
situationPd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); //企业ID
situationList.add(situationPd);
safetyenvironmentalsituationService.save(situationPd);
time = DateUtil.calculateDateSecond(time, 1);
} else {
@ -351,9 +354,11 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
situationPd.put("SITUATION", json.getString("SITUATION")); //检查情况
situationPd.put("OPERATOR", pd.getString("OPERATOR")); //修改人
situationPd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
situationList.add(situationPd);
safetyenvironmentalsituationService.edit(situationPd);
}
}
pd.put("situationList",JSON.toJSONString(situationList));
}
String[] delHiddens = "".equals(pd.getString("delHiddens")) ? new String[0] : pd.getString("delHiddens").split(",");
if (delHiddens.length > 0) {
@ -367,6 +372,8 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
if (Tools.notEmpty(pd.getString("HIDDENJSON"))) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("HIDDENJSON"));
String time = currentTime;
ArrayList<PageData> hiddenpdList = new ArrayList<>();
ArrayList<PageData> userList = new ArrayList<>();
for (JSONObject json : list) {
PageData hidden = new PageData();
if (Tools.isEmpty(json.getString("HIDDEN_ID"))) {
@ -389,6 +396,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
hidden.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
hidden.put("POSITIONDESC",json.getString("POSITIONDESC"));
hidden.put("ISRELEVANT",json.getString("ISRELEVANT"));
hiddenpdList.add(hidden);
hiddenService.save(hidden);
time = DateUtil.calculateDateSecond(time, 1);
} else {
@ -409,6 +417,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
hidden.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
hidden.put("POSITIONDESC",json.getString("POSITIONDESC"));
hidden.put("ISRELEVANT",json.getString("ISRELEVANT"));
hiddenpdList.add(hidden);
hiddenService.editInfo(hidden);
PageData del = new PageData();
@ -423,9 +432,12 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
findUser.put("USER_ID",json.getString("CREATOR"));
findUser.put("TYPE","1");
findUser.put("IS_MAIN","0");
userList.add(findUser);
hiddenUserService.save(findUser);
hiddenList.add(hidden);
}
pd.put("hiddenpdList",JSON.toJSONString(hiddenpdList));
pd.put("userList",JSON.toJSONString(userList));
}
String[] delHiddenFiles = "".equals(pd.getString("delHiddenFiles")) ? new String[0] : pd.getString("delHiddenFiles").split(",");
@ -442,6 +454,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
log.put("ACTION", "安全环保检查重新申请"); //操作内容
log.put("CREATTIME", pd.getString("CREATTIME")); //添加时间
log.put("CREATOR", pd.getString("ACTION_USER")); //添加人姓名
pd.put("log",JSON.toJSONString(log));
safetyenvironmentallogService.save(log);
// 编辑的时候自动清空附件
if (!"1".equals(pd.getString("unClear"))){

3
src/main/java/com/zcloud/util/InitPageDataUtil.java
View File

@ -20,12 +20,13 @@ public class InitPageDataUtil {
* @param pd
* @return
*/
public void initSave(PageData pd) {
public PageData initSave(PageData pd) {
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
return pd;
}
public void initSave(PageData pd, String PRIMARY_KEY) {

2
src/main/java/com/zcloud/util/biMapFactory/AbsFireSourcesHandel.java
View File

@ -1,7 +1,7 @@
package com.zcloud.util.biMapFactory;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.fireresources.FireResourcesMapper;
import com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper;
import com.zcloud.service.fireresources.FireResourcesService;
import org.springframework.beans.factory.InitializingBean;

26
src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml
View File

@ -453,4 +453,30 @@
where USER_ID = #{USER_ID}
</update>
<select id="getSelectByCorpInfo" resultType="com.zcloud.entity.PageData">
select
<include refid="Field"></include>
from
<include refid="tableName"></include>
f
left join `qa-czks-prevention`.sys_dictionaries d on d.DICTIONARIES_ID = f.REPORT_CYCLE
left join `qa-czks-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = f.CORP_OF_TYPE
left join `qa-czks-regulatory`.BUS_CORPTYPE type2 on type2.CORPTYPE_ID = f.CORP_OF_TYPE2
LEFT JOIN `qa-czks-prevention`.sys_dictionaries prvince ON prvince.BIANMA = f.PROVINCE
left join `qa-czks-prevention`.sys_dictionaries city on city.BIANMA = f.CITY
left join `qa-czks-prevention`.sys_dictionaries country on country.BIANMA = f.COUNTRY
left join `qa-czks-prevention`.sys_dictionaries village on village.BIANMA = f.VILLAGE
left join `qa-czks-prevention`.sys_dictionaries corpState on corpState.BIANMA = f.CORP_STATE
left join `qa-czks-prevention`.sys_dictionaries sub on sub.BIANMA = f.SUBORDINATION
left join `qa-czks-prevention`.sys_dictionaries ct1 on ct1.DICTIONARIES_ID = f.CORP_TYPE
left join `qa-czks-prevention`.sys_dictionaries ct2 on ct2.DICTIONARIES_ID = f.CORP_TYPE2
left join `qa-czks-prevention`.sys_dictionaries ct3 on ct3.DICTIONARIES_ID = f.CORP_TYPE3
left join `qa-czks-prevention`.sys_dictionaries ct4 on ct4.DICTIONARIES_ID = f.CORP_TYPE4
LEFT JOIN `qa-czks-prevention`.sys_dictionaries sd ON sd.DICTIONARIES_ID = f.INDUSTRY
left join `qa-czks-prevention`.sys_dictionaries state on state.BIANMA = f.CORP_STATE
LEFT JOIN `qa-czks-prevention`.sys_user su on su.CORPINFO_ID = f.CORPINFO_ID and su.isdelete = '0'
where 1=1 and f.ISDELETE ='0' and su.ISDELETE ='0'
GROUP BY f.CORPINFO_ID
ORDER BY (f.COR_ORDER+0) asc
</select>
</mapper>

10
src/main/resources/mybatis/datasource/bus/HiddenMapper.xml
View File

@ -875,11 +875,11 @@
(select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME
from
<include refid="tableName"></include> f
left join qa-gwj-prevention.`vi_user_all` cr on cr.USER_ID = f.CREATOR
left join qa-gwj-prevention.`vi_user_all` re on re.USER_ID = f.RECTIFICATIONOR
left join qa-gwj-prevention.`vi_user_all` ch on ch.USER_ID = f.CHECKOR
left join qa-gwj-prevention.`vi_user_all` rev on rev.USER_ID = f.REVIEWOR
left join qa-gwj-prevention.`vi_user_all` conUser on conUser.USER_ID = f.CONFIRM_USER
left join `qa-czks-prevention`.`vi_user_all` cr on cr.USER_ID = f.CREATOR
left join `qa-czks-prevention`.`vi_user_all` re on re.USER_ID = f.RECTIFICATIONOR
left join `qa-czks-prevention`.`vi_user_all` ch on ch.USER_ID = f.CHECKOR
left join `qa-czks-prevention`.`vi_user_all` rev on rev.USER_ID = f.REVIEWOR
left join `qa-czks-prevention`.`vi_user_all` conUser on conUser.USER_ID = f.CONFIRM_USER
left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT
left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT

20
src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml
View File

@ -73,7 +73,9 @@
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
f.ACCEPT_CONFESS_USER_SIGNER_TIME
f.ACCEPT_CONFESS_USER_SIGNER_TIME,
f.WORK_LATITUDE,
f.WORK_LONGITUDE
</sql>
<!-- 字段用于新增 -->
@ -137,7 +139,9 @@
ACCEPT_CONFESS_DEPARTMENT_ID,
ACCEPT_CONFESS_USER_ID,
ACCEPT_CONFESS_USER_SIGNER_PATH,
ACCEPT_CONFESS_USER_SIGNER_TIME
ACCEPT_CONFESS_USER_SIGNER_TIME,
WORK_LATITUDE,
WORK_LONGITUDE
</sql>
<!-- 字段值 -->
@ -202,7 +206,9 @@
#{ACCEPT_CONFESS_DEPARTMENT_ID},
#{ACCEPT_CONFESS_USER_ID},
#{ACCEPT_CONFESS_USER_SIGNER_PATH},
#{ACCEPT_CONFESS_USER_SIGNER_TIME}
#{ACCEPT_CONFESS_USER_SIGNER_TIME},
#{WORK_LATITUDE},
#{WORK_LONGITUDE}
</sql>
<!-- 新增-->
@ -487,6 +493,8 @@
f.ACCEPT_CONFESS_USER_ID,
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
f.ACCEPT_CONFESS_USER_SIGNER_TIME,
f.WORK_LATITUDE,
f.WORK_LONGITUDE,
(SELECT replace(a.ANALYZE_TIME,'-','/') from GF_CONFINEDSPACEGAS a where a.ISDELETE = '0'
AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
ORDER BY
@ -615,6 +623,8 @@
f.CONFESS_USER_SIGNER_TIME,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
f.WORK_LATITUDE,
f.WORK_LONGITUDE,
IFNULL((SELECT a.ANALYZE_TIME from GF_confinedspacegas a where a.ISDELETE = '0'
AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
ORDER BY
@ -845,6 +855,8 @@
f.CONFESS_USER_SIGNER_TIME,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
f.WORK_LATITUDE,
f.WORK_LONGITUDE,
IFNULL((SELECT replace(a.ANALYZE_TIME,'-','/') from GF_confinedspacegas a where a.ISDELETE = '0'
AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
ORDER BY
@ -1067,6 +1079,8 @@
f.CONFESS_USER_SIGNER_TIME,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
f.WORK_LATITUDE,
f.WORK_LONGITUDE,
IFNULL((SELECT a.ANALYZE_TIME from gf_confinedspacegas a where a.ISDELETE = '0'
AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
ORDER BY

2
src/main/resources/mybatis/datasource/system/UsersMapper.xml
View File

@ -252,7 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- 通过USERNAME获取数据 -->
<select id="findByUsername" parameterType="pd" resultType="pd" >
select
<include refid="Fieldf"></include> ,dept.name as deptName
<include refid="Fieldf"></include> ,f.USER_IDENTITY,dept.name as deptName
from
<include refid="tableName"></include> f
LEFT JOIN OA_DEPARTMENT dept on f.DEPARTMENT_ID = dept.DEPARTMENT_ID

472
src/main/resources/mybatis/dsno2/fireresources/FireResourcesMapper.xml Normal file
View File

@ -0,0 +1,472 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper">
<!--表名 -->
<sql id="tableName">
bus_fireresources
</sql>
<!-- 字段 -->
<sql id="Field">
FIRERESOURCES_ID,
FIRERESOURCES_NAME,
FIRERESOURCES_TYPE,
LONGTITUDE,
LATITUDE,
DESCR,
CREATIME,
OPERATIME,
ISDELETE,
CORPINFO_ID,
STATE
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{FIRERESOURCES_ID},
#{FIRERESOURCES_NAME},
#{FIRERESOURCES_TYPE},
#{LONGTITUDE},
#{LATITUDE},
#{DESCR},
#{CREATIME},
#{OPERATIME},
#{ISDELETE},
#{CORPINFO_ID},
#{STATE}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set ISDELETE = '1'
where
FIRERESOURCES_ID = #{FIRERESOURCES_ID}
</delete>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
FIRERESOURCES_NAME = #{FIRERESOURCES_NAME},
FIRERESOURCES_TYPE = #{FIRERESOURCES_TYPE},
LONGTITUDE = #{LONGTITUDE},
LATITUDE = #{LATITUDE},
DESCR = #{DESCR},
OPERATIME = #{OPERATIME},
ISDELETE = #{ISDELETE},
CORPINFO_ID = #{CORPINFO_ID},
STATE = #{STATE}
where
FIRERESOURCES_ID = #{FIRERESOURCES_ID}
</update>
<!-- 通过ID获取数据 -->
<select id="findById" parameterType="pd" resultType="pd">
select
f.*
from
<include refid="tableName"></include> f
where
FIRERESOURCES_ID = #{FIRERESOURCES_ID}
</select>
<!-- 列表 -->
<select id="datalistPage" parameterType="page" resultType="pd">
select
f.*,
c.CORP_NAME,
sd1.NAME as FIRERESOURCES_TYPENAME
from
<include refid="tableName"></include> f
left join `qa-czks-prevention`.sys_dictionaries sd1 on sd1.BIANMA = f.FIRERESOURCES_TYPE
left join `qa-czks-prevention`.bus_corp_info c on c.CORPINFO_ID = f.CORPINFO_ID
where
f.ISDELETE = '0'
<if test="pd.FIRERESOURCES_NAME != null and pd.FIRERESOURCES_NAME != ''">
and ( f.FIRERESOURCES_NAME LIKE CONCAT(CONCAT('%', #{pd.FIRERESOURCES_NAME}),'%') )
</if>
<if test="pd.FIRERESOURCES_TYPE != null and pd.FIRERESOURCES_TYPE != ''">
and f.FIRERESOURCES_TYPE = #{pd.FIRERESOURCES_TYPE}
</if>
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
order by f.CREATIME desc
</select>
<!-- 列表(全部) -->
<select id="listAll" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include>
</select>
<select id="getControlRoomDataList" resultType="com.zcloud.entity.PageData">
SELECT
FIRERESOURCES_ID id,
FIRERESOURCES_NAME NAME,
d.BIANMA TYPE,
LONGTITUDE LONGITUDE,
LATITUDE,
DESCR,
'./bi/images/map/xiaofang/contro.png' IMAGE_FILE
FROM
bus_fireresources f
LEFT JOIN `qa-czks-prevention`.sys_dictionaries d ON f.FIRERESOURCES_TYPE = d.BIANMA
WHERE
f.ISDELETE = 0
AND f.FIRERESOURCES_TYPE = 'xfkzs01'
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND f.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="list != null and list.size() > 0">
AND f.CORPINFO_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="getPumpRoomDataList" resultType="com.zcloud.entity.PageData">
SELECT
FIRERESOURCES_ID id,
FIRERESOURCES_NAME NAME,
d.BIANMA TYPE,
LONGTITUDE LONGITUDE,
LATITUDE,
DESCR,
'./bi/images/map/xiaofang/pumpRoom.png' IMAGE_FILE
FROM
bus_fireresources f
LEFT JOIN `qa-czks-prevention`.sys_dictionaries d ON f.FIRERESOURCES_TYPE = d.BIANMA
WHERE
f.ISDELETE = 0
AND f.FIRERESOURCES_TYPE = 'xfbf01'
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND f.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="list != null and list.size() > 0">
AND f.CORPINFO_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="getRescueTeamDataList" resultType="com.zcloud.entity.PageData">
SELECT
FIRERESOURCES_ID id,
FIRERESOURCES_NAME NAME,
d.BIANMA TYPE,
LONGTITUDE LONGITUDE,
LATITUDE,
DESCR,
'./bi/images/map/xiaofang/rescueTeam.png' IMAGE_FILE
FROM
bus_fireresources f
LEFT JOIN `qa-czks-prevention`.sys_dictionaries d ON f.FIRERESOURCES_TYPE = d.BIANMA
WHERE
f.ISDELETE = 0
AND f.FIRERESOURCES_TYPE = 'xfjyd01'
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND f.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="list != null and list.size() > 0">
AND f.CORPINFO_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="getWaterSourceDataList" resultType="com.zcloud.entity.PageData">
SELECT
FIRERESOURCES_ID id,
FIRERESOURCES_NAME NAME,
d.BIANMA TYPE,
LONGTITUDE LONGITUDE,
LATITUDE,
DESCR,
'./bi/images/map/xiaofang/waterSource.png' IMAGE_FILE
FROM
bus_fireresources f
LEFT JOIN `qa-czks-prevention`.sys_dictionaries d ON f.FIRERESOURCES_TYPE = d.BIANMA
WHERE
f.ISDELETE = 0
AND f.FIRERESOURCES_TYPE = 'xfsy01'
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND f.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="list != null and list.size() > 0">
AND f.CORPINFO_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="getPointDataList" resultType="com.zcloud.entity.PageData">
SELECT
FIRE_POINT_ID id,
FIRE_POINT_NAME NAME,
'point' TYPE,
LONGITUDE,
LATITUDE
FROM
`qa-czks-prevention`.bus_fire_point f
WHERE
f.ISDELETE = 0
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND f.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="list != null and list.size() > 0">
AND f.CORPINFO_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="getDataById" resultType="com.zcloud.entity.PageData">
SELECT
f.*,
c.CORP_NAME
FROM
bus_fireresources f
left join `qa-czks-prevention`.bus_corp_info c on f.CORPINFO_ID = c.CORPINFO_ID
where f.ISDELETE = 0
and f.FIRERESOURCES_ID = #{FIRERESOURCES_ID}
</select>
<select id="getCheckRecordByPid" resultType="pd">
SELECT
frp.EQUIPMENT_POINT_ID,
fc.FIRE_CHECK_STANDARD_NAME,
fc.FIRE_CHECK_TYPE,
u.`NAME` USERNAME,
dep.`NAME` deptName,
d.`NAME` dicName,
fpp.FIRE_CHECK_ID,
fr.FIRE_RECORD_ID,
fp.FIRE_POINT_NAME,
reg.FIRE_REGION_NAME,
fpp.FIRE_POINT_ID,
fr.CHECK_TIME,
fr.PERIODSTART,
fr.PERIODEND
FROM
`qa-czks-prevention`.bus_fire_record fr
LEFT JOIN `qa-czks-prevention`.bus_fire_point_prepared fpp ON fr.FIRE_CHECK_ID = fpp.FIRE_CHECK_ID
LEFT JOIN `qa-czks-prevention`.bus_fire_checklist fc ON fpp.FIRE_CHECK_ID = fc.FIRE_CHECK_ID
LEFT JOIN `qa-czks-prevention`.sys_dictionaries d ON fc.FIRE_CHECK_TYPE = d.BIANMA
LEFT JOIN `qa-czks-prevention`.sys_user u ON fc.USER_ID = u.USER_ID
LEFT JOIN `qa-czks-prevention`.bus_fire_point fp ON fp.FIRE_POINT_ID = fpp.FIRE_POINT_ID
LEFT JOIN `qa-czks-prevention`.bus_fire_region reg ON reg.FIRE_REGION_ID = fp.FIRE_REGION_ID
LEFT JOIN `qa-czks-prevention`.oa_department dep ON dep.DEPARTMENT_ID = fc.DEPARTMENT_ID
LEFT JOIN `qa-czks-prevention`.bus_fire_record_point frp ON fr.FIRE_RECORD_ID = frp.FIRE_RECORD_ID AND fp.FIRE_POINT_ID = frp.FIRE_POINT_ID
WHERE
fr.FINISHED = 1
and fc.ISDELETE = 0
and frp.ISDELETE = 0
<if test="FIRE_POINT_ID != null and FIRE_POINT_ID != ''" >
AND fpp.FIRE_POINT_ID = #{FIRE_POINT_ID}
</if>
<if test="KEYWORDS != null and KEYWORDS != ''" >
AND fc.FIRE_CHECK_STANDARD_NAME like concat('%',concat(#{KEYWORDS},'%'))
</if>
GROUP BY
fr.FIRE_CHECK_ID,
fr.FIRE_RECORD_ID
ORDER BY
fr.OPERATTIME DESC
</select>
<select id="findPointById" resultType="com.zcloud.entity.PageData">
SELECT
p.FIRE_POINT_ID,
p.FIRE_POINT_NAME,
p.FIRE_POINT_CODE,
p.QUALIFIED_PHOTOS_ID,
p.LONGITUDE,
p.LATITUDE,
CONCAT_WS('--', p.LATITUDE,p.LONGITUDE) LONGTITUDEANDLATITUDE,
r.FIRE_REGION_ID,
d.`NAME` AS DEPARTMENT_NAME,
u.`NAME` AS USERNAME,
r.FIRE_REGION_NAME,
u.USER_ID,
p.DEPARTMENT_ID
FROM
`qa-czks-prevention`.bus_fire_point AS p
left JOIN `qa-czks-prevention`.bus_fire_region AS r ON p.FIRE_REGION_ID = r.FIRE_REGION_ID
LEFT JOIN `qa-czks-prevention`.sys_user AS u ON p.USER_ID = u.USER_ID
left JOIN `qa-czks-prevention`.oa_department AS d ON p.DEPARTMENT_ID = d.DEPARTMENT_ID
WHERE
r.ISDELETE = 0 AND p.ISDELETE = 0
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND r.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="FIRE_POINT_ID != null and FIRE_POINT_ID != ''">
AND FIRE_POINT_ID = #{FIRE_POINT_ID}
</if>
</select>
<select id="listAll4H5" resultType="com.zcloud.entity.PageData">
SELECT fp.USER_ID,
fp.DEPARTMENT_ID,
fp.FIRE_POINT_NAME,
fp.FIRE_POINT_CODE,
fp.FIRE_POINT_ID,
fr.FIRE_REGION_NAME,
fr.FIRE_REGION_ID,
fd.FIRE_DEVICE_CODE,
fd.FIRE_DEVICE_TYPE_ID,
fd.VALIDITY_START_TIME,
fd.VALIDITY_END_TIME,
fd.REMAKE,
fd.FIRE_DEVICE_ID,
su.`NAME` AS USERNAME,
d.`NAME` AS DEPARTMENTNAME,
`qa-czks-prevention`.sys_dictionaries.`NAME` AS FIRE_DEVICE_TYPE_NAME,
GROUP_CONCAT(DISTINCT FIRE_CHECK_STANDARD_ITEM ORDER BY FIRE_CHECK_STANDARD_ITEM SEPARATOR '@@' ) FIRE_CHECK_STANDARD_ITEM
FROM `qa-czks-prevention`.bus_fire_point AS fp
LEFT JOIN `qa-czks-prevention`.bus_fire_device AS fd ON fp.FIRE_POINT_ID = fd.FIRE_POINT_ID
LEFT JOIN `qa-czks-prevention`.bus_fire_region AS fr ON fd.FIRE_REGION_ID = fr.FIRE_REGION_ID
LEFT JOIN `qa-czks-prevention`.sys_user AS su ON fp.USER_ID = su.USER_ID
LEFT JOIN `qa-czks-prevention`.oa_department AS d ON fd.DEPARTMENT_ID = d.DEPARTMENT_ID
LEFT JOIN `qa-czks-prevention`.sys_dictionaries ON fd.FIRE_DEVICE_TYPE_ID = sys_dictionaries.BIANMA
LEFT JOIN `qa-czks-prevention`.bus_fire_check_standard fcs on fd.FIRE_DEVICE_TYPE_ID = fcs.FIRE_DEVICE_TYPE
WHERE fp.ISDELETE = 0
AND fd.ISDELETE = 0
and fcs.ISDELETE = 0
AND fp.FIRE_POINT_ID = #{FIRE_POINT_ID}
GROUP BY fd.FIRE_DEVICE_CODE
ORDER BY fr.FIRE_REGION_ID,
fr.CREATTIME,
fp.FIRE_POINT_ID,
fp.CREATTIME,
fd.FIRE_DEVICE_TYPE_ID,
fd.CREATTIME,
fd.OPERATTIME DESC
</select>
<select id="getPointQualifiedPhotosByEpid" resultType="com.zcloud.entity.PageData">
SELECT
img.*
FROM
`qa-czks-prevention`.bus_imgfiles img
LEFT JOIN `qa-czks-prevention`.`qa-czks-prevention`.bus_fire_record_point p ON p.QUALIFIED_PHOTOS_ID = img.FOREIGN_KEY
WHERE
img.TYPE = 115
and p.EQUIPMENT_POINT_ID = #{EQUIPMENT_POINT_ID}
</select>
<select id="getPointQualifiedPhotos" resultType="com.zcloud.entity.PageData">
SELECT
img.*
FROM
`qa-czks-prevention`.bus_imgfiles img
LEFT JOIN `qa-czks-prevention`.bus_fire_point p ON p.QUALIFIED_PHOTOS_ID = img.FOREIGN_KEY
WHERE
img.TYPE = 115
and p.FIRE_POINT_ID = #{FIRE_POINT_ID}
</select>
<select id="goRecordDeviceByPid" resultType="com.zcloud.entity.PageData">
SELECT
frd.EQUIPMENT_RECORD_ID,
frd.ISNORMAL,
IFNULL( frd.HIDDEN_ID, '' ) HIDDEN_ID,
frd.FIRE_RECORD_ID,
fp.FIRE_POINT_ID,
fp.FIRE_POINT_NAME,
fr.FIRE_REGION_ID,
fr.FIRE_REGION_NAME,
frp.P_ISCHECKED ISCHECKED,
GROUP_CONCAT( DISTINCT d.NAME ) dicName,
GROUP_CONCAT( DISTINCT fd.FIRE_DEVICE_CODE ) FIRE_DEVICE_CODE,
GROUP_CONCAT( DISTINCT fd.FIRE_DEVICE_TYPE_ID ) FIRE_DEVICE_TYPE_ID,
GROUP_CONCAT( DISTINCT fcs.FIRE_CHECK_STANDARD_ITEM ORDER BY FIRE_CHECK_STANDARD_ITEM desc SEPARATOR '@@' ) FIRE_CHECK_STANDARD_ITEM
FROM
bus_fire_record_device frd
LEFT JOIN bus_fire_device fd ON frd.FIRE_DEVICE_ID = fd.FIRE_DEVICE_ID
LEFT JOIN sys_dictionaries d ON fd.FIRE_DEVICE_TYPE_ID = d.BIANMA
LEFT JOIN bus_fire_point fp ON fd.FIRE_POINT_ID = fp.FIRE_POINT_ID
LEFT JOIN bus_fire_record_point frp ON frp.FIRE_POINT_ID = fp.FIRE_POINT_ID
AND frd.FIRE_RECORD_ID = frp.FIRE_RECORD_ID
LEFT JOIN bus_fire_region fr ON fp.FIRE_REGION_ID = fr.FIRE_REGION_ID
LEFT JOIN bus_fire_check_standard fcs ON fd.FIRE_DEVICE_TYPE_ID = fcs.FIRE_DEVICE_TYPE
AND fcs.ISDELETE = 0
where frd.FIRE_RECORD_ID = #{FIRE_RECORD_ID} and fp.FIRE_POINT_ID = #{FIRE_POINT_ID}
GROUP BY
frd.FIRE_RECORD_ID,
fd.FIRE_DEVICE_ID
ORDER BY fd.FIRE_DEVICE_CODE
</select>
<select id="devicelistPage" resultType="com.zcloud.entity.PageData">
SELECT
d.FIRE_POINT_ID,
p.FIRE_POINT_NAME,
FIRE_DEVICE_TYPE_ID,
dic.`NAME` FIRE_DEVICE_TYPE_NAME,
COUNT( 1 ) COUNT
FROM
`qa-czks-prevention`.bus_fire_device d
LEFT JOIN `qa-czks-prevention`.bus_fire_point p ON d.FIRE_POINT_ID = p.FIRE_POINT_ID
LEFT JOIN `qa-czks-prevention`.sys_dictionaries dic ON d.FIRE_DEVICE_TYPE_ID = dic.BIANMA
WHERE
d.ISDELETE = 0 and p.isdelete = 0
<if test="pd.FIRE_DEVICE_TYPE_ID != null and pd.FIRE_DEVICE_TYPE_ID != ''">
and d.FIRE_DEVICE_TYPE_ID = #{pd.FIRE_DEVICE_TYPE_ID}
</if>
<if test="pd.FIRE_POINT_NAME != null and pd.FIRE_POINT_NAME != ''">
and p.FIRE_POINT_NAME like concat('%',concat(#{pd.FIRE_POINT_NAME},'%'))
</if>
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and d.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.AREA != null and pd.AREA != ''">
and d.CORPINFO_ID IN (select CORPINFO_ID from `qa-czks-prevention`.bus_corp_info where AREA = #{pd.AREA} and ISDELETE = 0)
</if>
GROUP BY
d.FIRE_POINT_ID,
d.FIRE_DEVICE_TYPE_ID
ORDER BY
d.CREATTIME DESC
</select>
<select id="getPointCheckPhotoById" resultType="com.zcloud.entity.PageData">
SELECT
GROUP_CONCAT( img.FILEPATH SEPARATOR '@@' ) FILEPATHLIST,
u.`NAME` CREATOR_NAME,
cl.FIRE_CHECK_ID,
cl.FIRE_CHECK_STANDARD_NAME,
frp.EQUIPMENT_POINT_ID,
frp.FIRE_POINT_ID,
frp.FIRE_RECORD_ID,
frp.CREATTIME
FROM
`qa-czks-prevention`.bus_fire_checklist cl
LEFT JOIN `qa-czks-prevention`.bus_fire_record_point frp ON frp.fire_check_id = cl.fire_check_id
AND cl.ISDELETE = 0
LEFT JOIN `qa-czks-prevention`.bus_imgfiles img ON frp.EQUIPMENT_POINT_ID = img.FOREIGN_KEY
LEFT JOIN `qa-czks-prevention`.sys_user u on frp.CREATOR = u.USER_ID
WHERE
frp.ISDELETE = 0
AND frp.FIRE_POINT_ID = #{FIRE_POINT_ID}
AND frp.P_ISCHECKED = 0
GROUP BY
cl.FIRE_CHECK_ID
ORDER BY
frp.CREATTIME DESC
limit 1
</select>
</mapper>