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

重点工程部分代码

pull/14/head
z 2023-12-22 16:37:33 +08:00
parent 15101b57fd
commit d7bf791dfc
4 changed files with 54 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java
View File

@ -49,18 +49,28 @@ public class KeyprojectCheckController extends BaseController {
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
PageData KEYPROJECTCHECK = new PageData();
// PageData KEYPROJECTCHECKINFO = new PageData();
// PageData HIDDEN = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("KEYPROJECTCHECK_ID", this.get32UUID()); //主键 pd.put("KEYPROJECTCHECK_ID", this.get32UUID()); //主键
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", 0); //是否删除 pd.put("ISDELETE", 0); //是否删除
pd.put("SOURCE", 1); //企业ID pd.put("SOURCE", 1); //企业ID
keyprojectcheckService.save(pd); keyprojectcheckService.save(pd);
KEYPROJECTCHECK.putAll(pd);
String currentTime = DateUtil.date2Str(new Date()); String currentTime = DateUtil.date2Str(new Date());
if (Tools.notEmpty(pd.getString("SITUATIONJSON"))) { if (Tools.notEmpty(pd.getString("SITUATIONJSON"))) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("SITUATIONJSON")); List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("SITUATIONJSON"));
String time = currentTime; String time = currentTime;
List situationPdList = new ArrayList<>();
for (JSONObject json : list) { for (JSONObject json : list) {
PageData situationPd = new PageData(); PageData situationPd = new PageData();
situationPd.put("KEYPROJECTCHECKINFO_ID", UuidUtil.get32UUID()); //主键 situationPd.put("KEYPROJECTCHECKINFO_ID", UuidUtil.get32UUID()); //主键
@ -72,8 +82,11 @@ public class KeyprojectCheckController extends BaseController {
situationPd.put("OPERATOR", pd.getString("OPERATOR")); //修改人 situationPd.put("OPERATOR", pd.getString("OPERATOR")); //修改人
situationPd.put("OPERATTIME", time); //修改时间 situationPd.put("OPERATTIME", time); //修改时间
keyprojectcheckInfoService.save(situationPd); keyprojectcheckInfoService.save(situationPd);
situationPdList.add(situationPd);
time = DateUtil.calculateDateSecond(time, 1); time = DateUtil.calculateDateSecond(time, 1);
} }
pd.put("KEYPROJECTCHECKINFO",situationPdList);
// p2.putAll(pd);
} }
if (Tools.notEmpty(pd.getString("HIDDENJSON"))) { if (Tools.notEmpty(pd.getString("HIDDENJSON"))) {
@ -110,7 +123,7 @@ public class KeyprojectCheckController extends BaseController {
hiddenList.add(hidden); hiddenList.add(hidden);
time = DateUtil.calculateDateSecond(time, 1); time = DateUtil.calculateDateSecond(time, 1);
} }
pd.put("hiddenList", hiddenList); pd.put("HIDDEN", hiddenList);
} }
map.put("pd", pd); map.put("pd", pd);
map.put("dockData", JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(pd));

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

@ -5,7 +5,6 @@ import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.entity.system.Department;
import com.zcloud.service.bus.ImgFilesService; import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.service.keyProjects.AIWarningService; import com.zcloud.service.keyProjects.AIWarningService;
import com.zcloud.service.keyProjects.OutSourcedService; import com.zcloud.service.keyProjects.OutSourcedService;
@ -15,7 +14,6 @@ import com.zcloud.service.system.UsersService;
import com.zcloud.util.*; import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.session.Session;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -59,7 +57,7 @@ public class OutSourcedController extends BaseController {
@RequestMapping(value = "/add") @RequestMapping(value = "/add")
@RequiresPermissions("outsourced:add") @RequiresPermissions("outsourced:add")
@ResponseBody @ResponseBody
@DockAnnotation(isAdd = true,hasAnnex = true) @DockAnnotation(isAdd = true, hasAnnex = true)
public Object add(@RequestParam(value = "file", required = false) MultipartFile file, public Object add(@RequestParam(value = "file", required = false) MultipartFile file,
@RequestParam(value = "file1", required = false) MultipartFile file1, @RequestParam(value = "file1", required = false) MultipartFile file1,
@RequestParam(value = "file2", required = false) MultipartFile file2, @RequestParam(value = "file2", required = false) MultipartFile file2,
@ -238,7 +236,7 @@ public class OutSourcedController extends BaseController {
pdImg.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); pdImg.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
pdImg.put("TYPE", "300"); pdImg.put("TYPE", "300");
pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID")); pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID"));
Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,pd.getString("OUTSOURCED_ID"),"300"); Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile, IMGFILES_ID, pd.getString("OUTSOURCED_ID"), "300");
imgfilesService.save(pdImg); imgfilesService.save(pdImg);
} }
} }
@ -250,7 +248,7 @@ public class OutSourcedController extends BaseController {
//} //}
pd.put("INVOLVING_CORPS", Jurisdiction.getCORPINFO_ID()); pd.put("INVOLVING_CORPS", Jurisdiction.getCORPINFO_ID());
outsourcedService.save(pd); outsourcedService.save(pd);
pd.put("pictList",strings); pd.put("pictList", strings);
map.put("dockData", JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -445,7 +443,7 @@ public class OutSourcedController extends BaseController {
pdImg.put("TYPE", "300"); pdImg.put("TYPE", "300");
pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID")); pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID"));
imgfilesService.save(pdImg); imgfilesService.save(pdImg);
Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,pd.getString("OUTSOURCED_ID"),"300"); Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile, IMGFILES_ID, pd.getString("OUTSOURCED_ID"), "300");
} }
@ -738,47 +736,47 @@ public class OutSourcedController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
//校验当前重点工程是否存在未完成的隐患 （包含未整改，未处罚，ai报警未处置的） //校验当前重点工程是否存在未完成的隐患 （包含未整改，未处罚，ai报警未处置的）
PageData pageData = outsourcedService.jieshuOutSourced(pd); 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("result", errInfo);
map.put("msg","当前重点工程还有"+pageData.getString("qr")+"项待确认安全环保检查,请处理以后再结束"); map.put("msg", "当前重点工程还有" + pageData.getString("qr") + "项待确认安全环保检查,请处理以后再结束");
map.put("code","500"); map.put("code", "500");
return map; return map;
} }
if(!StringUtils.equals("0",pageData.getString("zg"))){ if (!StringUtils.equals("0", pageData.getString("zg"))) {
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg","当前重点工程还有"+pageData.getString("zg")+"项需整改的隐患,请处理以后再结束"); map.put("msg", "当前重点工程还有" + pageData.getString("zg") + "项需整改的隐患,请处理以后再结束");
map.put("code","500"); map.put("code", "500");
return map; return map;
} }
if(!StringUtils.equals("0",pageData.getString("ys"))){ if (!StringUtils.equals("0", pageData.getString("ys"))) {
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg","当前重点工程还有"+pageData.getString("ys")+"项待验收隐患,请处理以后再结束"); map.put("msg", "当前重点工程还有" + pageData.getString("ys") + "项待验收隐患,请处理以后再结束");
map.put("code","500"); map.put("code", "500");
return map; return map;
} }
if(!StringUtils.equals("0",pageData.getString("cf"))){ if (!StringUtils.equals("0", pageData.getString("cf"))) {
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg","当前重点工程还有"+pageData.getString("cf")+"项待处罚隐患,请处理以后再结束"); map.put("msg", "当前重点工程还有" + pageData.getString("cf") + "项待处罚隐患,请处理以后再结束");
map.put("code","500"); map.put("code", "500");
return map; return map;
} }
if(!StringUtils.equals("0",pageData.getString("fk"))){ if (!StringUtils.equals("0", pageData.getString("fk"))) {
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg","当前重点工程还有"+pageData.getString("fk")+"项处罚待反馈隐患,请处理以后再结束"); map.put("msg", "当前重点工程还有" + pageData.getString("fk") + "项处罚待反馈隐患,请处理以后再结束");
map.put("code","500"); map.put("code", "500");
return map; return map;
} }
if(!StringUtils.equals("0",pageData.getString("ai"))){ if (!StringUtils.equals("0", pageData.getString("ai"))) {
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg","当前重点工程还有"+pageData.getString("ai")+"项AI报警待处置,请处理以后再结束"); map.put("msg", "当前重点工程还有" + pageData.getString("ai") + "项AI报警待处置,请处理以后再结束");
map.put("code","500"); map.put("code", "500");
return map; return map;
} }
pd = outsourcedService.findById(pd); pd = outsourcedService.findById(pd);
outsourcedService.jie(pd); outsourcedService.jie(pd);
//清空摄像头与重点工程的关联关系 //清空摄像头与重点工程的关联关系
videoManagerService.updateAiByOUTSOURCED_ID(pd); videoManagerService.updateAiByOUTSOURCED_ID(pd);
map.put("code","0"); map.put("code", "0");
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }

21
src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java
View File

@ -61,6 +61,7 @@ public class AppKeyprojectCheckController extends BaseController {
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
PageData KEYPROJECTCHECK = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("KEYPROJECTCHECK_ID", this.get32UUID()); //主键 pd.put("KEYPROJECTCHECK_ID", this.get32UUID()); //主键
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
@ -71,8 +72,9 @@ public class AppKeyprojectCheckController extends BaseController {
ArrayList<PageData> parm2List = new ArrayList<>(); ArrayList<PageData> parm2List = new ArrayList<>();
ArrayList<PageData> parm3List = new ArrayList<>(); ArrayList<PageData> parm3List = new ArrayList<>();
parm1.putAll(pd); // parm1.putAll(pd);
keyprojectcheckService.save(parm1); keyprojectcheckService.save(pd);
KEYPROJECTCHECK.putAll(pd);
@ -95,6 +97,7 @@ public class AppKeyprojectCheckController extends BaseController {
parm2List.add(situationPd); parm2List.add(situationPd);
time = DateUtil.calculateDateSecond(time, 1); time = DateUtil.calculateDateSecond(time, 1);
} }
pd.put("KEYPROJECTCHECKINFO",parm2List);
} }
Boolean boo = false; // 增加开关控制 Boolean boo = false; // 增加开关控制
if (Tools.notEmpty(pd.getString("HIDDENJSON"))) { if (Tools.notEmpty(pd.getString("HIDDENJSON"))) {
@ -130,12 +133,12 @@ public class AppKeyprojectCheckController extends BaseController {
keyprojectHiddenService.save(hidden); keyprojectHiddenService.save(hidden);
parm3List.add(hidden); // parm3List.add(hidden);
hiddenList.add(hidden); hiddenList.add(hidden);
time = DateUtil.calculateDateSecond(time, 1); time = DateUtil.calculateDateSecond(time, 1);
} }
pd.put("hiddenList", hiddenList); pd.put("HIDDEN", hiddenList);
} }
try { try {
//这里发送短信 通知 先判断重点工程是否要求发短信, 不发直接过，发的话 找到对应人以及对应手机号 发送对应模板短信啊 //这里发送短信 通知 先判断重点工程是否要求发短信, 不发直接过，发的话 找到对应人以及对应手机号 发送对应模板短信啊
@ -187,12 +190,8 @@ public class AppKeyprojectCheckController extends BaseController {
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
}finally { }finally {
PageData pageData = new PageData();
pageData.put("p1",parm1);
pageData.put("p1",parm1);
pageData.put("p1",parm1);
map.put("pd",pd); map.put("pd",pd);
map.put("dockData", JSON.toJSONString(pageData)); map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); map.put("result", errInfo);
} }
return map; return map;
@ -338,6 +337,7 @@ public class AppKeyprojectCheckController extends BaseController {
@RequestMapping(value="/check") @RequestMapping(value="/check")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation
public Object check() throws Exception{ public Object check() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
@ -347,6 +347,7 @@ public class AppKeyprojectCheckController extends BaseController {
keyprojectHiddenService.editstate(pd); keyprojectHiddenService.editstate(pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }
/**修改处罚状态 /**修改处罚状态
@ -356,12 +357,14 @@ public class AppKeyprojectCheckController extends BaseController {
@RequestMapping(value="/editHiddenIspunish") @RequestMapping(value="/editHiddenIspunish")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation
public Object editHiddenIspunish() throws Exception{ public Object editHiddenIspunish() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
keyprojectHiddenService.editstate(pd); keyprojectHiddenService.editstate(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }

6
src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectPunishController.java
View File

@ -1,7 +1,9 @@
package com.zcloud.controller.keyProjects.app; package com.zcloud.controller.keyProjects.app;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
@ -55,6 +57,7 @@ public class AppKeyprojectPunishController extends BaseController {
*/ */
@RequestMapping(value="/add") @RequestMapping(value="/add")
@ResponseBody @ResponseBody
@DockAnnotation(isAdd = true)
public Object add() throws Exception{ public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
@ -101,6 +104,7 @@ public class AppKeyprojectPunishController extends BaseController {
}finally { }finally {
map.put("result", errInfo); map.put("result", errInfo);
} }
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }
@ -136,7 +140,7 @@ public class AppKeyprojectPunishController extends BaseController {
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile);
pd.put("HANDLE_IMG", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("HANDLE_IMG", Const.FILEPATHFILE + pd.get("HANDLEDID") + "/" + ffile + "/" + fileName);
} }
} }
keyprojectpunishService.editstate(pd); keyprojectpunishService.editstate(pd);