From 09f069e1ac61bbcd20bdd17d92290f91926d7296 Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Thu, 11 Jan 2024 16:58:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eightWork/AppBlindBoardController.java | 3 + .../eightWork/AppBreakGroundController.java | 11 +- .../eightWork/AppConfinedSpaceController.java | 3 + .../eightWork/AppCutRoadController.java | 4 +- .../eightWork/AppElectricityController.java | 4 + .../eightWork/AppHighWorkController.java | 11 +- .../eightWork/AppHoistingController.java | 9 +- .../EightWorkVideoManagerController.java | 258 ++++++++++++++++++ .../video/VideoManagerController.java | 2 +- .../EightWorkVideoManagerMapper.java | 66 +++++ .../eightWork/ConfinedSpaceService.java | 4 +- .../EightWorkVideoManagerService.java | 67 +++++ .../service/eightWork/ElectricityService.java | 3 +- .../impl/ConfinedSpaceServiceImpl.java | 10 +- .../EightWorkVideoManagerServiceImpl.java | 93 +++++++ .../impl/ElectricityServiceImpl.java | 10 +- .../eightWork/impl/HotworkServiceImpl.java | 5 + src/main/resources/application.properties | 2 +- .../eightWork/EightWorkVideoManagerMapper.xml | 205 ++++++++++++++ .../dsno2/mq/MqErrorMessageLogMapper.xml | 2 +- 20 files changed, 739 insertions(+), 33 deletions(-) create mode 100644 src/main/java/com/zcloud/controller/eightWork/EightWorkVideoManagerController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/eightWork/EightWorkVideoManagerMapper.java create mode 100644 src/main/java/com/zcloud/service/eightWork/EightWorkVideoManagerService.java create mode 100644 src/main/java/com/zcloud/service/eightWork/impl/EightWorkVideoManagerServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/eightWork/EightWorkVideoManagerMapper.xml diff --git a/src/main/java/com/zcloud/controller/eightWork/AppBlindBoardController.java b/src/main/java/com/zcloud/controller/eightWork/AppBlindBoardController.java index 493a652..59811bc 100644 --- a/src/main/java/com/zcloud/controller/eightWork/AppBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/eightWork/AppBlindBoardController.java @@ -45,6 +45,8 @@ public class AppBlindBoardController extends BaseController { private BlindBoardToMeasuresService blindBoardToMeasuresService; @Autowired private Smb smb; + @Autowired + private EightWorkVideoManagerService eightworkvideomanagerService; /**获取编码 * @param * @throws Exception @@ -690,6 +692,7 @@ public class AppBlindBoardController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); blindboardService.edit(pd2); log.put("ACTION", "验收通过"); + eightworkvideomanagerService.editStatus(pd2); // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); diff --git a/src/main/java/com/zcloud/controller/eightWork/AppBreakGroundController.java b/src/main/java/com/zcloud/controller/eightWork/AppBreakGroundController.java index ee155f3..e589341 100644 --- a/src/main/java/com/zcloud/controller/eightWork/AppBreakGroundController.java +++ b/src/main/java/com/zcloud/controller/eightWork/AppBreakGroundController.java @@ -6,10 +6,7 @@ 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.BreakGroundAcceptUserService; -import com.zcloud.service.eightWork.BreakGroundLogService; -import com.zcloud.service.eightWork.BreakGroundService; -import com.zcloud.service.eightWork.BreakGroundToMeasuresService; +import com.zcloud.service.eightWork.*; import com.zcloud.util.*; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -46,6 +43,8 @@ public class AppBreakGroundController extends BaseController { private SendMessageUtil sendMessageUtil; @Autowired private Smb smb; + @Autowired + private EightWorkVideoManagerService eightworkvideomanagerService; /**获取编码 * @param * @throws Exception @@ -496,7 +495,7 @@ public class AppBreakGroundController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); breakGroundService.edit(pd2); log.put("ACTION", "验收通过"); - + eightworkvideomanagerService.editStatus(pd2); // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); @@ -722,7 +721,7 @@ public class AppBreakGroundController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); breakGroundService.edit(pd2); log.put("ACTION", "验收通过"); - + eightworkvideomanagerService.editStatus(pd2); // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); diff --git a/src/main/java/com/zcloud/controller/eightWork/AppConfinedSpaceController.java b/src/main/java/com/zcloud/controller/eightWork/AppConfinedSpaceController.java index fffcaa0..d08c218 100644 --- a/src/main/java/com/zcloud/controller/eightWork/AppConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/eightWork/AppConfinedSpaceController.java @@ -54,6 +54,8 @@ public class AppConfinedSpaceController extends BaseController { private SendMessageUtil sendMessageUtil; @Autowired private Smb smb; + @Autowired + private EightWorkVideoManagerService eightworkvideomanagerService; /**获取编码 * @param @@ -516,6 +518,7 @@ public class AppConfinedSpaceController extends BaseController { pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); confinedspaceService.edit(pd2); log.put("ACTION", "验收通过"); + eightworkvideomanagerService.editStatus(pd2); // 发短信 PageData mes = new PageData(); diff --git a/src/main/java/com/zcloud/controller/eightWork/AppCutRoadController.java b/src/main/java/com/zcloud/controller/eightWork/AppCutRoadController.java index bd011ed..71f2853 100644 --- a/src/main/java/com/zcloud/controller/eightWork/AppCutRoadController.java +++ b/src/main/java/com/zcloud/controller/eightWork/AppCutRoadController.java @@ -44,6 +44,8 @@ public class AppCutRoadController extends BaseController { private SendMessageUtil sendMessageUtil; @Autowired private Smb smb; + @Autowired + private EightWorkVideoManagerService eightworkvideomanagerService; /**获取编码 * @param * @throws Exception @@ -491,7 +493,7 @@ public class AppCutRoadController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); cutRoadService.edit(pd2); log.put("ACTION", "验收通过"); - + eightworkvideomanagerService.editStatus(pd2); // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); diff --git a/src/main/java/com/zcloud/controller/eightWork/AppElectricityController.java b/src/main/java/com/zcloud/controller/eightWork/AppElectricityController.java index fd07ad7..e18554a 100644 --- a/src/main/java/com/zcloud/controller/eightWork/AppElectricityController.java +++ b/src/main/java/com/zcloud/controller/eightWork/AppElectricityController.java @@ -52,6 +52,8 @@ public class AppElectricityController extends BaseController { private SendMessageUtil sendMessageUtil; @Autowired private Smb smb; + @Autowired + private EightWorkVideoManagerService eightworkvideomanagerService; /**获取编码 * @param @@ -446,6 +448,7 @@ public class AppElectricityController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); electricityService.edit(pd2); log.put("ACTION", "验收通过"); + eightworkvideomanagerService.editStatus(pd2); // 发短信 PageData mes = new PageData(); @@ -753,6 +756,7 @@ public class AppElectricityController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); electricityService.edit(pd2); log.put("ACTION", "验收通过"); + eightworkvideomanagerService.editStatus(pd2); // 发短信 PageData mes = new PageData(); diff --git a/src/main/java/com/zcloud/controller/eightWork/AppHighWorkController.java b/src/main/java/com/zcloud/controller/eightWork/AppHighWorkController.java index 90c2258..2fc30de 100644 --- a/src/main/java/com/zcloud/controller/eightWork/AppHighWorkController.java +++ b/src/main/java/com/zcloud/controller/eightWork/AppHighWorkController.java @@ -6,10 +6,7 @@ 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.HighWorkAcceptUserService; -import com.zcloud.service.eightWork.HighWorkLogService; -import com.zcloud.service.eightWork.HighWorkService; -import com.zcloud.service.eightWork.HighWorkToMeasuresService; +import com.zcloud.service.eightWork.*; import com.zcloud.util.*; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; @@ -48,6 +45,8 @@ public class AppHighWorkController extends BaseController { private SendMessageUtil sendMessageUtil; @Autowired private Smb smb; + @Autowired + private EightWorkVideoManagerService eightworkvideomanagerService; /**获取编码 * @param * @throws Exception @@ -449,7 +448,7 @@ public class AppHighWorkController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); highworkService.edit(pd2); log.put("ACTION", "验收通过"); - + eightworkvideomanagerService.editStatus(pd2); // 发短信 PageData mes = new PageData(); mes.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid @@ -856,7 +855,7 @@ public class AppHighWorkController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); highworkService.edit(pd2); log.put("ACTION", "验收通过"); - + eightworkvideomanagerService.editStatus(pd2); // 发短信 PageData mes = new PageData(); mes.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid diff --git a/src/main/java/com/zcloud/controller/eightWork/AppHoistingController.java b/src/main/java/com/zcloud/controller/eightWork/AppHoistingController.java index 9eeb843..97e111b 100644 --- a/src/main/java/com/zcloud/controller/eightWork/AppHoistingController.java +++ b/src/main/java/com/zcloud/controller/eightWork/AppHoistingController.java @@ -6,10 +6,7 @@ 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.HoistingAcceptUserService; -import com.zcloud.service.eightWork.HoistingLogService; -import com.zcloud.service.eightWork.HoistingService; -import com.zcloud.service.eightWork.HoistingToMeasuresService; +import com.zcloud.service.eightWork.*; import com.zcloud.util.*; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -46,6 +43,8 @@ public class AppHoistingController extends BaseController { private SendMessageUtil sendMessageUtil; @Autowired private Smb smb; + @Autowired + private EightWorkVideoManagerService eightworkvideomanagerService; /**获取编码 * @param * @throws Exception @@ -397,6 +396,7 @@ public class AppHoistingController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); hoistingService.edit(pd2); log.put("ACTION", "验收通过"); + eightworkvideomanagerService.editStatus(pd2); // 发短信 PageData mes = new PageData(); @@ -804,6 +804,7 @@ public class AppHoistingController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); hoistingService.edit(pd2); log.put("ACTION", "验收通过"); + eightworkvideomanagerService.editStatus(pd2); // 发短信 PageData mes = new PageData(); diff --git a/src/main/java/com/zcloud/controller/eightWork/EightWorkVideoManagerController.java b/src/main/java/com/zcloud/controller/eightWork/EightWorkVideoManagerController.java new file mode 100644 index 0000000..3736e51 --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightWork/EightWorkVideoManagerController.java @@ -0,0 +1,258 @@ +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.EightWorkVideoManagerService; +import com.zcloud.service.video.VideoManagerService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.ObjectExcelView; +import com.zcloud.util.Tools; +import org.apache.shiro.authz.annotation.RequiresPermissions; +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.servlet.ModelAndView; + +import java.util.*; + +/** + * 说明：盲板作业 + * 作者：luoxiaobao + * 时间：2021-08-23 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/eightworkvideomanager") +public class EightWorkVideoManagerController extends BaseController { + + @Autowired + private EightWorkVideoManagerService eightworkvideomanagerService; + @Autowired + private VideoManagerService videomanagerService; + + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @ResponseBody + public Object add() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("EIGHTWORKVIDEOMANAGER_ID", this.get32UUID()); //主键 + pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ISDELETE", "0"); + eightworkvideomanagerService.save(pd); + map.put("result", errInfo); + 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 = eightworkvideomanagerService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /**删除 + * @param out + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + eightworkvideomanagerService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @ResponseBody + public Object edit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + eightworkvideomanagerService.edit(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()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + pd.put("ISMAIN", Jurisdiction.getIS_MAIN()); + pd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); + pd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + String DEPTIDS = pd.getString("DEPTIDS"); + if(Tools.notEmpty(DEPTIDS)) { + String DEPT_IDS[] = DEPTIDS.split(","); + pd.put("DEPT_IDS", DEPT_IDS); + } + page.setPd(pd); + List varList = eightworkvideomanagerService.list(page); //列出eightworkvideomanager列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**批量删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/deleteAll") + @ResponseBody + 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(","); + eightworkvideomanagerService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + }else{ + errInfo = "error"; + } + map.put("result", errInfo); //返回结果 + return map; + } + + /**导出到excel + * @param + * @throws Exception + */ + @RequestMapping(value="/excel") + @RequiresPermissions("toExcel") + public ModelAndView exportExcel() throws Exception{ + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("设备管线名"); //1 + titles.add("所属企业"); //2 + titles.add("申请部门"); //3 + titles.add("申请人"); //4 + titles.add("删除标志"); //5 + titles.add("创建时间"); //6 + titles.add("添加人"); //7 + titles.add("修改时间"); //8 + titles.add("修改人"); //9 + titles.add("编号"); //10 + titles.add("申请单位负责人签字"); //11 + titles.add("申请单位负责人签字时间"); //12 + titles.add("介质"); //13 + titles.add("温度"); //14 + titles.add("施工单位"); //15 + titles.add("施工单位人"); //16 + titles.add("施工单位签字"); //17 + titles.add("施工单位签字时间"); //18 + titles.add("生产部门"); //19 + titles.add("生产部门人"); //20 + titles.add("生产部门签字"); //21 + titles.add("生产部门签字时间"); //22 + titles.add("安全部门"); //23 + titles.add("安全部门人"); //24 + titles.add("安全部门签字"); //25 + titles.add("安全部门签字时间"); //26 + titles.add("领导人部门"); //27 + titles.add("领导人"); //28 + titles.add("领导人签字"); //29 + titles.add("领导人签字时间"); //30 + titles.add("验收部门"); //31 + titles.add("验收人"); //32 + titles.add("验收签字"); //33 + titles.add("验收签字时间"); //34 + titles.add("状态"); //35 + dataMap.put("titles", titles); + List varOList = eightworkvideomanagerService.listAll(pd); + List varList = new ArrayList(); + for(int i=0;i 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/service/eightWork/ConfinedSpaceService.java b/src/main/java/com/zcloud/service/eightWork/ConfinedSpaceService.java index 7bc19ee..109a266 100644 --- a/src/main/java/com/zcloud/service/eightWork/ConfinedSpaceService.java +++ b/src/main/java/com/zcloud/service/eightWork/ConfinedSpaceService.java @@ -25,8 +25,6 @@ public interface ConfinedSpaceService{ */ public void delete(PageData pd)throws Exception; - public void cancel(PageData pd)throws Exception; - public PageData checkno(PageData pd)throws Exception; public void editSpecialwork(PageData pd)throws Exception; @@ -84,6 +82,6 @@ public interface ConfinedSpaceService{ PageData getCode(PageData pd)throws Exception; - void cancle(PageData pd)throws Exception; + void cancel(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/eightWork/EightWorkVideoManagerService.java b/src/main/java/com/zcloud/service/eightWork/EightWorkVideoManagerService.java new file mode 100644 index 0000000..5970e75 --- /dev/null +++ b/src/main/java/com/zcloud/service/eightWork/EightWorkVideoManagerService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.eightWork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：盲板作业 + * 作者：luoxiaobao + * 时间：2021-08-23 + * 官网：www.zcloudchina.com + */ +public interface EightWorkVideoManagerService { + + /**新增 + * @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 pd + * @throws Exception + */ + public void editStatus(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 index 6d8fcff..b373899 100644 --- a/src/main/java/com/zcloud/service/eightWork/ElectricityService.java +++ b/src/main/java/com/zcloud/service/eightWork/ElectricityService.java @@ -52,7 +52,6 @@ public interface ElectricityService{ */ public PageData findById(PageData pd)throws Exception; - public void cancel(PageData pd)throws Exception; public PageData checkno(PageData pd)throws Exception; @@ -84,6 +83,6 @@ public interface ElectricityService{ PageData getCode(PageData pd)throws Exception; - void cancle(PageData pd)throws Exception; + void cancel(PageData pd)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 7dfbe9a..8506080 100644 --- a/src/main/java/com/zcloud/service/eightWork/impl/ConfinedSpaceServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightWork/impl/ConfinedSpaceServiceImpl.java @@ -5,6 +5,7 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.eightWork.ConfinedSpaceMapper; import com.zcloud.service.eightWork.ConfinedSpaceService; +import com.zcloud.service.eightWork.EightWorkVideoManagerService; import com.zcloud.util.SendMessageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,6 +30,8 @@ public class ConfinedSpaceServiceImpl implements ConfinedSpaceService { private ConfinedSpaceMapper confinedspaceMapper; @Autowired private SendMessageUtil sendMessageUtil; + @Autowired + private EightWorkVideoManagerService eightworkvideomanagerService; /**新增 * @param pd @@ -46,9 +49,6 @@ public class ConfinedSpaceServiceImpl implements ConfinedSpaceService { confinedspaceMapper.delete(pd); } - public void cancel(PageData pd)throws Exception{ - confinedspaceMapper.cancel(pd); - } public PageData checkno(PageData pd)throws Exception{ return confinedspaceMapper.checkno(pd); @@ -157,7 +157,7 @@ public class ConfinedSpaceServiceImpl implements ConfinedSpaceService { } @Override - public void cancle(PageData pd)throws Exception{ + public void cancel(PageData pd)throws Exception{ Map map = new HashMap(); String errInfo = "success"; System.out.println(JSONObject.toJSONString(pd)); @@ -211,6 +211,7 @@ public class ConfinedSpaceServiceImpl implements ConfinedSpaceService { }else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") == null){ pd.put("APPLY_STATUS",-98); confinedspaceMapper.cancel(pd); + eightworkvideomanagerService.editStatus(cpd); PageData pd2 = new PageData(); pd2 = confinedspaceMapper.checkno(pd); PageData pd3 = new PageData(); @@ -245,6 +246,7 @@ public class ConfinedSpaceServiceImpl implements ConfinedSpaceService { }else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") == null){ pd.put("APPLY_STATUS",-99); confinedspaceMapper.cancel(pd); + eightworkvideomanagerService.editStatus(cpd); PageData pd2 = new PageData(); pd2 = confinedspaceMapper.checkno(pd); PageData pd3 = new PageData(); diff --git a/src/main/java/com/zcloud/service/eightWork/impl/EightWorkVideoManagerServiceImpl.java b/src/main/java/com/zcloud/service/eightWork/impl/EightWorkVideoManagerServiceImpl.java new file mode 100644 index 0000000..e94faf3 --- /dev/null +++ b/src/main/java/com/zcloud/service/eightWork/impl/EightWorkVideoManagerServiceImpl.java @@ -0,0 +1,93 @@ +package com.zcloud.service.eightWork.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper; +import com.zcloud.service.eightWork.EightWorkVideoManagerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：盲板作业 + * 作者：luoxiaobao + * 时间：2021-08-23 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class EightWorkVideoManagerServiceImpl implements EightWorkVideoManagerService { + + @Autowired + private EightWorkVideoManagerMapper eightworkvideomanagerMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + eightworkvideomanagerMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + eightworkvideomanagerMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + eightworkvideomanagerMapper.edit(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void editStatus(PageData pd)throws Exception{ + eightworkvideomanagerMapper.editStatus(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return eightworkvideomanagerMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return eightworkvideomanagerMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return eightworkvideomanagerMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + eightworkvideomanagerMapper.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 index 4450496..f7b71c8 100644 --- a/src/main/java/com/zcloud/service/eightWork/impl/ElectricityServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightWork/impl/ElectricityServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.eightWork.ElectricityMapper; +import com.zcloud.service.eightWork.EightWorkVideoManagerService; import com.zcloud.service.eightWork.ElectricityService; import com.zcloud.util.SendMessageUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +29,8 @@ public class ElectricityServiceImpl implements ElectricityService { private ElectricityMapper electricityMapper; @Autowired private SendMessageUtil sendMessageUtil; + @Autowired + private EightWorkVideoManagerService eightworkvideomanagerService; /**新增 * @param pd * @throws Exception @@ -85,9 +88,6 @@ public class ElectricityServiceImpl implements ElectricityService { public PageData findById(PageData pd)throws Exception{ return electricityMapper.findById(pd); } - public void cancel(PageData pd)throws Exception{ - electricityMapper.cancel(pd); - } public PageData checkno(PageData pd)throws Exception{ return electricityMapper.checkno(pd); @@ -153,7 +153,7 @@ public class ElectricityServiceImpl implements ElectricityService { } @Override - public void cancle(PageData pd)throws Exception{ + public void cancel(PageData pd)throws Exception{ Map map = new HashMap(); String errInfo = "success"; System.out.println(JSONObject.toJSONString(pd)); @@ -177,6 +177,7 @@ public class ElectricityServiceImpl implements ElectricityService { return; } else { electricityMapper.cancel(pd); + eightworkvideomanagerService.editStatus(cpd); PageData mes = new PageData(); mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid mes.put("templateCode", "YD_ZF");// 短信模板编码 @@ -201,6 +202,7 @@ public class ElectricityServiceImpl implements ElectricityService { } }else{ electricityMapper.cancel(pd); + eightworkvideomanagerService.editStatus(cpd); PageData pd2 = new PageData(); pd2 = electricityMapper.checkno(pd); PageData pd3 = new PageData(); diff --git a/src/main/java/com/zcloud/service/eightWork/impl/HotworkServiceImpl.java b/src/main/java/com/zcloud/service/eightWork/impl/HotworkServiceImpl.java index 9a4fe9a..f628ac4 100644 --- a/src/main/java/com/zcloud/service/eightWork/impl/HotworkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightWork/impl/HotworkServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.eightWork.HotworkMapper; +import com.zcloud.service.eightWork.EightWorkVideoManagerService; import com.zcloud.service.eightWork.HotworkService; import com.zcloud.util.SendMessageUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +30,8 @@ public class HotworkServiceImpl implements HotworkService { private HotworkMapper hotworkMapper; @Autowired private SendMessageUtil sendMessageUtil; + @Autowired + private EightWorkVideoManagerService eightworkvideomanagerService; /**新增 * @param pd @@ -162,6 +165,7 @@ public class HotworkServiceImpl implements HotworkService { }else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") == null){ pd.put("APPLY_STATUS",-98); hotworkMapper.cancel(pd); + eightworkvideomanagerService.editStatus(cpd); PageData pd2 = new PageData(); pd2 = hotworkMapper.checkno(pd); PageData pd3 = new PageData(); @@ -196,6 +200,7 @@ public class HotworkServiceImpl implements HotworkService { }else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("MONITOR_USER_SIGNER_TIME") == null){ pd.put("APPLY_STATUS",-99); hotworkMapper.cancel(pd); + eightworkvideomanagerService.editStatus(cpd); PageData pd2 = new PageData(); pd2 = hotworkMapper.checkno(pd); PageData pd3 = new PageData(); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 9a95565..5fdb381 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.application.name=integrated_whb -server.port=8099 +server.port=8091 datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.url=jdbc:mysql://192.168.0.42:3306/integrated_whb?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 diff --git a/src/main/resources/mybatis/datasource/eightWork/EightWorkVideoManagerMapper.xml b/src/main/resources/mybatis/datasource/eightWork/EightWorkVideoManagerMapper.xml new file mode 100644 index 0000000..b8ca9e3 --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightWork/EightWorkVideoManagerMapper.xml @@ -0,0 +1,205 @@ + + + + + + + BUS_EIGHTWORK_VIDEOMANAGER + + + + + SYS_DICTIONARIES + + + + + f.EIGHTWORKVIDEOMANAGER_ID, + f.CORPINFO_ID, + f.VIDEOMANAGER_ID, + f.CREATTIME, + f.CREATOR, + f.ISDELETE, + f.OPERATTIME, + f.OPERATOR, + f.LONGITUDE, + f.LATITUDE, + f.CHECK_NO + + + + + EIGHTWORKVIDEOMANAGER_ID, + CORPINFO_ID, + VIDEOMANAGER_ID, + CREATTIME, + CREATOR, + ISDELETE, + OPERATTIME, + OPERATOR, + LONGITUDE, + LATITUDE, + CHECK_NO + + + + + #{EIGHTWORKVIDEOMANAGER_ID}, + #{CORPINFO_ID}, + #{VIDEOMANAGER_ID}, + #{CREATTIME}, + #{CREATOR}, + #{ISDELETE}, + #{OPERATTIME}, + #{OPERATOR}, + #{LONGITUDE}, + #{LATITUDE}, + #{CHECK_NO} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + EIGHTWORKVIDEOMANAGER_ID = #{EIGHTWORKVIDEOMANAGER_ID} + + + + + update + + set + EIGHTWORKVIDEOMANAGER_ID = #{EIGHTWORKVIDEOMANAGER_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + VIDEOMANAGER_ID = #{VIDEOMANAGER_ID}, + ISDELETE = #{ISDELETE}, + CREATTIME = #{CREATTIME}, + CREATOR = #{CREATOR}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + LONGITUDE = #{LONGITUDE}, + LATITUDE = #{LATITUDE}, + CHECK_NO = #{CHECK_NO} + + where + EIGHTWORKVIDEOMANAGER_ID = #{EIGHTWORKVIDEOMANAGER_ID} + + + + + update + + set + ISDELETE = '1' + where + CHECK_NO = #{CHECK_NO} + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + EIGHTWORKVIDEOMANAGER_ID in + + #{item} + + + + + diff --git a/src/main/resources/mybatis/dsno2/mq/MqErrorMessageLogMapper.xml b/src/main/resources/mybatis/dsno2/mq/MqErrorMessageLogMapper.xml index 90f81f4..4f16685 100644 --- a/src/main/resources/mybatis/dsno2/mq/MqErrorMessageLogMapper.xml +++ b/src/main/resources/mybatis/dsno2/mq/MqErrorMessageLogMapper.xml @@ -4,7 +4,7 @@ - MQ_ERROR_MESSAGE_LOG + MQ_MESSAGE_ERROR_LOG