wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

pull/4/head
fangjiakai 2024-02-22 17:35:35 +08:00
parent 9d1bcaa909 7fcbffb803
commit 387a31b276
40 changed files with 3582 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,8 @@ public class AppHiddenController extends BaseController {
continue;
}
// if (che.get("STATE").equals("2")) { //原来是3，但是手机端待验收数据与列表数据不对。调整为2
if (che.get("STATE").equals("3") && pd.getString("USER_ID").equals(che.get("CHECKOR"))) {
//待验收 清单排查是3，安全环保检查是2
if ((che.get("STATE").equals("2") || che.get("STATE").equals("3")) && pd.getString("USER_ID").equals(che.get("CHECKOR"))) {
dys++;
}
}

282
src/main/java/com/zcloud/controller/eightwork/AppElertricityController.java Normal file
View File

@ -0,0 +1,282 @@
package com.zcloud.controller.eightwork;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.logs.LogAnno;
import com.zcloud.service.eightwork.ElectricityGasService;
import com.zcloud.service.eightwork.ElectricityService;
import com.zcloud.util.Tools;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartRequest;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 说明：受限作业
* 官网：www.zcloudchina.com
*/
@Controller
@RequestMapping("/app/electricity")
public class AppElertricityController extends BaseController {
@Autowired
private ElectricityService electricityService;
@Autowired
private ElectricityGasService electricityGasService;
/**
* 新增
* @param
* @throws Exception
*/
@RequestMapping(value = "/add")
@ResponseBody
@LogAnno(menuType = "手机", menuServer = "受限作业", instructionsOperate = "受限作业", instructionsType = "新增")
public Object add() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
electricityService.save(pd);
map.put("result", errInfo);
return map;
}
/**
* 修改
* @param
* @throws Exception
*/
@RequestMapping(value = "/edit")
@ResponseBody
@LogAnno(menuType = "手机", menuServer = "受限作业", instructionsOperate = "受限作业", instructionsType = "新增")
public Object edit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
electricityService.edit(pd);
map.put("result", errInfo);
return map;
}
/**
* 删除
* @throws Exception
*/
@RequestMapping(value = "/delete")
@ResponseBody
@LogAnno(menuType = "手机", menuServer = "受限作业", instructionsOperate = "受限作业", instructionsType = "删除")
public Object delete() throws Exception {
Map<String, String> map = new HashMap<String, String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
electricityService.delete(pd);
map.put("result", errInfo); //返回结果
return map;
}
/**列表
* @param page
* @throws Exception
*/
@RequestMapping(value="/list")
@ResponseBody
@LogAnno(menuType= "手机",menuServer= "受限作业",instructionsOperate = "受限作业",instructionsType = "列表")
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());
page.setPd(pd);
List<PageData> varList = electricityService.list(page); //列出electricity列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
@RequestMapping("/findById")
@ResponseBody
@LogAnno(menuType= "手机",menuServer= "受限作业",instructionsOperate = "受限作业",instructionsType = "获取详情")
public Object findById() throws Exception {
Map<String,Object> map = new HashMap<>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = electricityService.findById(pd);
map.put("result",errInfo);
map.put("pd",pd);
return map;
}
@RequestMapping("/listSignFinished")
@ResponseBody
public Object listSignFinished() throws Exception {
Map<String,Object> map = new HashMap<>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData signs = electricityService.listSignFinished(pd);
map.put("result",errInfo);
map.put("signs",signs);
return map;
}
@RequestMapping("/nextStep")
@ResponseBody
@LogAnno(menuType= "手机",menuServer= "受限作业",instructionsOperate = "受限作业",instructionsType = "通过")
public Object nextStep(MultipartRequest request) throws Exception {
Map<String,Object> map = new HashMap<>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
for (int i = 0; i < SIGNTIME.length; i++) {
fileList.add(request.getFile("file" + i));
}
electricityService.nextStep(pd, fileList.toArray(new MultipartFile[fileList.size()]));
map.put("result",errInfo);
return map;
}
@RequestMapping("/checkWorkCount")
@ResponseBody
public Object checkWorkCount() throws Exception{
Map<String,Object> map = new HashMap<>();
String errorInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
map.put("count",electricityService.checkWorkCount(pd));
map.put("result",errorInfo);
return map;
}
@RequestMapping("/listAllMeasures")
@ResponseBody
public Object listAllMeasures() throws Exception {
Map<String,Object> map = new HashMap<>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
List<PageData> measuresList = electricityService.listAllMeasures();
map.put("result",errInfo);
map.put("measuresList",measuresList);
return map;
}
@RequestMapping("/listAllMeasuresForSign")
@ResponseBody
public Object listAllMeasuresForSign() throws Exception {
Map<String,Object> map = new HashMap<>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
List<PageData> measuresForSignList = electricityService.listAllMeasuresForSign(pd);
map.put("result",errInfo);
map.put("measuresForSignList",measuresForSignList);
return map;
}
@RequestMapping("/listSignFinishMeasures")
@ResponseBody
public Object listSignFinishMeasures() throws Exception {
Map<String,Object> map = new HashMap<>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
List<PageData> finishMeasuresList = electricityService.listSignFinishMeasures(pd);
map.put("result",errInfo);
map.put("finishMeasuresList",finishMeasuresList);
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
*/
@RequestMapping(value="/gas/save")
@ResponseBody
@LogAnno(menuType= "手机",menuServer= "受限作业",instructionsOperate = "受限作业",instructionsType = "保存气体检测")
public Object gasSave(MultipartRequest request) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
for (int i = 0; i < SIGNTIME.length; i++) {
fileList.add(request.getFile("file" + i));
}
electricityService.saveGas(pd,fileList.toArray(new MultipartFile[fileList.size()]));
map.put("result", errInfo);
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
*/
@RequestMapping(value="/gas/list")
@ResponseBody
@LogAnno(menuType= "手机",menuServer= "受限作业",instructionsOperate = "受限作业",instructionsType = "去修改页面获取数据")
public Object gasList() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
List<PageData> varList = electricityGasService.listAll(pd); //列出electricity列表
map.put("varList", varList);
map.put("result", errInfo);
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
*/
@RequestMapping(value="/gas/delete")
@ResponseBody
@LogAnno(menuType= "手机",menuServer= "受限作业",instructionsOperate = "受限作业",instructionsType = "去修改页面获取数据")
public Object gasDel() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
electricityGasService.delete(pd);
map.put("result", errInfo); //返回结果
return map;
}
/**获取受限作业流程
* @param
* @throws Exception
*/
@RequestMapping(value="/getFlowList")
@ResponseBody
@LogAnno(menuType= "手机",menuServer= "受限作业",instructionsOperate = "受限作业",instructionsType = "获取受限作业流程")
public Object getFlowList() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
List<PageData> flowList = electricityService.getFlowList(pd);
map.put("flowList", flowList);
map.put("result", errInfo); //返回结果
return map;
}
}

36
src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java
View File

@ -404,5 +404,41 @@ public class AppKeyProjectsController extends BaseController {
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
*/
@RequestMapping(value="/goEdit")
@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 = personnelmanagementService.findByOutsourced(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**处罚管理列表 查询自己可以处罚的重点工程 角标计算逻辑 查询重点工程中所有处罚未选择是否处罚的隐患累加
* @throws Exception
*/
@RequestMapping(value="/getPUNISHlist")
@ResponseBody
public Object getPUNISHlist(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());
page.setPd(pd);
List<PageData> varList = outsourcedService.getPUNISHlist(page); //列出OutSourced列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
}

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

@ -664,4 +664,25 @@ public class AppKeyprojectCheckController extends BaseController {
map.put("dockData", JSON.toJSONString(pd));
return map;
}
/**重点工程处罚列表 包含 未选择处罚结果的隐患 已下发处罚但为反馈的隐患 不处罚的隐患
* @param page
* @throws Exception
*/
@RequestMapping(value="/punishlist")
@ResponseBody
public Object punishlist(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());
page.setPd(pd);
List<PageData> varList = keyprojectHiddenService.getpunishlist(page); //列出KeyprojectCheck列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
}

190
src/main/java/com/zcloud/controller/positioning/MapSettingController.java Normal file
View File

@ -0,0 +1,190 @@
package com.zcloud.controller.positioning;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.PLSUtil;
import com.zcloud.util.ReturnMap;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
/**
* 说明：定位管理-告警管理
* 作者：wangxuan
* 官网：www.zcloudchina.com
*/
@Controller
@RequestMapping("/positAlarm")
public class MapSettingController extends BaseController {
/**
* @Description: 创建图层
* @Author: dearLin
* @Date: 2024/1/26/026 16:43
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/list")
@ResponseBody
public ReturnMap list(Page page) throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.getLayerList(
Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), pageData.getString("KEYWORDS"));
if (body != null) {
List<JSONObject> list = body.getJSONArray("rows").toJavaList(JSONObject.class);
returnMap.put("varList", list);
page.setTotalResult(body.getIntValue("total"));
returnMap.put("page", page);
}
return returnMap;
}
/**
* @Description: 处理告警
* @Author: dearLin
* @Date: 2024/1/26/026 16:43
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/save")
@ResponseBody
public ReturnMap save() throws Exception {
PageData pageData = this.getPageData();
JSONArray list = JSONObject.parseArray(pageData.getString("list"));
pageData.put("list", list);
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPost("/region/layer", pageData, Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 详情
* @Author: dearLin
* @Date: 2024/1/26/026 16:43
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/goEdit")
@ResponseBody
public ReturnMap goEdit() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralGetById("/region/layer/", Integer.parseInt(pageData.getString("layId")), Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 修改
* @Author: dearLin
* @Date: 2024/1/26/026 16:43
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/edit")
@ResponseBody
public ReturnMap edit() throws Exception {
PageData pageData = this.getPageData();
JSONArray list = JSONObject.parseArray(pageData.getString("list"));
pageData.put("list", list);
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPut("/region/layer", pageData, Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 修改
* @Author: dearLin
* @Date: 2024/1/26/026 16:43
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/remove")
@ResponseBody
public ReturnMap remove() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralDelete("/region/layer/", pageData.getString("DATA_IDS"), Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
// 作业票区域
@RequestMapping(value = "/region/list")
@ResponseBody
public ReturnMap getFenceList() throws Exception {
PageData pageData = this.getPageData();
return ReturnMap.ok().put("data", PLSUtil.getRyRegionList(Jurisdiction.getCORPINFO_ID(), pageData.getString("KEYWORDS"), Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount"))));
}
// 路径规划
@RequestMapping(value = "/coordinateLine/tree")
@ResponseBody
public ReturnMap coordinateLineTree() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralList("/location/coordinateLine/tree", pageData);
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 新建路径规划
* @Author: dearLin
* @Date: 2024/2/22/022 15:48
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/coordinateLine/addCoordinateLine")
@ResponseBody
public ReturnMap addCoordinateLine() throws Exception {
PageData pageData = this.getPageData();
JSONArray coordinateGroup = JSONObject.parseArray(pageData.getString("coordinateGroup"));
pageData.put("coordinateGroup", coordinateGroup);
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPost("/location/coordinateLine/addCoordinateLine", pageData,Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 路径规划批量删除
* @Author: dearLin
* @Date: 2024/2/22/022 15:48
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/coordinateLine/batchDelete")
@ResponseBody
public ReturnMap batchDelete() throws Exception {
PageData pageData = this.getPageData();
JSONArray coordinateGroup = JSONObject.parseArray(pageData.getString("coordinateGroup"));
pageData.put("coordinateGroup", coordinateGroup);
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralDelete("/location/coordinateLine/", pageData.getString("DATA_IDS"),Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
}

393
src/main/java/com/zcloud/controller/positioning/PositAlarmController.java Normal file
View File

@ -0,0 +1,393 @@
package com.zcloud.controller.positioning;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.PLSUtil;
import com.zcloud.util.ReturnMap;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.HashMap;
import java.util.List;
/**
* 说明：定位管理-告警管理
* 作者：wangxuan
* 官网：www.zcloudchina.com
*/
@Controller
@RequestMapping("/positAlarm")
public class PositAlarmController extends BaseController {
/**
* @Description: 告警数据 来自人员定位系统
* @Author: dearLin
* @Date: 2024/1/26/026 16:43
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/getAlArmDataList")
@ResponseBody
public ReturnMap getAlArmDataList(Page page) throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.getAlArmDataList(
Jurisdiction.getCORPINFO_ID(), page.getCurrentPage() + 1, page.getShowCount(), "", Integer.parseInt(pageData.getString("status")), Integer.parseInt(pageData.getString("eleType"))
);
if (body != null) {
List<JSONObject> list = body.getJSONArray("rows").toJavaList(JSONObject.class);
returnMap.put("varList", list);
page.setTotalResult(body.getIntValue("total"));
returnMap.put("page", page);
}
return returnMap;
}
/**
* @Description: 处理告警
* @Author: dearLin
* @Date: 2024/1/26/026 16:43
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/alarmHandling")
@ResponseBody
public ReturnMap alarmHandling() throws Exception {
PageData pageData = this.getPageData();
JSONArray list = JSONObject.parseArray(pageData.getString("ids"));
pageData.put("ids", list);
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPost("/region/alarm/alarmHandling", pageData, Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 一键处理
* @Author: dearLin
* @Date: 2024/2/22/022 9:29
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/alarmHandlingAll")
@ResponseBody
public ReturnMap alarmHandlingAll() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPost("/region/alarm/alarmHandlingAll", pageData, Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 其他告警区域列表
* @Author: dearLin
* @Date: 2024/2/22/022 9:29
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/otherRegion/list")
@ResponseBody
public ReturnMap otherRegionList() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.getRyRegionList(Jurisdiction.getCORPINFO_ID(), pageData.getString("KEYWORDS"), Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")));
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 其他告警区域禁、起用
* @Author: dearLin
* @Date: 2024/2/22/022 9:29
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/otherRegion/editStatus")
@ResponseBody
public ReturnMap editStatus() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPut("/region/region", pageData, Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 其他告警区域删除
* @Author: dearLin
* @Date: 2024/2/22/022 9:29
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/otherRegion/regionDelete")
@ResponseBody
public ReturnMap regionDelete() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralDelete("/region/region/", pageData.getString("DATA_IDS"), Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 其他告警区域单个详情
* @Author: dearLin
* @Date: 2024/2/22/022 9:29
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/otherRegion/regionGoEdit")
@ResponseBody
public ReturnMap regionGoEdit() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralGetById("/region/region/", pageData.getString("id"), Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 确认选点 /region/region/redrawTheArea
* @Author: dearLin
* @Date: 2024/2/22/022 15:06
* @Param:
* @Return:
*/
@RequestMapping(value = "/otherRegion/save")
@ResponseBody
public ReturnMap otherRegionSave() throws Exception {
PageData pageData = this.getPageData();
JSONArray list = JSONObject.parseArray(pageData.getString("list"));
pageData.put("list", list);
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPost("/region/region", pageData, Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 确认选点 /region/region/redrawTheArea
* @Author: dearLin
* @Date: 2024/2/22/022 15:06
* @Param:
* @Return:
*/
@RequestMapping(value = "/otherRegion/redrawTheArea")
@ResponseBody
public ReturnMap redrawTheArea() throws Exception {
PageData pageData = this.getPageData();
JSONArray list = JSONObject.parseArray(pageData.getString("list"));
pageData.put("list", list);
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPost("/region/region/redrawTheArea", pageData, Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 其他告警区域所属图层
* @Author: dearLin
* @Date: 2024/2/22/022 9:29
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/otherRegion/selectRegionTreeVo")
@ResponseBody
public ReturnMap selectRegionTreeVo() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GetGeneral("/region/region/selectRegionTreeVo", Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 其他告警区域修改
* @Author: dearLin
* @Date: 2024/2/22/022 9:29
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/otherRegion/regionEdit")
@ResponseBody
public ReturnMap regionEdit() throws Exception {
PageData pageData = this.getPageData();
JSONArray list = JSONObject.parseArray(pageData.getString("list"));
pageData.put("list", list);
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPut("/region/region", pageData, Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 其他告警区域配置列表
* @Author: dearLin
* @Date: 2024/2/22/022 9:29
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/electronicFence/list")
@ResponseBody
public ReturnMap electronicFenceList() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralList("/region/electronicFence/list", pageData);
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 其他告警区域配置单个详情
* @Author: dearLin
* @Date: 2024/2/22/022 9:29
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/electronicFenceGoEdit")
@ResponseBody
public ReturnMap electronicFenceGoEdit() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralGetById("/region/electronicFence/", pageData.getString("id"), Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 其他告警区域配置修改
* @Author: dearLin
* @Date: 2024/2/22/022 9:29
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/electronicFenceEdit")
@ResponseBody
public ReturnMap electronicFenceEdit() throws Exception {
PageData pageData = this.getPageData();
JSONArray regGatherId = JSONObject.parseArray(pageData.getString("regGatherId"));
JSONArray gatherRegions = JSONObject.parseArray(pageData.getString("gatherRegions"));
JSONArray list = JSONObject.parseArray(pageData.getString("eleType"));
JSONArray eleDept = JSONObject.parseArray(pageData.getString("eleDept"));
JSONArray eleCrossed = JSONObject.parseArray(pageData.getString("eleCrossed"));
JSONArray regId = JSONObject.parseArray(pageData.getString("regId"));
JSONArray regions = JSONObject.parseArray(pageData.getString("regions"));
JSONArray regId1 = JSONObject.parseArray(pageData.getString("regId1"));
JSONArray doubles = JSONObject.parseArray(pageData.getString("doubles"));
pageData.put("regGatherId", regGatherId);
pageData.put("gatherRegions", gatherRegions);
pageData.put("eleType", list);
pageData.put("eleDept", eleDept);
pageData.put("eleCrossed", eleCrossed);
pageData.put("regions", regions);
pageData.put("regId", regId);
pageData.put("regId1", regId1);
pageData.put("doubles", doubles);
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPut("/region/electronicFence/", pageData, Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 其他告警区域配置修改
* @Author: dearLin
* @Date: 2024/2/22/022 9:29
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/electronicFenceSave")
@ResponseBody
public ReturnMap electronicFenceSave() throws Exception {
PageData pageData = this.getPageData();
JSONArray list = JSONObject.parseArray(pageData.getString("eleType"));
JSONArray eleDept = JSONObject.parseArray(pageData.getString("eleDept"));
JSONArray eleCrossed = JSONObject.parseArray(pageData.getString("eleCrossed"));
JSONArray regId = JSONObject.parseArray(pageData.getString("regId"));
JSONArray regions = JSONObject.parseArray(pageData.getString("regions"));
JSONArray regId1 = JSONObject.parseArray(pageData.getString("regId1"));
JSONArray doubles = JSONObject.parseArray(pageData.getString("doubles"));
pageData.put("eleType", list);
pageData.put("eleDept", eleDept);
pageData.put("eleCrossed", eleCrossed);
pageData.put("regions", regions);
pageData.put("regId", regId);
pageData.put("regId1", regId1);
pageData.put("doubles", doubles);
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPost("/region/electronicFence/", pageData, Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 其他告警区域配置停用启用
* @Author: dearLin
* @Date: 2024/2/22/022 9:29
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/electronicFenceStatus")
@ResponseBody
public ReturnMap electronicFenceStatus() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPut("/region/electronicFence/", pageData, Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 其他告警配置删除
* @Author: dearLin
* @Date: 2024/2/22/022 9:29
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/electronicFenceDelete")
@ResponseBody
public ReturnMap electronicFenceDelete() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralDelete("/region/electronicFence/", pageData.getString("DATA_IDS"), Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
}

164
src/main/java/com/zcloud/controller/positioning/UserCardController.java Normal file
View File

@ -0,0 +1,164 @@
package com.zcloud.controller.positioning;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.PLSUtil;
import com.zcloud.util.ReturnMap;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
/**
* 说明：用户定位卡管理
* 作者：wangxuan
* 官网：www.zcloudchina.com
*/
@Controller
@RequestMapping("/deploy/card")
public class UserCardController extends BaseController {
/**
* @Description: 人员卡管理
* @Author: dearLin
* @Date: 2024/1/26/026 16:43
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/list")
@ResponseBody
public ReturnMap list(Page page) throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
page.setPd(pageData);
JSONObject body = PLSUtil.getUserCardDataList(
Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), pageData.getString("KEYWORDS"));
if (body != null) {
List<JSONObject> list = body.getJSONArray("rows").toJavaList(JSONObject.class);
returnMap.put("varList", list);
page.setTotalResult(body.getIntValue("total"));
returnMap.put("page", page);
}
return returnMap;
}
/**
* @Description: 修改卡信息
* @Author: dearLin
* @Date: 2024/1/26/026 16:43
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/edit")
@ResponseBody
public ReturnMap edit() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPut("/deploy/card", pageData, Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 可绑卡人信息
* @Author: dearLin
* @Date: 2024/1/26/026 16:43
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/thePersonWhoDidNotBindTheCard")
@ResponseBody
public ReturnMap thePersonWhoDidNotBindTheCard() throws Exception {
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GetGeneral("/deploy/card/thePersonWhoDidNotBindTheCard", Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 查找信息
* @Author: dearLin
* @Date: 2024/1/26/026 16:43
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/goEdit")
@ResponseBody
public ReturnMap goEdit() throws Exception {
PageData pageData = getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralGetById("/deploy/card/feign-client/", Integer.parseInt(pageData.getString("cardNo")), Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 删除卡
* @Author: dearLin
* @Date: 2024/1/26/026 16:43
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/remove")
@ResponseBody
public ReturnMap remove() throws Exception {
PageData pageData = getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralDelete("/deploy/card/", pageData.getString("DATA_IDS"), Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 批量解绑
* @Author: dearLin
* @Date: 2024/1/26/026 16:43
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/batchUnbinding")
@ResponseBody
public ReturnMap removeBatch() throws Exception {
PageData pageData = getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralDelete("/deploy/card/batchUnbinding/", pageData.getString("DATA_IDS"), Jurisdiction.getCORPINFO_ID());
if (body != null) {
if (!"200".equals(body.getString("code"))) return ReturnMap.error(body.getString("msg"));
returnMap.putAll(body);
}
return returnMap;
}
/**
* @Description: 批量制卡
* @Author: dearLin
* @Date: 2024/2/21/021 15:33
* @Param: [] []
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/addInBulk")
@ResponseBody
public ReturnMap addInBulk() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralPost("/deploy/card/addInBulk", pageData, Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
}

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

@ -149,6 +149,9 @@ public class LoginController extends BaseController {
PageData dpd = new PageData();
dpd.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID"));
dpd = departmentService.findById(dpd);
if (dpd.getString("FOREIGNPERSONNEL").equals("1")) {
return ReturnMap.error("账号密码不正确");
}
map.put("DEPARTMENT_NAME", dpd.getString("NAME"));
map.put("DEPARTMENT_LEVEL", dpd.getString("LEVEL"));
map.put("ISSUPERVISE", dpd.getString("ISSUPERVISE"));

588
src/main/java/com/zcloud/controller/video/VideoManagerController.java
View File

@ -27,296 +27,336 @@ import java.util.*;
@RequestMapping("/videomanager")
public class VideoManagerController extends BaseController {
@Autowired
private VideoManagerService videomanagerService;
@Autowired
private TokenService tokenService;
/**新增
* @param
* @throws Exception
*/
@RequestMapping(value="/add")
@Autowired
private VideoManagerService videomanagerService;
@Autowired
private TokenService tokenService;
/**
* 新增
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/add")
// // @RequiresPermissions("videomanager:add")
@ResponseBody
@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "新增")
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("VIDEOMANAGER_ID", this.get32UUID()); //主键
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("OPDATE", DateUtil.date2Str(new Date())); //操作日期
pd.put("OPUSER", Jurisdiction.getUsername()); //操作人
pd.put("ISDELETE", "0"); //是否删除
JSONObject jsonObject = PLSUtil.saveCamera(Jurisdiction.getCORPINFO_ID(), pd);
if (!"200".equals(jsonObject.getString("code"))) {
return ReturnMap.error("三方系统摄像头对接失败");
}
pd.put("PLS_ID", jsonObject.get("data"));
videomanagerService.save(pd);
map.put("result", errInfo);
return map;
}
@ResponseBody
@LogAnno(menuType = "监测预警", menuServer = "视频管理", instructionsOperate = "视频维护", instructionsType = "新增")
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("VIDEOMANAGER_ID", this.get32UUID()); //主键
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("OPDATE", DateUtil.date2Str(new Date())); //操作日期
pd.put("OPUSER", Jurisdiction.getUsername()); //操作人
pd.put("ISDELETE", "0"); //是否删除
JSONObject jsonObject = PLSUtil.saveCamera(Jurisdiction.getCORPINFO_ID(), pd);
if (!"200".equals(jsonObject.getString("code"))) {
return ReturnMap.error("三方系统摄像头对接失败");
}
pd.put("PLS_ID", jsonObject.get("data"));
videomanagerService.save(pd);
map.put("result", errInfo);
return map;
}
/**删除
* @param out
* @throws Exception
*/
@RequestMapping(value="/delete")
/**
* 删除
*
* @param out
* @throws Exception
*/
@RequestMapping(value = "/delete")
// // @RequiresPermissions("videomanager:del")
@ResponseBody
@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "删除")
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
JSONObject jsonObject = PLSUtil.removeCamera(Jurisdiction.getCORPINFO_ID(), pd);
if (!"200".equals(jsonObject.getString("code"))) {
return ReturnMap.error("三方系统摄像头对接失败");
}
videomanagerService.delete(pd);
map.put("result", errInfo); //返回结果
return map;
}
@ResponseBody
@LogAnno(menuType = "监测预警", menuServer = "视频管理", instructionsOperate = "视频维护", instructionsType = "删除")
public Object delete() throws Exception {
Map<String, String> map = new HashMap<String, String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
JSONObject jsonObject = PLSUtil.removeCamera(Jurisdiction.getCORPINFO_ID(), pd);
if (!"200".equals(jsonObject.getString("code"))) {
return ReturnMap.error("三方系统摄像头对接失败");
}
videomanagerService.delete(pd);
map.put("result", errInfo); //返回结果
return map;
}
/**列表 数据置顶
* @param
* @throws Exception
*/
@RequestMapping(value="/editZhiding")
// @RequiresPermissions("video:edit")
@ResponseBody
/**
* 列表 数据置顶
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/editZhiding")
// @RequiresPermissions("video:edit")
@ResponseBody
// @LogAnno(menuType= "综合管理",menuServer= "学习园地",instructionsOperate = "企业视频",instructionsType = "数据置顶列表")
public Object editZhiding() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = this.getPageData();
pd.put("ISSHOW", "1");
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
videomanagerService.editZhiding(pd);//置顶信息
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
public Object editZhiding() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
pd.put("ISSHOW", "1");
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
videomanagerService.editZhiding(pd);//置顶信息
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**修改
* @param
* @throws Exception
*/
@RequestMapping(value="/edit")
/**
* 修改
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/edit")
// // @RequiresPermissions("videomanager:edit")
@ResponseBody
@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "修改")
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
JSONObject jsonObject = PLSUtil.editCamera(Jurisdiction.getCORPINFO_ID(), pd);
if (!"200".equals(jsonObject.getString("code"))) {
return ReturnMap.error("三方系统摄像头对接失败，禁止修改");
}
videomanagerService.edit(pd);
map.put("result", errInfo);
return map;
}
@ResponseBody
@LogAnno(menuType = "监测预警", menuServer = "视频管理", instructionsOperate = "视频维护", instructionsType = "修改")
public Object edit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
JSONObject jsonObject = PLSUtil.editCamera(Jurisdiction.getCORPINFO_ID(), pd);
if (!"200".equals(jsonObject.getString("code"))) {
return ReturnMap.error("三方系统摄像头对接失败，禁止修改");
}
videomanagerService.edit(pd);
map.put("result", errInfo);
return map;
}
/**修改人员定位系统ID
* @param
* @throws Exception
*/
@RequestMapping(value="/editPls")
/**
* 修改人员定位系统ID
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/editPls")
// // @RequiresPermissions("videomanager:edit")
@ResponseBody
@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "修改")
public Object editPls() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
videomanagerService.editPls(pd);
map.put("result", errInfo);
return map;
}
@ResponseBody
@LogAnno(menuType = "监测预警", menuServer = "视频管理", instructionsOperate = "视频维护", instructionsType = "修改")
public Object editPls() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
videomanagerService.editPls(pd);
map.put("result", errInfo);
return map;
}
/**列表
* @param page
* @throws Exception
*/
@RequestMapping(value="/list")
/**
* 列表
*
* @param page
* @throws Exception
*/
@RequestMapping(value = "/list")
// // @RequiresPermissions("videomanager:list")
@ResponseBody
@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "列表")
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());
@ResponseBody
@LogAnno(menuType = "监测预警", menuServer = "视频管理", instructionsOperate = "视频维护", instructionsType = "列表")
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);
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> varList = videomanagerService.list(page); //列出VideoManager列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
@RequestMapping(value="/getISshow")
@ResponseBody
public Object getISshow() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISSHOW", "1");
List<PageData> varList = videomanagerService.listAll(pd); //根据ID读取
List<PageData> tList =tokenService.listAll(pd);
System.out.println(tList.get(0).getString("TOKEN"));
map.put("pd", pd);
map.put("varList", varList);
map.put("token", tList.get(0).getString("TOKEN"));
map.put("result", errInfo);
return map;
}
@RequestMapping(value="/editIsShow")
@ResponseBody
public Object editIsShow() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData epd = new PageData();
epd.put("ISSHOW", '0');
epd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
videomanagerService.editIsShowBycorpinfoid(epd); //根据ID读取
List<PageData> varList = videomanagerService.list(page); //列出VideoManager列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
pd.put("ISSHOW", '1');
videomanagerService.editIsShow(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
*/
@RequestMapping(value="/goEdit")
/**
* @Description: 摆放摄像头位置，修改
* @Author: dearLin
* @Date: 2024/2/22/022 17:25
* @Param: [] []
* @Return: java.lang.Object
*/
@RequestMapping(value = "/setPositioning")
@ResponseBody
public Object setPositioning() throws Exception {
PageData pageData = getPageData();
PLSUtil.GeneralPut("/device/camera", pageData, Jurisdiction.getCORPINFO_ID());
return ReturnMap.ok();
}
@RequestMapping(value = "/getISshow")
@ResponseBody
public Object getISshow() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISSHOW", "1");
List<PageData> varList = videomanagerService.listAll(pd); //根据ID读取
List<PageData> tList = tokenService.listAll(pd);
System.out.println(tList.get(0).getString("TOKEN"));
map.put("pd", pd);
map.put("varList", varList);
map.put("token", tList.get(0).getString("TOKEN"));
map.put("result", errInfo);
return map;
}
@RequestMapping(value = "/editIsShow")
@ResponseBody
public Object editIsShow() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData epd = new PageData();
epd.put("ISSHOW", '0');
epd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
videomanagerService.editIsShowBycorpinfoid(epd); //根据ID读取
pd.put("ISSHOW", '1');
videomanagerService.editIsShow(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**
* 去修改页面获取数据
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/goEdit")
// // @RequiresPermissions("videomanager:edit")
@ResponseBody
@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "去修改页面获取数据")
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = videomanagerService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
@RequestMapping(value="/govideo")
@ResponseBody
public Object govideo() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = videomanagerService.findById(pd); //根据ID读取
List<PageData> varList =tokenService.listAll(pd);
pd.put("token", varList.get(0).getString("TOKEN"));
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
@RequestMapping(value="/govideoall")
@ResponseBody
public Object govideoall() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> videoList = videomanagerService.listAll(pd); //根据ID读取
String videostr="";
for(PageData video:videoList) {
videostr+=video.getString("VIDEOURL")+",";
}
List<PageData> varList =tokenService.listAll(pd);
pd.put("token", varList.get(0).getString("TOKEN"));
map.put("pd", pd);
map.put("videostr", videostr.substring(0, videostr.length()-1));
map.put("count", videoList.size());
map.put("result", errInfo);
return map;
}
@ResponseBody
@LogAnno(menuType = "监测预警", menuServer = "视频管理", instructionsOperate = "视频维护", instructionsType = "去修改页面获取数据")
public Object goEdit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = videomanagerService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**批量删除
* @param
* @throws Exception
*/
@RequestMapping(value="/deleteAll")
// @RequiresPermissions("videomanager:del")
@ResponseBody
@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "批量删除")
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(",");
videomanagerService.deleteAll(ArrayDATA_IDS);
errInfo = "success";
}else{
errInfo = "error";
}
map.put("result", errInfo); //返回结果
return map;
}
@RequestMapping(value = "/govideo")
@ResponseBody
public Object govideo() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = videomanagerService.findById(pd); //根据ID读取
List<PageData> varList = tokenService.listAll(pd);
pd.put("token", varList.get(0).getString("TOKEN"));
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**导出到excel
* @param
* @throws Exception
*/
@RequestMapping(value="/excel")
// @RequiresPermissions("toExcel")
@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "导出到excel")
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("企业ID"); //1
titles.add("视频名称"); //2
titles.add("播放地址"); //3
titles.add("操作日期"); //4
titles.add("操作人"); //5
titles.add("是否删除"); //6
dataMap.put("titles", titles);
List<PageData> varOList = videomanagerService.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("CORPINFO_ID")); //1
vpd.put("var2", varOList.get(i).getString("VIDEONAME")); //2
vpd.put("var3", varOList.get(i).getString("VIDEOURL")); //3
vpd.put("var4", varOList.get(i).getString("OPDATE")); //4
vpd.put("var5", varOList.get(i).getString("OPUSER")); //5
vpd.put("var6", varOList.get(i).getString("ISDELETE")); //6
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap);
return mv;
}
@RequestMapping(value = "/govideoall")
@ResponseBody
public Object govideoall() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> videoList = videomanagerService.listAll(pd); //根据ID读取
String videostr = "";
for (PageData video : videoList) {
videostr += video.getString("VIDEOURL") + ",";
}
List<PageData> varList = tokenService.listAll(pd);
pd.put("token", varList.get(0).getString("TOKEN"));
map.put("pd", pd);
map.put("videostr", videostr.substring(0, videostr.length() - 1));
map.put("count", videoList.size());
map.put("result", errInfo);
return map;
}
/**
* 批量删除
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/deleteAll")
// @RequiresPermissions("videomanager:del")
@ResponseBody
@LogAnno(menuType = "监测预警", menuServer = "视频管理", instructionsOperate = "视频维护", instructionsType = "批量删除")
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(",");
videomanagerService.deleteAll(ArrayDATA_IDS);
errInfo = "success";
} else {
errInfo = "error";
}
map.put("result", errInfo); //返回结果
return map;
}
/**
* 导出到excel
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/excel")
// @RequiresPermissions("toExcel")
@LogAnno(menuType = "监测预警", menuServer = "视频管理", instructionsOperate = "视频维护", instructionsType = "导出到excel")
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("企业ID"); //1
titles.add("视频名称"); //2
titles.add("播放地址"); //3
titles.add("操作日期"); //4
titles.add("操作人"); //5
titles.add("是否删除"); //6
dataMap.put("titles", titles);
List<PageData> varOList = videomanagerService.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("CORPINFO_ID")); //1
vpd.put("var2", varOList.get(i).getString("VIDEONAME")); //2
vpd.put("var3", varOList.get(i).getString("VIDEOURL")); //3
vpd.put("var4", varOList.get(i).getString("OPDATE")); //4
vpd.put("var5", varOList.get(i).getString("OPUSER")); //5
vpd.put("var6", varOList.get(i).getString("ISDELETE")); //6
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv, dataMap);
return mv;
}
}

59
src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityGasMapper.java Normal file
View File

@ -0,0 +1,59 @@
package com.zcloud.mapper.datasource.eightwork;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：用电气体检测
* 作者：luoxiaobao
* 时间：2021-09-08
* 官网：www.zcloudchina.com
*/
public interface ElectricityGasMapper {
/**新增
* @param pd
* @throws Exception
*/
void save(PageData pd);
/**删除
* @param pd
* @throws Exception
*/
void delete(PageData pd);
/**修改
* @param pd
* @throws Exception
*/
void edit(PageData pd);
/**列表
* @param page
* @throws Exception
*/
List<PageData> datalistPage(Page page);
/**列表(全部)
* @param pd
* @throws Exception
*/
List<PageData> listAll(PageData pd);
/**通过id获取数据
* @param pd
* @throws Exception
*/
PageData findById(PageData pd);
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
void deleteAll(String[] ArrayDATA_IDS);
}

34
src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityMapper.java Normal file
View File

@ -0,0 +1,34 @@
package com.zcloud.mapper.datasource.eightwork;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：临时用电作业
* 作者：luoxiaobao
* 时间：2021-09-08
* 官网：www.zcloudchina.com
*/
public interface ElectricityMapper {
PageData getCode(PageData pd);
PageData findById(PageData pd);
void save(PageData pd);
void delete(PageData pd);
void edit(PageData pd);
void editGasTime(PageData pd);
void editStep(PageData pd);
void setPosition(PageData pd);
List<PageData> datalistPage(Page page);
List<PageData> listAllMeasures();
List<PageData> checkWorkCount(PageData pd);
List<PageData> getFlowList(PageData pd);
List<PageData> getMapList(PageData pd);
}

37
src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricitySignMapper.java Normal file
View File

@ -0,0 +1,37 @@
package com.zcloud.mapper.datasource.eightwork;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* @author fangjiakai
* @date 2024/01/17 11:31
*/
public interface ElectricitySignMapper {
/**新增
* @param pd
* @throws Exception
*/
void save(PageData pd);
void saveBatch(List<PageData> signers);
/**修改
* @param pd
* @throws Exception
*/
void edit(PageData pd);
/**根据动火ID查询签字列表
* @throws Exception
*/
List<PageData> listById(PageData pd);
List<PageData> listAll(PageData sign);
/**根据动火ID查询未签字列表
* @throws Exception
*/
List<PageData> checkUnsigned(PageData sign);
}

57
src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityToMeasuresMapper.java Normal file
View File

@ -0,0 +1,57 @@
package com.zcloud.mapper.datasource.eightwork;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：动火措施中间表
* 作者：luoxiaobao
* 时间：2021-09-18
* 官网：www.zcloudchina.com
*/
public interface ElectricityToMeasuresMapper {
/**新增
* @param pd
* @throws Exception
*/
void save(PageData pd);
void saveBatch(List<PageData> signers);
/**删除
* @param pd
* @throws Exception
*/
void delete(PageData pd);
/**修改
* @param pd
* @throws Exception
*/
void edit(PageData pd);
/**列表(全部)
* @param pd
* @throws Exception
*/
List<PageData> listAll(PageData pd);
/**通过id获取数据
* @param pd
* @throws Exception
*/
PageData findById(PageData pd);
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
void deleteAll(String[] ArrayDATA_IDS);
List<PageData> listAllMeasuresForSign(PageData pd);
List<PageData> listSignFinishMeasures(PageData pd);
}

2
src/main/java/com/zcloud/mapper/datasource/relatedparty/OutSourcedMapper.java
View File

@ -90,5 +90,7 @@ public interface OutSourcedMapper{
List<PageData> outSouceslistPage(Page page);
Integer getDingWeiSum(PageData pd);
List<PageData> getPUNISHlistPage(Page page);
}

2
src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java
View File

@ -66,5 +66,7 @@ public interface PersonnelManagementMapper{
void editPassword(PageData pd);
PageData findForLogin(PageData pd);
PageData findByOutsourced(PageData pd);
}

59
src/main/java/com/zcloud/service/eightwork/ElectricityGasService.java Normal file
View File

@ -0,0 +1,59 @@
package com.zcloud.service.eightwork;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：用电气体检测
* 作者：luoxiaobao
* 时间：2021-09-08
* 官网：www.zcloudchina.com
*/
public interface ElectricityGasService {
/**新增
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception;
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception;
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception;
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception;
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception;
/**通过id获取数据
* @param pd
* @throws Exception
*/
public PageData findById(PageData pd)throws Exception;
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
}

45
src/main/java/com/zcloud/service/eightwork/ElectricityService.java Normal file
View File

@ -0,0 +1,45 @@
package com.zcloud.service.eightwork;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.util.ReturnMap;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
* @author fangjiakai
* @date 2024/01/17 11:29
*/
public interface ElectricityService {
void save(PageData pd)throws Exception;
void edit(PageData pd)throws Exception;
void delete(PageData pd)throws Exception;
List<PageData> list(Page page) throws Exception;
void nextStep(PageData pd, MultipartFile[] files) throws Exception;
PageData findById(PageData pd) throws Exception;
PageData listSignFinished(PageData pd) throws Exception;
PageData checkWorkCount(PageData pd);
//获取所有措施(bus_Electricity_measures)
List<PageData> listAllMeasures() throws Exception;
//
// //获取需要签字的措施(bus_Electricitytomeasures)
List<PageData> listAllMeasuresForSign(PageData pd) throws Exception;
//
// //获取所有签字完成的措施(bus_Electricitytomeasures)
List<PageData> listSignFinishMeasures(PageData pd) throws Exception;
void saveGas(PageData pd,MultipartFile[] files) throws Exception;
List<PageData> getFlowList(PageData pd)throws Exception;
ReturnMap getMapList()throws Exception;
}

1
src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java
View File

@ -233,6 +233,7 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
@Transactional
public void saveGas(PageData pd, MultipartFile[] files) throws Exception {
PageData work = confinedspaceMapper.findById(pd);
work.putAll(pd);
List<String> filePaths = new ArrayList<>();
for (int i = 0; i < files.length; i++) {
//保存签名文件

83
src/main/java/com/zcloud/service/eightwork/impl/ElectricityGasServiceImpl.java Normal file
View File

@ -0,0 +1,83 @@
package com.zcloud.service.eightwork.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.eightwork.ElectricityGasMapper;
import com.zcloud.service.eightwork.ElectricityGasService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 说明：用电气体检测
* 作者：luoxiaobao
* 时间：2021-09-08
* 官网：www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class ElectricityGasServiceImpl implements ElectricityGasService {
@Autowired
private ElectricityGasMapper electricitygasMapper;
/**新增
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception{
electricitygasMapper.save(pd);
}
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception{
electricitygasMapper.delete(pd);
}
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception{
electricitygasMapper.edit(pd);
}
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception{
return electricitygasMapper.datalistPage(page);
}
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception{
return electricitygasMapper.listAll(pd);
}
/**通过id获取数据
* @param pd
* @throws Exception
*/
public PageData findById(PageData pd)throws Exception{
return electricitygasMapper.findById(pd);
}
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
electricitygasMapper.deleteAll(ArrayDATA_IDS);
}
}

428
src/main/java/com/zcloud/service/eightwork/impl/ElectricityServiceImpl.java Normal file
View File

@ -0,0 +1,428 @@
package com.zcloud.service.eightwork.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.eightwork.*;
import com.zcloud.service.eightwork.ElectricityService;
import com.zcloud.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author fangjiakai
* @date 2024/01/17 11:30
*/
@Service
@Transactional //开启事物
public class ElectricityServiceImpl implements ElectricityService {
@Autowired
private ElectricityMapper electricityMapper;
@Autowired
private EightWorkTaskFlowMapper eightWorkTaskFlowMapper;
@Autowired
private EightWorkFlowLogMapper eightWorkFlowLogMapper;
@Autowired
private ElectricitySignMapper electricitySignMapper;
@Autowired
private ElectricityToMeasuresMapper electricityToMeasuresMapper;
@Autowired
private ElectricityGasMapper electricitygasMapper;
@Autowired
private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
@Autowired
private Smb smb;
private final String primary_key = "ELECTRICITY_ID";
private final String work_type = "ELECTRICITY";
@Override
@Transactional
public void save(PageData pd) throws Exception {
PageData pd2 = new PageData();
Calendar calendar = Calendar.getInstance();
DecimalFormat dft=new DecimalFormat("00");
int year = calendar.get(Calendar.YEAR);
String month = dft.format(calendar.get(Calendar.MONTH) + 1);
String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH));
pd2.put("CREATDATE",year + "-" + month + "-" + day);
pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID"));
pd2 = electricityMapper.getCode(pd2); //根据ID读取
String code = "LS" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1));
pd.put("CHECK_NO", code);
pd.put(primary_key, UuidUtil.get32UUID()); //主键
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
electricityMapper.save(pd);
if (pd.get("APPLY_STATUS").equals("1")) {
// PageData flow = getStep(pd.get("TASK_ID"),"1");
saveLog(pd,pd.getString("CREATOR"),"1");
PageData flow = getCurrentFlow(pd);
pd.put("STEP_ID", flow.get("STEP_ID"));
electricityMapper.editStep(pd);
saveNextSigner(pd,flow);
setPosition(pd);
}
}
@Override
@Transactional
public void edit(PageData pd) throws Exception {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
electricityMapper.edit(pd);
if (pd.get("APPLY_STATUS").equals("1")) {
pd.put("STEP_ID", 1);
electricityMapper.editStep(pd);
PageData flow = getStep(pd.get("TASK_ID"),"1");
saveLog(pd,pd.getString("CREATOR"),"1");
saveNextSigner(pd,flow);
setPosition(pd);
}
}
@Override
public void delete(PageData pd) throws Exception {
electricityMapper.delete(pd);
}
@Override
public List<PageData> list(Page page) throws Exception {
return electricityMapper.datalistPage(page);
}
/*
* 下一步
*/
@Override
@Transactional
public void nextStep(PageData pd, MultipartFile[] files) throws Exception {
PageData work = this.findById(pd);
work.putAll(pd);
List<String> filePaths = new ArrayList<>();
for (int i = 0; i < files.length; i++) {
//保存签名文件
String ffile = DateUtil.getDays();
String fileName = UuidUtil.get32UUID() + files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf("."));
smb.sshSftp(files[i], fileName, Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile);
filePaths.add(Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
}
PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
//保存签名信息
PageData sign = new PageData();
if(work.getString("IMG_PATH") != ""){
sign.put("IMG_PATH", work.get("IMG_PATH"));
}
sign.put(primary_key, work.get(primary_key));
sign.put("STEP_ID", work.get("STEP_ID"));
sign.put("SIGN_USER_ID", work.get("USER_ID"));
sign.put("SIGN_TIME", work.getString("SIGNTIME"));
sign.put("SIGN_PATH", String.join(",",filePaths));
sign.put("DESCR", work.get("DESCR"));
electricitySignMapper.edit(sign);
if (work.get("MEASURES") != null && !work.get("MEASURES").equals("")) { //安全措施确认步骤
saveMeasures(work);
}
List<PageData> unsignedList = electricitySignMapper.checkUnsigned(sign);//当前步骤未签名人列表
if((unsignedList == null || unsignedList.size() == 0) && pd.getString("APPLY_STATUS").equals("1")){//如果没有未签人 则跳转下一步
electricityMapper.editStep(work);
PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
//保存日志
saveLog(work,work.getString("USER_ID"),"1");
if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
eightworkvideomanagerMapper.editStatus(work);
return;
}
if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤
savePreparers(work,currentflow);
}
saveNextSigner(work,currentflow);
}else if(pd.getString("APPLY_STATUS").equals("-1")){
//保存日志
saveLog(work,work.getString("USER_ID"),"-1");
eightworkvideomanagerMapper.editStatus(work);
work.put("STEP_ID",-1);
electricityMapper.editStep(work);
}
}
@Override
public PageData findById(PageData pd) throws Exception {
PageData pageData = electricityMapper.findById(pd);
return pageData;
}
@Override
public PageData listSignFinished(PageData pd) throws Exception {
Map<String,List<PageData>> rmap = new HashMap<>();
List<PageData> varList = electricitySignMapper.listAll(pd);
if (varList != null && !varList.isEmpty()) {
varList.stream().forEach(item -> {
PageData sign = new PageData();
sign.put("SIGN_PATH", item.getString("SIGN_PATH").split(","));
sign.put("SIGN_TIME", item.getString("SIGN_TIME").split(","));
if(item.getString("IMG_PATH") != null || "".equals(item.getString("IMG_PATH"))){
sign.put("IMG_PATH", item.getString("IMG_PATH").split(","));
}
sign.put("DESCR", item.getString("DESCR") != null ? item.getString("DESCR") : "无");
if(rmap.containsKey(item.getString("CODE"))){
rmap.get(item.getString("CODE")).add(sign);
}else{
List<PageData> signs = new ArrayList<>();
signs.add(sign);
rmap.put(item.getString("CODE"),signs);
}
});
}
PageData rpd = new PageData();
if (rmap != null && !rmap.isEmpty()) {
rpd.putAll(rmap);
}
return rpd;
}
@Override
public PageData checkWorkCount(PageData pd) {
PageData rpd = new PageData();
List<PageData> varList = electricityMapper.checkWorkCount(pd);
if (varList != null && !varList.isEmpty()) {
Map<String, String> newMap = varList.stream()
.collect(Collectors.toMap(map -> map.getString("CODE"), map -> map.getString("COUNT")));
rpd.putAll(newMap);
}
return rpd;
}
@Override
public List<PageData> listAllMeasures() throws Exception {
return electricityMapper.listAllMeasures();
}
@Override
public List<PageData> listAllMeasuresForSign(PageData pd) throws Exception {
return electricityToMeasuresMapper.listAllMeasuresForSign(pd);
}
@Override
public List<PageData> listSignFinishMeasures(PageData pd) throws Exception {
return electricityToMeasuresMapper.listSignFinishMeasures(pd);
}
@Override
@Transactional
public void saveGas(PageData pd, MultipartFile[] files) throws Exception {
PageData work = electricityMapper.findById(pd);
work.putAll(pd);
List<String> filePaths = new ArrayList<>();
for (int i = 0; i < files.length; i++) {
//保存签名文件
String ffile = DateUtil.getDays();
String fileName = UuidUtil.get32UUID() + files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf("."));
smb.sshSftp(files[i], fileName, Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile);
filePaths.add(Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
}
pd.put("ELECTRICITYGAS_ID", UuidUtil.get32UUID()); //主键
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
pd.put("SIGN_PATH", String.join(",",filePaths));
electricitygasMapper.save(pd);
electricityMapper.editGasTime(pd);//修改最后一次气体检测时间
PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
if (pd.get("APPLY_STATUS").equals("1")) { //如果通过
if(flow.get("NEXT_STEP_ID") != null && flow.getString("NEXT_STEP_ID").equals("2")) {//如果为气体检测步骤,则保存日志并跳转下一步
PageData sign = new PageData();
sign.put(primary_key, work.get(primary_key));
sign.put("STEP_ID", 2);
sign.put("SIGN_USER_ID", pd.get("USER_ID"));
sign.put("SIGN_TIME", DateUtil.date2Str(new Date()));
sign.put("SIGN_PATH", String.join(",", filePaths));
sign.put("DESCR", pd.get("DESCR"));
electricitySignMapper.edit(sign);
work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
electricityMapper.editStep(work);
//保存日志
saveLog(work, work.getString("USER_ID"), "1");
//预存下一步
PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
saveNextSigner(work, currentflow);
}
}else if(pd.getString("APPLY_STATUS").equals("-1")){
PageData sign = new PageData();
sign.put(primary_key, work.get(primary_key));
sign.put("STEP_ID", 2);
sign.put("SIGN_USER_ID", pd.get("USER_ID"));
sign.put("SIGN_TIME", DateUtil.date2Str(new Date()));
sign.put("SIGN_PATH", String.join(",", filePaths));
sign.put("DESCR", pd.get("DESCR"));
electricitySignMapper.edit(sign);
//保存日志
eightworkvideomanagerMapper.editStatus(work);
work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
saveLog(work,pd.getString("USER_ID"),"-2");
work.put("STEP_ID",-1);
electricityMapper.editStep(work);
}
}
@Override
public List<PageData> getFlowList(PageData pd) throws Exception {
pd=findById(pd);
return electricityMapper.getFlowList(pd);
}
@Override
public ReturnMap getMapList() throws Exception {
ReturnMap returnMap = new ReturnMap();
PageData pd = new PageData();
pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
returnMap.put("varList",electricityMapper.getMapList(pd));
return returnMap;
}
private void saveNextSigner(PageData pd,PageData flow) throws Exception {
pd.put("STEP_ID",flow.get("NEXT_STEP_ID"));
if(pd.get(flow.get("NEXT_ACTOR_FIELD")) == null || pd.get(flow.get("NEXT_ACTOR_FIELD")).equals("")){
return;
}
//提前保存下一步签字人
List<PageData> signers = new ArrayList<>();
PageData signer = new PageData();
signer.put("ELECTRICITY_SIGN_ID", UuidUtil.get32UUID()); // 主键
signer.put(primary_key, pd.get(primary_key));
signer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
signer.put("SIGN_USER_ID", pd.get(flow.get("NEXT_ACTOR_FIELD")));
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
signers.add(signer);
electricitySignMapper.saveBatch(signers);
}
private void saveMeasures(PageData pd) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("MEASURES").toString());
for (JSONObject json : list) {
PageData measure = new PageData();
measure.put("ELECTRICITYTOMEASURES_ID",json.get("ELECTRICITYTOMEASURES_ID"));
measure.put("STATUS", json.get("STATUS"));
measure.put("ANSWER1", json.get("ANSWER1"));
measure.put("ANSWER2", json.get("ANSWER2"));
measure.put("ANSWER3", json.get("ANSWER3"));
measure.put("SIGN_PATH", json.get("SIGN_PATH"));
measure.put("SIGN_TIME", json.get("SIGN_TIME"));
measure.put("IMG_PATH", json.get("IMG_PATH"));
electricityToMeasuresMapper.edit(measure);
}
}
private void savePreparers(PageData pd,PageData flow) {
List<PageData> signers = new ArrayList<>();
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("PREPARERS").toString());
for (JSONObject json : list) {
PageData preparer = new PageData();
preparer.put("ELECTRICITYTOMEASURES_ID", UuidUtil.get32UUID()); // 主键
preparer.put("ELECTRICITY_ID", pd.get("ELECTRICITY_ID"));
preparer.put("BUS_ELECTRICITY_MEASURES_ID", json.get("BUS_ELECTRICITY_MEASURES_ID"));
preparer.put("CONFIRM_ID", json.get("USER_ID"));
signers.add(preparer);
}
if(signers.size() > 0){
electricityToMeasuresMapper.saveBatch(signers);
//获取所有需要签名人
List<String> fieldList = signers.stream()
.map(map -> map.getString("CONFIRM_ID"))
.collect(Collectors.toList());
Set<String > fieldSet = new HashSet<>(fieldList); //去重
List<String> uniqueList = new ArrayList<>(fieldSet);
List<PageData> nextSigners = new ArrayList<>();
uniqueList.forEach(item -> { // 保存下一步需要签名的人
PageData signer = new PageData();
signer.put("ELECTRICITY_SIGN_ID", UuidUtil.get32UUID()); // 主键
signer.put(primary_key, pd.get(primary_key));
signer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
signer.put("SIGN_USER_ID", item);
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
nextSigners.add(signer);
});
electricitySignMapper.saveBatch(nextSigners);
}
}
private PageData getStep(Object TASK_ID, Object STEP_ID) throws Exception {
PageData flow = new PageData();
flow.put("TASK_ID", TASK_ID);
flow.put("STEP_ID", STEP_ID);
flow = eightWorkTaskFlowMapper.getStep(flow);
return flow;
}
private void saveLog(PageData pd,String act_user,String status) throws Exception {
PageData log = new PageData();
log.put("LOG_ID", UuidUtil.get32UUID());
log.put("WORK_ID", pd.get(primary_key));
log.put("TASK_ID", pd.get("TASK_ID"));
log.put("STEP_ID", pd.get("STEP_ID"));
log.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
log.put("CHECK_NO", pd.get("CHECK_NO"));
log.put("ACT_USER", act_user);
log.put("ACT_TIME", DateUtil.date2Str(new Date()));
log.put("STATUS", status);
log.put("WORK_TYPE",work_type);
eightWorkFlowLogMapper.save(log);
}
private PageData getCurrentFlow(PageData pd) throws Exception {
PageData flow = new PageData();
flow.put("TASK_ID", pd.get("TASK_ID"));
flow.put("STEP_ID", pd.get("STEP_ID"));
flow = eightWorkTaskFlowMapper.getStep(flow);
if("1".equals(flow.getString("CAN_SKIP")) && (pd.get(flow.get("NEXT_ACTOR_FIELD")) == null || pd.get(flow.get("NEXT_ACTOR_FIELD")).equals(""))){
pd.put("STEP_ID", flow.get("NEXT_STEP_ID"));
return getCurrentFlow(pd);
}else{
return flow;
}
}
private void setPosition(PageData pd) throws Exception {
JSONObject body = PLSUtil.getRyRegionInfo(pd.getString("CORPINFO_ID"),Integer.parseInt(pd.getString("PLS_ID")));
List pointList = (List)((Map) body.get("data")).get("list");
List<String> positions = PLSUtil.getRandomPointInPolygon(pointList);
pd.put("WORK_POSITION", String.join(",",positions));
electricityMapper.setPosition(pd);
}
}

3
src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java
View File

@ -328,8 +328,9 @@ public class HighworkServiceImpl implements HighworkService {
eightWorkFlowLogMapper.save(log);
}
private void setPosition(PageData pd) throws Exception {
JSONObject body = PLSUtil.getRyRegionInfo(Jurisdiction.getCORPINFO_ID(),Integer.parseInt(pd.getString("PLS_ID")));
JSONObject body = PLSUtil.getRyRegionInfo(pd.getString("CORPINFO_ID"),Integer.parseInt(pd.getString("PLS_ID")));
List pointList = (List)((Map) body.get("data")).get("list");
List<String> positions = PLSUtil.getRandomPointInPolygon(pointList);
pd.put("WORK_POSITION", String.join(",",positions));

2
src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java
View File

@ -192,5 +192,7 @@ public interface KeyprojectHiddenService {
* @return
*/
String getCorpInfoIdByHiddenId(PageData pd);
List<PageData> getpunishlist(Page page);
}

1
src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java
View File

@ -264,5 +264,6 @@ public class KeyprojectHiddenServiceImpl implements KeyprojectHiddenService {
public String getCorpInfoIdByHiddenId(PageData pd) {
return hiddenMapper.getCorpInfoIdByHiddenId(pd);
}
}

2
src/main/java/com/zcloud/service/relatedparty/OutSourcedService.java
View File

@ -95,5 +95,7 @@ public interface OutSourcedService{
List<PageData> outSouceslistPage(Page page);
Integer getDingWeiSum(PageData pd);
List<PageData> getPUNISHlist(Page page);
}

5
src/main/java/com/zcloud/service/relatedparty/impl/OutSourcedServiceImpl.java
View File

@ -147,5 +147,10 @@ public class OutSourcedServiceImpl implements OutSourcedService{
return outsourcedMapper.getDingWeiSum(pd);
}
@Override
public List<PageData> getPUNISHlist(Page page) {
return outsourcedMapper.getPUNISHlistPage(page);
}
}

2
src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java
View File

@ -66,5 +66,7 @@ public interface PersonnelManagementService{
void editPassword(PageData updateUser) throws Exception;
PageData findForLogin(PageData pd);
PageData findByOutsourced(PageData pd);
}

5
src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java
View File

@ -105,5 +105,10 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic
return personnelmanagementMapper.findForLogin(pd);
}
@Override
public PageData findByOutsourced(PageData pd) {
return personnelmanagementMapper.findByOutsourced(pd);
}
}

159
src/main/java/com/zcloud/util/PLSUtil.java
View File

@ -1,5 +1,6 @@
package com.zcloud.util;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.entity.PageData;
import com.zcloud.service.corp.CorpPlsInfoService;
@ -19,6 +20,8 @@ import org.springframework.web.client.RestTemplate;
import javax.annotation.PostConstruct;
import java.io.IOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.*;
@Component
@ -44,6 +47,17 @@ public class PLSUtil {
return exchange.getBody();
}
public static JSONObject GetGeneral(String url, String CORPINFO_ID) throws Exception {
HttpHeaders headers = new HttpHeaders();
headers.set("Authorization", getToken(CORPINFO_ID));
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
ResponseEntity<JSONObject> exchange = restTemplate.exchange(
PLSUtil.BAKEADDR.get(CORPINFO_ID) + url,
HttpMethod.GET, httpEntity,
JSONObject.class);
return exchange.getBody();
}
@Autowired
public void setCorpplsinfoService(CorpPlsInfoService corpplsinfoServicebean, UsersService usersServicebean, RestTemplate restTemplatebean) {
corpplsinfoService = corpplsinfoServicebean;
@ -69,6 +83,64 @@ public class PLSUtil {
return exchange.getBody();
}
public static JSONObject GeneralPost(String Url, PageData pageData, String CORPINFO_ID) throws Exception {
JSONObject uriVariables = JSONObject.parseObject(JSON.toJSONString(pageData));
HttpHeaders headers = new HttpHeaders();
headers.set("Authorization", getToken(CORPINFO_ID));
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(uriVariables, headers);
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url,
HttpMethod.POST,
httpEntity,
JSONObject.class);
return exchange.getBody();
}
public static JSONObject GeneralGetById(String Url, Object id, String CORPINFO_ID) throws Exception {
HttpHeaders headers = new HttpHeaders();
headers.set("Authorization", getToken(CORPINFO_ID));
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + id,
HttpMethod.GET,
httpEntity,
JSONObject.class);
return exchange.getBody();
}
public static JSONObject GeneralList(String Url, PageData pageData) throws Exception {
String params = buildGetParams(JSONObject.parseObject(JSON.toJSONString(pageData)));
String CORPINFO_ID = Jurisdiction.getCORPINFO_ID();
HttpHeaders headers = new HttpHeaders();
headers.set("Authorization", getToken(CORPINFO_ID));
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + params,
HttpMethod.GET,
httpEntity,
JSONObject.class);
return exchange.getBody();
}
public static JSONObject GeneralPut(String Url, PageData pageData, String CORPINFO_ID) throws Exception {
JSONObject uriVariables = JSONObject.parseObject(JSON.toJSONString(pageData));
HttpHeaders headers = new HttpHeaders();
headers.set("Authorization", getToken(CORPINFO_ID));
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(uriVariables, headers);
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url,
HttpMethod.PUT,
httpEntity,
JSONObject.class);
return exchange.getBody();
}
public static JSONObject GeneralDelete(String Url, Object id, String CORPINFO_ID) throws Exception {
HttpHeaders headers = new HttpHeaders();
headers.set("Authorization", getToken(CORPINFO_ID));
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + id,
HttpMethod.DELETE,
httpEntity,
JSONObject.class);
return exchange.getBody();
}
/**
* @Description: 电子围栏列表
@ -77,7 +149,28 @@ public class PLSUtil {
* @Param: [java.lang.String, java.lang.Integer, java.lang.Integer] [keywords, currentPage, showCount]
* @Return: com.alibaba.fastjson.JSONObject
*/
public static JSONObject getAlArmDataList(String CORPINFO_ID, Integer currentPage, Integer showCount ,String keywords,Integer status,Integer eleType) throws Exception {
public static JSONObject getLayerList(String CORPINFO_ID, Integer currentPage, Integer showCount, String keywords) throws Exception {
HttpHeaders headers = new HttpHeaders();
headers.set("Authorization", getToken(CORPINFO_ID));
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
String url = "/region/layer/list?pageNum=" + currentPage + "&pageSize=" + showCount + "&str=";
if (Tools.notEmpty(keywords)) {
url = url + keywords;
}
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url
, HttpMethod.GET, httpEntity, JSONObject.class);
return exchange.getBody();
}
/**
* @Description: 电子围栏列表
* @Author: dearLin
* @Date: 2024/1/25/025 14:37
* @Param: [java.lang.String, java.lang.Integer, java.lang.Integer] [keywords, currentPage, showCount]
* @Return: com.alibaba.fastjson.JSONObject
*/
public static JSONObject getAlArmDataList(String CORPINFO_ID, Integer currentPage, Integer showCount, String keywords, Integer status, Integer eleType) throws Exception {
HttpHeaders headers = new HttpHeaders();
headers.set("Authorization", getToken(CORPINFO_ID));
@ -85,11 +178,34 @@ public class PLSUtil {
// currentPage + "&pageSize=" + showCount +"&str=" + "&eleType="+eleType+ "&status="+status
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) +
"/region/alarm/list?eleType="+eleType+"+&status="+status+"&pageNum="+currentPage+"&pageSize="+showCount+"&str="
,HttpMethod.GET, httpEntity, JSONObject.class);
"/region/alarm/list?eleType=" + eleType + "+&status=" + status + "&pageNum=" + currentPage + "&pageSize=" + showCount + "&str="
, HttpMethod.GET, httpEntity, JSONObject.class);
return exchange.getBody();
}
/**
* @Description: 人员卡列表
* @Author: dearLin
* @Date: 2024/1/25/025 14:37
* @Param: [java.lang.String, java.lang.Integer, java.lang.Integer] [keywords, currentPage, showCount]
* @Return: com.alibaba.fastjson.JSONObject
*/
public static JSONObject getUserCardDataList(String CORPINFO_ID, Integer currentPage, Integer showCount, String keywords) throws Exception {
HttpHeaders headers = new HttpHeaders();
headers.set("Authorization", getToken(CORPINFO_ID));
String url = "/deploy/card/list?pageNum=" + currentPage + "&pageSize=" + showCount + "&str=";
if (Tools.notEmpty(keywords)) {
url = url + keywords;
}
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url
, HttpMethod.GET, httpEntity, JSONObject.class);
return exchange.getBody();
}
/**
* @Description: 查询摄像头
* @Author: dearLin
@ -188,13 +304,14 @@ public class PLSUtil {
*/
public static JSONObject getRyRegionList(String CORPINFO_ID, String keywords, Integer currentPage, Integer showCount) throws Exception {
HttpHeaders headers = new HttpHeaders();
String url = "/region/region/list?pageNum=" +
currentPage +
"&pageSize=" + showCount + "&type=0" +
"&str=";
if (Tools.notEmpty(keywords)) url += keywords;
headers.set("Authorization", getToken(CORPINFO_ID));
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/region/list?pageNum=" +
currentPage +
"&pageSize=" + showCount +
"&str=" + keywords + "&type=0", HttpMethod.GET, httpEntity, JSONObject.class);
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url, HttpMethod.GET, httpEntity, JSONObject.class);
return exchange.getBody();
}
@ -214,7 +331,7 @@ public class PLSUtil {
}
/**
* @Description: 当前在线人员实时位置信息
* @Description: 当前在线人员实时位置信息
* @Date: 2024/1/25/025 14:37
* @Return: com.alibaba.fastjson.JSONObject
*/
@ -552,11 +669,28 @@ public class PLSUtil {
return pageData;
}
public static String buildGetParams(Map<String, Object> params) throws Exception {
StringBuilder sb = new StringBuilder();
sb.append("?");
for (Map.Entry<String, Object> entry : params.entrySet()) {
if (sb.length() > 1) {
sb.append("&");
}
String key = entry.getKey();
if ("currentPage".equals(entry.getKey())) key = "pageNum";
if ("showCount".equals(entry.getKey())) key = "pageSize";
sb.append(URLEncoder.encode(key, StandardCharsets.UTF_8.toString()));
sb.append("=");
sb.append(entry.getValue());
}
return sb.toString();
}
/**
* 获取区域内随机坐标点
*
* @param polygon [[lng,lat,alt],[lng,lat,alt],[lng,lat,alt],...]
* @return [lng,lat,alt]
* @return [lng, lat, alt]
* @throws IOException
*/
public static List<String> getRandomPointInPolygon(List<List<Double>> polygon) {
@ -578,7 +712,7 @@ public class PLSUtil {
Double y = minY + rand.nextDouble() * (maxY - minY);
if (pointInPolygon(polygon, x, y)) {
List<String> point = Arrays.asList(x.toString(),y.toString(),polygon.get(0).get(2).toString());
List<String> point = Arrays.asList(x.toString(), y.toString(), polygon.get(0).get(2).toString());
return point;
}
}
@ -586,12 +720,13 @@ public class PLSUtil {
/**
* 判断点是否在多边形内
*
* @param polygon
* @param lng
* @param lat
* @return
*/
private static boolean pointInPolygon(List<List<Double>> polygon,double lng, double lat) {
private static boolean pointInPolygon(List<List<Double>> polygon, double lng, double lat) {
boolean inside = false;
int n = polygon.size();
for (int i = 0, j = n - 1; i < n; j = i++) {

3
src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml
View File

@ -280,7 +280,7 @@
left join BUS_LIMITSPACE sp on sp.LIMITSPACE_ID=f.LIMITSPACE_ID
left join oa_department as woro on f.WORK_DEPARTMENT_ID = woro.DEPARTMENT_ID
left join oa_department as woro on f.WORK_USER_DEPARTMENT_ID = woro.DEPARTMENT_ID
left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID
left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
@ -436,6 +436,7 @@
<if test="pd.GASCHECK != null and pd.GASCHECK != ''"><!-- 关键词检索 -->
and f.STEP_ID &gt; 0 and f.STEP_ID != 15 and f.ANALYZE_USER_ID = #{pd.GASCHECK}
</if>
order by f.STEP_ID,f.CREATTIME
</select>
<select id="checkWorkCount" parameterType="pd" resultType="pd" >

5
src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml
View File

@ -50,7 +50,10 @@
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') CONFINEDSPACE_COUNT,
(select count(1) COUNT from bus_highwork_sign sign
left join bus_highwork work on work.HIGHWORK_ID = sign.HIGHWORK_ID
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') HIGHWORK_COUNT
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') HIGHWORK_COUNT,
(select count(1) COUNT from bus_electricity_sign sign
left join bus_electricity work on work.ELECTRICITY_ID = sign.ELECTRICITY_ID
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') ELECTRICITY_COUNT
</select>
</mapper>

141
src/main/resources/mybatis/datasource/eightwork/ElectricityGasMapper.xml Normal file
View File

@ -0,0 +1,141 @@
<?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.datasource.eightwork.ElectricityGasMapper">
<!--表名 -->
<sql id="tableName">
BUS_ELECTRICITYGAS
</sql>
<!--数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<!-- 字段 -->
<sql id="Field">
f.ELECTRICITY_ID,
f.ANALYZE_TIME,
f.ANALYZE_PLACE,
f.ANALYZE_RESULT,
f.ANALYZE_USER,
f.ISDELETE,
f.ELECTRICITYGAS_ID,
f.SIGN_PATH
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
ELECTRICITY_ID,
ANALYZE_TIME,
ANALYZE_PLACE,
ANALYZE_RESULT,
ANALYZE_USER,
ISDELETE,
ELECTRICITYGAS_ID,
SIGN_PATH
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{ELECTRICITY_ID},
#{ANALYZE_TIME},
#{ANALYZE_PLACE},
#{ANALYZE_RESULT},
#{ANALYZE_USER},
#{ISDELETE},
#{ELECTRICITYGAS_ID},
#{SIGN_PATH}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1'
where
ELECTRICITYGAS_ID = #{ELECTRICITYGAS_ID}
</delete>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
ELECTRICITY_ID = #{ELECTRICITY_ID},
ANALYZE_TIME = #{ANALYZE_TIME},
ANALYZE_PLACE = #{ANALYZE_PLACE},
ANALYZE_RESULT = #{ANALYZE_RESULT},
ANALYZE_USER = #{ANALYZE_USER},
ELECTRICITYGAS_ID = ELECTRICITYGAS_ID,
SIGN_PATH = #{SIGN_PATH}
where
ELECTRICITYGAS_ID = #{ELECTRICITYGAS_ID}
</update>
<!-- 通过ID获取数据 -->
<select id="findById" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where
f.ELECTRICITY_ID = #{ELECTRICITY_ID}
</select>
<!-- 列表 -->
<select id="datalistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
<!-- and-->
<!-- (-->
<!-- &lt;!&ndash; 根据需求自己加检索条件-->
<!-- 字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')-->
<!-- or-->
<!-- 字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')-->
<!-- &ndash;&gt;-->
<!-- )-->
</if>
ORDER BY f.ANALYZE_TIME desc
</select>
<!-- 列表(全部) -->
<select id="listAll" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where f.ISDELETE = '0' and f.ELECTRICITY_ID = #{ELECTRICITY_ID}
ORDER BY f.ANALYZE_TIME desc
</select>
<!-- 批量删除 -->
<delete id="deleteAll" parameterType="String">
update
<include refid="tableName"></include>
set
ISDELETE = '1'
where
ELECTRICITYGAS_ID in
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
</mapper>

602
src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml Normal file
View File

@ -0,0 +1,602 @@
<?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.datasource.eightwork.ElectricityMapper">
<!--表名 -->
<sql id="tableName">
BUS_ELECTRICITY
</sql>
<!--数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<!-- 字段 -->
<sql id="Field">
f.ELECTRICITY_ID,
f.CORPINFO_ID,
f.TASK_ID,
f.STEP_ID,
f.ISDELETE,
f.CREATTIME,
f.CREATOR,
f.OPERATTIME,
f.OPERATOR,
f.CHECK_NO,
f.APPLY_DEPARTMENT_ID,
f.APPLY_USER_ID,
f.WORK_START_DATE,
f.WORK_END_DATE,
f.WORK_PLACE,
f.WORK_CONTENT,
f.SPECIAL_WORK,
f.RISK_IDENTIFICATION,
f.CARD_NO,
f.ALLOW_POWER,
f.WORK_VOLTAGE,
f.RATED_POWER,
f.ELECTRICITY_USER_ID,
f.ELECTRICITY_DEPARTMENT_ID,
f.WORK_USER_ID,
f.WORK_DEPARTMENT_ID,
f.ANALYZE_TIME,
f.ISANALYZE,
f.ANALYZE_DEPARTMENT_ID,
f.ANALYZE_USER_ID,
f.CONFESS_DEPARTMENT_ID,
f.CONFESS_USER_ID,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
f.GUARDIAN_DEPARTMENT_ID,
f.GUARDIAN_USER_ID,
f.CONFIRM_DEPARTMENT_ID,
f.CONFIRM_USER_ID,
f.LEADER_CARD_NO,
f.AUDIT_DEPARTMENT_ID,
f.AUDIT_USER_ID,
f.APPROVE_DEPARTMENT_ID,
f.APPROVE_USER_ID,
f.ACCEPT_DEPARTMENT_ID,
f.ACCEPT_USER_ID,
f.WORK_START_DEPARTMENT_ID,
f.WORK_START_USER_ID,
f.WORK_END_DEPARTMENT_ID,
f.WORK_END_USER_ID,
f.ACCEPT_TIME,
f.PLS_ID,
f.PLS_NAME,
f.WORK_POSITION,
f.VIDEO_PATH
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
ELECTRICITY_ID,
CORPINFO_ID,
TASK_ID,
STEP_ID,
ISDELETE,
CREATTIME,
CREATOR,
OPERATTIME,
OPERATOR,
CHECK_NO,
APPLY_DEPARTMENT_ID,
APPLY_USER_ID,
WORK_START_DATE,
WORK_END_DATE,
WORK_PLACE,
WORK_CONTENT,
SPECIAL_WORK,
RISK_IDENTIFICATION,
CARD_NO,
ALLOW_POWER,
WORK_VOLTAGE,
RATED_POWER,
ELECTRICITY_USER_ID,
ELECTRICITY_DEPARTMENT_ID,
WORK_USER_ID,
WORK_DEPARTMENT_ID,
ANALYZE_TIME,
ISANALYZE,
ANALYZE_DEPARTMENT_ID,
ANALYZE_USER_ID,
CONFESS_DEPARTMENT_ID,
CONFESS_USER_ID,
ACCEPT_CONFESS_DEPARTMENT_ID,
ACCEPT_CONFESS_USER_ID,
GUARDIAN_DEPARTMENT_ID,
GUARDIAN_USER_ID,
CONFIRM_DEPARTMENT_ID,
CONFIRM_USER_ID,
LEADER_CARD_NO,
AUDIT_DEPARTMENT_ID,
AUDIT_USER_ID,
APPROVE_DEPARTMENT_ID,
APPROVE_USER_ID,
ACCEPT_DEPARTMENT_ID,
ACCEPT_USER_ID,
WORK_START_DEPARTMENT_ID,
WORK_START_USER_ID,
WORK_END_DEPARTMENT_ID,
WORK_END_USER_ID,
ACCEPT_TIME,
PLS_ID,
PLS_NAME,
WORK_POSITION,
VIDEO_PATH
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{ELECTRICITY_ID},
#{CORPINFO_ID},
#{TASK_ID},
#{STEP_ID},
#{ISDELETE},
#{CREATTIME},
#{CREATOR},
#{OPERATTIME},
#{OPERATOR},
#{CHECK_NO},
#{APPLY_DEPARTMENT_ID},
#{APPLY_USER_ID},
#{WORK_START_DATE},
#{WORK_END_DATE},
#{WORK_PLACE},
#{WORK_CONTENT},
#{SPECIAL_WORK},
#{RISK_IDENTIFICATION},
#{CARD_NO},
#{ALLOW_POWER},
#{WORK_VOLTAGE},
#{RATED_POWER},
#{ELECTRICITY_USER_ID},
#{ELECTRICITY_DEPARTMENT_ID},
#{WORK_USER_ID},
#{WORK_DEPARTMENT_ID},
#{ANALYZE_TIME},
#{ISANALYZE},
#{ANALYZE_DEPARTMENT_ID},
#{ANALYZE_USER_ID},
#{CONFESS_DEPARTMENT_ID},
#{CONFESS_USER_ID},
#{ACCEPT_CONFESS_DEPARTMENT_ID},
#{ACCEPT_CONFESS_USER_ID},
#{GUARDIAN_DEPARTMENT_ID},
#{GUARDIAN_USER_ID},
#{CONFIRM_DEPARTMENT_ID},
#{CONFIRM_USER_ID},
#{LEADER_CARD_NO},
#{AUDIT_DEPARTMENT_ID},
#{AUDIT_USER_ID},
#{APPROVE_DEPARTMENT_ID},
#{APPROVE_USER_ID},
#{ACCEPT_DEPARTMENT_ID},
#{ACCEPT_USER_ID},
#{WORK_START_DEPARTMENT_ID},
#{WORK_START_USER_ID},
#{WORK_END_DEPARTMENT_ID},
#{WORK_END_USER_ID},
#{ACCEPT_TIME},
#{PLS_ID},
#{PLS_NAME},
#{WORK_POSITION},
#{VIDEO_PATH}
</sql>
<!-- 获取编码 -->
<select id="getCode" parameterType="pd" resultType="pd">
SELECT
COUNT(1) as code
FROM <include refid="tableName"></include> f
WHERE f.CORPINFO_ID = #{CORPINFO_ID}
and f.CREATTIME LIKE CONCAT(#{CREATDATE},'%')
</select>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1'
where
ELECTRICITY_ID = #{ELECTRICITY_ID}
</delete>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
ELECTRICITY_ID = #{ELECTRICITY_ID},
CORPINFO_ID = #{CORPINFO_ID},
TASK_ID = #{TASK_ID},
STEP_ID = #{STEP_ID},
ISDELETE = #{ISDELETE},
CREATTIME = #{CREATTIME},
CREATOR = #{CREATOR},
OPERATTIME = #{OPERATTIME},
OPERATOR = #{OPERATOR},
CHECK_NO = #{CHECK_NO},
APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID},
APPLY_USER_ID = #{APPLY_USER_ID},
WORK_START_DATE = #{WORK_START_DATE},
WORK_END_DATE = #{WORK_END_DATE},
WORK_PLACE = #{WORK_PLACE},
WORK_CONTENT = #{WORK_CONTENT},
SPECIAL_WORK = #{SPECIAL_WORK},
RISK_IDENTIFICATION = #{RISK_IDENTIFICATION},
CARD_NO = #{CARD_NO},
ALLOW_POWER = #{ALLOW_POWER},
WORK_VOLTAGE = #{WORK_VOLTAGE},
RATED_POWER = #{RATED_POWER},
ELECTRICITY_USER_ID = #{ELECTRICITY_USER_ID},
ELECTRICITY_DEPARTMENT_ID = #{ELECTRICITY_DEPARTMENT_ID},
WORK_USER_ID = #{WORK_USER_ID},
WORK_DEPARTMENT_ID = #{WORK_DEPARTMENT_ID},
ANALYZE_TIME = #{ANALYZE_TIME},
ISANALYZE = #{ISANALYZE},
ANALYZE_DEPARTMENT_ID = #{ANALYZE_DEPARTMENT_ID},
ANALYZE_USER_ID = #{ANALYZE_USER_ID},
CONFESS_DEPARTMENT_ID = #{CONFESS_DEPARTMENT_ID},
CONFESS_USER_ID = #{CONFESS_USER_ID},
ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID},
ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID},
GUARDIAN_DEPARTMENT_ID = #{GUARDIAN_DEPARTMENT_ID},
GUARDIAN_USER_ID = #{GUARDIAN_USER_ID},
CONFIRM_DEPARTMENT_ID = #{CONFIRM_DEPARTMENT_ID},
CONFIRM_USER_ID = #{CONFIRM_USER_ID},
LEADER_CARD_NO = #{LEADER_CARD_NO},
AUDIT_DEPARTMENT_ID = #{AUDIT_DEPARTMENT_ID},
AUDIT_USER_ID = #{AUDIT_USER_ID},
APPROVE_DEPARTMENT_ID = #{APPROVE_DEPARTMENT_ID},
APPROVE_USER_ID = #{APPROVE_USER_ID},
ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID},
ACCEPT_USER_ID = #{ACCEPT_USER_ID},
WORK_START_DEPARTMENT_ID = #{WORK_START_DEPARTMENT_ID},
WORK_START_USER_ID = #{WORK_START_USER_ID},
WORK_END_DEPARTMENT_ID = #{WORK_END_DEPARTMENT_ID},
WORK_END_USER_ID = #{WORK_END_USER_ID},
ACCEPT_TIME = #{ACCEPT_TIME},
PLS_ID = #{PLS_ID},
PLS_NAME = #{PLS_NAME},
WORK_POSITION = #{WORK_POSITION},
VIDEO_PATH = #{VIDEO_PATH}
where
ELECTRICITY_ID = #{ELECTRICITY_ID}
</update>
<update id="editGasTime" parameterType="pd">
update
<include refid="tableName"></include>
set
ANALYZE_TIME = #{ANALYZE_TIME}
where
ELECTRICITY_ID = #{ELECTRICITY_ID}
</update>
<!-- 通过ID获取数据 -->
<select id="findById" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>,
ad.NAME as APPLY_DEPARTMENT_NAME,
au.NAME as APPLY_USER_NAME,
cd.NAME as CONFIRM_DEPARTMENT_NAME,
cu.NAME as CONFIRM_USER_NAME,
aud.NAME as AUDIT_DEPARTMENT_NAME,
auu.NAME as AUDIT_USER_NAME,
apd.NAME as APPROVE_DEPARTMENT_NAME,
apu.NAME as APPROVE_USER_NAME,
acd.NAME as ACCEPT_DEPARTMENT_NAME,
acu.NAME as ACCEPT_USER_NAME,
anad.NAME as ANALYZE_DEPARTMENT_NAME,
anau.NAME as ANALYZE_USER_NAME,
ac.NAME as CONFESS_DEPARTMENT_NAME,
accu.NAME as CONFESS_USER_NAME,
aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
aacu.NAME as ACCEPT_CONFESS_USER_NAME,
bc.NAME as GUARDIAN_DEPARTMENT_NAME,
bcu.NAME as GUARDIAN_USER_NAME,
woro.`NAME` as WORK_USER_DEPARTMENT_NAME,
woru.`NAME` as WORK_USER_NAME,
stao.`NAME` as WORK_START_DEPARTMENT_NAME,
stau.`NAME` as WORK_START_USER_NAME,
endo.`NAME` as WORK_END_DEPARTMENT_NAME,
endu.`NAME` as WORK_END_USER_NAME,
eleo.`NAME` as ELECTRICITY_DEPARTMENT_NAME,
eleu.`NAME` as ELECTRICITY_USER_NAME
from
<include refid="tableName"></include> f
left join OA_DEPARTMENT bc on bc.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
left join SYS_USER bcu on bcu.USER_ID = f.GUARDIAN_USER_ID
left join oa_department as woro on f.WORK_DEPARTMENT_ID = woro.DEPARTMENT_ID
left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID
left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
left join SYS_USER au on au.USER_ID = f.APPLY_USER_ID
left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONFIRM_DEPARTMENT_ID
left join SYS_USER cu on cu.USER_ID = f.CONFIRM_USER_ID
left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID
left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID
left join oa_department as stao on f.WORK_START_DEPARTMENT_ID = stao.DEPARTMENT_ID
left join sys_user as stau on f.WORK_START_USER_ID = stau.USER_ID
left join oa_department as endo on f.WORK_END_DEPARTMENT_ID = endo.DEPARTMENT_ID
left join sys_user as endu on f.WORK_END_USER_ID = endu.USER_ID
left join oa_department as eleo on f.ELECTRICITY_DEPARTMENT_ID = eleo.DEPARTMENT_ID
left join sys_user as eleu on f.ELECTRICITY_USER_ID = eleu.USER_ID
where
f.ELECTRICITY_ID = #{ELECTRICITY_ID}
</select>
<!-- 修改 -->
<update id="editStep" parameterType="pd">
update
<include refid="tableName"></include>
set
<if test="WORK_START_DATE != null and WORK_START_DATE != ''"><!-- 关键词检索 -->
WORK_START_DATE = #{WORK_START_DATE},
</if>
<if test="WORK_END_DATE != null and WORK_END_DATE != ''"><!-- 关键词检索 -->
WORK_END_DATE = #{WORK_END_DATE},
</if>
<if test="ACCEPT_TIME != null and ACCEPT_TIME != ''"><!-- 关键词检索 -->
ACCEPT_TIME = #{ACCEPT_TIME},
</if>
STEP_ID = #{STEP_ID}
where
ELECTRICITY_ID = #{ELECTRICITY_ID}
</update>
<!-- 修改位置 -->
<update id="setPosition" parameterType="pd">
update
<include refid="tableName"></include>
set
WORK_POSITION = #{WORK_POSITION}
where
ELECTRICITY_ID = #{ELECTRICITY_ID}
</update>
<!-- 列表 -->
<select id="datalistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>,
ad.NAME as APPLY_DEPARTMENT_NAME,
au.NAME as APPLY_USER_NAME,
cd.NAME as CONFIRM_DEPARTMENT_NAME,
cu.NAME as CONFIRM_USER_NAME,
aud.NAME as AUDIT_DEPARTMENT_NAME,
auu.NAME as AUDIT_USER_NAME,
apd.NAME as APPROVE_DEPARTMENT_NAME,
apu.NAME as APPROVE_USER_NAME,
acd.NAME as ACCEPT_DEPARTMENT_NAME,
acu.NAME as ACCEPT_USER_NAME,
anad.NAME as ANALYZE_DEPARTMENT_NAME,
anau.NAME as ANALYZE_USER_NAME,
ac.NAME as CONFESS_DEPARTMENT_NAME,
accu.NAME as CONFESS_USER_NAME,
aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
aacu.NAME as ACCEPT_CONFESS_USER_NAME,
bc.NAME as GUARDIAN_DEPARTMENT_NAME,
bcu.NAME as GUARDIAN_USER_NAME,
woro.`NAME` as WORK_USER_DEPARTMENT_NAME,
woru.`NAME` as WORK_USER_NAME,
stao.`NAME` as WORK_START_DEPARTMENT_NAME,
stau.`NAME` as WORK_START_USER_NAME,
endo.`NAME` as WORK_END_DEPARTMENT_NAME,
endu.`NAME` as WORK_END_USER_NAME,
eleo.`NAME` as ELECTRICITY_DEPARTMENT_NAME,
eleu.`NAME` as ELECTRICITY_USER_NAME,
log.STEP_NAME,
flow.NEXT_STEP_ID,
n.STEP_NAME as NEXT_STEP_NAME,
log.STATUS
from
<include refid="tableName"></include> f
left join OA_DEPARTMENT bc on bc.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
left join SYS_USER bcu on bcu.USER_ID = f.GUARDIAN_USER_ID
left join oa_department as woro on f.WORK_DEPARTMENT_ID = woro.DEPARTMENT_ID
left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID
left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
left join SYS_USER au on au.USER_ID = f.APPLY_USER_ID
left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONFIRM_DEPARTMENT_ID
left join SYS_USER cu on cu.USER_ID = f.CONFIRM_USER_ID
left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID
left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID
left join oa_department as stao on f.WORK_START_DEPARTMENT_ID = stao.DEPARTMENT_ID
left join sys_user as stau on f.WORK_START_USER_ID = stau.USER_ID
left join oa_department as endo on f.WORK_END_DEPARTMENT_ID = endo.DEPARTMENT_ID
left join sys_user as endu on f.WORK_END_USER_ID = endu.USER_ID
left join oa_department as eleo on f.ELECTRICITY_DEPARTMENT_ID = eleo.DEPARTMENT_ID
left join sys_user as eleu on f.ELECTRICITY_USER_ID = eleu.USER_ID
left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.ELECTRICITY_ID
left join bus_eightwork_task_flow flow on flow.STEP_ID = f.STEP_ID and flow.TASK_ID = log.TASK_ID
left join bus_eightwork_step n on n.STEP_ID = flow.NEXT_STEP_ID
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
</if>
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.STEP_NAME != null and pd.STEP_NAME != ''"><!-- 关键词检索 -->
and exists (
select 1 from bus_electricity_sign sign
left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID
where sign.ELECTRICITY_ID = f.ELECTRICITY_ID
and sign.SIGN_TIME is null
and sign.SIGN_USER_ID = #{pd.USER_ID}
and step.STEP_NAME = #{pd.STEP_NAME}
and f.STEP_ID != -1
)
</if>
<if test="pd.STEP_ID != null and pd.STEP_ID != ''"><!-- 关键词检索 -->
and log.NEXT_STEP_ID = #{pd.STEP_ID} and f.STEP_ID != -1
</if>
<if test="pd.CREATOR != null and pd.CREATOR != ''"><!-- 关键词检索 -->
and f.CREATOR = #{pd.CREATOR}
</if>
<if test="pd.GASCHECK != null and pd.GASCHECK != ''"><!-- 关键词检索 -->
and f.STEP_ID &gt; 0 and f.STEP_ID != 15 and f.ANALYZE_USER_ID = #{pd.GASCHECK}
</if>
order by f.STEP_ID,f.CREATTIME desc
</select>
<select id="checkWorkCount" parameterType="pd" resultType="pd" >
select
step.CODE,count(1) COUNT
from
bus_electricity_sign sign
left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID
left join bus_electricity work on work.ELECTRICITY_ID = sign.ELECTRICITY_ID
where
sign.SIGN_TIME is null
and work.STEP_ID != '-1'
and
sign.SIGN_USER_ID = #{USER_ID}
group by step.CODE
</select>
<select id="listAllMeasures" resultType="pd">
select
*
from
BUS_ELECTRICITY_MEASURES
</select>
<select id="getFlowList" resultType="pd">
select
flow.CAN_SKIP,
flow.ACTOR_FIELD,
step.STEP_NAME,
user.NAME as ACT_USER_NAME,
log.ACT_TIME,
log.STATUS,
cu.SIGN_USER,
cu.FINISHED_SIGN_USER,
cu.STEP_ID as CURRENT_STEP
from
bus_eightwork_task_flow flow
left join bus_eightwork_step step on step.STEP_ID = flow.STEP_ID
left join bus_eightwork_flow_log log on log.STEP_ID = flow.STEP_ID and
log.WORK_ID = #{ELECTRICITY_ID}
left join sys_user user on user.USER_ID = log.ACT_USER
left join (select sign.STEP_ID,
GROUP_CONCAT( if(sign.SIGN_TIME IS NULL,signer.NAME,null) ) sign_user,
GROUP_CONCAT( if(sign.SIGN_TIME IS not NULL,signer.NAME,null) ) finished_sign_user
from bus_electricity_sign sign
left join sys_user signer on signer.USER_ID = sign.SIGN_USER_ID where sign.ELECTRICITY_ID = #{ELECTRICITY_ID}
GROUP BY sign.STEP_ID) cu on cu.STEP_ID = step.STEP_ID
where
flow.TASK_ID = #{TASK_ID}
and
flow.STEP_ID != 0
order by
flow.ORDER_BY
</select>
<select id="getMapList" resultType="pd">
select
f.ELECTRICITY_ID,
f.CHECK_NO,
f.WORK_POSITION
from
<include refid="tableName"></include> f
left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.ELECTRICITY_ID
where f.ISDELETE = '0' and f.WORK_POSITION is not null
and f.CORPINFO_ID = #{CORPINFO_ID}
and f.STEP_ID &gt; 0 and log.NEXT_STEP_ID != 99
</select>
</mapper>

140
src/main/resources/mybatis/datasource/eightwork/ElectricitySignMapper.xml Normal file
View File

@ -0,0 +1,140 @@
<?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.datasource.eightwork.ElectricitySignMapper">
<!--表名 -->
<sql id="tableName">
BUS_ELECTRICITY_SIGN
</sql>
<!--数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<!-- 字段 -->
<sql id="Field">
f.ELECTRICITY_SIGN_ID,
f.ELECTRICITY_ID,
f.CORPINFO_ID,
f.SIGN_USER_ID,
f.SIGN_PATH,
f.SIGN_TIME,
f.DESCR,
f.STEP_ID,
f.IMG_PATH
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
ELECTRICITY_SIGN_ID,
ELECTRICITY_ID,
CORPINFO_ID,
SIGN_USER_ID,
SIGN_PATH,
SIGN_TIME,
DESCR,
STEP_ID,
IMG_PATH
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{ELECTRICITY_SIGN_ID},
#{ELECTRICITY_ID},
#{CORPINFO_ID},
#{SIGN_USER_ID},
#{SIGN_PATH},
#{SIGN_TIME},
#{DESCR},
#{STEP_ID},
#{IMG_PATH}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<insert id="saveBatch" parameterType="pd">
insert into
<include refid="tableName"></include>
(
ELECTRICITY_SIGN_ID,
ELECTRICITY_ID,
CORPINFO_ID,
SIGN_USER_ID,
STEP_ID
) values
<foreach collection="list" item="item" index="index" separator="," >
(#{item.ELECTRICITY_SIGN_ID},
#{item.ELECTRICITY_ID},
#{item.CORPINFO_ID},
#{item.SIGN_USER_ID},
#{item.STEP_ID})
</foreach>
</insert>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
DESCR = #{DESCR},
SIGN_PATH = #{SIGN_PATH},
SIGN_TIME= #{SIGN_TIME},
IMG_PATH = #{IMG_PATH}
where
ELECTRICITY_ID = #{ELECTRICITY_ID} and SIGN_USER_ID = #{SIGN_USER_ID} and STEP_ID = #{STEP_ID}
</update>
<select id="listById" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where
f.ELECTRICITY_ID = #{pd.ELECTRICITY_ID}
order by f.SIGN_TIME desc
</select>
<select id="listAll" parameterType="pd" resultType="pd">
select
f.ELECTRICITY_SIGN_ID,
f.ELECTRICITY_ID,
f.CORPINFO_ID,
f.SIGN_USER_ID,
f.SIGN_PATH,
f.SIGN_TIME,
f.STEP_ID,
f.IMG_PATH,
IFNULL(f.DESCR,'无') as DESCR,
step.CODE
from
<include refid="tableName"></include> f
left join bus_eightwork_step step on step.STEP_ID = f.STEP_ID
where
f.ELECTRICITY_ID = #{ELECTRICITY_ID}
and
f.SIGN_TIME is not null
</select>
<select id="checkUnsigned" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where
f.ELECTRICITY_ID = #{ELECTRICITY_ID}
and
f.SIGN_TIME is null
</select>
</mapper>

156
src/main/resources/mybatis/datasource/eightwork/ElectricityToMeasuresMapper.xml Normal file
View File

@ -0,0 +1,156 @@
<?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.datasource.eightwork.ElectricityToMeasuresMapper">
<!--表名 -->
<sql id="tableName">
BUS_ELECTRICITYTOMEASURES
</sql>
<!--数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<!-- 字段 -->
<sql id="Field">
f.ELECTRICITY_ID,
f.BUS_ELECTRICITY_MEASURES_ID,
f.STATUS,
f.ELECTRICITYTOMEASURES_ID,
f.CONFIRM_ID,
f.SIGN_PATH,
f.SIGN_TIME,
f.IMG_PATH
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
ELECTRICITY_ID,
BUS_ELECTRICITY_MEASURES_ID,
STATUS,
ELECTRICITYTOMEASURES_ID,
CONFIRM_ID,
SIGN_PATH,
SIGN_TIME,
IMG_PATH
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{ELECTRICITY_ID},
#{BUS_ELECTRICITY_MEASURES_ID},
#{STATUS},
#{ELECTRICITYTOMEASURES_ID},
#{CONFIRM_ID},
#{SIGN_PATH},
#{SIGN_TIME},
#{IMG_PATH}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<insert id="saveBatch" parameterType="pd">
insert into
<include refid="tableName"></include>
(
ELECTRICITY_ID,
BUS_ELECTRICITY_MEASURES_ID,
ELECTRICITYTOMEASURES_ID,
CONFIRM_ID
) values
<foreach collection="list" item="item" index="index" separator="," >
(
#{item.ELECTRICITY_ID},
#{item.BUS_ELECTRICITY_MEASURES_ID},
#{item.ELECTRICITYTOMEASURES_ID},
#{item.CONFIRM_ID}
)
</foreach>
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
delete from
<include refid="tableName"></include>
where
ELECTRICITY_ID = #{ELECTRICITY_ID}
</delete>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
STATUS = #{STATUS},
SIGN_PATH = #{SIGN_PATH},
IMG_PATH = #{IMG_PATH},
SIGN_TIME = #{SIGN_TIME}
where
ELECTRICITYTOMEASURES_ID = #{ELECTRICITYTOMEASURES_ID}
</update>
<!-- 通过ID获取数据 -->
<select id="findById" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where
f.ELECTRICITYTOMEASURES_ID = #{ELECTRICITYTOMEASURES_ID}
</select>
<!-- 列表(全部) -->
<select id="listAll" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
</select>
<!-- 批量删除 -->
<delete id="deleteAll" parameterType="String">
update
<include refid="tableName"></include>
set
ISDELETE = '1'
where
ELECTRICITYTOMEASURES_ID in
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<select id="listAllMeasuresForSign" parameterType="pd" resultType="pd">
select
f.ELECTRICITYTOMEASURES_ID,
m.*
from
<include refid="tableName"></include> f
left join bus_electricity_measures m on f.BUS_ELECTRICITY_MEASURES_ID = m.BUS_ELECTRICITY_MEASURES_ID
where
f.ELECTRICITY_ID = #{ELECTRICITY_ID} and f.CONFIRM_ID = #{CONFIRM_ID}
</select>
<select id="listSignFinishMeasures" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>,
m.*
from
<include refid="tableName"></include> f
left join bus_electricity_measures m on f.BUS_ELECTRICITY_MEASURES_ID = m.BUS_ELECTRICITY_MEASURES_ID
where
f.ELECTRICITY_ID = #{ELECTRICITY_ID}
</select>
</mapper>

1
src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml
View File

@ -418,6 +418,7 @@
<if test="pd.CREATOR != null and pd.CREATOR != ''"><!-- 关键词检索 -->
and f.CREATOR = #{pd.CREATOR}
</if>
order by f.STEP_ID,f.CREATTIME
</select>

3
src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
View File

@ -493,6 +493,7 @@
<if test="pd.GASCHECK != null and pd.GASCHECK != ''"><!-- 关键词检索 -->
and f.STEP_ID &gt; 0 and f.STEP_ID != 15 and f.ANALYZE_USER_ID = #{pd.GASCHECK}
</if>
order by f.STEP_ID,f.CREATTIME desc
</select>
@ -500,7 +501,7 @@
select
concat("姓名：",f.NAME,'，',"编号：",f.CERTIFICATE_NUM) NAME
from
BUS_PERSONNELMANAGEMENT f
bus_specialoperations f
left join sys_dictionaries a on a.DICTIONARIES_ID = f.JOB_TYPE
left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID
left join bus_units r on r.UNITS_ID = f.UNITS_ID

54
src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
View File

@ -1569,33 +1569,33 @@
<select id="getpunishlistPage" parameterType="page" resultType="pd">
SELECT
u.UNITS_NAME,
per.`NAME` as PERSON_NAME,
ifnull(v.`NAME`,vv.`NAME`) as CREATOR_NAME,
c.KEYPROJECTCHECK_ID,
p.KEYPROJECTPUNISH_ID,
p.HANDLED,
p.REASON,
vi.`NAME` as RECTIFICATIONOR_NAME,
h.*
u.UNITS_NAME,
per.`NAME` as PERSON_NAME,
ifnull(v.`NAME`,vv.`NAME`) as CREATOR_NAME,
c.KEYPROJECTCHECK_ID,
p.KEYPROJECTPUNISH_ID,
p.HANDLED,
p.REASON,
vi.`NAME` as RECTIFICATIONOR_NAME,
h.*
FROM
bus_keyproject_hidden h
LEFT JOIN us_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
LEFT JOIN us_keyprojectpunish p ON p.HIDDEN_ID = h.HIDDEN_ID
LEFT JOIN us_units u ON h.RECTIFICATIONDEPT = u.UNITS_ID
LEFT JOIN us_personnelmanagement per on per.PERSONNELMANAGEMENT_ID = p.PERSONNELMANAGEMENT_ID
LEFT JOIN i_user_all v ON v.USER_ID = p.CREATOR
LEFT JOIN i_user_all vv ON vv.USER_ID = h.PUNISH_PERSON
LEFT JOIN us_personnelmanagement vi ON vi.PERSONNELMANAGEMENT_ID = h.RECTIFICATIONOR
bus_keyproject_hidden h
LEFT JOIN bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
LEFT JOIN bus_keyprojectpunish p ON p.HIDDEN_ID = h.HIDDEN_ID
LEFT JOIN bus_units u ON h.RECTIFICATIONDEPT = u.UNITS_ID
LEFT JOIN bus_personnelmanagement per on per.PERSONNELMANAGEMENT_ID = p.PERSONNELMANAGEMENT_ID
LEFT JOIN vi_user_all v ON v.USER_ID = p.CREATOR
LEFT JOIN vi_user_all vv ON vv.USER_ID = h.PUNISH_PERSON
LEFT JOIN bus_personnelmanagement vi ON vi.PERSONNELMANAGEMENT_ID = h.RECTIFICATIONOR
WHERE
h.ISDELETE = '0'
<if test="pd.HANDLED==1">
and (P.HANDLED = '0' OR P.HANDLED IS NULL)
</if>
<if test="pd.HANDLED==2">
and P.HANDLED = '1'
</if>
AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID = #{pd.OUTSOURCED_ID} )
h.ISDELETE = '0'
<if test="pd.HANDLED==1">
and (P.HANDLED = '0' OR P.HANDLED IS NULL)
</if>
<if test="pd.HANDLED==2">
and P.HANDLED = '1'
</if>
AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID = #{pd.OUTSOURCED_ID} )
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
@ -1603,8 +1603,8 @@
)
</if>
ORDER BY
h.ISPUNISH ASC,
p.HANDLED DESC
h.ISPUNISH ASC,
p.HANDLED DESC
</select>
<select id="getSmsList" parameterType="pd" resultType="pd">

115
src/main/resources/mybatis/datasource/relatedparty/OutSourcedMapper.xml
View File

@ -331,7 +331,7 @@
( select GROUP_CONCAT(t.CORP_NAME) from BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
(select GROUP_CONCAT(t.NAME) from ( SELECT CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID FROM OA_DEPARTMENT t LEFT JOIN bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
vuad.NAME CORP_NAME,
p.`NAME` as UNITS_PIC_NAME
from
<include refid="tableName"></include> f
@ -340,7 +340,8 @@
LEFT JOIN oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
left join oa_department a on a.DEPARTMENT_ID = f.DEPARTMENT_ID
left join bus_units b using (UNITS_ID)
LEFT JOIN vi_user_all vua on f.CREATOR = vua.USERNAME
LEFT JOIN sys_user vua on f.CREATOR = vua.USERNAME and vua.ISDELETE = '0'
LEFT JOIN oa_department vuad ON vuad.DEPARTMENT_ID = vua.DEPARTMENT_ID
LEFT JOIN vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
LEFT JOIN bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
where f.ISDELETE = '0'
@ -648,6 +649,8 @@
<!-- 列表 -->
<select id="outSouceslistPage" parameterType="page" resultType="pd">
select
f.WORK_LONGITUDE,
f.WORK_LATITUDE,
f.CONTRACT_PIC,
f.STARTTIME,
f.ENDTIME,
@ -850,4 +853,112 @@
AND (WORK_LONGITUDE IS NULL or WORK_LONGITUDE = '' )
) c
</select>
<select id="getPUNISHlistPage" parameterType="page" resultType="pd">
select
f.WORK_LONGITUDE,
f.WORK_LATITUDE,
f.CONTRACT_PIC,
f.STARTTIME,
f.ENDTIME,
f.OUTSOURCED_NAME,
f.CONTRACT_STIME,
f.CONTRACT_ETIME,
f.CONTRACT_NUM,
f.UNITS_APTITUDE,
f.UNITS_PIC,
f.UNITS_PHONE,
f.MANAGE_NAME,
f.DESIGE,
f.MANAGE_APTITUDE,
f.MANAGE_PIC,
f.MANAGE_PHONE,
f.MEASURES,
f.ATTACHMENTS,
f.REMARKS,
f.TRAINING_NAME,
f.TRAINING_PIC,
f.TRAINING_STIME,
f.TRAINING_ETIME,
f.RECORDS,
f.SHEET,
f.EXAMINATION,
f.OATTACHMENTS,
f.CREATOR,
f.CREATTIME,
f.OPERATOR,
f.OPERATTIME,
f.ISDELETE,
f.CORPINFO_ID,
f.APPLICANT,
f.STATE,
f.OUTSOURCED_ID,
f.UNITS_APTITUDEPATH,
f.MANAGE_APTITUDEPATH,
f.MEASURESPATH,
f.DESIGEPATH,
f.ATTACHMENTSPATH,
f.RECORDSPATH,
f.SHEETPATH,
f.EXAMINATIONPATH,
f.OATTACHMENTSPATH,
a.NAME as DEPARTMENT_ID,
pcij.NAME Q_DEPARTMENT_NAME,
isdd.NAME MANAGER_DEPARTMENT_NAME,
b.UNITS_NAME as UNITS_NAME,
vua.NAME OUTSOURCED_CREATOR_NAME,
pci.NAME Q_COMPETENT_DEPT_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
( select count(1) from BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT,
( select GROUP_CONCAT(t.CORP_NAME) from BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
(select GROUP_CONCAT(t.NAME) from ( SELECT CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID FROM OA_DEPARTMENT t LEFT JOIN bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
p.`NAME` as UNITS_PIC_NAME
,ifnull(cfsl.co,0) as cfcount
from
<include refid="tableName"></include> f
LEFT JOIN oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
LEFT JOIN oa_department isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
LEFT JOIN oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
left join oa_department a on a.DEPARTMENT_ID = f.DEPARTMENT_ID
left join bus_units b using (UNITS_ID)
LEFT JOIN vi_user_all vua on f.CREATOR = vua.USERNAME
LEFT JOIN vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
LEFT JOIN bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
left join (SELECT PUN.OUTSOURCED_ID,COUNT( distinct PUN.HIDDEN_ID) co FROM (
SELECT
f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID
FROM
BUS_KEYPROJECT_HIDDEN f
LEFT JOIN bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
and f.ISPUNISH is null
) PUN GROUP BY PUN.OUTSOURCED_ID ) cfsl on cfsl.OUTSOURCED_ID = f.OUTSOURCED_ID
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
<!-- 根据需求自己加检索条件-->
f.OUTSOURCED_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
b.UNITS_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
f.UNITS_PIC LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
pcij.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
and f.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{pd.PUNISHUser} ), '%' )
AND f.STATE = '1'
ORDER BY
cfsl.co DESC,
f.OPERATTIME DESC
</select>
</mapper>

14
src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
View File

@ -33,7 +33,8 @@
f.OPERATTIME,
f.ISDELETE,
f.CORPINFO_ID,
f.PERSONNELMANAGEMENT_ID
f.PERSONNELMANAGEMENT_ID,
f.PASSWORD
</sql>
<!-- 字段用于新增 -->
@ -263,4 +264,15 @@
</foreach>
</delete>
<select id="findByOutsourced" parameterType="pd" resultType="pd">
select
f.*
from
<include refid="tableName"></include> f
left join BUS_OUTSOURCED t on t.UNITS_PIC = f.PERSONNELMANAGEMENT_ID
where
t.OUTSOURCED_ID = #{OUTSOURCED_ID}
and t.ISDELETE = '0'
</select>
</mapper>

3
src/main/resources/mybatis/datasource/system/DepartmentMapper.xml
View File

@ -34,6 +34,7 @@
LEADER_CHARGE,
STATE,
checkedIds,
FOREIGNPERSONNEL,
DJBM
</sql>
@ -58,6 +59,7 @@
#{LEADER_CHARGE},
#{STATE},
#{checkedIds},
#{FOREIGNPERSONNEL},
#{DJBM}
</sql>
@ -100,6 +102,7 @@
LEADER_CHARGE = #{LEADER_CHARGE},
STATE = #{STATE},
checkedIds = #{checkedIds},
FOREIGNPERSONNEL = #{FOREIGNPERSONNEL},
DJBM = #{DJBM}
where ISDELETE = 0 and
DEPARTMENT_ID = #{DEPARTMENT_ID}