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

八项作业添加监控

pull/4/head
chenxinying 2024-01-11 16:58:12 +08:00
parent a96b4f85df
commit 09f069e1ac
20 changed files with 739 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zcloud/controller/eightWork/AppBlindBoardController.java
View File

@ -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);

11
src/main/java/com/zcloud/controller/eightWork/AppBreakGroundController.java
View File

@ -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);

3
src/main/java/com/zcloud/controller/eightWork/AppConfinedSpaceController.java
View File

@ -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();

4
src/main/java/com/zcloud/controller/eightWork/AppCutRoadController.java
View File

@ -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);

4
src/main/java/com/zcloud/controller/eightWork/AppElectricityController.java
View File

@ -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();

11
src/main/java/com/zcloud/controller/eightWork/AppHighWorkController.java
View File

@ -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

9
src/main/java/com/zcloud/controller/eightWork/AppHoistingController.java
View File

@ -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();

258
src/main/java/com/zcloud/controller/eightWork/EightWorkVideoManagerController.java Normal file
View File

@ -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<String,Object> map = new HashMap<String,Object>();
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<String,Object> map = new HashMap<String,Object>();
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<String,String> map = new HashMap<String,String>();
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<String,Object> map = new HashMap<String,Object>();
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<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业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<PageData> 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<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(",");
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<String,Object> dataMap = new HashMap<String,Object>();
List<String> titles = new ArrayList<String>();
titles.add("设备管线名"); //1
titles.add("所属企业"); //2
titles.add("申请部门"); //3
titles.add("申请人"); //4
titles.add("删除标志"); //5
titles.add("创建时间"); //6
titles.add("添加人"); //7
titles.add("修改时间"); //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<PageData> varOList = eightworkvideomanagerService.listAll(pd);
List<PageData> varList = new ArrayList<PageData>();
for(int i=0;i<varOList.size();i++){
PageData vpd = new PageData();
vpd.put("var1", varOList.get(i).getString("NAME")); //1
vpd.put("var2", varOList.get(i).getString("CORP_INFO")); //2
vpd.put("var3", varOList.get(i).getString("APPLY_DEPARTMENT_ID")); //3
vpd.put("var4", varOList.get(i).getString("APPLY_USER_ID")); //4
vpd.put("var5", varOList.get(i).get("ISDELETE").toString()); //5
vpd.put("var6", varOList.get(i).getString("CREATTIME")); //6
vpd.put("var7", varOList.get(i).getString("CREATOR")); //7
vpd.put("var8", varOList.get(i).getString("OPERATTIME")); //8
vpd.put("var9", varOList.get(i).getString("OPERATOR")); //9
vpd.put("var10", varOList.get(i).getString("CHECK_NO")); //10
vpd.put("var11", varOList.get(i).getString("APPLY_USER_SIGNER_PATH")); //11
vpd.put("var12", varOList.get(i).getString("APPLY_USER_SIGNER_TIME")); //12
vpd.put("var13", varOList.get(i).getString("MEDIUM")); //13
vpd.put("var14", varOList.get(i).getString("TEMPERATURE")); //14
vpd.put("var15", varOList.get(i).getString("CONSTRUCTION_DEPARTMENT_ID")); //15
vpd.put("var16", varOList.get(i).getString("CONSTRUCTION_USER_ID")); //16
vpd.put("var17", varOList.get(i).getString("CONSTRUCTION_USER_SIGNER_PATH")); //17
vpd.put("var18", varOList.get(i).getString("CONSTRUCTION_USER_SIGNER_TIME")); //18
vpd.put("var19", varOList.get(i).getString("PRODUCTION_DEPARTMENT_ID")); //19
vpd.put("var20", varOList.get(i).getString("PRODUCTION_USER_ID")); //20
vpd.put("var21", varOList.get(i).getString("PRODUCTION_USER_SIGNER_PATH")); //21
vpd.put("var22", varOList.get(i).getString("PRODUCTION_USER_SIGNER_TIME")); //22
vpd.put("var23", varOList.get(i).getString("SAFETY_DEPARTMENT_ID")); //23
vpd.put("var24", varOList.get(i).getString("SAFETY_USER_ID")); //24
vpd.put("var25", varOList.get(i).getString("SAFETY_USER_SIGNER_PATH")); //25
vpd.put("var26", varOList.get(i).getString("SAFETY_USER_SIGNER_TIME")); //26
vpd.put("var27", varOList.get(i).getString("LEADER_DEPARTMENT_ID")); //27
vpd.put("var28", varOList.get(i).getString("LEADER_USER_ID")); //28
vpd.put("var29", varOList.get(i).getString("LEADER_USER_SIGNER_PATH")); //29
vpd.put("var30", varOList.get(i).getString("LEADER_USER_SIGNER_TIME")); //30
vpd.put("var31", varOList.get(i).getString("ACCEPT_DEPARTMENT_ID")); //31
vpd.put("var32", varOList.get(i).getString("ACCEPT_USER_ID")); //32
vpd.put("var33", varOList.get(i).getString("ACCEPT_USER_SIGNER_PATH")); //33
vpd.put("var34", varOList.get(i).getString("ACCEPT_USER_SIGNER_TIME")); //34
vpd.put("var35", varOList.get(i).getString("APPLY_STATUS")); //35
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap);
return mv;
}
}

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

@ -126,7 +126,7 @@ public class VideoManagerController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/list")
@RequiresPermissions("videomanager:list")
// @RequiresPermissions("videomanager:list")
@ResponseBody
@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "列表")
public Object list(Page page) throws Exception{

66
src/main/java/com/zcloud/mapper/datasource/eightWork/EightWorkVideoManagerMapper.java Normal file
View File

@ -0,0 +1,66 @@
package com.zcloud.mapper.datasource.eightWork;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：盲板作业
* 作者：luoxiaobao
* 时间：2021-08-23
* 官网：www.zcloudchina.com
*/
public interface EightWorkVideoManagerMapper {
/**新增
* @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 pd
* @throws Exception
*/
void editStatus(PageData pd);
/**列表
* @param page
* @throws Exception
*/
List<PageData> datalistPage(Page page);
/**列表(全部)
* @param pd
* @throws Exception
*/
List<PageData> listAll(PageData pd);
/**通过id获取数据
* @param pd
* @throws Exception
*/
PageData findById(PageData pd);
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
void deleteAll(String[] ArrayDATA_IDS);
}

4
src/main/java/com/zcloud/service/eightWork/ConfinedSpaceService.java
View File

@ -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;
}

67
src/main/java/com/zcloud/service/eightWork/EightWorkVideoManagerService.java Normal file
View File

@ -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<PageData> list(Page page)throws Exception;
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception;
/**通过id获取数据
* @param pd
* @throws Exception
*/
public PageData findById(PageData pd)throws Exception;
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
}

3
src/main/java/com/zcloud/service/eightWork/ElectricityService.java
View File

@ -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;
}

10
src/main/java/com/zcloud/service/eightWork/impl/ConfinedSpaceServiceImpl.java
View File

@ -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<String,String> map = new HashMap<String,String>();
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();

93
src/main/java/com/zcloud/service/eightWork/impl/EightWorkVideoManagerServiceImpl.java Normal file
View File

@ -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<PageData> list(Page page)throws Exception{
return eightworkvideomanagerMapper.datalistPage(page);
}
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> 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);
}
}

10
src/main/java/com/zcloud/service/eightWork/impl/ElectricityServiceImpl.java
View File

@ -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<String,String> map = new HashMap<String,String>();
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();

5
src/main/java/com/zcloud/service/eightWork/impl/HotworkServiceImpl.java
View File

@ -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();

2
src/main/resources/application.properties
View File

@ -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

205
src/main/resources/mybatis/datasource/eightWork/EightWorkVideoManagerMapper.xml Normal file
View File

@ -0,0 +1,205 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper">
<!--表名 -->
<sql id="tableName">
BUS_EIGHTWORK_VIDEOMANAGER
</sql>
<!--数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<!-- 字段 -->
<sql id="Field">
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
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
EIGHTWORKVIDEOMANAGER_ID,
CORPINFO_ID,
VIDEOMANAGER_ID,
CREATTIME,
CREATOR,
ISDELETE,
OPERATTIME,
OPERATOR,
LONGITUDE,
LATITUDE,
CHECK_NO
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{EIGHTWORKVIDEOMANAGER_ID},
#{CORPINFO_ID},
#{VIDEOMANAGER_ID},
#{CREATTIME},
#{CREATOR},
#{ISDELETE},
#{OPERATTIME},
#{OPERATOR},
#{LONGITUDE},
#{LATITUDE},
#{CHECK_NO}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1'
where
EIGHTWORKVIDEOMANAGER_ID = #{EIGHTWORKVIDEOMANAGER_ID}
</delete>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
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>
<!-- 修改 -->
<update id="editStatus" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1'
where
CHECK_NO = #{CHECK_NO}
</update>
<!-- 通过ID获取数据 -->
<select id="findById" parameterType="pd" resultType="pd">
select
f.EIGHTWORKVIDEOMANAGER_ID,
f.CORPINFO_ID,
f.VIDEOMANAGER_ID,
f.CREATTIME,
f.CREATOR,
f.ISDELETE,
f.OPERATTIME,
f.OPERATOR,
f.LONGITUDE,
f.LATITUDE,
bc.VIDEONAME,
bc.CODE,
bc.GBS_NUM,
bc.VIDEOURL,
f.CHECK_NO
from
<include refid="tableName"></include> f
left join BUS_VIDEOMANAGER bc on bc.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID and bc.ISDELETE = '0'
where
f.VIDEOMANAGER_ID = #{VIDEOMANAGER_ID} and
f.ISDELETE = '0'
<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
and f.CORPINFO_ID=#{CORPINFO_ID}
</if>
</select>
<!-- 列表 -->
<select id="datalistPage" parameterType="page" resultType="pd">
select
f.EIGHTWORKVIDEOMANAGER_ID,
f.CORPINFO_ID,
f.VIDEOMANAGER_ID,
f.CREATTIME,
f.CREATOR,
f.ISDELETE,
f.OPERATTIME,
f.OPERATOR,
f.LONGITUDE,
f.LATITUDE,
bc.VIDEONAME,
bc.CODE,
bc.GBS_NUM,
bc.VIDEOURL,
f.CHECK_NO
from
<include refid="tableName"></include> f
left join BUS_VIDEOMANAGER bc on bc.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID and bc.ISDELETE = '0'
where f.ISDELETE = '0'
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.CHECK_NO != null and pd.CHECK_NO != ''">
and f.CHECK_NO = #{pd.CHECK_NO}
</if>
<if test="pd.CREATOR != null and pd.CREATOR != ''">
and f.CREATOR = #{pd.CREATOR}
</if>
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
f.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
ORDER BY f.CREATTIME DESC
</select>
<!-- 列表(全部) -->
<select id="listAll" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
</select>
<!-- 批量删除 -->
<delete id="deleteAll" parameterType="String">
update
<include refid="tableName"></include>
set
ISDELETE = '1'
where
EIGHTWORKVIDEOMANAGER_ID in
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
</mapper>

2
src/main/resources/mybatis/dsno2/mq/MqErrorMessageLogMapper.xml
View File

@ -4,7 +4,7 @@
<!--表名 -->
<sql id="tableName">
MQ_ERROR_MESSAGE_LOG
MQ_MESSAGE_ERROR_LOG
</sql>
<!--数据字典表名 -->