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

Merge branch 'guoyuepeng-1212-八项作业迁移' into 1212-八项作业迁移

pull/5/head
dearlin 2023-12-22 09:09:20 +08:00
parent 0d9228dda4 519c0be3e7
commit 2bdacb3f08
116 changed files with 9163 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1656,7 +1656,7 @@ public class AppHiddenController extends BaseController {
inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID"));
inspection.put("OPERATOR", pd.getString("FINAL_CHECKOR"));
inspection.put("OPERATTIME", DateUtil.date2Str(new Date()));
inspection.put("INSPECTION_STATUS", "7"); // 已验收
inspection.put("INSPECTION_STATUS", "8"); // 已验收
safetyenvironmentalService.editStatus(inspection);
}
}

97
src/main/java/com/zcloud/controller/app/highriskwork/AppConfinedSpaceController.java
View File

@ -6,6 +6,7 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
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.bus.CorpInfoService;
import com.zcloud.service.bus.MSMLoginService;
import com.zcloud.service.bus.NoticeCorpService;
@ -21,9 +22,7 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
@ -58,6 +57,9 @@ public class AppConfinedSpaceController extends BaseController {
@Autowired
private NoticeCorpService noticeCorpService;
@Autowired
private SendMessageUtil sendMessageUtil;
/**新增
* @param
* @throws Exception
@ -551,4 +553,93 @@ public class AppConfinedSpaceController extends BaseController {
map.put("count", count);
return map;
}
/**作废
* @param out
* @throws Exception
*/
@PostMapping(value="/cancel")
@ResponseBody
@LogAnno(menuType= "手机",menuServer= "受限空间",instructionsOperate = "受限空间",instructionsType = "作废")
public void cancel(@RequestBody PageData pd) throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
System.out.println(JSONObject.toJSONString(pd));
PageData cpd = new PageData();
cpd = confinedspaceService.findById(pd);
if(cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") != null){
return;
}else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") == null){
pd.put("APPLY_STATUS",-98);
confinedspaceService.cancel(pd);
PageData pd2 = new PageData();
pd2 = confinedspaceService.checkno(pd);
PageData pd3 = new PageData();
pd3.put("CHECK_NO",pd2.getString("CHECK_NO"));
pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID"));
confinedspaceService.editSpecialwork(pd3);
confinedspaceService.editSpecialwork1(pd3);
confinedspaceService.editSpecialwork2(pd3);
confinedspaceService.editSpecialwork3(pd3);
confinedspaceService.editSpecialwork4(pd3);
confinedspaceService.editSpecialwork5(pd3);
confinedspaceService.editSpecialwork6(pd3);
confinedspaceService.editSpecialwork7(pd3);
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
mes.put("templateCode", "YX_ZF1");// 短信模板编码
mes.put("SMSCode", "SMS_462060039");// 短信模板编码
mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList = new ArrayList<PageData>();
// 第1个参数
PageData params1 = new PageData();
params1.put("name", "number");// 存入短信模板中的参数名称
params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList.add(params1);
// 第2个参数
PageData params2 = new PageData();
params2.put("name", "params1");// 存入短信模板中的参数名称
params2.put("value", "受限空间作业");// 存入上面参数名称所传递的值
paramsList.add(params2);
sendMessageUtil.sendMessages(mes, paramsList);
}else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") == null){
pd.put("APPLY_STATUS",-99);
confinedspaceService.cancel(pd);
PageData pd2 = new PageData();
pd2 = confinedspaceService.checkno(pd);
PageData pd3 = new PageData();
pd3.put("CHECK_NO",pd2.getString("CHECK_NO"));
pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID"));
confinedspaceService.editSpecialwork(pd3);
confinedspaceService.editSpecialwork1(pd3);
confinedspaceService.editSpecialwork2(pd3);
confinedspaceService.editSpecialwork3(pd3);
confinedspaceService.editSpecialwork4(pd3);
confinedspaceService.editSpecialwork5(pd3);
confinedspaceService.editSpecialwork6(pd3);
confinedspaceService.editSpecialwork7(pd3);
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
mes.put("templateCode", "YX_ZF2");// 短信模板编码
mes.put("SMSCode", "SMS_462060039");// 短信模板编码
mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList = new ArrayList<PageData>();
// 第1个参数
PageData params1 = new PageData();
params1.put("name", "number");// 存入短信模板中的参数名称
params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList.add(params1);
// 第2个参数
PageData params2 = new PageData();
params2.put("name", "params1");// 存入短信模板中的参数名称
params2.put("value", "受限空间作业");// 存入上面参数名称所传递的值
paramsList.add(params2);
sendMessageUtil.sendMessages(mes, paramsList);
}
map.put("result", errInfo); //返回结果
return ;
}
}

101
src/main/java/com/zcloud/controller/app/highriskwork/AppElectricityController.java
View File

@ -6,6 +6,7 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
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.bus.CorpInfoService;
import com.zcloud.service.bus.MSMLoginService;
import com.zcloud.service.bus.NoticeCorpService;
@ -22,12 +23,12 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@ -60,6 +61,9 @@ public class AppElectricityController extends BaseController {
private NoticeCorpService noticeCorpService;
@Autowired
private DepartmentService departmentService;
@Autowired
private SendMessageUtil sendMessageUtil;
/**新增
* @param
* @throws Exception
@ -1160,4 +1164,95 @@ public class AppElectricityController extends BaseController {
map.put("count", count);
return map;
}
/**作废
* @param out
* @throws Exception
*/
@PostMapping(value="/cancel")
@ResponseBody
@LogAnno(menuType= "手机",menuServer= "受限空间",instructionsOperate = "受限空间",instructionsType = "作废")
public void cancel(@RequestBody PageData pd) throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
System.out.println(JSONObject.toJSONString(pd));
PageData cpd = new PageData();
cpd = electricityService.findById(pd);
if(cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null){
String WORK_START_DATE = pd.getString("WORK_START_DATE");
String ANALYZE_TIME = cpd.getString("ANALYZE_TIME");
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
System.out.println(WORK_START_DATE);
System.out.println(ANALYZE_TIME);
System.out.println("-------------123----------");
try {
Date date1 = format.parse(WORK_START_DATE);
Date date2 = format.parse(ANALYZE_TIME);
long workTime = date1.getTime();
long analyzeTime = date2.getTime();
System.out.println(workTime - analyzeTime);
System.out.println(analyzeTime - workTime);
if (workTime - analyzeTime >= 0) {
return;
} else {
electricityService.cancel(pd);
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
mes.put("templateCode", "YD_ZF");// 短信模板编码
mes.put("SMSCode", "SMS_462060039");// 短信模板编码
mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList = new ArrayList<PageData>();
// 第1个参数
PageData params1 = new PageData();
params1.put("name", "number");// 存入短信模板中的参数名称
params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList.add(params1);
// 第2个参数
PageData params2 = new PageData();
params2.put("name", "params1");// 存入短信模板中的参数名称
params2.put("value", "临时用电安全作业");// 存入上面参数名称所传递的值
paramsList.add(params2);
sendMessageUtil.sendMessages(mes, paramsList);
}
} catch (ParseException e) {
e.printStackTrace();
}
}else{
electricityService.cancel(pd);
PageData pd2 = new PageData();
pd2 = electricityService.checkno(pd);
PageData pd3 = new PageData();
pd3.put("CHECK_NO",pd2.getString("CHECK_NO"));
pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID"));
electricityService.editSpecialwork(pd3);
electricityService.editSpecialwork1(pd3);
electricityService.editSpecialwork2(pd3);
electricityService.editSpecialwork3(pd3);
electricityService.editSpecialwork4(pd3);
electricityService.editSpecialwork5(pd3);
electricityService.editSpecialwork6(pd3);
electricityService.editSpecialwork7(pd3);
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
mes.put("templateCode", "YD_ZF");// 短信模板编码
mes.put("SMSCode", "SMS_462060039");// 短信模板编码
mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList = new ArrayList<PageData>();
// 第1个参数
PageData params1 = new PageData();
params1.put("name", "number");// 存入短信模板中的参数名称
params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList.add(params1);
// 第2个参数
PageData params2 = new PageData();
params2.put("name", "params1");// 存入短信模板中的参数名称
params2.put("value", "临时用电安全作业");// 存入上面参数名称所传递的值
paramsList.add(params2);
sendMessageUtil.sendMessages(mes, paramsList);
}
map.put("result", errInfo); //返回结果
return ;
}
}

43
src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java
View File

@ -9,6 +9,7 @@ import com.zcloud.service.inspection.SafetyEnvironmentalInspectorService;
import com.zcloud.service.inspection.SafetyEnvironmentalService;
import com.zcloud.service.keyProjects.KeyprojectHiddenService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@ -86,6 +87,26 @@ public class AppHomeController extends BaseController {
PageData myGasAnaly = new PageData();
if(!Tools.isEmpty(pd.get("USER_ID"))){
varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID"));
PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID"));
if (Integer.parseInt(delayedCount.getString("count")) != 0) {
if (varList.size() > 0) {
boolean isDelayedExist = false;
for (PageData data : varList) {
if (StringUtils.equals(data.getString("STATE"), "10")) isDelayedExist = true;
}
if (isDelayedExist) {
for (PageData pageData : varList) {
if (StringUtils.equals(pageData.getString("STATE"), "10")) {
pageData.put("count", delayedCount.getString("count"));
}
}
} else {
varList.add(delayedCount);
}
} else {
varList.add(delayedCount);
}
}
myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID"));
}
map.put("result", errInfo);
@ -126,6 +147,26 @@ public class AppHomeController extends BaseController {
PageData myGasAnaly = new PageData();
if(!Tools.isEmpty(pd.get("USER_ID"))){
varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID"));
PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID"));
if (Integer.parseInt(delayedCount.getString("count")) != 0) {
if (varList.size() > 0) {
boolean isDelayedExist = false;
for (PageData data : varList) {
if (StringUtils.equals(data.getString("STATE"), "10")) isDelayedExist = true;
}
if (isDelayedExist) {
for (PageData pageData : varList) {
if (StringUtils.equals(pageData.getString("STATE"), "10")) {
pageData.put("count", delayedCount.getString("count"));
}
}
} else {
varList.add(delayedCount);
}
} else {
varList.add(delayedCount);
}
}
myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID"));
}
@ -142,7 +183,7 @@ public class AppHomeController extends BaseController {
//统计消防总数
List<PageData> dataList = fireCheckListService.getFireCheckListCountByApp(pd);
map.put("result", errInfo);
map.put("blindboardCount", blindboardCount);
map.put("breakGroundCount", breakGroundCount);

127
src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java
View File

@ -17,6 +17,7 @@ import com.zcloud.service.system.FHlogService;
import com.zcloud.util.*;
import com.zcloud.util.message.MessageService;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.crypto.hash.SimpleHash;
import org.apache.xpath.SourceTree;
@ -745,42 +746,44 @@ public class AppHotWorkApplicationController extends BaseController {
}
}
PageData hotUser = new PageData();
hotUser.put("hotIds", hotIds);
List<PageData> hotUserAllList = hotWorkApplicationUserService.listAll(hotUser);
for (PageData userPageData : hotUserAllList){
String hotAndType = userPageData.getString("FOREIGN_KEY");
if(hotIdKeyMap.containsKey(hotAndType)){
PageData hot = varList.get(hotIdKeyMap.get(hotAndType));
String type = userPageData.get("STATE").toString();
if("0".equals(type)){ // 申请办理人
hot.put("APPLY_DEPARTMENT_NAME",userPageData.getString("deptName"));
hot.put("APPLY_USER_NAME",userPageData.getString("userName"));
hot.put("APPLY_USER_ID",userPageData.getString("USER_ID"));
}else if("1".equals(type)){ //动火单位负责人
hot.put("HOT_WORK_UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("HOT_WORK_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("2".equals(type)){ // 项目发包单位负责人
hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("3".equals(type)){ // 现场管辖单位负责人
hot.put("UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("5".equals(type)){ // 动火前 负责人
hot.put("HOT_WORK_BEFORE_UNIT_LEADER",userPageData.getString("userName"));
}else if("6".equals(type)){ // 现场负责人
hot.put("SITE_LEADER_NAME",userPageData.getString("userName"));
hot.put("SITE_LEADER_PHONE",userPageData.getString("userPhone"));
}else if("7".equals(type)){ // 动火后 负责人
hot.put("HOT_WORK_AFTER_UNIT_LEADER",userPageData.getString("userName"));
} else if("11".equals(type)){ // 特级动火 申请人
hot.put("DEPARTMENT_PERSONNEL_NAME",userPageData.getString("userName"));
hot.put("DEPARTMENT_PERSONNEL_ID",userPageData.getString("USER_ID"));
}else if("20".equals(type)){ // 特级动火 申请人
hot.put("SUPERVISOR_OF_HOT_WORK_UNIT",userPageData.getString("USER_ID"));
}else if("21".equals(type)){ // 动火后 负责人
String userName = userPageData.getString("userName2") +",";
String oldName = Tools.isEmpty(pd.get("HOT_WORK_OPERATOR_NAME"))?"":pd.get("HOT_WORK_OPERATOR_NAME").toString();
hot.put("HOT_WORK_OPERATOR_NAME",oldName + userName);
if (hotIds.size() > 0) {
hotUser.put("hotIds", hotIds);
List<PageData> hotUserAllList = hotWorkApplicationUserService.listAll(hotUser);
for (PageData userPageData : hotUserAllList){
String hotAndType = userPageData.getString("FOREIGN_KEY");
if(hotIdKeyMap.containsKey(hotAndType)){
PageData hot = varList.get(hotIdKeyMap.get(hotAndType));
String type = userPageData.get("STATE").toString();
if("0".equals(type)){ // 申请办理人
hot.put("APPLY_DEPARTMENT_NAME",userPageData.getString("deptName"));
hot.put("APPLY_USER_NAME",userPageData.getString("userName"));
hot.put("APPLY_USER_ID",userPageData.getString("USER_ID"));
}else if("1".equals(type)){ //动火单位负责人
hot.put("HOT_WORK_UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("HOT_WORK_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("2".equals(type)){ // 项目发包单位负责人
hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("3".equals(type)){ // 现场管辖单位负责人
hot.put("UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("5".equals(type)){ // 动火前 负责人
hot.put("HOT_WORK_BEFORE_UNIT_LEADER",userPageData.getString("userName"));
}else if("6".equals(type)){ // 现场负责人
hot.put("SITE_LEADER_NAME",userPageData.getString("userName"));
hot.put("SITE_LEADER_PHONE",userPageData.getString("userPhone"));
}else if("7".equals(type)){ // 动火后 负责人
hot.put("HOT_WORK_AFTER_UNIT_LEADER",userPageData.getString("userName"));
} else if("11".equals(type)){ // 特级动火 申请人
hot.put("DEPARTMENT_PERSONNEL_NAME",userPageData.getString("userName"));
hot.put("DEPARTMENT_PERSONNEL_ID",userPageData.getString("USER_ID"));
}else if("20".equals(type)){ // 特级动火 申请人
hot.put("SUPERVISOR_OF_HOT_WORK_UNIT",userPageData.getString("USER_ID"));
}else if("21".equals(type)){ // 动火后 负责人
String userName = userPageData.getString("userName2") +",";
String oldName = Tools.isEmpty(pd.get("HOT_WORK_OPERATOR_NAME"))?"":pd.get("HOT_WORK_OPERATOR_NAME").toString();
hot.put("HOT_WORK_OPERATOR_NAME",oldName + userName);
}
}
}
}
@ -806,11 +809,30 @@ public class AppHotWorkApplicationController extends BaseController {
hotUserPd.put("STATE",pd.get("STATE").toString()); // 哪一步
hotUserPd.put("USER_ID",pd.getString("loginUserId"));// 登录人
List<PageData> hotUserList = hotWorkApplicationUserService.listAll(hotUserPd); // 找到这一笔的审批人
if(hotUserList.size() != 1){
map.put("result", "error");
map.put("msg", "获取审批人意见失败！请联系管理员");
return map;
if ("10".equals(pd.get("STATE").toString())) {
PageData hotWorkApplication = hotworkapplicationService.findById(pd);
if(!Tools.isEmpty(hotWorkApplication) && hotWorkApplication.getString("STATE").equals("11")){ // 判断此作业是否已归档
map.put("result", "error");
map.put("msg", "此作业已归档，请勿重复操作！");
return map;
}
}
List<PageData> hotUserList = new ArrayList<>();
if (!pd.getString("STATE").equals("10")) {
hotUserList = hotWorkApplicationUserService.listAll(hotUserPd); // 找到这一笔的审批人
if (hotUserList.size() != 1) {
map.put("result", "error");
map.put("msg", "获取审批人意见失败！请联系管理员");
return map;
}
} else {
hotUserList = hotWorkApplicationUserService.listByDepartment(hotUserPd); // 找到这一笔的审批人们
if (hotUserList.size() < 1) {
map.put("result", "error");
map.put("msg", "获取审批人意见失败！请联系管理员");
return map;
}
}
@ -953,7 +975,8 @@ public class AppHotWorkApplicationController extends BaseController {
}else if("9".equals(pd.getString("STATE"))){ // 添加 临时监火
PageData leaderUser = new PageData();
leaderUser.put("HOTWORKAPPLICATIONUSER_ID", UuidUtil.get32UUID());
leaderUser.put("USER_ID",pd.get("TIME_LAPSE_FIREMAN_ID"));
// leaderUser.put("USER_ID",pd.get("TIME_LAPSE_FIREMAN_ID"));
leaderUser.put("USER_ID",pd.get("TIME_LAPSE_FIREMAN_DEPARTMENT_ID"));
leaderUser.put("STATE","10");
leaderUser.put("TYPE","-1");
leaderUser.put("ISDELETE","0");
@ -1339,6 +1362,26 @@ public class AppHotWorkApplicationController extends BaseController {
PageData myGasAnaly = new PageData();
if(!Tools.isEmpty(pd.get("USER_ID"))){
varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID"));
PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID"));
if (Integer.parseInt(delayedCount.getString("count")) != 0) {
if (varList.size() > 0) {
boolean isDelayedExist = false;
for (PageData data : varList) {
if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true;
}
if (isDelayedExist) {
for (PageData pageData : varList){
if (StringUtils.equals(pageData.getString("STATE"),"10")) {
pageData.put("count",delayedCount.getString("count"));
}
}
} else {
varList.add(delayedCount);
}
} else {
varList.add(delayedCount);
}
}
myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID"));
}
map.put("varList", varList);

38
src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java
View File

@ -1,5 +1,10 @@
package com.zcloud.controller.app.highriskwork;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@ -22,6 +27,8 @@ import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.highriskwork.HotWorkApplicationDelayedService;
import javax.imageio.ImageIO;
/**
* 说明：延时监火
* 作者：luoxiaobao
@ -62,9 +69,38 @@ public class AppHotWorkApplicationDelayedController extends BaseController {
map.put("msg", "文件格式不正确！");
return map;
}
Image srcImg = ImageIO.read(file.getInputStream());
//获取图片的宽
int srcImgWidth = srcImg.getWidth(null);
//获取图片的高
int srcImgHeight = srcImg.getHeight(null);
BufferedImage bufImg = new BufferedImage(srcImgWidth, srcImgHeight, BufferedImage.TYPE_INT_RGB);
// 加水印
//创建画笔
Graphics2D g = bufImg.createGraphics();
//srcImg 为上面获取到的原始图片的图片对象
g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null);
//根据图片的背景设置水印颜色
g.setColor(new Color(255,255,255,128));
//设置字体 画笔字体样式为微软雅黑，加粗，文字大小为60pt
g.setFont(new Font("微软雅黑", Font.BOLD, 20));
//设置水印的坐标
int x=(srcImgWidth - WaterMarkUtil.getWatermarkLength(DateUtil.date2Str(new Date()), g)) / 2;
int y=srcImgHeight / 2;
//画出水印 第一个参数是水印内容，第二个参数是x轴坐标，第三个参数是y轴坐标
g.drawString(DateUtil.date2Str(new Date()), x, y);
g.dispose();
//将加完水印的图片暂存到内存中
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ImageIO.write(bufImg, suffixName, bos);
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile);
// Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile);
//通过流的方式上传文件
Smb.sshSftpForInput(bis, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile);
pd.put("FILEPATH",Const.FILEPATHYHTP + corpInfoId + "/" + ffile + "/" + fileName);
}
hotworkapplicationdelayedService.save(pd);

1513
src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java Normal file
View File

File diff suppressed because it is too large Load Diff

20
src/main/java/com/zcloud/controller/bus/CorpInfoController.java
View File

@ -10,6 +10,7 @@ import java.util.Map;
import com.zcloud.service.bus.CorpInfoRelatedService;
import com.zcloud.service.system.DictionariesService;
import com.zcloud.util.*;
import net.sf.json.JSONArray;
import org.apache.commons.io.FileUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -583,4 +584,23 @@ public class CorpInfoController extends BaseController {
map.put("result", errInfo);
return map;
}
/**
* 显示列表ztree(只查企业端部门) 有排序
*
* @return
*/
@RequestMapping(value = "/listTreeManageAndCorpHasOrder")
@ResponseBody
public Object listTreeManageAndCorpHasOrder() throws Exception {
Map<String, String> map = new HashMap<String, String>();
String errInfo = "success";
PageData pd = new PageData();
pd.put("DEPARTMENT_ID", "0"); //查询父节点为0的根节点数据
List<PageData> rootList = departmentService.listTreeManageAndCorpHasOrder(pd);
JSONArray arr = JSONArray.fromObject(rootList);
map.put("zTreeNodes", arr.toString());
map.put("result", errInfo);
return map;
}
}

2
src/main/java/com/zcloud/controller/bus/HiddenController.java
View File

@ -2902,7 +2902,7 @@ public class HiddenController extends BaseController {
inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID"));
inspection.put("OPERATOR", Jurisdiction.getUSER_ID());
inspection.put("OPERATTIME", DateUtil.date2Str(new Date()));
inspection.put("INSPECTION_STATUS", "7"); // 已验收
inspection.put("INSPECTION_STATUS", "8"); // 已验收
safetyenvironmentalService.editStatus(inspection);
}

2
src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java
View File

@ -1311,6 +1311,8 @@ public class HotWorkApplicationController extends BaseController {
hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("4".equals(type)){ // 现场管辖单位负责人
hot.put("UNIT_LEADER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID"));
hot.put("UNIT_LEADER_DEPARTMENT_NAME",userPageData.getString("deptName"));
hot.put("UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("5".equals(type)){ // 动火前 负责人

160
src/main/java/com/zcloud/controller/eightWork/AppEightWorkCfdController.java Normal file
View File

@ -0,0 +1,160 @@
package com.zcloud.controller.eightWork;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.entity.Response;
import com.zcloud.logs.LogAnno;
import com.zcloud.service.eightWork.EightWorkCfdService;
import com.zcloud.service.highriskwork.*;
import com.zcloud.service.system.DictionariesService;
import com.zcloud.service.system.UsersService;
import com.zcloud.util.Tools;
import com.zcloud.util.Warden;
import org.apache.commons.lang.StringUtils;
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 java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 说明：八项作业
* 作者：luoxiaobao
* 时间：2021-08-31
* 官网：www.zcloudchina.com
*/
@Controller
@RequestMapping("/app/eightwork/cfd")
public class AppEightWorkCfdController extends BaseController {
@Autowired
private EightWorkCfdService eightworkCfdService;
@Autowired
private DictionariesService dictionariesService;
@Autowired
private UsersService usersService;
@Autowired
private ConfinedSpaceService confinedSpaceService;
@Autowired
private BlindBoardService blindBoardService;
@Autowired
private BreakGroundService breakGroundService;
@Autowired
private HighWorkService highWorkService;
@Autowired
private HoistingService hoistingService;
@Autowired
private ElectricityService electricityService;
@Autowired
private HotworkService hotworkService;
@Autowired
private CutRoadService cutRoadService;
/**八项作业列表
* @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());
page.setPd(pd);
List<PageData> varList = eightworkCfdService.list(page); //列出confinedspace列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
* description:
* accidentType-风险点
* hiddenLevel-隐患级别
*
* @return tree or list
* @throws Exception all
*/
@RequestMapping(value = "/getInfo")
@ResponseBody
public Response getInfo() throws Exception {
Response response = Response.getResponse();
try {
PageData request = this.getPageData();
if (StringUtils.isBlank(request.getString("vectors"))) throw new RuntimeException("未找到要获取的数据字典类型");
List<String> vectors = Warden.getList(request.getString("vectors"),String.class);
for (String vector: vectors) {
switch (vector) {
case "accidentType":
//事故类型
response.put("accidentType", dictionariesService.getTreeById("cee1190ea96a4ca9b7bca81e11f0d0f8"));
continue;
default:
}
}
return response.OK();
} catch (Exception e) {
e.printStackTrace();
return response.errorMessage(e.getMessage());
}
}
/**
* 获取全部用户列表
* @return
* @throws Exception
*/
@RequestMapping(value = "/getAllUserList")
@ResponseBody
public Object getAllUserList() throws Exception{
Map<String,Object> map = new HashMap<>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
return usersService.getAllUserList();
}
/**
* 高危作业待办数量统计
* @return
* @throws Exception
*/
@RequestMapping(value = "/countCheck")
@ResponseBody
public Object countCheck() throws Exception{
Map<String, Object> map = new HashMap<>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData count1 = confinedSpaceService.countCheck(pd);
PageData count2 = blindBoardService.countCheck(pd);
PageData count3 = breakGroundService.countCheck(pd);
PageData count4 = highWorkService.countCheck(pd);
PageData count5 = hoistingService.countCheck(pd);
PageData count6 = electricityService.countCheck(pd);
PageData count7 = hotworkService.countCheck(pd);
PageData count8 = cutRoadService.countCheck(pd);
map.put("result", errInfo);
map.put("count1", count1);
map.put("count2", count2);
map.put("count3", count3);
map.put("count4", count4);
map.put("count5", count5);
map.put("count6", count6);
map.put("count7", count7);
map.put("count8", count8);
return map;
}
}

6
src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java
View File

@ -3,11 +3,12 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.dto.TenCorpConst;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mq.util.TenCorpConst;
import com.zcloud.service.gf.*;
import com.zcloud.service.mq.SendMessageService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -16,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartRequest;
import com.zcloud.mq.service.SendMessageService;
import javax.annotation.Resource;
import java.text.DecimalFormat;

9
src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java
View File

@ -3,12 +3,12 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.dto.mq.Response;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.dto.TenCorpConst;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mq.util.TenCorpConst;
import com.zcloud.service.gf.*;
import com.zcloud.service.mq.SendMessageService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartRequest;
import com.zcloud.mq.service.SendMessageService;
import javax.annotation.Resource;
import java.text.DecimalFormat;
@ -182,8 +181,6 @@ public class AppGFElectricityController extends BaseController {
}
/**删除
* @param out
* @throws Exception
*/
@RequestMapping(value="/delete")
@ResponseBody

9
src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java
View File

@ -3,13 +3,12 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.dto.mq.Response;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.dto.TenCorpConst;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mq.service.SendMessageService;
import com.zcloud.mq.util.TenCorpConst;
import com.zcloud.service.gf.*;
import com.zcloud.service.mq.SendMessageService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -195,8 +194,6 @@ public class AppGFHotworkController extends BaseController {
}
/**修改
* @param
* @throws Exception
*/
@RequestMapping(value="/edit")
@ResponseBody

318
src/main/java/com/zcloud/controller/highriskwork/HotworkCfdController.java Normal file
View File

@ -0,0 +1,318 @@
package com.zcloud.controller.highriskwork;
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.highriskwork.HotworkAcceptUserCfdService;
import com.zcloud.service.highriskwork.HotworkCfdService;
import com.zcloud.service.highriskwork.HotworkGasCfdService;
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.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 说明：动火作业
* 作者：luoxiaobao
* 时间：2021-09-18
* 官网：www.zcloudchina.com
*/
@Controller
@RequestMapping("/hotwork/cfd")
public class HotworkCfdController extends BaseController {
@Autowired
private HotworkCfdService hotworkCfdService;
@Autowired
private HotworkGasCfdService hotworkGasCfdService;
@Autowired
private HotworkAcceptUserCfdService hotworkacceptuserCfdService;
/**新增
* @param
* @throws Exception
*/
@RequestMapping(value="/add")
@RequiresPermissions("hotwork: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("HOTWORK_ID", this.get32UUID()); //主键
hotworkCfdService.save(pd);
map.put("result", errInfo);
return map;
}
/**删除
* @param out
* @throws Exception
*/
@RequestMapping(value="/delete")
@RequiresPermissions("hotwork:del")
@ResponseBody
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
hotworkCfdService.delete(pd);
map.put("result", errInfo); //返回结果
return map;
}
/**修改
* @param
* @throws Exception
*/
@RequestMapping(value="/edit")
@RequiresPermissions("hotwork: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();
hotworkCfdService.edit(pd);
map.put("result", errInfo);
return map;
}
/**列表
* @param page
* @throws Exception
*/
@RequestMapping(value="/list")
@RequiresPermissions("hotwork: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 = hotworkCfdService.list(page); //列出Hotwork列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
*/
@RequestMapping(value="/goEdit")
@ResponseBody
@LogAnno(menuType= "高危作业管理",menuServer= "动火作业管理",instructionsOperate = "动火作业数据",instructionsType = "去修改页面获取数据")
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = hotworkCfdService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("measuresList", hotworkCfdService.listAllMeasures(pd));
map.put("gasList", hotworkGasCfdService.listAll(pd));
map.put("imgList", hotworkacceptuserCfdService.findByIds(pd));
map.put("imgList1", hotworkacceptuserCfdService.findById(pd));
map.put("result", errInfo);
return map;
}
/**批量删除
* @param
* @throws Exception
*/
@RequestMapping(value="/deleteAll")
@RequiresPermissions("hotwork:del")
@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(",");
hotworkCfdService.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
titles.add("作业级别"); //36
titles.add("作业人"); //37
titles.add("特殊作业"); //38
titles.add("风险辨识"); //39
titles.add("作业负责人"); //40
titles.add("分析部门"); //41
titles.add("分析人"); //42
titles.add("监护人部门"); //43
titles.add("监护人"); //44
titles.add("监护人签字"); //45
titles.add("监护人签字时间"); //46
titles.add("监护人意见"); //47
titles.add("动火点车间"); //48
titles.add("动火点车间负责人"); //49
titles.add("车间负责人签字"); //50
titles.add("车间负责人签字时间"); //51
titles.add("车间负责人意见"); //52
titles.add("班长部门"); //53
titles.add("班长"); //54
titles.add("班长签字"); //55
titles.add("班长签字时间"); //56
titles.add("班长意见"); //57
titles.add("交底人"); //58
titles.add("教育人"); //59
titles.add("接受教育人"); //60
titles.add("初审人"); //61
dataMap.put("titles", titles);
List<PageData> varOList = hotworkCfdService.listAll(pd);
List<PageData> varList = new ArrayList<PageData>();
for(int i=0;i<varOList.size();i++){
PageData vpd = new PageData();
vpd.put("var1", varOList.get(i).getString("CORPINFO_ID")); //1
vpd.put("var2", varOList.get(i).get("ISDELETE").toString()); //2
vpd.put("var3", varOList.get(i).getString("CREATTIME")); //3
vpd.put("var4", varOList.get(i).getString("CREATOR")); //4
vpd.put("var5", varOList.get(i).getString("OPERATTIME")); //5
vpd.put("var6", varOList.get(i).getString("OPERATOR")); //6
vpd.put("var7", varOList.get(i).getString("CHECK_NO")); //7
vpd.put("var8", varOList.get(i).getString("WORK_CONTENT")); //8
vpd.put("var9", varOList.get(i).getString("WORK_START_DATE")); //9
vpd.put("var10", varOList.get(i).getString("WORK_END_DATE")); //10
vpd.put("var11", varOList.get(i).getString("CONFIRM_DEPARTMENT_ID")); //11
vpd.put("var12", varOList.get(i).getString("CONFIRM_USER_ID")); //12
vpd.put("var13", varOList.get(i).getString("CONFIRM_USER_SIGNER_PATH")); //13
vpd.put("var14", varOList.get(i).getString("CONFIRM_USER_SIGNER_TIME")); //14
vpd.put("var15", varOList.get(i).getString("AUDIT_DEPARTMENT_ID")); //15
vpd.put("var16", varOList.get(i).getString("AUDIT_USER_ID")); //16
vpd.put("var17", varOList.get(i).getString("AUDIT_USER_SIGNER_PATH")); //17
vpd.put("var18", varOList.get(i).getString("AUDIT_USER_SIGNER_TIME")); //18
vpd.put("var19", varOList.get(i).getString("APPROVE_DEPARTMENT_ID")); //19
vpd.put("var20", varOList.get(i).getString("APPROVE_USER_ID")); //20
vpd.put("var21", varOList.get(i).getString("APPROVE_USER_SIGNER_PATH")); //21
vpd.put("var22", varOList.get(i).getString("APPROVE_USER_SIGNER_TIME")); //22
vpd.put("var23", varOList.get(i).getString("APPLY_STATUS")); //23
vpd.put("var24", varOList.get(i).getString("CONFIRM_CONTENT")); //24
vpd.put("var25", varOList.get(i).getString("AUDIT_CONTENT")); //25
vpd.put("var26", varOList.get(i).getString("APPROVE_CONTENT")); //26
vpd.put("var27", varOList.get(i).getString("OTHER_PROTECTIVE_MEASURES")); //27
vpd.put("var28", varOList.get(i).getString("ACCEPT_DEPARTMENT_ID")); //28
vpd.put("var29", varOList.get(i).getString("ACCEPT_USER_ID")); //29
vpd.put("var30", varOList.get(i).getString("ACCEPT_USER_SIGNER_PATH")); //30
vpd.put("var31", varOList.get(i).getString("ACCEPT_USER_SIGNER_TIME")); //31
vpd.put("var32", varOList.get(i).getString("ACCEPT_CONTENT")); //32
vpd.put("var33", varOList.get(i).getString("APPLY_DEPARTMENT_ID")); //33
vpd.put("var34", varOList.get(i).getString("APPLY_USER_ID")); //34
vpd.put("var35", varOList.get(i).getString("WORK_PLACE")); //35
vpd.put("var36", varOList.get(i).getString("WORK_LEVEL")); //36
vpd.put("var37", varOList.get(i).getString("WORK_USER")); //37
vpd.put("var38", varOList.get(i).getString("SPECIAL_WORK")); //38
vpd.put("var39", varOList.get(i).getString("RISK_IDENTIFICATION")); //39
vpd.put("var40", varOList.get(i).getString("WORK_MANAGER")); //40
vpd.put("var41", varOList.get(i).getString("ANALYZE_DEPARTMENT_ID")); //41
vpd.put("var42", varOList.get(i).getString("ANALYZE_USER_ID")); //42
vpd.put("var43", varOList.get(i).getString("GUARDIAN_DEPARTMENT_ID")); //43
vpd.put("var44", varOList.get(i).getString("GUARDIAN_USER_ID")); //44
vpd.put("var45", varOList.get(i).getString("GUARDIAN_USER_SIGNER_PATH")); //45
vpd.put("var46", varOList.get(i).getString("GUARDIAN_USER_SIGNER_TIME")); //46
vpd.put("var47", varOList.get(i).getString("GUARDIAN_CONTENT")); //47
vpd.put("var48", varOList.get(i).getString("LEADER_DEPARTMENT_ID")); //48
vpd.put("var49", varOList.get(i).getString("LEADER_USER_ID")); //49
vpd.put("var50", varOList.get(i).getString("LEADER_USER_SIGNER_PATH")); //50
vpd.put("var51", varOList.get(i).getString("LEADER_USER_SIGNER_TIME")); //51
vpd.put("var52", varOList.get(i).getString("LEADER_CONTENT")); //52
vpd.put("var53", varOList.get(i).getString("MONITOR_DEPARTMENT_ID")); //53
vpd.put("var54", varOList.get(i).getString("MONITOR_USER_ID")); //54
vpd.put("var55", varOList.get(i).getString("MONITOR_USER_SIGNER_PATH")); //55
vpd.put("var56", varOList.get(i).getString("MONITOR_USER_SIGNER_TIME")); //56
vpd.put("var57", varOList.get(i).getString("MONITOR_CONTENT")); //57
vpd.put("var58", varOList.get(i).getString("CONFESS_USER")); //58
vpd.put("var59", varOList.get(i).getString("EDUCATE_USER")); //59
vpd.put("var60", varOList.get(i).getString("ACCEPT_EDUCATE_USER")); //60
vpd.put("var61", varOList.get(i).getString("TRIAL_USER")); //61
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap);
return mv;
}
}

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

@ -761,4 +761,23 @@ public class OutSourcedController extends BaseController {
return map;
}
/**
* 批量删除
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/updateState")
@ResponseBody
public Object updateState() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
outsourcedService.updateState(pd);
map.put("result", errInfo); //返回结果
return map;
}
}

27
src/main/java/com/zcloud/mq/controller/EightWorkListener.java → src/main/java/com/zcloud/controller/mq/EightWorkListener.java
View File

@ -1,15 +1,17 @@
package com.zcloud.mq.controller;
package com.zcloud.controller.mq;
import com.alibaba.fastjson.JSON;
import com.zcloud.controller.gf.GFEightWorkController;
import com.zcloud.controller.app.highriskwork.AppConfinedSpaceController;
import com.zcloud.controller.app.highriskwork.AppElectricityController;
import com.zcloud.controller.app.highriskwork.AppHotworkCfdController;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.mq.MqMessageLogMapper;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.mq.service.LogService;
import com.zcloud.mq.service.SendMessageService;
import com.zcloud.mq.util.MqUtil;
import com.zcloud.service.mq.LogService;
import com.zcloud.service.mq.SendMessageService;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Warden;
import com.zcloud.util.mq.MqUtil;
import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
import org.apache.rocketmq.spring.annotation.SelectorType;
import org.apache.rocketmq.spring.core.RocketMQListener;
@ -29,8 +31,13 @@ import java.util.Date;
selectorType = SelectorType.TAG)
public class EightWorkListener implements RocketMQListener<String> {
@Resource
private GFEightWorkController eightWorkClient;
private AppConfinedSpaceController appConfinedSpaceController;
@Resource
private AppElectricityController appElectricityController;
@Resource
private AppHotworkCfdController appHotworkCfdController;
@Resource
private SendMessageService sendMessageService;
@ -59,15 +66,15 @@ public class EightWorkListener implements RocketMQListener<String> {
switch (data.getMessage()){
case "confined-space":
System.out.println("受限空间模块消费");
// eightWorkClient.confinedSpaceCancel(data.getData());
appConfinedSpaceController.cancel(data.getData());
break;
case "electricity":
System.out.println("临时用电模块消费");
// eightWorkClient.electricityCancel(data.getData());
appElectricityController.cancel(data.getData());
break;
case "hot-work":
System.out.println("动火模块消费");
// eightWorkClient.hotWorkCancel(data.getData());
appHotworkCfdController.cancel(data.getData());
break;
default:
System.out.println("异常模块不消费");

4
src/main/java/com/zcloud/mq/controller/MqListener.java → src/main/java/com/zcloud/controller/mq/MqListener.java
View File

@ -1,7 +1,7 @@
package com.zcloud.mq.controller;
package com.zcloud.controller.mq;
import com.alibaba.fastjson.JSON;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.dto.TenCorpDto;
import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
import org.apache.rocketmq.spring.annotation.SelectorType;
import org.apache.rocketmq.spring.core.RocketMQListener;

19
src/main/java/com/zcloud/mq/controller/SendController.java → src/main/java/com/zcloud/controller/mq/SendController.java
View File

@ -1,26 +1,25 @@
package com.zcloud.mq.controller;
package com.zcloud.controller.mq;
import com.zcloud.controller.base.BaseController;
import com.zcloud.dto.mq.Response;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.mq.service.SendMessageService;
import org.springframework.web.bind.annotation.*;
import com.zcloud.dto.Response;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.service.mq.SendMessageService;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
/**
* 说明：TODO
* 说明：
* 作者：wangxuan
* 官网：www.zcloudchina.com
*/
@RestController
@RequestMapping("/messageQueue")
public class SendController extends BaseController {
@Resource
private SendMessageService sendMessageService;
@RequestMapping("/sendMessage")
public Response sendMessage(@RequestParam("tenCorpDto") TenCorpDto tenCorpDto) throws Exception {
try {
sendMessageService.sendMessage(tenCorpDto);
@ -30,7 +29,6 @@ public class SendController extends BaseController {
return Response.OK();
}
@PostMapping("SendTimelyQueue")
public Response timelyQueue(@RequestBody TenCorpDto tenCorpDto) throws Exception {
try {
sendMessageService.sendMessage(tenCorpDto);
@ -40,7 +38,6 @@ public class SendController extends BaseController {
return Response.OK();
}
@PostMapping("/SendDelayQueue")
public Response SendDelayQueue(@RequestBody TenCorpDto tenCorpDto) throws Exception {
try {
sendMessageService.SendDelayQueue(tenCorpDto);

38
src/main/java/com/zcloud/controller/openApi/OpenApiController.java
View File

@ -82,6 +82,28 @@ public class OpenApiController extends BaseController {
return map;
}
@RequestMapping(value="/user/getUserInfo")
@ResponseBody
public Object getUserInfo() throws Exception{
PageData map = new PageData();
PageData pd = this.getPageData();
PageData userInfo = usersService.getUserInfo(pd); //列出Post列表
map.putAll(userInfo);
map.put("result", "success");
return map;
}
@RequestMapping(value="/department/getDepartmentInfo")
@ResponseBody
public Object getDepartmentInfo() throws Exception{
PageData map = new PageData();
PageData pd = this.getPageData();
PageData departmentInfo = departmentService.getDepartmentInfo(pd); //列出Post列表
map.putAll(departmentInfo);
map.put("result", "success");
return map;
}
/**列表
* @throws Exception
*/
@ -97,4 +119,20 @@ public class OpenApiController extends BaseController {
map.put("result", errInfo);
return map;
}
/**列表
* @throws Exception
*/
@RequestMapping(value="/corp/findById")
@ResponseBody
public Object findById() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = corpInfoService.findById(pd); //列出Post列表
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
}

238
src/main/java/com/zcloud/controller/specialoperation/AppPersonnelManagementCfdController.java Normal file
View File

@ -0,0 +1,238 @@
package com.zcloud.controller.specialoperation;
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.bus.SpecialUserService;
import com.zcloud.service.specialoperation.PersonnelManagementCfdService;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.ObjectExcelView;
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.servlet.ModelAndView;
import java.util.*;
/**
* 说明：特种作业人员管理
* 作者：luoxiaobao
* 时间：2022-06-16
* 官网：www.zcloudchina.com
*/
@Controller
@RequestMapping("/app/personnelmanagement/cfd")
public class AppPersonnelManagementCfdController extends BaseController {
@Autowired
private PersonnelManagementCfdService personnelmanagementCfdService;
@Autowired
private SpecialUserService specialUserService;
/**新增
* @param
* @throws Exception
*/
@RequestMapping(value="/add")
@ResponseBody
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "新增")
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("PERSONNELMANAGEMENT_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"); //是否删除
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
personnelmanagementCfdService.save(pd);
map.put("result", errInfo);
return map;
}
/**删除
* @param
* @throws Exception
*/
@RequestMapping(value="/delete")
@ResponseBody
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "删除")
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
personnelmanagementCfdService.delete(pd);
map.put("result", errInfo); //返回结果
return map;
}
/**修改
* @param
* @throws Exception
*/
@RequestMapping(value="/edit")
@ResponseBody
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "修改")
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
personnelmanagementCfdService.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 endday = DateUtil.getDay();
PageData getPD = new PageData();
getPD.put("endday",endday);
List<PageData> varList = specialUserService.nameListAll(getPD);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
*/
@RequestMapping(value="/goEdit")
@ResponseBody
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "去修改页面获取数据")
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = personnelmanagementCfdService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**批量删除
* @param
* @throws Exception
*/
@RequestMapping(value="/deleteAll")
@ResponseBody
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "批量删除")
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(",");
personnelmanagementCfdService.deleteAll(ArrayDATA_IDS);
errInfo = "success";
}else{
errInfo = "error";
}
map.put("result", errInfo); //返回结果
return map;
}
/**判断特种作业证书编号是否存在
* @return
*/
@RequestMapping(value="/hasCertificate")
@ResponseBody
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "判断特种作业证书编号是否存在")
public Object hasCertificate() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
if(personnelmanagementCfdService.findByCertificate(pd) != null){
map.put("msg","特种作业证书编号已存在");
}
map.put("result", errInfo); //返回结果
return map;
}
/**导出到excel
* @param
* @throws Exception
*/
@RequestMapping(value="/excel")
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "导出到excel")
public ModelAndView exportExcel() throws Exception{
ModelAndView mv = new ModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
Map<String,Object> dataMap = new HashMap<String,Object>();
List<String> titles = new ArrayList<String>();
titles.add("添加人"); //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("企业ID"); //19
dataMap.put("titles", titles);
List<PageData> varOList = personnelmanagementCfdService.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("CREATOR")); //1
vpd.put("var2", varOList.get(i).getString("ADDUNITS")); //2
vpd.put("var3", varOList.get(i).getString("UNITS_NAME")); //3
vpd.put("var4", varOList.get(i).getString("TYPE")); //4
vpd.put("var5", varOList.get(i).getString("JOB_TYPE")); //5
vpd.put("var6", varOList.get(i).getString("OPERATIONITEM")); //6
vpd.put("var7", varOList.get(i).getString("NAME")); //7
vpd.put("var8", varOList.get(i).getString("SEX")); //8
vpd.put("var9", varOList.get(i).getString("CERTIFICATE_NUM")); //9
vpd.put("var10", varOList.get(i).getString("REVIEWTIME")); //10
vpd.put("var11", varOList.get(i).getString("PHONENUM")); //11
vpd.put("var12", varOList.get(i).getString("IDENTITYCARD")); //12
vpd.put("var13", varOList.get(i).getString("LICENSING")); //13
vpd.put("var14", varOList.get(i).getString("VALID")); //14
vpd.put("var15", varOList.get(i).getString("CREATETIME")); //15
vpd.put("var16", varOList.get(i).getString("OPERATOR")); //16
vpd.put("var17", varOList.get(i).getString("OPERATTIME")); //17
vpd.put("var18", varOList.get(i).getString("ISDELETE")); //18
vpd.put("var19", varOList.get(i).getString("CORPINFO_ID")); //19
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap);
return mv;
}
}

244
src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementCfdController.java Normal file
View File

@ -0,0 +1,244 @@
package com.zcloud.controller.specialoperation;
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.specialoperation.PersonnelManagementCfdService;
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
* 时间：2022-06-16
* 官网：www.zcloudchina.com
*/
@Controller
@RequestMapping("/personnelmanagement/cfd")
public class PersonnelManagementCfdController extends BaseController {
@Autowired
private PersonnelManagementCfdService personnelmanagementCfdService;
/**新增
* @param
* @throws Exception
*/
@RequestMapping(value="/add")
@RequiresPermissions("personnelmanagement:add")
@ResponseBody
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "新增")
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("PERSONNELMANAGEMENT_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"); //是否删除
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
personnelmanagementCfdService.save(pd);
map.put("result", errInfo);
return map;
}
/**删除
* @param out
* @throws Exception
*/
@RequestMapping(value="/delete")
@RequiresPermissions("personnelmanagement:del")
@ResponseBody
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "删除")
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
personnelmanagementCfdService.delete(pd);
map.put("result", errInfo); //返回结果
return map;
}
/**修改
* @param
* @throws Exception
*/
@RequestMapping(value="/edit")
@RequiresPermissions("personnelmanagement:edit")
@ResponseBody
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "修改")
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
personnelmanagementCfdService.edit(pd);
map.put("result", errInfo);
return map;
}
/**列表
* @param page
* @throws Exception
*/
@RequestMapping(value="/list")
@RequiresPermissions("personnelmanagement: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
page.setPd(pd);
List<PageData> varList = personnelmanagementCfdService.list(page); //列出PersonnelManagement列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
*/
@RequestMapping(value="/goEdit")
@RequiresPermissions("personnelmanagement:edit")
@ResponseBody
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "去修改页面获取数据")
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = personnelmanagementCfdService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**批量删除
* @param
* @throws Exception
*/
@RequestMapping(value="/deleteAll")
@RequiresPermissions("personnelmanagement:del")
@ResponseBody
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "批量删除")
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(",");
personnelmanagementCfdService.deleteAll(ArrayDATA_IDS);
errInfo = "success";
}else{
errInfo = "error";
}
map.put("result", errInfo); //返回结果
return map;
}
/**判断特种作业证书编号是否存在
* @return
*/
@RequestMapping(value="/hasCertificate")
@ResponseBody
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "判断特种作业证书编号是否存在")
public Object hasCertificate() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
if(personnelmanagementCfdService.findByCertificate(pd) != null){
map.put("msg","特种作业证书编号已存在");
}
map.put("result", errInfo); //返回结果
return map;
}
/**导出到excel
* @param
* @throws Exception
*/
@RequestMapping(value="/excel")
@RequiresPermissions("toExcel")
@LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "导出到excel")
public ModelAndView exportExcel() throws Exception{
ModelAndView mv = new ModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
Map<String,Object> dataMap = new HashMap<String,Object>();
List<String> titles = new ArrayList<String>();
titles.add("添加人"); //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("企业ID"); //19
dataMap.put("titles", titles);
List<PageData> varOList = personnelmanagementCfdService.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("CREATOR")); //1
vpd.put("var2", varOList.get(i).getString("ADDUNITS")); //2
vpd.put("var3", varOList.get(i).getString("UNITS_NAME")); //3
vpd.put("var4", varOList.get(i).getString("TYPE")); //4
vpd.put("var5", varOList.get(i).getString("JOB_TYPE")); //5
vpd.put("var6", varOList.get(i).getString("OPERATIONITEM")); //6
vpd.put("var7", varOList.get(i).getString("NAME")); //7
vpd.put("var8", varOList.get(i).getString("SEX")); //8
vpd.put("var9", varOList.get(i).getString("CERTIFICATE_NUM")); //9
vpd.put("var10", varOList.get(i).getString("REVIEWTIME")); //10
vpd.put("var11", varOList.get(i).getString("PHONENUM")); //11
vpd.put("var12", varOList.get(i).getString("IDENTITYCARD")); //12
vpd.put("var13", varOList.get(i).getString("LICENSING")); //13
vpd.put("var14", varOList.get(i).getString("VALID")); //14
vpd.put("var15", varOList.get(i).getString("CREATETIME")); //15
vpd.put("var16", varOList.get(i).getString("OPERATOR")); //16
vpd.put("var17", varOList.get(i).getString("OPERATTIME")); //17
vpd.put("var18", varOList.get(i).getString("ISDELETE")); //18
vpd.put("var19", varOList.get(i).getString("CORPINFO_ID")); //19
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap);
return mv;
}
}

1
src/main/java/com/zcloud/controller/system/DepartmentController.java
View File

@ -11,6 +11,7 @@ import com.zcloud.util.ObjectExcelView;
import net.sf.json.JSONArray;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;

94
src/main/java/com/zcloud/controller/xgf/CorpFgsController.java Normal file
View File

@ -0,0 +1,94 @@
package com.zcloud.controller.xgf;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.util.HttpClientService;
import com.zcloud.util.Jurisdiction;
import org.springframework.beans.factory.annotation.Value;
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.Map;
/**
* @author fangjiakai
* @date 2023/05/15 11:09
*/
@Controller
@RequestMapping("/corpFgs")
public class CorpFgsController extends BaseController {
@Value("${preventionxgf.api.url}")
private String xgfUrl;
/**
* 相关方单位列表
* @param page
* @return
* @throws Exception
*/
@RequestMapping(value="/corpFgsList")
@ResponseBody
public Object batchList(Page page) throws Exception{
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpFgs/corpFgsList" +getPageUrl(page), pd);
return result;
}
/**
* 相关方单位人员列表
* @param page
* @return
* @throws Exception
*/
@RequestMapping(value="/corpUserFgsList")
@ResponseBody
public Object batchUserList(Page page) throws Exception{
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserFgsList" +getPageUrl(page), pd);
return result;
}
/**
* 相关方单位人员-人员基础信息管理-人员详细信息
* @return
* @throws Exception
*/
@RequestMapping(value="/getCorpUserDetail")
@ResponseBody
public Object getCorpUserDetail() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserDetailInfoById", pd);
return result;
}
private String getPageUrl(Page page){
return "?showCount=" +page.getShowCount() + "&currentPage=" + page.getUrlCurrentPage();
}
/**
* 相关方单位--根据企业端corpInfoId查询到对应的相关方部门树形结构
* @return
* @throws Exception
*/
@RequestMapping(value="/listTreeByFgsId")
@ResponseBody
public Object listTreeByFgsId() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpFgs/listTreeByFgsId", pd);
return result;
}
}

1
src/main/java/com/zcloud/controller/xgf/FlowTrainController.java
View File

@ -31,7 +31,6 @@ public class FlowTrainController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
pd.put("MAndTUserId",Jurisdiction.getUSER_ID());
// pd.put("TRAIN_CORP_LEADER", Jurisdiction.getUSER_ID());
Map result = HttpClientService.doPost(xgfUrl + "/openApi/trainingbatch/list" +getPageUrl(page), pd);
return result;
}

240
src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java Normal file
View File

@ -0,0 +1,240 @@
package com.zcloud.controller.xgf;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.util.DateUtil;
import com.zcloud.util.HttpClientService;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.ObjectExcelView;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
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
* 时间：2022-06-07
* 官网：www.zcloudchina.com
*/
@Controller
@RequestMapping("/relevantunits")
public class RelevantUnitsController extends BaseController {
@Value("${preventionxgf.api.url}")
private String xgfUrl;
/**
* 相关方单位信息审核模块的列表
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/list")
@ResponseBody
public Object list() throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/list", pd);
return result;
}
/**
* 审核
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/examine")
@ResponseBody
public Object examine() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
pd.put("OPERATOR", Jurisdiction.getUSER_ID());
String type = pd.getString("STATE"); //2 通过 3.未通过
if ("2".equals(type)) {
pd.put("STATE", "2"); // 审核状态改为通过
} else if ("3".equals(type)) {
pd.put("STATE", "3"); // 审核状态改为打回
}
// Map result2 = HttpClientService.doPost(XGF_EDITROLEBTG, pd);
Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/corpInfoAudit", pd);
map.put("result", errInfo);
return map;
}
/**
* 相关方单位人员-人员基础信息管理-list
*
* @return
* @throws Exception
*/
@RequestMapping(value = "/getCorpInfoDetail")
@ResponseBody
public Object getCorpInfoDetail() throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/getDataForEditByCorpInfoIdForApi", pd);
return result;
}
/**
* 相关方单位账号管理-列表
*
* @param page
* @throws Exception
*/
@RequestMapping(value = "/getCorpInfoList")
@ResponseBody
public Object getCorpInfoList(Page page) throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/list", pd);
return result;
}
/**
* 导出到excel
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/excelAll")
@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
dataMap.put("titles", titles);
Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/unitCorpInfo", pd);
List<HashMap<String, Object>> varOList = (List<HashMap<String, Object>>) result.get("unitCorp");
List<PageData> varList = new ArrayList<PageData>();
for (int i = 0; i < varOList.size(); i++) {
PageData vpd = new PageData();
vpd.put("var1", i + 1);
if (varOList.get(i).get("STATE").equals("0")) {
vpd.put("var2", "未填报");
} else if (varOList.get(i).get("STATE").equals("1")) {
vpd.put("var2", "待审核");
} else if (varOList.get(i).get("STATE").equals("2")) {
vpd.put("var2", "已审核");
} else if (varOList.get(i).get("STATE").equals("3")) {
vpd.put("var2", "已打回");
} else if (varOList.get(i).get("STATE").equals("4")) {
vpd.put("var2", "已填报");
}
vpd.put("var3", varOList.get(i).get("MAIN_DEPARTMENT_NAME"));
vpd.put("var4", varOList.get(i).get("SUPERVISE_CORPINFO_NAME"));
vpd.put("var5", varOList.get(i).get("SUPERVISE_DEPARTMENT_NAME"));
vpd.put("var6", varOList.get(i).get("RELEVANT_UNIT_NAME"));
vpd.put("var7", varOList.get(i).get("SOCIAL_CODE"));
vpd.put("var8", varOList.get(i).get("BUSINESS_ADDRESS"));
vpd.put("var9", varOList.get(i).get("LEGAL_PERSON"));
vpd.put("var10", varOList.get(i).get("CONTACT_PERSON"));
vpd.put("var11", varOList.get(i).get("CONTACT_TEL"));
vpd.put("var12", varOList.get(i).get("EMPLOYMENT_FORM_NAME"));
if (varOList.get(i).get("SELECT_FORM").equals("competitive_negotiation")) {
vpd.put("var13", "竞争性谈判");
}
if (varOList.get(i).get("SELECT_FORM").equals("invite_tenders")) {
vpd.put("var13", "招标");
}
vpd.put("var14", varOList.get(i).get("FLOATING_PERCENT"));
vpd.put("var15", varOList.get(i).get("CREATOR_NAME"));
vpd.put("var16", varOList.get(i).get("CREATTIME").toString().replace("T", " ").replace(".000+0000", ""));
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv, dataMap);
return mv;
}
/**
* 保存数据
*
* @throws Exception
*/
@RequestMapping(value = "/saveCorpInfo")
@ResponseBody
public Object saveCorpInfo() throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/saveDataForApi", pd);
return result;
}
/**
* 查询相关方名称是否唯一
*
* @throws Exception
*/
@RequestMapping(value = "/hasName")
@ResponseBody
public Object hasName() throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/hasName", pd);
return result;
}
/**
* 查询相关方统一社会信用代码是否唯一
*
* @throws Exception
*/
@RequestMapping(value = "/hasSocialCode")
@ResponseBody
public Object hasSocialCode() throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/hasSocialCode", pd);
return result;
}
/**
* 查询相关方统一社会信用代码是否唯一
*
* @throws Exception
*/
@RequestMapping(value = "/resetPassword")
@ResponseBody
public Object resetPassword() throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/resetPasswordByCorpInfoId", pd);
return result;
}
}

1
src/main/java/com/zcloud/controller/xgf/XgfCorpController.java
View File

@ -236,7 +236,6 @@ public class XgfCorpController extends BaseController {
} else if ("3".equals(type)) {
pd.put("STATE", "3"); // 审核状态改为打回
}
// Map result2 = HttpClientService.doPost(XGF_EDITROLEBTG, pd);
Map result = HttpClientService.doPost(url + "/api/corpinfo/corpInfoAudit", pd);
map.put("result", errInfo);
return map;

16
src/main/java/com/zcloud/controller/xgf/XgfDictionariesController.java
View File

@ -54,4 +54,20 @@ public class XgfDictionariesController extends BaseController {
Map result = HttpClientService.doPost(url + "/api/dictionaries/getAreaLevels", pd);
return result;
}
/**
* 字典
* @return
* @throws Exception
*/
@RequestMapping(value="/listSelectTree")
@ResponseBody
public Object listSelectTree() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(url + "/api/dictionaries/listSelectTree", pd);
return result;
}
}

110
src/main/java/com/zcloud/controller/xgf/app/AppCorpFgsController.java Normal file
View File

@ -0,0 +1,110 @@
package com.zcloud.controller.xgf.app;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.util.HttpClientService;
import com.zcloud.util.Tools;
import org.springframework.beans.factory.annotation.Value;
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.Map;
/**
* @author fangjiakai
* @date 2023/05/15 11:09
*/
@Controller
@RequestMapping("/app/corpFgs")
public class AppCorpFgsController extends BaseController {
@Value("${preventionxgf.api.url}")
private String xgfUrl;
/**
* 相关方单位列表
* @param page
* @return
* @throws Exception
*/
@RequestMapping(value="/corpFgsList")
@ResponseBody
public Object batchList(Page page) throws Exception{
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpFgs/corpFgsList" +getPageUrl(page), pd);
return result;
}
/**
* 相关方单位人员列表
* @param page
* @return
* @throws Exception
*/
@RequestMapping(value="/corpUserFgsList")
@ResponseBody
public Object batchUserList(Page page) throws Exception{
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserFgsList" +getPageUrl(page), pd);
return result;
}
/**
* 相关方单位人员-人员基础信息管理-人员详细信息
* @return
* @throws Exception
*/
@RequestMapping(value="/getCorpUserDetail")
@ResponseBody
public Object getCorpUserDetail() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserDetailInfoById", pd);
return result;
}
private String getPageUrl(Page page){
return "?showCount=" +page.getShowCount() + "&currentPage=" + page.getUrlCurrentPage();
}
/**
* 相关方单位--根据企业端corpInfoId查询到对应的相关方部门树形结构
* @return
* @throws Exception
*/
@RequestMapping(value="/listTreeByFgsId")
@ResponseBody
public Object listTreeByFgsId() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpFgs/listTreeByFgsId", pd);
return result;
}
/**
* 根据相关方部门id获取部门下所有人员
* @return
* @throws Exception
*/
@RequestMapping(value="/findUserByDepartmentId")
@ResponseBody
public Object findUserByDepartmentId() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpUserFgs/findUserByDepartmentId", pd);
return result;
}
}

4
src/main/java/com/zcloud/dto/mq/Response.java → src/main/java/com/zcloud/dto/Response.java
View File

@ -1,4 +1,4 @@
package com.zcloud.dto.mq;
package com.zcloud.dto;
import com.alibaba.fastjson.JSON;
import lombok.Data;
@ -56,7 +56,7 @@ public class Response {
public static Response ERROR(String errorMessage) {
Response response = new Response();
response.result = "succeed";
response.result = "exception";
response.code = "9999";
response.exception = errorMessage;
return response;

2
src/main/java/com/zcloud/mq/util/TenCorpConst.java → src/main/java/com/zcloud/dto/TenCorpConst.java
View File

@ -1,4 +1,4 @@
package com.zcloud.mq.util;
package com.zcloud.dto;
public class TenCorpConst {
public static final String confinedSpace = "confined-space";

11
src/main/java/com/zcloud/dto/mq/TenCorpDto.java → src/main/java/com/zcloud/dto/TenCorpDto.java
View File

@ -1,9 +1,7 @@
package com.zcloud.dto.mq;
package com.zcloud.dto;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.entity.PageData;
import com.zcloud.util.Warden;
import lombok.Data;
@Data
@ -11,7 +9,7 @@ public class TenCorpDto {
// 请秋id
private String id;
// 消息来源名称
private String producer_name;
private String producer_name = "qa-prevention-cfd";
private String topic;
//印记(方便寻找该条请求)
private String mark;
@ -20,8 +18,9 @@ public class TenCorpDto {
// 消息发送时间(yyyy-MM-dd HH:mm:ss:SSS)
private String time_stamp;
// 消息体
// 八项作业根据这个区分接口
private String message;
// 消息体
private PageData data;
public TenCorpDto() {
@ -39,7 +38,7 @@ public class TenCorpDto {
info.put("PRODUCER_NAME", this.producer_name);
info.put("MARK", this.mark);
info.put("MARK_NAME", this.mark_name);
info.put("MESSAGE", JSONObject.toJSONString(this.data));
info.put("MESSAGE", this.message);
info.put("TOPIC",this.topic);
return info;
}

87
src/main/java/com/zcloud/dto/Warden.java Normal file
View File

@ -0,0 +1,87 @@
package com.zcloud.dto;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.entity.PageData;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.UuidUtil;
import org.apache.commons.lang.StringUtils;
import java.util.*;
public class Warden {
public static List<PageData> getList(String raw) {
return JSON.parseArray(raw, PageData.class);
}
public static <T> List<T> getList(String raw, Class<T> clazz) {
return JSON.parseArray(raw, clazz);
}
public static List<PageData> getList(JSONArray raw) {
return JSON.parseArray(raw.toJSONString(), PageData.class);
}
public static PageData getPageData(JSONObject raw) {
return JSON.parseObject(raw.toJSONString(), PageData.class);
}
public static PageData getPageData(String raw) {
return JSON.parseObject(raw, PageData.class);
}
public static String get32UUID() {
return UuidUtil.get32UUID();
}
public static List<Map<String, String>> getVueUploadEntity(String url) {
List<Map<String, String>> list = new ArrayList<>();
Map<String, String> map = new HashMap<>();
map.put("name", get32UUID());
map.put("url", url);
list.add(map);
return list;
}
public static void initDate(PageData entity) {
entity.put("CREATOR", Jurisdiction.getUSER_ID());
entity.put("CREATE_TIME", DateUtil.getTime());
entity.put("CREATOR_NAME", Jurisdiction.getName());
entity.put("CREATTIME", DateUtil.getTime());
entity.put("OPERATOR", Jurisdiction.getUSER_ID());
entity.put("OPERATOR_NAME", Jurisdiction.getName());
entity.put("OPERAT_TIME", DateUtil.getTime());
entity.put("OPERATTIME", DateUtil.getTime());
entity.put("ISDELETE", "0");
}
public static void updateDate(PageData entity) {
entity.put("OPERATOR", Jurisdiction.getUSER_ID());
entity.put("OPERAT_TIME", DateUtil.getTime());
entity.put("OPERATTIME", DateUtil.getTime());
entity.put("ISDELETE", "0");
}
public static Date addDate(Date date, long day) {
if (date == null) {
return new Date();
}
long time = date.getTime(); // 得到指定日期的毫秒数
day = day * 24 * 60 * 60 * 1000; // 要加上的天数转换成毫秒数
time += day; // 相加得到新的毫秒数
return new Date(time); // 将毫秒数转换成日期
}
public static String checkId(Object object) {
if (object == null || StringUtils.isEmpty(object.toString())) {
return get32UUID();
} else {
return object.toString();
}
}
}

2
src/main/java/com/zcloud/mapper/datasource/bus/SpecialUserMapper.java
View File

@ -66,5 +66,7 @@ public interface SpecialUserMapper{
* @throws Exception
*/
void deleteTem(PageData pd);
List<PageData> nameListAll(PageData getPD);
}

26
src/main/java/com/zcloud/mapper/datasource/eightWork/EightWorkCfdMapper.java Normal file
View File

@ -0,0 +1,26 @@
package com.zcloud.mapper.datasource.eightWork;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：有限空间作业
* 作者：luoxiaobao
* 时间：2021-09-13
* 官网：www.zcloudchina.com
*/
public interface EightWorkCfdMapper {
/**列表
* @param page
* @throws Exception
*/
List<PageData> datalist(Page page);
List<PageData> getWorkUserLabels(List<String> workUserIds);
}

10
src/main/java/com/zcloud/mapper/datasource/highriskwork/ConfinedSpaceMapper.java
View File

@ -63,5 +63,15 @@ public interface ConfinedSpaceMapper {
* @return
*/
PageData countCheck(PageData pd);
void cancel(PageData pd);
PageData checkno(PageData pd);
void editSpecialwork(PageData pd);
void editSpecialwork1(PageData pd);
void editSpecialwork2(PageData pd);
void editSpecialwork3(PageData pd);
void editSpecialwork4(PageData pd);
void editSpecialwork5(PageData pd);
void editSpecialwork6(PageData pd);
void editSpecialwork7(PageData pd);
}

11
src/main/java/com/zcloud/mapper/datasource/highriskwork/ElectricityMapper.java
View File

@ -77,5 +77,16 @@ public interface ElectricityMapper{
*/
int numberCheck(PageData pd);
PageData getCode(PageData pd);
void cancel(PageData pd);
PageData checkno(PageData pd);
void editSpecialwork(PageData pd);
void editSpecialwork1(PageData pd);
void editSpecialwork2(PageData pd);
void editSpecialwork3(PageData pd);
void editSpecialwork4(PageData pd);
void editSpecialwork5(PageData pd);
void editSpecialwork6(PageData pd);
void editSpecialwork7(PageData pd);
}

2
src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationMapper.java
View File

@ -91,5 +91,7 @@ public interface HotWorkApplicationMapper{
* @throws Exception
*/
void updateState4ids(PageData pageData);
PageData getCountByMyApprovalForDelayedHotWork(PageData pageData);
}

2
src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationUserMapper.java
View File

@ -89,5 +89,7 @@ public interface HotWorkApplicationUserMapper{
List<PageData> getHotdelayed (PageData pd) throws Exception;
List<PageData> getHotGasanalysis (PageData pd) throws Exception;
List<PageData> listByDepartment(PageData hotUserPd) throws Exception;
}

67
src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkAcceptUserCfdMapper.java Normal file
View File

@ -0,0 +1,67 @@
package com.zcloud.mapper.datasource.highriskwork;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：图片管理
* 作者：luoxiaobao
* 时间：2020-12-24
* 官网：www.zcloudchina.com
*/
public interface HotworkAcceptUserCfdMapper {
/**新增
* @param pd
* @throws Exception
*/
void save(PageData pd);
/**删除
* @param pd
* @throws Exception
*/
void delete(PageData pd);
/**删除
* @param pd
* @throws Exception
*/
void deleteList(PageData pd);
/**修改
* @param pd
* @throws Exception
*/
void edit(PageData pd);
/**列表
* @param page
* @throws Exception
*/
List<PageData> datalistPage(Page page);
/**列表(全部)
* @param pd
* @throws Exception
*/
List<PageData> listAll(PageData pd);
/**通过id获取数据
* @param pd
* @throws Exception
*/
List<PageData> findById(PageData pd);
List<PageData> findByIds(PageData pd);
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
void deleteAll(String[] ArrayDATA_IDS);
List<PageData> listAllByIds(PageData pd);
}

89
src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkCfdMapper.java Normal file
View File

@ -0,0 +1,89 @@
package com.zcloud.mapper.datasource.highriskwork;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：动火作业
* 作者：luoxiaobao
* 时间：2021-09-18
* 官网：www.zcloudchina.com
*/
public interface HotworkCfdMapper {
/**新增
* @param pd
* @throws Exception
*/
void save(PageData pd);
/**删除
* @param pd
* @throws Exception
*/
void delete(PageData pd);
/**修改
* @param pd
* @throws Exception
*/
void edit(PageData pd);
/**列表
* @param page
* @throws Exception
*/
List<PageData> datalistPage(Page page);
List<PageData> jhdatalistPage(Page page);
List<PageData> aqdatalistPage(Page page);
List<PageData> jsdatalistPage(Page page);
/**列表(全部)
* @param pd
* @throws Exception
*/
List<PageData> listAll(PageData pd);
/**通过id获取数据
* @param pd
* @throws Exception
*/
PageData findById(PageData pd);
void cancel(PageData pd);
PageData checkno(PageData pd);
void editSpecialwork(PageData pd);
void editSpecialwork1(PageData pd);
void editSpecialwork2(PageData pd);
void editSpecialwork3(PageData pd);
void editSpecialwork4(PageData pd);
void editSpecialwork5(PageData pd);
void editSpecialwork6(PageData pd);
void editSpecialwork7(PageData pd);
void edittime(PageData pd);
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
void deleteAll(String[] ArrayDATA_IDS);
List<PageData> listAllMeasures(PageData pd);
/**
* 待办作业数
* @param pd
* @return
* @throws Exception
*/
PageData countCheck(PageData pd);
PageData getCode(PageData pd);
}

59
src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkGasCfdMapper.java Normal file
View File

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

59
src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkLogCfdMapper.java Normal file
View File

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

59
src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkToMeasuresCfdMapper.java Normal file
View File

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

67
src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementCfdMapper.java Normal file
View File

@ -0,0 +1,67 @@
package com.zcloud.mapper.datasource.specialoperation;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：特种作业人员管理
* 作者：luoxiaobao
* 时间：2022-06-16
* 官网：www.zcloudchina.com
*/
public interface PersonnelManagementCfdMapper {
/**新增
* @param pd
* @throws Exception
*/
void save(PageData pd);
/**删除
* @param pd
* @throws Exception
*/
void delete(PageData pd);
/**修改
* @param pd
* @throws Exception
*/
void edit(PageData pd);
/**列表
* @param page
* @throws Exception
*/
List<PageData> datalistPage(Page page);
/**列表(全部)
* @param pd
* @throws Exception
*/
List<PageData> listAll(PageData pd);
List<PageData> namelist(PageData pd);
/**通过id获取数据
* @param pd
* @throws Exception
*/
PageData findById(PageData pd);
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
void deleteAll(String[] ArrayDATA_IDS);
/**
* 判断特种作业证书编号是否存在，减少返回字段，优化压力
* @param pd
* @return
*/
PageData findByCertificate(PageData pd);
}

4
src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java
View File

@ -173,5 +173,9 @@ public interface DepartmentMapper{
* @return
*/
List<PageData> listTreeManageAndCorpForPcPunishThePerson(PageData pd);
PageData getInfo(PageData pd) throws Exception;
List<PageData> listTreeManageAndCorpHasOrder(PageData pd);
}

9
src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
View File

@ -36,6 +36,13 @@ public interface UsersMapper {
PageData findBySelect(PageData pd);
PageData findByName(PageData pd);
/**
* 获取全部用户名称列表
* @return
* @throws Exception
*/
List<PageData> getAllUserList()throws Exception;
/**用户列表
* @param page
* @return
@ -292,4 +299,6 @@ public interface UsersMapper {
List<PageData> selectUserListByUserIds(PageData pd);
void resetCardNo(PageData pd);
PageData getUserInfo(PageData pd);
}

2
src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java
View File

@ -73,5 +73,7 @@ public interface OutSourcedMapper{
//校验结束重点工程是否有为完成的内容
PageData jieshuOutSourced(PageData pd);
void updateState(PageData pd);
}

117
src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java Normal file
View File

@ -0,0 +1,117 @@
package com.zcloud.mapper.dsno2.system;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.entity.system.Department;
import java.util.List;
/**
* 说明： 组织机构接Mapper
* 作者：luoxiaobao
* 官网：www.qdkjchina.com
*/
public interface Department2Mapper {
/**新增
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception;
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception;
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception;
/**列表
* @param page
* @throws Exception
*/
public List<PageData> datalistPage(Page page)throws Exception;
/**通过id获取数据
* @param pd
* @throws Exception
*/
public PageData findById(PageData pd)throws Exception;
/**通过编码获取数据
* @param pd
* @throws Exception
*/
public PageData findByBianma(PageData pd)throws Exception;
/**
* 通过ID获取其子级列表
* @param parentId
* @return
* @throws Exception
*/
public List<Department> listSubDepartmentByParentId(String parentId) throws Exception;
/**
* 通过ID获取其子级列表
* @param parentId
* @return
* @throws Exception
*/
public List<Department> listByCorpInfoId(String parentId,String CORPINFO_ID) throws Exception;
List<PageData> deptinformation(PageData pageData) throws Exception;
/**
* 获取所有数据并填充每条数据的子级列表(递归处理)
* @param MENU_ID
* @return
* @throws Exception
*/
public List<Department> listAllDepartment(String parentId) throws Exception;
/**
* 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用
* @param MENU_ID
* @return
* @throws Exception
*/
public List<PageData> listAllDepartmentToSelect(String parentId, List<PageData> zdepartmentPdList) throws Exception;
/**获取某个部门所有下级部门ID(返回拼接字符串 in的形式)
* @param DEPARTMENT_ID
* @return
* @throws Exception
*/
public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception;
public List<PageData> listAll(PageData pd);
public List<PageData> listAllMent (PageData pd);
public List<Department> listAllDepartmentByType(PageData pd) throws Exception;
void saveCorpdept(PageData pd);
List<PageData> saftpersonlist(PageData pd) throws Exception;
List<PageData> saftmanagelist(PageData pd);
List<PageData> findbyCorpIdtoDeptlistPage(Page page);
List<PageData> findByDeptIdlistPage(Page page);
public PageData findCorpDeptDetail(PageData pd);
void editNameBDId(PageData deptPageData);
//从管理端修改部门 新
void editCorpdeptNew(PageData pd);
List<PageData> listTreeCorpDept(PageData pd);
}

6
src/main/java/com/zcloud/mq/util/Const.java
View File

@ -1,6 +0,0 @@
package com.zcloud.mq.util;
public class Const {
public static final String topic_eightWork="eightWork";
public static final String topic_info="info";
}

1
src/main/java/com/zcloud/service/bus/SpecialUserService.java
View File

@ -68,5 +68,6 @@ public interface SpecialUserService{
*/
public void deleteTem(PageData pd)throws Exception;
List<PageData> nameListAll(PageData getPD)throws Exception;
}

5
src/main/java/com/zcloud/service/bus/impl/SpecialUserServiceImpl.java
View File

@ -94,5 +94,10 @@ public class SpecialUserServiceImpl implements SpecialUserService{
public void deleteTem(PageData pd)throws Exception{
specialuserMapper.deleteTem(pd);
}
@Override
public List<PageData> nameListAll(PageData getPD) throws Exception {
return specialuserMapper.nameListAll(getPD);
}
}

19
src/main/java/com/zcloud/service/corpFgs/CorpFgsService.java Normal file
View File

@ -0,0 +1,19 @@
package com.zcloud.service.corpFgs;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：用电气体检测
* 作者：luoxiaobao
* 时间：2021-09-08
* 官网：www.zcloudchina.com
*/
public interface CorpFgsService {
String getXgfUserName(String workUser);
}

46
src/main/java/com/zcloud/service/corpFgs/impl/CorpFgsServiceImpl.java Normal file
View File

@ -0,0 +1,46 @@
package com.zcloud.service.corpFgs.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.eightWork.ElectricityYthGasMapper;
import com.zcloud.service.corpFgs.CorpFgsService;
import com.zcloud.service.eightWork.ElectricityYthGasService;
import com.zcloud.util.HttpClientService;
import com.zcloud.util.Tools;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* 说明：用电气体检测
* 作者：luoxiaobao
* 时间：2021-09-08
* 官网：www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class CorpFgsServiceImpl implements CorpFgsService {
@Value("${preventionxgf.api.url}")
private String xgfUrl;
@Override
public String getXgfUserName(String workUser){
PageData pd = new PageData();
pd.put("USER_ID",workUser);
Map<String,Object> result = HttpClientService.doPost(xgfUrl + "/openApi/user/findUserById", pd);
Map<String,Object> pageData = (Map<String, Object>) result.get("pd");
if(Tools.isEmpty(pageData)){
return workUser;
}else {
return pageData.get("NAME").toString();
}
}
}

26
src/main/java/com/zcloud/service/eightWork/EightWorkCfdService.java Normal file
View File

@ -0,0 +1,26 @@
package com.zcloud.service.eightWork;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：有限空间作业
* 作者：luoxiaobao
* 时间：2021-09-13
* 官网：www.zcloudchina.com
*/
public interface EightWorkCfdService {
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception;
List<PageData> getWorkUserLabels(List<String> workUserIds)throws Exception;
}

41
src/main/java/com/zcloud/service/eightWork/impl/EightWorkCfdServiceImpl.java Normal file
View File

@ -0,0 +1,41 @@
package com.zcloud.service.eightWork.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.eightWork.EightWorkCfdMapper;
import com.zcloud.service.eightWork.EightWorkCfdService;
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-13
* 官网：www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class EightWorkCfdServiceImpl implements EightWorkCfdService {
@Autowired
private EightWorkCfdMapper eightworkCfdMapper;
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception{
return eightworkCfdMapper.datalist(page);
}
@Override
public List<PageData> getWorkUserLabels(List<String> workUserIds) throws Exception {
return eightworkCfdMapper.getWorkUserLabels(workUserIds);
}
}

11
src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java
View File

@ -1,8 +1,10 @@
package com.zcloud.service.gf.impl;
import com.zcloud.controller.xgf.app.AppCorpFgsController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.gf.GFBlindBoardMapper;
import com.zcloud.service.corpFgs.CorpFgsService;
import com.zcloud.service.gf.GFBlindBoardService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -23,6 +25,9 @@ public class GFBlindBoardServiceImpl implements GFBlindBoardService {
@Resource
private GFBlindBoardMapper GFblindboardMapper;
@Resource
private CorpFgsService corpFgsService;
/**新增
* @param pd
* @throws Exception
@ -76,7 +81,11 @@ public class GFBlindBoardServiceImpl implements GFBlindBoardService {
* @throws Exception
*/
public PageData findById(PageData pd)throws Exception{
return GFblindboardMapper.findById(pd);
PageData pageData = GFblindboardMapper.findById(pd);
//调用接口 获取用户信息
//String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER"));
//pageData.put("WORK_USER",workUser);
return pageData;
}
/**批量删除

9
src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.zcloud.service.gf.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.gf.GFHighWorkMapper;
import com.zcloud.service.corpFgs.CorpFgsService;
import com.zcloud.service.gf.GFHighWorkService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -22,6 +23,8 @@ public class GFHighWorkServiceImpl implements GFHighWorkService {
@Resource
private GFHighWorkMapper GFhighworkMapper;
@Resource
private CorpFgsService corpFgsService;
/**新增
* @param pd
@ -77,7 +80,11 @@ public class GFHighWorkServiceImpl implements GFHighWorkService {
* @throws Exception
*/
public PageData findById(PageData pd)throws Exception{
return GFhighworkMapper.findById(pd);
PageData pageData = GFhighworkMapper.findById(pd);
//调用接口 获取用户信息
//String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER"));
//pageData.put("PROJECT_MANAGER",workUser);
return pageData;
}
/**批量删除

10
src/main/java/com/zcloud/service/highriskwork/ConfinedSpaceService.java
View File

@ -64,5 +64,15 @@ public interface ConfinedSpaceService {
* @throws Exception
*/
PageData countCheck(PageData pd)throws Exception;
void editSpecialwork(PageData pd)throws Exception;
void editSpecialwork1(PageData pd)throws Exception;
void editSpecialwork2(PageData pd)throws Exception;
void editSpecialwork3(PageData pd)throws Exception;
void editSpecialwork4(PageData pd)throws Exception;
void editSpecialwork5(PageData pd)throws Exception;
void editSpecialwork6(PageData pd)throws Exception;
void editSpecialwork7(PageData pd)throws Exception;
void cancel(PageData pd)throws Exception;
PageData checkno(PageData pd)throws Exception;
}

11
src/main/java/com/zcloud/service/highriskwork/ElectricityService.java
View File

@ -78,5 +78,16 @@ public interface ElectricityService{
public int numberCheck(PageData pd)throws Exception;
PageData getCode(PageData pd)throws Exception;
void cancel(PageData pd)throws Exception;
PageData checkno(PageData pd)throws Exception;
void editSpecialwork(PageData pd)throws Exception;
void editSpecialwork1(PageData pd)throws Exception;
void editSpecialwork2(PageData pd)throws Exception;
void editSpecialwork3(PageData pd)throws Exception;
void editSpecialwork4(PageData pd)throws Exception;
void editSpecialwork5(PageData pd)throws Exception;
void editSpecialwork6(PageData pd)throws Exception;
void editSpecialwork7(PageData pd)throws Exception;
}

2
src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationService.java
View File

@ -110,6 +110,8 @@ public interface HotWorkApplicationService{
public List<PageData> archivelist(Page page) throws Exception;
public void updateState4ids(PageData pageData);
PageData getCountByMyApprovalForDelayedHotWork(String user_id) throws Exception;
}

2
src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java
View File

@ -112,5 +112,7 @@ public interface HotWorkApplicationUserService{
public List<PageData> getHotdelayed (PageData pd) throws Exception;
public List<PageData> getHotGasanalysis (PageData pd) throws Exception;
List<PageData> listByDepartment(PageData hotUserPd) throws Exception;
}

67
src/main/java/com/zcloud/service/highriskwork/HotworkAcceptUserCfdService.java Normal file
View File

@ -0,0 +1,67 @@
package com.zcloud.service.highriskwork;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：图片管理
* 作者：luoxiaobao
* 时间：2020-12-24
* 官网：www.zcloudchina.com
*/
public interface HotworkAcceptUserCfdService {
/**新增
* @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 deleteList(PageData pd)throws Exception;
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception;
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception;
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception;
/**通过id获取数据
* @param pd
* @throws Exception
*/
public List<PageData> findById(PageData pd)throws Exception;
public List<PageData> findByIds(PageData pd)throws Exception;
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
public List<PageData> listAllByIds(PageData pd)throws Exception;
}

88
src/main/java/com/zcloud/service/highriskwork/HotworkCfdService.java Normal file
View File

@ -0,0 +1,88 @@
package com.zcloud.service.highriskwork;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：动火作业
* 作者：luoxiaobao
* 时间：2021-09-18
* 官网：www.zcloudchina.com
*/
public interface HotworkCfdService {
/**新增
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception;
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception;
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception;
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception;
public List<PageData> jhlist(Page page)throws Exception;
public List<PageData> aqlist(Page page)throws Exception;
public List<PageData> jslist(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;
public void cancel(PageData pd)throws Exception;
public PageData checkno(PageData pd)throws Exception;
public void editSpecialwork(PageData pd)throws Exception;
public void editSpecialwork1(PageData pd)throws Exception;
public void editSpecialwork2(PageData pd)throws Exception;
public void editSpecialwork3(PageData pd)throws Exception;
public void editSpecialwork4(PageData pd)throws Exception;
public void editSpecialwork5(PageData pd)throws Exception;
public void editSpecialwork6(PageData pd)throws Exception;
public void editSpecialwork7(PageData pd)throws Exception;
public void edittime(PageData pd)throws Exception;
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
public List<PageData> listAllMeasures(PageData pd)throws Exception;
/**
* 待办作业数
* @param pd
* @return
* @throws Exception
*/
PageData countCheck(PageData pd)throws Exception;
PageData getCode(PageData pd)throws Exception;
}

59
src/main/java/com/zcloud/service/highriskwork/HotworkGasCfdService.java Normal file
View File

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

59
src/main/java/com/zcloud/service/highriskwork/HotworkLogCfdService.java Normal file
View File

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

59
src/main/java/com/zcloud/service/highriskwork/HotworkToMeasuresCfdService.java Normal file
View File

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

33
src/main/java/com/zcloud/service/highriskwork/impl/ConfinedSpaceServiceImpl.java
View File

@ -118,5 +118,38 @@ public class ConfinedSpaceServiceImpl implements ConfinedSpaceService {
public PageData countCheck(PageData pd) throws Exception {
return confinedspaceMapper.countCheck(pd);
}
public void cancel(PageData pd)throws Exception{
confinedspaceMapper.cancel(pd);
}
public PageData checkno(PageData pd)throws Exception{
return confinedspaceMapper.checkno(pd);
}
public void editSpecialwork(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork(pd);
}
public void editSpecialwork1(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork1(pd);
}
public void editSpecialwork2(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork2(pd);
}
public void editSpecialwork3(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork3(pd);
}
public void editSpecialwork4(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork4(pd);
}
public void editSpecialwork5(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork5(pd);
}
public void editSpecialwork6(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork6(pd);
}
public void editSpecialwork7(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork7(pd);
}
}

31
src/main/java/com/zcloud/service/highriskwork/impl/ElectricityServiceImpl.java
View File

@ -231,5 +231,36 @@ public class ElectricityServiceImpl implements ElectricityService {
public PageData getCode(PageData pd)throws Exception{
return electricityMapper.getCode(pd);
}
public void cancel(PageData pd)throws Exception{
electricityMapper.cancel(pd);
}
public PageData checkno(PageData pd)throws Exception{
return electricityMapper.checkno(pd);
}
public void editSpecialwork(PageData pd)throws Exception{
electricityMapper.editSpecialwork(pd);
}
public void editSpecialwork1(PageData pd)throws Exception{
electricityMapper.editSpecialwork1(pd);
}
public void editSpecialwork2(PageData pd)throws Exception{
electricityMapper.editSpecialwork2(pd);
}
public void editSpecialwork3(PageData pd)throws Exception{
electricityMapper.editSpecialwork3(pd);
}
public void editSpecialwork4(PageData pd)throws Exception{
electricityMapper.editSpecialwork4(pd);
}
public void editSpecialwork5(PageData pd)throws Exception{
electricityMapper.editSpecialwork5(pd);
}
public void editSpecialwork6(PageData pd)throws Exception{
electricityMapper.editSpecialwork6(pd);
}
public void editSpecialwork7(PageData pd)throws Exception{
electricityMapper.editSpecialwork7(pd);
}
}

8
src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationServiceImpl.java
View File

@ -105,6 +105,14 @@ public class HotWorkApplicationServiceImpl implements HotWorkApplicationService{
public void updateState4ids(PageData pageData){
hotworkapplicationMapper.updateState4ids(pageData);
}
@Override
public PageData getCountByMyApprovalForDelayedHotWork(String user_id) throws Exception {
PageData pd = new PageData();
pd.put("USER_ID",user_id);
return hotworkapplicationMapper.getCountByMyApprovalForDelayedHotWork(pd);
}
/**修改 动火状态
* 1.如果是打回。state =0
* @throws Exception

5
src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java
View File

@ -370,5 +370,10 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser
public List<PageData> getHotGasanalysis (PageData pd) throws Exception{
return hotworkapplicationuserMapper.getHotGasanalysis(pd);
}
@Override
public List<PageData> listByDepartment(PageData hotUserPd) throws Exception {
return hotworkapplicationuserMapper.listByDepartment(hotUserPd);
}
}

102
src/main/java/com/zcloud/service/highriskwork/impl/HotworkAcceptUserCfdServiceImpl.java Normal file
View File

@ -0,0 +1,102 @@
package com.zcloud.service.highriskwork.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.highriskwork.HotworkAcceptUserCfdMapper;
import com.zcloud.service.highriskwork.HotworkAcceptUserCfdService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 说明：图片管理
* 作者：luoxiaobao
* 时间：2020-12-24
* 官网：www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class HotworkAcceptUserCfdServiceImpl implements HotworkAcceptUserCfdService {
@Autowired
private HotworkAcceptUserCfdMapper hotworkAcceptUserCfdMapper;
/**新增
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception{
hotworkAcceptUserCfdMapper.save(pd);
}
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception{
hotworkAcceptUserCfdMapper.delete(pd);
}
/**删除
* @param pd
* @throws Exception
*/
public void deleteList(PageData pd)throws Exception{
hotworkAcceptUserCfdMapper.deleteList(pd);
}
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception{
hotworkAcceptUserCfdMapper.edit(pd);
}
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception{
return hotworkAcceptUserCfdMapper.datalistPage(page);
}
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception{
return hotworkAcceptUserCfdMapper.listAll(pd);
}
/**通过id获取数据
* @param pd
* @throws Exception
*/
public List<PageData> findById(PageData pd)throws Exception{
return hotworkAcceptUserCfdMapper.findById(pd);
}
public List<PageData> findByIds(PageData pd)throws Exception{
return hotworkAcceptUserCfdMapper.findByIds(pd);
}
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
hotworkAcceptUserCfdMapper.deleteAll(ArrayDATA_IDS);
}
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAllByIds(PageData pd)throws Exception{
return hotworkAcceptUserCfdMapper.listAllByIds(pd);
}
}

150
src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java Normal file
View File

@ -0,0 +1,150 @@
package com.zcloud.service.highriskwork.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.highriskwork.HotworkCfdMapper;
import com.zcloud.service.highriskwork.HotworkCfdService;
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-18
* 官网：www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class HotworkCfdServiceImpl implements HotworkCfdService {
@Autowired
private HotworkCfdMapper hotworkCfdMapper;
/**新增
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception{
hotworkCfdMapper.save(pd);
}
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception{
hotworkCfdMapper.delete(pd);
}
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception{
hotworkCfdMapper.edit(pd);
}
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception{
return hotworkCfdMapper.datalistPage(page);
}
public List<PageData> jhlist(Page page)throws Exception{
return hotworkCfdMapper.jhdatalistPage(page);
}
public List<PageData> aqlist(Page page)throws Exception{
return hotworkCfdMapper.aqdatalistPage(page);
}
public List<PageData> jslist(Page page)throws Exception{
return hotworkCfdMapper.jsdatalistPage(page);
}
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception{
return hotworkCfdMapper.listAll(pd);
}
/**通过id获取数据
* @param pd
* @throws Exception
*/
public PageData findById(PageData pd)throws Exception{
return hotworkCfdMapper.findById(pd);
}
public void cancel(PageData pd)throws Exception{
hotworkCfdMapper.cancel(pd);
}
public PageData checkno(PageData pd)throws Exception{
return hotworkCfdMapper.checkno(pd);
}
public void editSpecialwork(PageData pd)throws Exception{
hotworkCfdMapper.editSpecialwork(pd);
}
public void editSpecialwork1(PageData pd)throws Exception{
hotworkCfdMapper.editSpecialwork1(pd);
}
public void editSpecialwork2(PageData pd)throws Exception{
hotworkCfdMapper.editSpecialwork2(pd);
}
public void editSpecialwork3(PageData pd)throws Exception{
hotworkCfdMapper.editSpecialwork3(pd);
}
public void editSpecialwork4(PageData pd)throws Exception{
hotworkCfdMapper.editSpecialwork4(pd);
}
public void editSpecialwork5(PageData pd)throws Exception{
hotworkCfdMapper.editSpecialwork5(pd);
}
public void editSpecialwork6(PageData pd)throws Exception{
hotworkCfdMapper.editSpecialwork6(pd);
}
public void editSpecialwork7(PageData pd)throws Exception{
hotworkCfdMapper.editSpecialwork7(pd);
}
public void edittime(PageData pd)throws Exception{
hotworkCfdMapper.edittime(pd);
}
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
hotworkCfdMapper.deleteAll(ArrayDATA_IDS);
}
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAllMeasures(PageData pd)throws Exception{
return hotworkCfdMapper.listAllMeasures(pd);
}
/**
* 待办作业数
* @param pd
* @return
*/
@Override
public PageData countCheck(PageData pd) throws Exception {
return hotworkCfdMapper.countCheck(pd);
}
@Override
public PageData getCode(PageData pd)throws Exception{
return hotworkCfdMapper.getCode(pd);
}
}

83
src/main/java/com/zcloud/service/highriskwork/impl/HotworkGasCfdServiceImpl.java Normal file
View File

@ -0,0 +1,83 @@
package com.zcloud.service.highriskwork.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.highriskwork.HotworkGasCfdMapper;
import com.zcloud.service.highriskwork.HotworkGasCfdService;
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-18
* 官网：www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class HotworkGasCfdServiceImpl implements HotworkGasCfdService {
@Autowired
private HotworkGasCfdMapper hotworkGasCfdMapper;
/**新增
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception{
hotworkGasCfdMapper.save(pd);
}
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception{
hotworkGasCfdMapper.delete(pd);
}
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception{
hotworkGasCfdMapper.edit(pd);
}
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception{
return hotworkGasCfdMapper.datalistPage(page);
}
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception{
return hotworkGasCfdMapper.listAll(pd);
}
/**通过id获取数据
* @param pd
* @throws Exception
*/
public PageData findById(PageData pd)throws Exception{
return hotworkGasCfdMapper.findById(pd);
}
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
hotworkGasCfdMapper.deleteAll(ArrayDATA_IDS);
}
}

83
src/main/java/com/zcloud/service/highriskwork/impl/HotworkLogCfdServiceImpl.java Normal file
View File

@ -0,0 +1,83 @@
package com.zcloud.service.highriskwork.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.highriskwork.HotworkLogCfdMapper;
import com.zcloud.service.highriskwork.HotworkLogCfdService;
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-18
* 官网：www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class HotworkLogCfdServiceImpl implements HotworkLogCfdService {
@Autowired
private HotworkLogCfdMapper hotworkLogCfdMapper;
/**新增
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception{
hotworkLogCfdMapper.save(pd);
}
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception{
hotworkLogCfdMapper.delete(pd);
}
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception{
hotworkLogCfdMapper.edit(pd);
}
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception{
return hotworkLogCfdMapper.datalistPage(page);
}
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception{
return hotworkLogCfdMapper.listAll(pd);
}
/**通过id获取数据
* @param pd
* @throws Exception
*/
public PageData findById(PageData pd)throws Exception{
return hotworkLogCfdMapper.findById(pd);
}
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
hotworkLogCfdMapper.deleteAll(ArrayDATA_IDS);
}
}

83
src/main/java/com/zcloud/service/highriskwork/impl/HotworkToMeasuresCfdServiceImpl.java Normal file
View File

@ -0,0 +1,83 @@
package com.zcloud.service.highriskwork.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.highriskwork.HotworkToMeasuresCfdMapper;
import com.zcloud.service.highriskwork.HotworkToMeasuresCfdService;
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-18
* 官网：www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class HotworkToMeasuresCfdServiceImpl implements HotworkToMeasuresCfdService {
@Autowired
private HotworkToMeasuresCfdMapper hotworkToMeasuresCfdMapper;
/**新增
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception{
hotworkToMeasuresCfdMapper.save(pd);
}
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception{
hotworkToMeasuresCfdMapper.delete(pd);
}
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception{
hotworkToMeasuresCfdMapper.edit(pd);
}
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception{
return hotworkToMeasuresCfdMapper.datalistPage(page);
}
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception{
return hotworkToMeasuresCfdMapper.listAll(pd);
}
/**通过id获取数据
* @param pd
* @throws Exception
*/
public PageData findById(PageData pd)throws Exception{
return hotworkToMeasuresCfdMapper.findById(pd);
}
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
hotworkToMeasuresCfdMapper.deleteAll(ArrayDATA_IDS);
}
}

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

@ -74,5 +74,7 @@ public interface OutSourcedService{
//校验结束重点工程是否有为完成的内容
PageData jieshuOutSourced(PageData pd);
void updateState(PageData pd);
}

8
src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java
View File

@ -4,10 +4,12 @@ import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.dsno2.keyProjects.OutSourcedMapper;
import com.zcloud.service.keyProjects.OutSourcedService;
import com.zcloud.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
/**
@ -98,5 +100,11 @@ public class OutSourcedServiceImpl implements OutSourcedService {
public PageData jieshuOutSourced(PageData pd) {
return outsourcedMapper.jieshuOutSourced(pd);
}
@Override
public void updateState(PageData pd) {
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
outsourcedMapper.updateState(pd);
}
}

2
src/main/java/com/zcloud/mq/service/LogService.java → src/main/java/com/zcloud/service/mq/LogService.java
View File

@ -1,4 +1,4 @@
package com.zcloud.mq.service;
package com.zcloud.service.mq;
import com.zcloud.entity.PageData;

4
src/main/java/com/zcloud/mq/service/SendMessageService.java → src/main/java/com/zcloud/service/mq/SendMessageService.java
View File

@ -1,6 +1,6 @@
package com.zcloud.mq.service;
package com.zcloud.service.mq;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.dto.TenCorpDto;
public interface SendMessageService {

4
src/main/java/com/zcloud/mq/service/impl/LogServiceImpl.java → src/main/java/com/zcloud/service/mq/impl/LogServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.zcloud.mq.service.impl;
package com.zcloud.service.mq.impl;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.mq.MqErrorMessageLogMapper;
import com.zcloud.mapper.datasource.mq.MqMessageLogMapper;
import com.zcloud.mq.service.LogService;
import com.zcloud.service.mq.LogService;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Warden;
import org.springframework.scheduling.annotation.Async;

10
src/main/java/com/zcloud/mq/service/impl/SendMessageServiceImpl.java → src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java
View File

@ -1,15 +1,15 @@
package com.zcloud.mq.service.impl;
package com.zcloud.service.mq.impl;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.mq.MqErrorMessageLogMapper;
import com.zcloud.mapper.datasource.mq.MqMessageLogMapper;
import com.zcloud.mq.service.LogService;
import com.zcloud.mq.service.SendMessageService;
import com.zcloud.mq.util.MqUtil;
import com.zcloud.service.mq.LogService;
import com.zcloud.service.mq.SendMessageService;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Warden;
import com.zcloud.util.mq.MqUtil;
import org.apache.rocketmq.client.producer.SendResult;
import org.apache.rocketmq.client.producer.SendStatus;
import org.apache.rocketmq.spring.core.RocketMQTemplate;

67
src/main/java/com/zcloud/service/specialoperation/PersonnelManagementCfdService.java Normal file
View File

@ -0,0 +1,67 @@
package com.zcloud.service.specialoperation;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：特种作业人员管理
* 作者：luoxiaobao
* 时间：2022-06-16
* 官网：www.zcloudchina.com
*/
public interface PersonnelManagementCfdService {
/**新增
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception;
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception;
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception;
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception;
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception;
public List<PageData> namelist(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;
/**
* 判断特种作业证书编号是否存在
* @param pd
* @return
* @throws Exception
*/
public PageData findByCertificate(PageData pd)throws Exception;
}

95
src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementCfdServiceImpl.java Normal file
View File

@ -0,0 +1,95 @@
package com.zcloud.service.specialoperation.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.specialoperation.PersonnelManagementCfdMapper;
import com.zcloud.service.specialoperation.PersonnelManagementCfdService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 说明：特种作业人员管理
* 作者：luoxiaobao
* 时间：2022-06-16
* 官网：www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class PersonnelManagementCfdServiceImpl implements PersonnelManagementCfdService {
@Autowired
private PersonnelManagementCfdMapper personnelmanagementCfdMapper;
/**新增
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception{
personnelmanagementCfdMapper.save(pd);
}
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception{
personnelmanagementCfdMapper.delete(pd);
}
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception{
personnelmanagementCfdMapper.edit(pd);
}
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception{
return personnelmanagementCfdMapper.datalistPage(page);
}
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception{
return personnelmanagementCfdMapper.listAll(pd);
}
public List<PageData> namelist(PageData pd)throws Exception{
return personnelmanagementCfdMapper.namelist(pd);
}
/**通过id获取数据
* @param pd
* @throws Exception
*/
public PageData findById(PageData pd)throws Exception{
return personnelmanagementCfdMapper.findById(pd);
}
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
personnelmanagementCfdMapper.deleteAll(ArrayDATA_IDS);
}
/**
* 判断特种作业证书编号是否存在
* @param pd
* @return
* @throws Exception
*/
public PageData findByCertificate(PageData pd) throws Exception {
return personnelmanagementCfdMapper.findByCertificate(pd);
}
}

4
src/main/java/com/zcloud/service/system/DepartmentService.java
View File

@ -223,5 +223,9 @@ public interface DepartmentService{
List<PageData> listTreeManageAndCorp1(PageData pd)throws Exception;
List<PageData> listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception;
PageData getDepartmentInfo(PageData pd) throws Exception;
List<PageData> listTreeManageAndCorpHasOrder(PageData pd);
}

4
src/main/java/com/zcloud/service/system/DictionariesService.java
View File

@ -34,6 +34,8 @@ public interface DictionariesService {
*/
public PageData findById(PageData pd)throws Exception;
public List<PageData> getTreeById(String id) throws Exception;
/**通过id获取数据
* @param pd
* @throws Exception
@ -149,6 +151,4 @@ public interface DictionariesService {
*/
public List<PageData> getIdsByParentIds(List<String> parentIds) throws Exception;
public List<PageData> getTreeById(String id) throws Exception;
}

9
src/main/java/com/zcloud/service/system/UsersService.java
View File

@ -28,6 +28,13 @@ public interface UsersService {
*/
public PageData findByUsername(PageData pd)throws Exception;
/**
* 获取全部用户信息列表
* @return
* @throws Exception
*/
Object getAllUserList()throws Exception;
/**通过组ID获取组下级角色列表
* @param pd
* @return
@ -343,4 +350,6 @@ public interface UsersService {
List<PageData> selectUserListByUserIds(PageData selectPageData);
void resetCardNo(PageData pd);
PageData getUserInfo(PageData pd);
}

10
src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java
View File

@ -409,5 +409,15 @@ public class DepartmentServiceImpl implements DepartmentService{
public List<PageData> listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception {
return departmentMapper.listTreeManageAndCorpForPcPunishThePerson(pd);
}
@Override
public PageData getDepartmentInfo(PageData pd) throws Exception {
return departmentMapper.getInfo(pd);
}
@Override
public List<PageData> listTreeManageAndCorpHasOrder(PageData pd) {
return departmentMapper.listTreeManageAndCorpHasOrder(pd);
}
}

24
src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java
View File

@ -65,6 +65,18 @@ public class DictionariesServiceImpl implements DictionariesService {
return dictionariesMapper.listSubDictByParentIdAndCourseware(pd);
}
@Override
public List<PageData> getTreeById(String id) throws Exception {
List<Dictionaries> _list = this.listSubDictByParentId(id); //用传过来的ID获取此ID下的子列表数据
return _list.stream().map(n -> {
PageData entity = new PageData();
entity.put("DICTIONARIES_ID", n.getDICTIONARIES_ID());
entity.put("BIANMA", n.getBIANMA());
entity.put("NAME", n.getNAME());
return entity;
}).collect(Collectors.toList());
}
/**
* 获取所有数据并填充每条数据的子级列表(递归处理)用于代码生成器引用数据字典
* @param MENU_ID
@ -244,16 +256,4 @@ public class DictionariesServiceImpl implements DictionariesService {
return dictionariesMapper.getIdsByParentIds(parentIds);
}
@Override
public List<PageData> getTreeById(String id) throws Exception {
List<Dictionaries> _list = this.listSubDictByParentId(id); //用传过来的ID获取此ID下的子列表数据
return _list.stream().map(n -> {
PageData entity = new PageData();
entity.put("DICTIONARIES_ID", n.getDICTIONARIES_ID());
entity.put("BIANMA", n.getBIANMA());
entity.put("NAME", n.getNAME());
return entity;
}).collect(Collectors.toList());
}
}

39
src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
View File

@ -79,6 +79,40 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.findById(pd);
}
/**
* 获取全部用户信息列表
* @return
* @throws Exception
*/
@Override
@Transactional
public Object getAllUserList() throws Exception {
Map<String,Object> map = new HashMap<>();
String errInfo = "success";
// List<PageData> varList = new ArrayList<>();
// List<PageData> corpInfoList = corpInfoMapper.getAllCorpInfoList();
// 所有企业列表
// Map<String, Object> corpInfoListMap = new HashMap<>();
// Map<String, Object> corpInfoListMapLived = new HashMap<>();
// for (PageData pageData : corpInfoList) {
// corpInfoListMap.put(pageData.getString("CORPINFO_ID"),pageData);
// }
// 所有部门列表
// List<PageData> departmentList = departmentMapper.getAllDepartmentList();
// Map<String, Object> departmentListMap = new HashMap<>();
// for (PageData pageData : departmentList) {
// departmentListMap.put(pageData.getString("DEPARTMENT_ID"),pageData);
// }
// 所有人员列表
List<PageData> userList = usersMapper.getAllUserList();
map.put("userList", userList);
map.put("result",errInfo);
return map;
}
/**通过用户ID获取用户信息
* @param pd
* @return
@ -434,4 +468,9 @@ public class UsersServiceImpl implements UsersService {
public void resetCardNo(PageData pd) {
usersMapper.resetCardNo(pd);
}
@Override
public PageData getUserInfo(PageData pd) {
return usersMapper.getUserInfo(pd);
}
}

3
src/main/java/com/zcloud/util/Const.java
View File

@ -55,5 +55,8 @@ public class Const {
public final static String OA_APPID = "wx69f7e25b3760001c";//公众号
public final static String OA_SECRET = "087fe91f660300df63d0ef16fd162124";//公众号
// mq
public static final String topic_eightWork="eightWork";
public static final String topic_info="info";
}

15
src/main/java/com/zcloud/util/WaterMarkUtil.java Normal file
View File

@ -0,0 +1,15 @@
package com.zcloud.util;
import java.awt.*;
public class WaterMarkUtil {
/**
* 获取水印文字的长度
* @param waterMarkContent
* @param g
* @return
*/
public static int getWatermarkLength(String waterMarkContent, Graphics2D g) {
return g.getFontMetrics(g.getFont()).charsWidth(waterMarkContent.toCharArray(), 0, waterMarkContent.length());
}
}

49
src/main/java/com/zcloud/util/mq/MqSendUtil.java Normal file
View File

@ -0,0 +1,49 @@
package com.zcloud.util.mq;
import com.zcloud.dto.Response;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.service.mq.SendMessageService;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
/**
* @author zhangyue
* @date 2023/9/23/023 13:54
*/
@Component
public class MqSendUtil {
@Resource
private SendMessageService sendMessageService;
public Response sendMessage(TenCorpDto tenCorpDto) throws Exception {
try {
sendMessageService.sendMessage(tenCorpDto);
} catch (Exception e) {
e.printStackTrace();
}
return Response.OK();
}
public Response timelyQueue(TenCorpDto tenCorpDto) throws Exception {
try {
sendMessageService.sendMessage(tenCorpDto);
} catch (Exception e) {
e.printStackTrace();
}
return Response.OK();
}
public Response sendDelayQueue(TenCorpDto tenCorpDto) throws Exception {
try {
sendMessageService.SendDelayQueue(tenCorpDto);
return Response.OK();
} catch (Exception e) {
e.printStackTrace();
return Response.ERROR(e.getMessage());
}
}
}

15
src/main/java/com/zcloud/mq/util/MqUtil.java → src/main/java/com/zcloud/util/mq/MqUtil.java
View File

@ -1,4 +1,7 @@
package com.zcloud.mq.util;
package com.zcloud.util.mq;
import com.zcloud.util.Const;
import java.text.SimpleDateFormat;
import java.util.Date;
@ -13,7 +16,7 @@ public class MqUtil {
if (time_difference < 0){
return 0;
}
if (time_difference > 2*60*60*1000){
if (time_difference > 2 * 60 * 60 * 1000){
return 18;
}
if (time_difference > 60 * 60 * 1000){
@ -61,11 +64,11 @@ public class MqUtil {
if (time_difference > 10 * 1000){
return 3;
}
if (time_difference > 5 * 1000){
return 2;
}
// if (time_difference > 5 * 1000){
// return 2;
// }
if (time_difference > 1000){
return 1;
return 2;
}
return 0;
}

24
src/main/resources/application-dev.properties
View File

@ -69,3 +69,27 @@ smb.port=22
smb.user=root
smb.password=Zcloud@zcloud88888
smb.basePath=/mnt/qgfile/file/
#Mq\u914D\u7F6E
rocketmq.consumer.group2=edu-admin-edit
rocketmq.consumer.group1=edu-admin-add
#rocketmq.name-server=10.0.140.141:9876
#rocketmq.name-server=192.168.0.70:9876
rocketmq.name-server=192.168.0.31:9876
rocketmq.producer.group=libmiddle
rocketmq.producer.send-message-timeout=3000
rocketmq.producer.compress-message-body-threshold=4096
rocketmq.producer.max-message-size=4194304
rocketmq.producer.retry-times-when-send-failed=3
rocketmq.producer.retry-next-server=true
rocketmq.producer.retry-times-when-send-async-failed=3
## topic \u524D\u7F00
mq.topic.info=info
mq.topic.eightWork=eightWork
mq.group.info=scheduled_tasks
mq.group.eightWork=scheduled_tasks_eightWork
corp.default.pic-path=https://qgqy.qhdsafety.com/file/
corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/

23
src/main/resources/application-local.properties
View File

@ -70,3 +70,26 @@ smb.port=22
smb.user=root
smb.password=Zcloud@zcloud88888
smb.basePath=/mnt/qgfile/file/
#Mq\u914D\u7F6E
rocketmq.consumer.group2=edu-admin-edit
rocketmq.consumer.group1=edu-admin-add
#rocketmq.name-server=10.0.140.141:9876
#rocketmq.name-server=192.168.0.70:9876
rocketmq.name-server=192.168.151.57:9876
rocketmq.producer.group=libmiddle
rocketmq.producer.send-message-timeout=3000
rocketmq.producer.compress-message-body-threshold=4096
rocketmq.producer.max-message-size=4194304
rocketmq.producer.retry-times-when-send-failed=3
rocketmq.producer.retry-next-server=true
rocketmq.producer.retry-times-when-send-async-failed=3
## topic \u524D\u7F00
mq.topic.info=info
mq.topic.eightWork=eightWork
mq.group.info=scheduled_tasks
mq.group.eightWork=scheduled_tasks_eightWork
corp.default.pic-path=https://qgqy.qhdsafety.com/file/
corp.default.back-end-path=http://192.168.151.57:8092/

22
src/main/resources/application-master.properties
View File

@ -64,4 +64,26 @@ smb.port=22
smb.user=root
smb.password=SJSKAQHBGLXT@20220311
smb.basePath=/mnt/qask/file/
#Mq\u914D\u7F6E
rocketmq.consumer.group2=edu-admin-edit
rocketmq.consumer.group1=edu-admin-add
#rocketmq.name-server=10.0.140.141:9876
#rocketmq.name-server=192.168.0.70:9876
rocketmq.name-server=192.168.192.201:9876
rocketmq.producer.group=libmiddle
rocketmq.producer.send-message-timeout=3000
rocketmq.producer.compress-message-body-threshold=4096
rocketmq.producer.max-message-size=4194304
rocketmq.producer.retry-times-when-send-failed=3
rocketmq.producer.retry-next-server=true
rocketmq.producer.retry-times-when-send-async-failed=3
## topic \u524D\u7F00
mq.topic.info=info
mq.topic.eightWork=eightWork
mq.group.info=scheduled_tasks
mq.group.eightWork=scheduled_tasks_eightWork
corp.default.pic-path=https://qgqy.qhdsafety.com/file/
corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/

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

@ -3,7 +3,7 @@ server.port=8091
#??
#spring.profiles.active=local
#??
#部署31时使用
spring.profiles.active=dev
#??
#spring.profiles.active=master

109
src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml
View File

@ -1,65 +1,65 @@
<?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.bus.ShiftWorkRulesMapper">
<!--表名 -->
<sql id="tableName">
BUS_SHIFTWORKRULES
</sql>
<!--数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<!-- 字段 -->
<sql id="Field">
f.NAME,
f.CORPINFO_ID,
f.CREATOR,
f.CREATTIME,
f.OPERATOR,
f.OPERATTIME,
f.ISDELETE,
f.NAME,
f.CORPINFO_ID,
f.CREATOR,
f.CREATTIME,
f.OPERATOR,
f.OPERATTIME,
f.ISDELETE,
f.PARENTID,
f.LEVEL,
f.ISCUSTOM,
f.SHIFTWORKRULES_ID
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
NAME,
CORPINFO_ID,
CREATOR,
CREATTIME,
OPERATOR,
OPERATTIME,
ISDELETE,
NAME,
CORPINFO_ID,
CREATOR,
CREATTIME,
OPERATOR,
OPERATTIME,
ISDELETE,
PARENTID,
LEVEL,
ISCUSTOM,
SHIFTWORKRULES_ID
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{NAME},
#{CORPINFO_ID},
#{CREATOR},
#{CREATTIME},
#{OPERATOR},
#{OPERATTIME},
#{ISDELETE},
#{NAME},
#{CORPINFO_ID},
#{CREATOR},
#{CREATTIME},
#{OPERATOR},
#{OPERATTIME},
#{ISDELETE},
#{PARENTID},
#{LEVEL},
#{ISCUSTOM},
#{SHIFTWORKRULES_ID}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
@ -67,7 +67,7 @@
<include refid="FieldValue"></include>
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
@ -76,10 +76,10 @@
ISDELETE = '1',
OPERATOR = #{OPERATOR},
OPERATTIME = #{OPERATTIME}
where
where
SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID}
</delete>
<!-- 删除-->
<delete id="deleteByPar" parameterType="pd">
update
@ -88,15 +88,15 @@
ISDELETE = '1',
OPERATOR = #{OPERATOR},
OPERATTIME = #{OPERATTIME}
where
where
PARENTID = #{PARENTID}
</delete>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
set
<if test="NAME != null and NAME != ''"><!-- 关键词检索 -->
NAME = #{NAME},
</if>
@ -109,56 +109,57 @@
<if test="OPERATTIME != null and OPERATTIME != ''"><!-- 关键词检索 -->
OPERATTIME = #{OPERATTIME},
</if>
SHIFTWORKRULES_ID = SHIFTWORKRULES_ID
where
where
SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID}
</update>
<!-- 通过ID获取数据 -->
<select id="findById" parameterType="pd" resultType="pd">
select
select
<include refid="Field"></include>
from
from
<include refid="tableName"></include> f
where
where
f.SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID}
</select>
<!-- 列表 -->
<select id="datalistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>
from
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
<!-- 根据需求自己加检索条件
字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-->
)
</if>
</if>
<if test="pd.PARENTID != null and pd.PARENTID != ''"><!-- 关键词检索 -->
and f.PARENTID = #{pd.PARENTID}
and f.PARENTID = #{pd.PARENTID}
</if>
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.LEVEL != null and pd.LEVEL != ''"><!-- 关键词检索 -->
and f.LEVEL = #{pd.LEVEL}
and f.LEVEL = #{pd.LEVEL}
</if>
</select>
<!-- 列表(全部) -->
<select id="listAll" parameterType="pd" resultType="pd">
SELECT
<include refid="Field"></include>
FROM
FROM
<include refid="tableName"></include> f
WHERE f.ISDELETE = '0'
AND f.CORPINFO_ID = #{CORPINFO_ID}
@ -166,21 +167,21 @@
AND f.PARENTID = #{PARENTID}
</if>
</select>
<!-- 批量删除 -->
<delete id="deleteAll" parameterType="String">
update
<include refid="tableName"></include>
set
ISDELETE = '1'
where
where
SHIFTWORKRULES_ID in
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 排班类型1是否使用 -->
<select id="isUseOne" parameterType="pd" resultType="int">
SELECT COUNT(1) FROM SYS_USER WHERE SHIFTDUTYONE = #{SHIFTWORKRULES_ID}

18
src/main/resources/mybatis/datasource/bus/SpecialUserMapper.xml
View File

@ -251,6 +251,24 @@
and f.SPECIAL_NUMBER = #{SPECIAL_NUMBER}
</if>
</select>
<select id="nameListAll" parameterType="pd" resultType="pd">
select
concat(f.USERNAME,' ',f.SPECIAL_NUMBER) NAME
from
<include refid="tableName"></include> f
left join SYS_USER u on u.USER_ID = f.USER_ID
left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
where f.ISDELETE = '0'
<if test="UNIT_ID != null and UNIT_ID != ''"><!-- 人员类型 -->
and f.UNIT_ID = #{UNIT_ID}
</if>
<if test="endday != null and endday !=''">
and f.VALIDITY_TIME_END <![CDATA[ >= ]]> #{endday}
</if>
order by f.CREATTIME desc
</select>
<!-- 删除-->
<delete id="deleteTem" parameterType="pd">
delete from

Some files were not shown because too many files have changed in this diff Show More