From c4730709b2864cdd1007a16231928afc1bd85e04 Mon Sep 17 00:00:00 2001 From: zhangqihang Date: Thu, 22 Feb 2024 08:42:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/AppKeyProjectsController.java | 36 ++++++ .../app/AppKeyprojectCheckController.java | 21 ++++ .../relatedparty/OutSourcedMapper.java | 2 + .../PersonnelManagementMapper.java | 2 + .../keyProjects/KeyprojectHiddenService.java | 2 + .../impl/KeyprojectHiddenServiceImpl.java | 1 + .../relatedparty/OutSourcedService.java | 2 + .../impl/OutSourcedServiceImpl.java | 5 + .../PersonnelManagementService.java | 2 + .../impl/PersonnelManagementServiceImpl.java | 5 + .../keyProjects/KeyprojectHiddenMapper.xml | 54 ++++---- .../relatedparty/OutSourcedMapper.xml | 115 +++++++++++++++++- .../PersonnelManagementMapper.xml | 14 ++- 13 files changed, 231 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java index 5c4627b..bace89a 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java @@ -404,5 +404,41 @@ public class AppKeyProjectsController extends BaseController { return map; } + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + 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 map = new HashMap(); + 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 varList = outsourcedService.getPUNISHlist(page); //列出OutSourced列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java index f48dbc7..454fc5a 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java @@ -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 map = new HashMap(); + 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 varList = keyprojectHiddenService.getpunishlist(page); //列出KeyprojectCheck列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/mapper/datasource/relatedparty/OutSourcedMapper.java b/src/main/java/com/zcloud/mapper/datasource/relatedparty/OutSourcedMapper.java index d5c7b3e..3186202 100644 --- a/src/main/java/com/zcloud/mapper/datasource/relatedparty/OutSourcedMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/relatedparty/OutSourcedMapper.java @@ -90,5 +90,7 @@ public interface OutSourcedMapper{ List outSouceslistPage(Page page); Integer getDingWeiSum(PageData pd); + + List getPUNISHlistPage(Page page); } diff --git a/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java index cf7e812..2726158 100644 --- a/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java @@ -66,5 +66,7 @@ public interface PersonnelManagementMapper{ void editPassword(PageData pd); PageData findForLogin(PageData pd); + + PageData findByOutsourced(PageData pd); } diff --git a/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java b/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java index df33096..4a6c822 100644 --- a/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java +++ b/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java @@ -192,5 +192,7 @@ public interface KeyprojectHiddenService { * @return */ String getCorpInfoIdByHiddenId(PageData pd); + + List getpunishlist(Page page); } diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java index 4d9d1c8..c6fb365 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java @@ -264,5 +264,6 @@ public class KeyprojectHiddenServiceImpl implements KeyprojectHiddenService { public String getCorpInfoIdByHiddenId(PageData pd) { return hiddenMapper.getCorpInfoIdByHiddenId(pd); } + } diff --git a/src/main/java/com/zcloud/service/relatedparty/OutSourcedService.java b/src/main/java/com/zcloud/service/relatedparty/OutSourcedService.java index 0516c34..89a1272 100644 --- a/src/main/java/com/zcloud/service/relatedparty/OutSourcedService.java +++ b/src/main/java/com/zcloud/service/relatedparty/OutSourcedService.java @@ -95,5 +95,7 @@ public interface OutSourcedService{ List outSouceslistPage(Page page); Integer getDingWeiSum(PageData pd); + + List getPUNISHlist(Page page); } diff --git a/src/main/java/com/zcloud/service/relatedparty/impl/OutSourcedServiceImpl.java b/src/main/java/com/zcloud/service/relatedparty/impl/OutSourcedServiceImpl.java index 186bea6..d7103b3 100644 --- a/src/main/java/com/zcloud/service/relatedparty/impl/OutSourcedServiceImpl.java +++ b/src/main/java/com/zcloud/service/relatedparty/impl/OutSourcedServiceImpl.java @@ -147,5 +147,10 @@ public class OutSourcedServiceImpl implements OutSourcedService{ return outsourcedMapper.getDingWeiSum(pd); } + @Override + public List getPUNISHlist(Page page) { + return outsourcedMapper.getPUNISHlistPage(page); + } + } diff --git a/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java b/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java index cc17929..e7adff7 100644 --- a/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java +++ b/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java @@ -66,5 +66,7 @@ public interface PersonnelManagementService{ void editPassword(PageData updateUser) throws Exception; PageData findForLogin(PageData pd); + + PageData findByOutsourced(PageData pd); } diff --git a/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java b/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java index cac1592..44a6dbc 100644 --- a/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java @@ -105,5 +105,10 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic return personnelmanagementMapper.findForLogin(pd); } + @Override + public PageData findByOutsourced(PageData pd) { + return personnelmanagementMapper.findByOutsourced(pd); + } + } diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 929b44d..6ac38f8 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -1569,33 +1569,33 @@ 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 + + + diff --git a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml index 41ada3d..7747fb3 100644 --- a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml +++ b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml @@ -33,7 +33,8 @@ f.OPERATTIME, f.ISDELETE, f.CORPINFO_ID, - f.PERSONNELMANAGEMENT_ID + f.PERSONNELMANAGEMENT_ID, + f.PASSWORD @@ -263,4 +264,15 @@ + + From 34d95fcf18561c5c12721065442a4aa7fe3a037e Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 22 Feb 2024 09:19:36 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8D=A1=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../positioning/MapSettingController.java | 119 +++++++++++++ .../positioning/PositAlarmController.java | 79 +++++++++ .../positioning/UserCardController.java | 164 ++++++++++++++++++ src/main/java/com/zcloud/util/PLSUtil.java | 115 +++++++++++- 4 files changed, 470 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/zcloud/controller/positioning/MapSettingController.java create mode 100644 src/main/java/com/zcloud/controller/positioning/PositAlarmController.java create mode 100644 src/main/java/com/zcloud/controller/positioning/UserCardController.java diff --git a/src/main/java/com/zcloud/controller/positioning/MapSettingController.java b/src/main/java/com/zcloud/controller/positioning/MapSettingController.java new file mode 100644 index 0000000..ca570f9 --- /dev/null +++ b/src/main/java/com/zcloud/controller/positioning/MapSettingController.java @@ -0,0 +1,119 @@ +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("/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(), page.getCurrentPage() + 1, page.getShowCount(), pageData.getString("keywords")); + if (body != null) { + List 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(); + 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(); + 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/",Integer.parseInt(pageData.getString("layId")), Jurisdiction.getCORPINFO_ID()); + if (body != null) { + returnMap.putAll(body); + } + return returnMap; + } + +} diff --git a/src/main/java/com/zcloud/controller/positioning/PositAlarmController.java b/src/main/java/com/zcloud/controller/positioning/PositAlarmController.java new file mode 100644 index 0000000..2aa6cea --- /dev/null +++ b/src/main/java/com/zcloud/controller/positioning/PositAlarmController.java @@ -0,0 +1,79 @@ +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.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 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(); + ReturnMap returnMap = new ReturnMap(); + JSONObject body = PLSUtil.GeneralPost("/region/alarm/alarmHandling",pageData, Jurisdiction.getCORPINFO_ID()); + if (body != null) { + returnMap.putAll(body); + } + return 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; + } + + +} diff --git a/src/main/java/com/zcloud/controller/positioning/UserCardController.java b/src/main/java/com/zcloud/controller/positioning/UserCardController.java new file mode 100644 index 0000000..87b44ff --- /dev/null +++ b/src/main/java/com/zcloud/controller/positioning/UserCardController.java @@ -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 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 (!body.getString("code").equals("200")) 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; + } + +} diff --git a/src/main/java/com/zcloud/util/PLSUtil.java b/src/main/java/com/zcloud/util/PLSUtil.java index 1e7d152..6eb331a 100644 --- a/src/main/java/com/zcloud/util/PLSUtil.java +++ b/src/main/java/com/zcloud/util/PLSUtil.java @@ -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; @@ -44,6 +45,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 httpEntity = new HttpEntity<>(headers); + ResponseEntity 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 +81,69 @@ 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 httpEntity = new HttpEntity<>(uriVariables, headers); + ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url, + HttpMethod.POST, + httpEntity, + JSONObject.class); + return exchange.getBody(); + } + + public static JSONObject GeneralGetById(String Url, Integer id, String CORPINFO_ID) throws Exception { + HttpHeaders headers = new HttpHeaders(); + headers.set("Authorization", getToken(CORPINFO_ID)); + HttpEntity httpEntity = new HttpEntity<>(headers); + ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + id, + 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 httpEntity = new HttpEntity<>(uriVariables,headers); + ResponseEntity 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 httpEntity = new HttpEntity<>(headers); + ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url+id, + HttpMethod.DELETE, + 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 getLayerList(String CORPINFO_ID, Integer currentPage, Integer showCount, String keywords) throws Exception { + HttpHeaders headers = new HttpHeaders(); + headers.set("Authorization", getToken(CORPINFO_ID)); + + HttpEntity httpEntity = new HttpEntity<>(headers); + String url = "/region/layer/list?pageNum=" + currentPage + "&pageSize=" + showCount + "&str="; + if (Tools.notEmpty(keywords)) { + url = url + keywords; + } + ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url + , HttpMethod.GET, httpEntity, JSONObject.class); + return exchange.getBody(); + } /** * @Description: 电子围栏列表 @@ -77,7 +152,7 @@ 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 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 +160,36 @@ public class PLSUtil { // currentPage + "&pageSize=" + showCount +"&str=" + "&eleType="+eleType+ "&status="+status HttpEntity httpEntity = new HttpEntity<>(headers); ResponseEntity 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 httpEntity = new HttpEntity<>(headers); + ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url + , HttpMethod.GET, httpEntity, JSONObject.class); + return exchange.getBody(); + } + + + + /** * @Description: 查询摄像头 * @Author: dearLin @@ -214,7 +314,7 @@ public class PLSUtil { } /** - * @Description: 当前在线人员实时位置信息 + * @Description: 当前在线人员实时位置信息 * @Date: 2024/1/25/025 14:37 * @Return: com.alibaba.fastjson.JSONObject */ @@ -556,7 +656,7 @@ public class PLSUtil { * 获取区域内随机坐标点 * * @param polygon [[lng,lat,alt],[lng,lat,alt],[lng,lat,alt],...] - * @return [lng,lat,alt] + * @return [lng, lat, alt] * @throws IOException */ public static List getRandomPointInPolygon(List> polygon) { @@ -578,7 +678,7 @@ public class PLSUtil { Double y = minY + rand.nextDouble() * (maxY - minY); if (pointInPolygon(polygon, x, y)) { - List point = Arrays.asList(x.toString(),y.toString(),polygon.get(0).get(2).toString()); + List point = Arrays.asList(x.toString(), y.toString(), polygon.get(0).get(2).toString()); return point; } } @@ -586,12 +686,13 @@ public class PLSUtil { /** * 判断点是否在多边形内 + * * @param polygon * @param lng * @param lat * @return */ - private static boolean pointInPolygon(List> polygon,double lng, double lat) { + private static boolean pointInPolygon(List> polygon, double lng, double lat) { boolean inside = false; int n = polygon.size(); for (int i = 0, j = n - 1; i < n; j = i++) { From c5c765bee3a6dff3274a11d6f7a313df9f1b048c Mon Sep 17 00:00:00 2001 From: wangpeng Date: Thu, 22 Feb 2024 10:06:21 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=BE=85=E9=AA=8C=E6=94=B6=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/app/AppHiddenController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java index 0b8d38f..8a7967f 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java @@ -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++; } } From cbad06c6dcb3b73319af61e72c7e622696294a0f Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Thu, 22 Feb 2024 11:35:14 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E7=94=A8=E7=94=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eightwork/AppElertricityController.java | 282 ++++++++ .../eightwork/ElectricityGasMapper.java | 59 ++ .../eightwork/ElectricityMapper.java | 34 + .../eightwork/ElectricitySignMapper.java | 37 ++ .../ElectricityToMeasuresMapper.java | 57 ++ .../eightwork/ElectricityGasService.java | 59 ++ .../service/eightwork/ElectricityService.java | 45 ++ .../impl/ConfinedspaceServiceImpl.java | 1 + .../impl/ElectricityGasServiceImpl.java | 83 +++ .../impl/ElectricityServiceImpl.java | 428 +++++++++++++ .../eightwork/impl/HighworkServiceImpl.java | 3 +- .../eightwork/ConfinedspaceMapper.xml | 3 +- .../eightwork/EightWorkTaskMapper.xml | 5 +- .../eightwork/ElectricityGasMapper.xml | 141 ++++ .../eightwork/ElectricityMapper.xml | 602 ++++++++++++++++++ .../eightwork/ElectricitySignMapper.xml | 140 ++++ .../eightwork/ElectricityToMeasuresMapper.xml | 156 +++++ .../datasource/eightwork/HighWorkMapper.xml | 1 + .../datasource/eightwork/HotWorkMapper.xml | 3 +- 19 files changed, 2135 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/zcloud/controller/eightwork/AppElertricityController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityGasMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricitySignMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityToMeasuresMapper.java create mode 100644 src/main/java/com/zcloud/service/eightwork/ElectricityGasService.java create mode 100644 src/main/java/com/zcloud/service/eightwork/ElectricityService.java create mode 100644 src/main/java/com/zcloud/service/eightwork/impl/ElectricityGasServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/eightwork/impl/ElectricityServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/eightwork/ElectricityGasMapper.xml create mode 100644 src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml create mode 100644 src/main/resources/mybatis/datasource/eightwork/ElectricitySignMapper.xml create mode 100644 src/main/resources/mybatis/datasource/eightwork/ElectricityToMeasuresMapper.xml diff --git a/src/main/java/com/zcloud/controller/eightwork/AppElertricityController.java b/src/main/java/com/zcloud/controller/eightwork/AppElertricityController.java new file mode 100644 index 0000000..12e454f --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightwork/AppElertricityController.java @@ -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 map = new HashMap(); + 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 map = new HashMap(); + 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 map = new HashMap(); + 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 map = new HashMap(); + 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 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 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 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 map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List fileList = new ArrayList(); + 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 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 map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List measuresList = electricityService.listAllMeasures(); + map.put("result",errInfo); + map.put("measuresList",measuresList); + return map; + } + + @RequestMapping("/listAllMeasuresForSign") + @ResponseBody + public Object listAllMeasuresForSign() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List measuresForSignList = electricityService.listAllMeasuresForSign(pd); + map.put("result",errInfo); + map.put("measuresForSignList",measuresForSignList); + return map; + } + + @RequestMapping("/listSignFinishMeasures") + @ResponseBody + public Object listSignFinishMeasures() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List 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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List fileList = new ArrayList(); + 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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List 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 map = new HashMap(); + 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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List flowList = electricityService.getFlowList(pd); + map.put("flowList", flowList); + map.put("result", errInfo); //返回结果 + return map; + } + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityGasMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityGasMapper.java new file mode 100644 index 0000000..0b1b784 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityGasMapper.java @@ -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 datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityMapper.java new file mode 100644 index 0000000..dbbc48a --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityMapper.java @@ -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 datalistPage(Page page); + + List listAllMeasures(); + + List checkWorkCount(PageData pd); + + List getFlowList(PageData pd); + + List getMapList(PageData pd); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricitySignMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricitySignMapper.java new file mode 100644 index 0000000..fc6fddd --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricitySignMapper.java @@ -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 signers); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**根据动火ID查询签字列表 + * @throws Exception + */ + List listById(PageData pd); + + List listAll(PageData sign); + + /**根据动火ID查询未签字列表 + * @throws Exception + */ + List checkUnsigned(PageData sign); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityToMeasuresMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityToMeasuresMapper.java new file mode 100644 index 0000000..ad64d38 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityToMeasuresMapper.java @@ -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 signers); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + List listAllMeasuresForSign(PageData pd); + + List listSignFinishMeasures(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/eightwork/ElectricityGasService.java b/src/main/java/com/zcloud/service/eightwork/ElectricityGasService.java new file mode 100644 index 0000000..6c7cb97 --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/ElectricityGasService.java @@ -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 list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List 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; + +} + diff --git a/src/main/java/com/zcloud/service/eightwork/ElectricityService.java b/src/main/java/com/zcloud/service/eightwork/ElectricityService.java new file mode 100644 index 0000000..3f1e9e3 --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/ElectricityService.java @@ -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 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 listAllMeasures() throws Exception; +// +// //获取需要签字的措施(bus_Electricitytomeasures) + List listAllMeasuresForSign(PageData pd) throws Exception; +// +// //获取所有签字完成的措施(bus_Electricitytomeasures) + List listSignFinishMeasures(PageData pd) throws Exception; + + void saveGas(PageData pd,MultipartFile[] files) throws Exception; + + List getFlowList(PageData pd)throws Exception; + + ReturnMap getMapList()throws Exception; +} diff --git a/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java index e5f79de..0dfe872 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java @@ -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 filePaths = new ArrayList<>(); for (int i = 0; i < files.length; i++) { //保存签名文件 diff --git a/src/main/java/com/zcloud/service/eightwork/impl/ElectricityGasServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/ElectricityGasServiceImpl.java new file mode 100644 index 0000000..0c50b6c --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/impl/ElectricityGasServiceImpl.java @@ -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 list(Page page)throws Exception{ + return electricitygasMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List 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); + } + +} + diff --git a/src/main/java/com/zcloud/service/eightwork/impl/ElectricityServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/ElectricityServiceImpl.java new file mode 100644 index 0000000..cf7de02 --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/impl/ElectricityServiceImpl.java @@ -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 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 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 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> rmap = new HashMap<>(); + List 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 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 varList = electricityMapper.checkWorkCount(pd); + + if (varList != null && !varList.isEmpty()) { + Map newMap = varList.stream() + .collect(Collectors.toMap(map -> map.getString("CODE"), map -> map.getString("COUNT"))); + + rpd.putAll(newMap); + } + return rpd; + } + + @Override + public List listAllMeasures() throws Exception { + return electricityMapper.listAllMeasures(); + + } + + @Override + public List listAllMeasuresForSign(PageData pd) throws Exception { + return electricityToMeasuresMapper.listAllMeasuresForSign(pd); + + } + + @Override + public List 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 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 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 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 list = (List) 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 signers = new ArrayList<>(); + List list = (List) 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 fieldList = signers.stream() + .map(map -> map.getString("CONFIRM_ID")) + .collect(Collectors.toList()); + Set fieldSet = new HashSet<>(fieldList); //去重 + + List uniqueList = new ArrayList<>(fieldSet); + List 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 positions = PLSUtil.getRandomPointInPolygon(pointList); + pd.put("WORK_POSITION", String.join(",",positions)); + electricityMapper.setPosition(pd); + } + +} diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java index a8e9876..4f8cb4e 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java @@ -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 positions = PLSUtil.getRandomPointInPolygon(pointList); pd.put("WORK_POSITION", String.join(",",positions)); diff --git a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml index b7428e1..e416530 100644 --- a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml @@ -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 @@ and f.STEP_ID > 0 and f.STEP_ID != 15 and f.ANALYZE_USER_ID = #{pd.GASCHECK} + order by f.STEP_ID,f.CREATTIME diff --git a/src/main/resources/mybatis/datasource/eightwork/ElectricityGasMapper.xml b/src/main/resources/mybatis/datasource/eightwork/ElectricityGasMapper.xml new file mode 100644 index 0000000..d5b46cb --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/ElectricityGasMapper.xml @@ -0,0 +1,141 @@ + + + + + + + BUS_ELECTRICITYGAS + + + + + SYS_DICTIONARIES + + + + + f.ELECTRICITY_ID, + f.ANALYZE_TIME, + f.ANALYZE_PLACE, + f.ANALYZE_RESULT, + f.ANALYZE_USER, + f.ISDELETE, + f.ELECTRICITYGAS_ID, + f.SIGN_PATH + + + + + ELECTRICITY_ID, + ANALYZE_TIME, + ANALYZE_PLACE, + ANALYZE_RESULT, + ANALYZE_USER, + ISDELETE, + ELECTRICITYGAS_ID, + SIGN_PATH + + + + + #{ELECTRICITY_ID}, + #{ANALYZE_TIME}, + #{ANALYZE_PLACE}, + #{ANALYZE_RESULT}, + #{ANALYZE_USER}, + #{ISDELETE}, + #{ELECTRICITYGAS_ID}, + #{SIGN_PATH} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + ELECTRICITYGAS_ID = #{ELECTRICITYGAS_ID} + + + + + update + + 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 + + set + ISDELETE = '1' + where + ELECTRICITYGAS_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml b/src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml new file mode 100644 index 0000000..b08e5d3 --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml @@ -0,0 +1,602 @@ + + + + + + + BUS_ELECTRICITY + + + + + SYS_DICTIONARIES + + + + + 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 + + + + + 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 + + + + + #{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} + + + + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + ELECTRICITY_ID = #{ELECTRICITY_ID} + + + + + update + + 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 + + set + ANALYZE_TIME = #{ANALYZE_TIME} + where + ELECTRICITY_ID = #{ELECTRICITY_ID} + + + + + + + + + update + + set + + WORK_START_DATE = #{WORK_START_DATE}, + + + WORK_END_DATE = #{WORK_END_DATE}, + + + ACCEPT_TIME = #{ACCEPT_TIME}, + + STEP_ID = #{STEP_ID} + where + ELECTRICITY_ID = #{ELECTRICITY_ID} + + + + + update + + set + WORK_POSITION = #{WORK_POSITION} + where + ELECTRICITY_ID = #{ELECTRICITY_ID} + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/ElectricitySignMapper.xml b/src/main/resources/mybatis/datasource/eightwork/ElectricitySignMapper.xml new file mode 100644 index 0000000..5960b79 --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/ElectricitySignMapper.xml @@ -0,0 +1,140 @@ + + + + + + + BUS_ELECTRICITY_SIGN + + + + + SYS_DICTIONARIES + + + + + 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 + + + + + ELECTRICITY_SIGN_ID, + ELECTRICITY_ID, + CORPINFO_ID, + SIGN_USER_ID, + SIGN_PATH, + SIGN_TIME, + DESCR, + STEP_ID, + IMG_PATH + + + + + #{ELECTRICITY_SIGN_ID}, + #{ELECTRICITY_ID}, + #{CORPINFO_ID}, + #{SIGN_USER_ID}, + #{SIGN_PATH}, + #{SIGN_TIME}, + #{DESCR}, + #{STEP_ID}, + #{IMG_PATH} + + + + + insert into + + ( + + ) values ( + + ) + + + + insert into + + ( + ELECTRICITY_SIGN_ID, + ELECTRICITY_ID, + CORPINFO_ID, + SIGN_USER_ID, + STEP_ID + ) values + + (#{item.ELECTRICITY_SIGN_ID}, + #{item.ELECTRICITY_ID}, + #{item.CORPINFO_ID}, + #{item.SIGN_USER_ID}, + #{item.STEP_ID}) + + + + + + update + + 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} + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/ElectricityToMeasuresMapper.xml b/src/main/resources/mybatis/datasource/eightwork/ElectricityToMeasuresMapper.xml new file mode 100644 index 0000000..119b266 --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/ElectricityToMeasuresMapper.xml @@ -0,0 +1,156 @@ + + + + + + + BUS_ELECTRICITYTOMEASURES + + + + + SYS_DICTIONARIES + + + + + 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 + + + + + ELECTRICITY_ID, + BUS_ELECTRICITY_MEASURES_ID, + STATUS, + ELECTRICITYTOMEASURES_ID, + CONFIRM_ID, + SIGN_PATH, + SIGN_TIME, + IMG_PATH + + + + + #{ELECTRICITY_ID}, + #{BUS_ELECTRICITY_MEASURES_ID}, + #{STATUS}, + #{ELECTRICITYTOMEASURES_ID}, + #{CONFIRM_ID}, + #{SIGN_PATH}, + #{SIGN_TIME}, + #{IMG_PATH} + + + + + insert into + + ( + + ) values ( + + ) + + + + insert into + + ( + ELECTRICITY_ID, + BUS_ELECTRICITY_MEASURES_ID, + ELECTRICITYTOMEASURES_ID, + CONFIRM_ID + ) values + + ( + #{item.ELECTRICITY_ID}, + #{item.BUS_ELECTRICITY_MEASURES_ID}, + #{item.ELECTRICITYTOMEASURES_ID}, + #{item.CONFIRM_ID} + ) + + + + + + delete from + + where + ELECTRICITY_ID = #{ELECTRICITY_ID} + + + + + update + + set + STATUS = #{STATUS}, + SIGN_PATH = #{SIGN_PATH}, + IMG_PATH = #{IMG_PATH}, + SIGN_TIME = #{SIGN_TIME} + where + ELECTRICITYTOMEASURES_ID = #{ELECTRICITYTOMEASURES_ID} + + + + + + + + + + + update + + set + ISDELETE = '1' + where + ELECTRICITYTOMEASURES_ID in + + #{item} + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml index f4bc026..e796fdf 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml @@ -418,6 +418,7 @@ and f.CREATOR = #{pd.CREATOR} + order by f.STEP_ID,f.CREATTIME diff --git a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml index 33f3854..0911ed3 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml @@ -493,6 +493,7 @@ and f.STEP_ID > 0 and f.STEP_ID != 15 and f.ANALYZE_USER_ID = #{pd.GASCHECK} + order by f.STEP_ID,f.CREATTIME desc @@ -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 From 9b40b93f37b90527358c4024108925eb0dc00c3c Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 22 Feb 2024 16:04:48 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=9C=B0=E5=9B=BE=E8=AE=BE=E7=BD=AE=EF=BC=8C=E8=81=9A?= =?UTF-8?q?=E9=9B=86=E7=AE=A1=E7=90=86Api=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../positioning/MapSettingController.java | 83 ++++- .../positioning/PositAlarmController.java | 338 +++++++++++++++++- .../positioning/UserCardController.java | 2 +- src/main/java/com/zcloud/util/PLSUtil.java | 54 ++- 4 files changed, 448 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/zcloud/controller/positioning/MapSettingController.java b/src/main/java/com/zcloud/controller/positioning/MapSettingController.java index ca570f9..875cf28 100644 --- a/src/main/java/com/zcloud/controller/positioning/MapSettingController.java +++ b/src/main/java/com/zcloud/controller/positioning/MapSettingController.java @@ -1,5 +1,6 @@ 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; @@ -34,7 +35,7 @@ public class MapSettingController extends BaseController { PageData pageData = this.getPageData(); ReturnMap returnMap = new ReturnMap(); JSONObject body = PLSUtil.getLayerList( - Jurisdiction.getCORPINFO_ID(), page.getCurrentPage() + 1, page.getShowCount(), pageData.getString("keywords")); + Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), pageData.getString("KEYWORDS")); if (body != null) { List list = body.getJSONArray("rows").toJavaList(JSONObject.class); returnMap.put("varList", list); @@ -43,6 +44,7 @@ public class MapSettingController extends BaseController { } return returnMap; } + /** * @Description: 处理告警 * @Author: dearLin @@ -54,13 +56,16 @@ public class MapSettingController extends BaseController { @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()); + JSONObject body = PLSUtil.GeneralPost("/region/layer", pageData, Jurisdiction.getCORPINFO_ID()); if (body != null) { - returnMap.putAll(body); + returnMap.putAll(body); } return returnMap; } + /** * @Description: 详情 * @Author: dearLin @@ -73,12 +78,13 @@ public class MapSettingController extends BaseController { 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()); + 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 @@ -90,13 +96,16 @@ public class MapSettingController extends BaseController { @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()); + JSONObject body = PLSUtil.GeneralPut("/region/layer", pageData, Jurisdiction.getCORPINFO_ID()); if (body != null) { returnMap.putAll(body); } return returnMap; } + /** * @Description: 修改 * @Author: dearLin @@ -109,11 +118,73 @@ public class MapSettingController extends BaseController { public ReturnMap remove() throws Exception { PageData pageData = this.getPageData(); ReturnMap returnMap = new ReturnMap(); - JSONObject body = PLSUtil.GeneralDelete("/region/layer/",Integer.parseInt(pageData.getString("layId")), Jurisdiction.getCORPINFO_ID()); + 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; + } } diff --git a/src/main/java/com/zcloud/controller/positioning/PositAlarmController.java b/src/main/java/com/zcloud/controller/positioning/PositAlarmController.java index 2aa6cea..ed4f4d3 100644 --- a/src/main/java/com/zcloud/controller/positioning/PositAlarmController.java +++ b/src/main/java/com/zcloud/controller/positioning/PositAlarmController.java @@ -1,5 +1,6 @@ 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; @@ -22,6 +23,7 @@ import java.util.List; @Controller @RequestMapping("/positAlarm") public class PositAlarmController extends BaseController { + /** * @Description: 告警数据 来自人员定位系统 * @Author: dearLin @@ -45,6 +47,7 @@ public class PositAlarmController extends BaseController { } return returnMap; } + /** * @Description: 处理告警 * @Author: dearLin @@ -56,24 +59,335 @@ public class PositAlarmController extends BaseController { @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; - } - @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()); + 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; + } } diff --git a/src/main/java/com/zcloud/controller/positioning/UserCardController.java b/src/main/java/com/zcloud/controller/positioning/UserCardController.java index 87b44ff..79f1aa6 100644 --- a/src/main/java/com/zcloud/controller/positioning/UserCardController.java +++ b/src/main/java/com/zcloud/controller/positioning/UserCardController.java @@ -136,7 +136,7 @@ public class UserCardController extends BaseController { ReturnMap returnMap = new ReturnMap(); JSONObject body = PLSUtil.GeneralDelete("/deploy/card/batchUnbinding/", pageData.getString("DATA_IDS"), Jurisdiction.getCORPINFO_ID()); if (body != null) { - if (!body.getString("code").equals("200")) return ReturnMap.error(body.getString("msg")); + if (!"200".equals(body.getString("code"))) return ReturnMap.error(body.getString("msg")); returnMap.putAll(body); } return returnMap; diff --git a/src/main/java/com/zcloud/util/PLSUtil.java b/src/main/java/com/zcloud/util/PLSUtil.java index 6eb331a..2f4f43a 100644 --- a/src/main/java/com/zcloud/util/PLSUtil.java +++ b/src/main/java/com/zcloud/util/PLSUtil.java @@ -20,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 @@ -93,7 +95,7 @@ public class PLSUtil { return exchange.getBody(); } - public static JSONObject GeneralGetById(String Url, Integer id, String CORPINFO_ID) throws Exception { + public static JSONObject GeneralGetById(String Url, Object id, String CORPINFO_ID) throws Exception { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); @@ -103,27 +105,43 @@ public class PLSUtil { 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 httpEntity = new HttpEntity<>(headers); + ResponseEntity 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 httpEntity = new HttpEntity<>(uriVariables,headers); + HttpEntity httpEntity = new HttpEntity<>(uriVariables, headers); ResponseEntity 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 httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url+id, + ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + id, HttpMethod.DELETE, httpEntity, JSONObject.class); return exchange.getBody(); } + /** * @Description: 电子围栏列表 * @Author: dearLin @@ -188,8 +206,6 @@ public class PLSUtil { } - - /** * @Description: 查询摄像头 * @Author: dearLin @@ -288,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 httpEntity = new HttpEntity<>(headers); - ResponseEntity 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 exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url, HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -652,6 +669,23 @@ public class PLSUtil { return pageData; } + public static String buildGetParams(Map params) throws Exception { + StringBuilder sb = new StringBuilder(); + sb.append("?"); + for (Map.Entry 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(); + } + /** * 获取区域内随机坐标点 * From 0fbddd5f623d9438def717fb8c72f0fd9b8daff7 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 22 Feb 2024 16:33:00 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=96=B0=E5=8A=A0=E5=A4=96=E6=9D=A5?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=83=A8=E9=97=A8=EF=BC=8C=E5=A4=96=E6=9D=A5?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=B9=B6=E4=B8=94=E7=A6=81=E6=AD=A2=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=88=B0=E7=B3=BB=E7=BB=9F=E6=8F=90=E7=A4=BA=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=AF=86=E7=A0=81=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/system/LoginController.java | 3 +++ .../resources/mybatis/datasource/system/DepartmentMapper.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index bc442a2..830d6a1 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -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")); diff --git a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml index 850a482..73cbab4 100644 --- a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml @@ -34,6 +34,7 @@ LEADER_CHARGE, STATE, checkedIds, + FOREIGNPERSONNEL, DJBM @@ -58,6 +59,7 @@ #{LEADER_CHARGE}, #{STATE}, #{checkedIds}, + #{FOREIGNPERSONNEL}, #{DJBM} @@ -100,6 +102,7 @@ LEADER_CHARGE = #{LEADER_CHARGE}, STATE = #{STATE}, checkedIds = #{checkedIds}, + FOREIGNPERSONNEL = #{FOREIGNPERSONNEL}, DJBM = #{DJBM} where ISDELETE = 0 and DEPARTMENT_ID = #{DEPARTMENT_ID} From 7fcbffb8035e616bfc5244da386a0a7fdf22f39b Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 22 Feb 2024 17:31:28 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../video/VideoManagerController.java | 588 ++++++++++-------- 1 file changed, 314 insertions(+), 274 deletions(-) diff --git a/src/main/java/com/zcloud/controller/video/VideoManagerController.java b/src/main/java/com/zcloud/controller/video/VideoManagerController.java index c5b1f1f..5b1d17f 100644 --- a/src/main/java/com/zcloud/controller/video/VideoManagerController.java +++ b/src/main/java/com/zcloud/controller/video/VideoManagerController.java @@ -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 map = new HashMap(); - 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 map = new HashMap(); + 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 map = new HashMap(); - 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 map = new HashMap(); + 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 map = new HashMap(); - 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 map = new HashMap(); + 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 map = new HashMap(); - 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 map = new HashMap(); + 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 map = new HashMap(); - 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 map = new HashMap(); + 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 map = new HashMap(); - 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 map = new HashMap(); + 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 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 map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - pd.put("ISSHOW", "1"); - List varList = videomanagerService.listAll(pd); //根据ID读取 - List 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 map = new HashMap(); - 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 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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("ISSHOW", "1"); + List varList = videomanagerService.listAll(pd); //根据ID读取 + List 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 map = new HashMap(); + 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 map = new HashMap(); - 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 map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd = videomanagerService.findById(pd); //根据ID读取 - List 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 map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - List videoList = videomanagerService.listAll(pd); //根据ID读取 - String videostr=""; - for(PageData video:videoList) { - videostr+=video.getString("VIDEOURL")+","; - } - List 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 map = new HashMap(); + 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 map = new HashMap(); - 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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = videomanagerService.findById(pd); //根据ID读取 + List 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 dataMap = new HashMap(); - List titles = new ArrayList(); - titles.add("企业ID"); //1 - titles.add("视频名称"); //2 - titles.add("播放地址"); //3 - titles.add("操作日期"); //4 - titles.add("操作人"); //5 - titles.add("是否删除"); //6 - dataMap.put("titles", titles); - List varOList = videomanagerService.listAll(pd); - List varList = new ArrayList(); - for(int i=0;i map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List videoList = videomanagerService.listAll(pd); //根据ID读取 + String videostr = ""; + for (PageData video : videoList) { + videostr += video.getString("VIDEOURL") + ","; + } + List 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 map = new HashMap(); + 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 dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("企业ID"); //1 + titles.add("视频名称"); //2 + titles.add("播放地址"); //3 + titles.add("操作日期"); //4 + titles.add("操作人"); //5 + titles.add("是否删除"); //6 + dataMap.put("titles", titles); + List varOList = videomanagerService.listAll(pd); + List varList = new ArrayList(); + 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; + } }