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

补充 机设部 业务部 综合办公室 隐患统计增加统计的内容

0927cmt
dearLin 2024-07-16 17:56:29 +08:00
parent a450bcda16
commit 23f3f9bcc1
8 changed files with 1371 additions and 1424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -268,7 +268,7 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>1.1.12</version> <version>1.1.13</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>

565
src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java
View File

@ -158,8 +158,7 @@ public class HiddenApiController extends BaseController {
* 隐患图片 ，隐患视频 自己通过上传附件上传，暂时不处理 * 隐患图片 ，隐患视频 自己通过上传附件上传，暂时不处理
*/ */
/** 缺少必填参数:RISK_UNIT IDENTIFICATION RISK_POSITION 暂存 */ /** 缺少必填参数:RISK_UNIT IDENTIFICATION RISK_POSITION 暂存 */
String serl = "SOURCE,HIDDENDESCR,DISCOVERYTIME,RECTIFICATIONTYPE,HIDDENLEVEL," + String serl = "SOURCE,HIDDENDESCR,DISCOVERYTIME,RECTIFICATIONTYPE,HIDDENLEVEL," + "HIDDENTYPE,ISRELEVANT";
"HIDDENTYPE,ISRELEVANT";
if ("2".equals(pd.getString("SOURCE")) || "6".equals(pd.getString("SOURCE"))) {//如果是清单检查，需要填入其他必填项 if ("2".equals(pd.getString("SOURCE")) || "6".equals(pd.getString("SOURCE"))) {//如果是清单检查，需要填入其他必填项
// serl +=",RISK_UNIT,IDENTIFICATION,RISK_DESCR,RISK_POSITION,LEVEL,CHECK_CONTENT"; // serl +=",RISK_UNIT,IDENTIFICATION,RISK_DESCR,RISK_POSITION,LEVEL,CHECK_CONTENT";
@ -192,15 +191,15 @@ public class HiddenApiController extends BaseController {
/** 处理 隐患 部位的方法 .如果用户填入的隐患部位是输入的 */ /** 处理 隐患 部位的方法 .如果用户填入的隐患部位是输入的 */
if ("value".equals(pd.getString("hiddenPartType"))) { if ("value".equals(pd.getString("hiddenPartType"))) {
PageData hiddenRegion = hiddenRegionService.saveHidden(pd.getString("HIDDENPART")); PageData hiddenRegion = hiddenRegionService.saveHidden(pd.getString("HIDDENPART"));
pd.put("saveHidden",JSON.toJSONString(hiddenRegion)); pd.put("saveHidden", JSON.toJSONString(hiddenRegion));
pd.put("HIDDENPART", hiddenRegion.getString("HIDDENREGION_ID")); pd.put("HIDDENPART", hiddenRegion.getString("HIDDENREGION_ID"));
} }
/** 隐患的主要负责人 一条隐患 多个隐患发现人 ，把多个信息填入这个张表中 */ /** 隐患的主要负责人 一条隐患 多个隐患发现人 ，把多个信息填入这个张表中 */
PageData saveRectificationo = hiddenUserApiService.saveRectificationo(pd.getString("findCreator"), pd.getString("HIDDEN_ID"), "1", Jurisdiction.getUSER_ID()); PageData saveRectificationo = hiddenUserApiService.saveRectificationo(pd.getString("findCreator"), pd.getString("HIDDEN_ID"), "1", Jurisdiction.getUSER_ID());
pd.put("saveRectificationo",JSON.toJSONString(saveRectificationo)); pd.put("saveRectificationo", JSON.toJSONString(saveRectificationo));
/** 初始化隐患确认信息 记录隐患发现人的隐患等级等信息 */ /** 初始化隐患确认信息 记录隐患发现人的隐患等级等信息 */
PageData saveConfirm = hiddenExamineApiService.saveConfirm(pd, "0"); PageData saveConfirm = hiddenExamineApiService.saveConfirm(pd, "0");
pd.put("saveConfirm",JSON.toJSONString(saveConfirm)); pd.put("saveConfirm", JSON.toJSONString(saveConfirm));
/* 隐患的立即整改 填入整改信息，其他的信息是一样的 */ /* 隐患的立即整改 填入整改信息，其他的信息是一样的 */
if ("1".equals(pd.getString("RECTIFICATIONTYPE"))) { if ("1".equals(pd.getString("RECTIFICATIONTYPE"))) {
pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间
@ -222,7 +221,7 @@ public class HiddenApiController extends BaseController {
pd.put("CONFIRM_USER", longinfoUserDept.getString("HEADMAN"));//通过名字查询用户获取出ID pd.put("CONFIRM_USER", longinfoUserDept.getString("HEADMAN"));//通过名字查询用户获取出ID
} }
} }
pd.put("saveApi",JSON.toJSONString(pd)); pd.put("saveApi", JSON.toJSONString(pd));
hiddenApiService.saveApi(pd); hiddenApiService.saveApi(pd);
/* 发送隐患的通知公告 */ /* 发送隐患的通知公告 */
Map<String, Object> notRepr = new HashMap<>(); Map<String, Object> notRepr = new HashMap<>();
@ -233,8 +232,7 @@ public class HiddenApiController extends BaseController {
notRepr.put("params2", "隐患确认");// notRepr.put("params2", "隐患确认");//
} }
notRepr.put("params3", "确认");// notRepr.put("params3", "确认");//
messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患需要确认", Jurisdiction.getCORPINFO_ID(), pd.getString("CONFIRM_USER"), pd.getString("HIDDEN_ID"), messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患需要确认", Jurisdiction.getCORPINFO_ID(), pd.getString("CONFIRM_USER"), pd.getString("HIDDEN_ID"), pd.getString("HIDDENDESCR"), "隐患确认", "确认", "", "");
pd.getString("HIDDENDESCR"), "隐患确认", "确认", "", "");
/** /**
* 可以为空的 * 可以为空的
* POSITIONDESC 隐患位置描述 * POSITIONDESC 隐患位置描述
@ -250,7 +248,7 @@ public class HiddenApiController extends BaseController {
*/ */
map.put("result", errInfo); map.put("result", errInfo);
map.put("pd", pd); map.put("pd", pd);
map.put("dockData",JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }
@ -372,8 +370,6 @@ public class HiddenApiController extends BaseController {
} }
map.put("hImgs", imgMapListAll.get("3"));// 隐患图片 map.put("hImgs", imgMapListAll.get("3"));// 隐患图片
map.put("rImgs", imgMapListAll.get("4"));// 整改图片 map.put("rImgs", imgMapListAll.get("4"));// 整改图片
map.put("fcImgs", imgMapListAll.get("50"));// 安全环保检查验收图片 map.put("fcImgs", imgMapListAll.get("50"));// 安全环保检查验收图片
@ -438,8 +434,7 @@ public class HiddenApiController extends BaseController {
code = hiddenApiService.goEmis(pd); code = hiddenApiService.goEmis(pd);
return ResultCodeConstant.resMap(code); //隐患走到这就完成了 return ResultCodeConstant.resMap(code); //隐患走到这就完成了
} }
if ("hiddenLevel1001".equals(pd.getString("HIDDENLEVEL")) || if ("hiddenLevel1001".equals(pd.getString("HIDDENLEVEL")) || "1".equals(hidden.get("RECTIFICATIONTYPE").toString())) {
"1".equals(hidden.get("RECTIFICATIONTYPE").toString())) {
// 如果是忽略隐患 或者是立即整改 // 如果是忽略隐患 或者是立即整改
pd.put("STATE", "4"); pd.put("STATE", "4");
// 隐患状态修改成整改完成 // 隐患状态修改成整改完成
@ -459,25 +454,21 @@ public class HiddenApiController extends BaseController {
} else { } else {
pd.put("STATE", "1"); pd.put("STATE", "1");
} }
// 4 2 无整改人 // 4 2 无整改人
hidden.put("HIDDENLEVEL",HIDDENLEVEL); hidden.put("HIDDENLEVEL", HIDDENLEVEL);
hidden.put("RECTIFICATIONOR",RECTIFICATIONOR); hidden.put("RECTIFICATIONOR", RECTIFICATIONOR);
hidden.put("RECTIFICATIONDEADLINE",RECTIFICATIONDEADLINE); hidden.put("RECTIFICATIONDEADLINE", RECTIFICATIONDEADLINE);
hidden.put("RECTIFICATIONDEPT",RECTIFICATIONDEPT); hidden.put("RECTIFICATIONDEPT", RECTIFICATIONDEPT);
PageData pageData = hiddenExamineApiService.saveConfirm(hidden, "4"); //添加隐患处理流程 PageData pageData = hiddenExamineApiService.saveConfirm(hidden, "4"); //添加隐患处理流程
pd.put("pageData", JSON.toJSONString(pageData)); pd.put("pageData", JSON.toJSONString(pageData));
PageData confirm = hiddenApiService.confirmHidden(pd); //确认 PageData confirm = hiddenApiService.confirmHidden(pd); //确认
pd.put("confirm", JSON.toJSONString(confirm)); pd.put("confirm", JSON.toJSONString(confirm));
if (Tools.notEmpty(pd.getString("RECTIFICATIONOR")) && !hidden.getString("RECTIFICATIONTYPE").equals("1")) { if (Tools.notEmpty(pd.getString("RECTIFICATIONOR")) && !hidden.getString("RECTIFICATIONTYPE").equals("1")) {
messageService.sendMessageByParameter("HIDDEN_MAIL_002", "友情提示：有一条隐患需要整改", messageService.sendMessageByParameter("HIDDEN_MAIL_002", "友情提示：有一条隐患需要整改", hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"), hidden.getString("HIDDENDESCR"), "隐患整改", "整改", "", "");
hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"),
hidden.getString("HIDDENDESCR"), "隐患整改", "整改", "", "");
} else if ("1".equals(hidden.getString("RECTIFICATIONTYPE"))) { } else if ("1".equals(hidden.getString("RECTIFICATIONTYPE"))) {
messageService.sendMessageByParameter("HIDDEN_MAIL_003", "友情提示：有一条隐患已验收", messageService.sendMessageByParameter("HIDDEN_MAIL_003", "友情提示：有一条隐患已验收", hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"), hidden.getString("HIDDENDESCR"), "通过", "整改", "", "");
hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"),
hidden.getString("HIDDENDESCR"), "通过", "整改", "", "");
} }
map.put("dockData",JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(pd));
return ResultCodeConstant.resMap(code, map); return ResultCodeConstant.resMap(code, map);
} }
@ -519,14 +510,12 @@ public class HiddenApiController extends BaseController {
before.put("OPERATTIME", DateUtil.date2Str(new Date())); before.put("OPERATTIME", DateUtil.date2Str(new Date()));
before.put("REPULSE_CAUSE", pd.getString("REJECTOPINION")); before.put("REPULSE_CAUSE", pd.getString("REJECTOPINION"));
before = hiddenExamineApiService.save(before); before = hiddenExamineApiService.save(before);
pd.put("before",JSON.toJSONString(before)); pd.put("before", JSON.toJSONString(before));
List<PageData> hiddenUserList = hiddenUserApiService.getListByHiddenId(pd.getString("HIDDEN_ID")); List<PageData> hiddenUserList = hiddenUserApiService.getListByHiddenId(pd.getString("HIDDEN_ID"));
for (PageData pageData : hiddenUserList) { for (PageData pageData : hiddenUserList) {
messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患被打回", messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患被打回", Jurisdiction.getCORPINFO_ID(), pageData.getString("USER_ID"), pd.getString("HIDDEN_ID"), pd.getString("HIDDENDESCR"), "上报", "查看", "", "");
Jurisdiction.getCORPINFO_ID(), pageData.getString("USER_ID"), pd.getString("HIDDEN_ID"),
pd.getString("HIDDENDESCR"), "上报", "查看", "", "");
} }
map.put("dockData",JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(pd));
return ResultCodeConstant.resMap(code, map); return ResultCodeConstant.resMap(code, map);
} }
@ -573,8 +562,7 @@ public class HiddenApiController extends BaseController {
} }
PageData hidden = hiddenApiService.findById(pd); //获取隐患信息 PageData hidden = hiddenApiService.findById(pd); //获取隐患信息
/** 整改,修改隐患信息 **/ /** 整改,修改隐患信息 **/
int hiddenupdateSate = hiddenApiService.rectify(pd.getString("HIDDEN_ID"), pd.getString("RECTIFYDESCR"), int hiddenupdateSate = hiddenApiService.rectify(pd.getString("HIDDEN_ID"), pd.getString("RECTIFYDESCR"), pd.getString("RECTIFICATIONTIME"), pd.getString("HAVESCHEME"), pd.getString("INVESTMENT_FUNDS"));
pd.getString("RECTIFICATIONTIME"), pd.getString("HAVESCHEME"), pd.getString("INVESTMENT_FUNDS"));
map.put("hiddenupdateSate", hiddenupdateSate); map.put("hiddenupdateSate", hiddenupdateSate);
if ("1".equals(pd.getString("HAVESCHEME"))) { //如果有整改方案 添加上整改方案 if ("1".equals(pd.getString("HAVESCHEME"))) { //如果有整改方案 添加上整改方案
pd.put("HIDDENSCHEME_ID", this.get32UUID()); pd.put("HIDDENSCHEME_ID", this.get32UUID());
@ -589,7 +577,7 @@ public class HiddenApiController extends BaseController {
} }
/** 隐患验收信息 **/ /** 隐患验收信息 **/
PageData hiddenCheck = hiddenCheckApiService.saveHiddenCheck(pd.getString("CHECKOR"), pd.getString("CHECKDEPT"), pd.getString("OTHER"), pd.getString("HIDDEN_ID"), hidden.getString("HIDDENDESCR")); PageData hiddenCheck = hiddenCheckApiService.saveHiddenCheck(pd.getString("CHECKOR"), pd.getString("CHECKDEPT"), pd.getString("OTHER"), pd.getString("HIDDEN_ID"), hidden.getString("HIDDENDESCR"));
pd.put("hiddenCheck",JSON.toJSONString(hiddenCheck)); pd.put("hiddenCheck", JSON.toJSONString(hiddenCheck));
/** 隐患延时申请的要通过 **/ /** 隐患延时申请的要通过 **/
PageData exam = hiddenExamineApiService.saveRectify(pd.getString("HIDDEN_ID")); //添加隐患整改记录 PageData exam = hiddenExamineApiService.saveRectify(pd.getString("HIDDEN_ID")); //添加隐患整改记录
pd.put("exam", JSON.toJSONString(exam)); pd.put("exam", JSON.toJSONString(exam));
@ -600,7 +588,7 @@ public class HiddenApiController extends BaseController {
} }
} }
map.put("hiddenCheckState", hiddenCheck.get("retint")); map.put("hiddenCheckState", hiddenCheck.get("retint"));
map.put("dockData",JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(pd));
return ResultCodeConstant.resMap(code, map); return ResultCodeConstant.resMap(code, map);
} }
@ -614,8 +602,7 @@ public class HiddenApiController extends BaseController {
@RequiresPermissions("hidden:list") @RequiresPermissions("hidden:list")
@ResponseBody @ResponseBody
@DockAnnotation(isAdd = true) @DockAnnotation(isAdd = true)
public Object public Object unableRectify() throws Exception {
unableRectify() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
Integer code = 000000; Integer code = 000000;
PageData pd = new PageData(); PageData pd = new PageData();
@ -647,10 +634,8 @@ public class HiddenApiController extends BaseController {
examine.put("OPERATOR", Jurisdiction.getUSER_ID()); examine.put("OPERATOR", Jurisdiction.getUSER_ID());
examine.put("OPERATTIME", DateUtil.date2Str(new Date())); examine.put("OPERATTIME", DateUtil.date2Str(new Date()));
examine = hiddenExamineApiService.save(examine); examine = hiddenExamineApiService.save(examine);
pd.put("examine",JSON.toJSONString(examine)); pd.put("examine", JSON.toJSONString(examine));
messageService.sendMessageByParameter("HIDDEN_MAIL_005", "友情提示：有一条隐患需要特殊审核", messageService.sendMessageByParameter("HIDDEN_MAIL_005", "友情提示：有一条隐患需要特殊审核", hidden.getString("CORPINFO_ID"), hidden.getString("CONFIRM_USER"), hidden.getString("HIDDEN_ID"), hidden.getString("HIDDENDESCR"), "特殊处置审核", "审核", "", "");
hidden.getString("CORPINFO_ID"), hidden.getString("CONFIRM_USER"), hidden.getString("HIDDEN_ID"),
hidden.getString("HIDDENDESCR"), "特殊处置审核", "审核", "", "");
map.put("msg", "隐患特殊处理申请成功。请通知隐患确认人进行特殊处理确认操作！"); map.put("msg", "隐患特殊处理申请成功。请通知隐患确认人进行特殊处理确认操作！");
/** 暂时没有整理 **/ /** 暂时没有整理 **/
@ -671,7 +656,7 @@ public class HiddenApiController extends BaseController {
inspection.put("HIDDEN_vector", pd.getString("HIDDEN_ID")); inspection.put("HIDDEN_vector", pd.getString("HIDDEN_ID"));
noticeUtil.SE_ThreeStepUtil(inspection); noticeUtil.SE_ThreeStepUtil(inspection);
} }
map.put("dockData",JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(pd));
return ResultCodeConstant.resMap(code, map); return ResultCodeConstant.resMap(code, map);
} }
@ -723,12 +708,10 @@ public class HiddenApiController extends BaseController {
examine.put("DISPOSAL_FILE", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); examine.put("DISPOSAL_FILE", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
} }
examine = hiddenExamineApiService.save(examine); examine = hiddenExamineApiService.save(examine);
pd.put("examine",JSON.toJSONString(examine)); pd.put("examine", JSON.toJSONString(examine));
messageService.sendMessageByParameter("HIDDEN_MAIL_007", "友情提示：有一条隐患需要延期审核", messageService.sendMessageByParameter("HIDDEN_MAIL_007", "友情提示：有一条隐患需要延期审核", hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"), hidden.getString("HIDDENDESCR"), "延期审核", "审核", "", "");
hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"),
hidden.getString("HIDDENDESCR"), "延期审核", "审核", "", "");
map.put("msg", "隐患延期申成功。请通知隐患确认人进行延期确认操作！"); map.put("msg", "隐患延期申成功。请通知隐患确认人进行延期确认操作！");
map.put("dockData",JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(pd));
return ResultCodeConstant.resMap(code, map); return ResultCodeConstant.resMap(code, map);
} }
@ -777,7 +760,7 @@ public class HiddenApiController extends BaseController {
if (Jurisdiction.getUSER_ID().equals(pageData.getString("USER_ID"))) { if (Jurisdiction.getUSER_ID().equals(pageData.getString("USER_ID"))) {
check = pageData; check = pageData;
PageData exampd = hiddenCheckApiService.checkHidden(pd.getString("HIDDEN_ID"), pageData.getString("HIDDENCHECK_ID"), pd.getString("CHECKDESCR"), pd.getString("CHECK_TIME"), Jurisdiction.getDEPARTMENT_ID(), Jurisdiction.getUSER_ID()); PageData exampd = hiddenCheckApiService.checkHidden(pd.getString("HIDDEN_ID"), pageData.getString("HIDDENCHECK_ID"), pd.getString("CHECKDESCR"), pd.getString("CHECK_TIME"), Jurisdiction.getDEPARTMENT_ID(), Jurisdiction.getUSER_ID());
hiddenCheckMap.put("exampd"+count, JSON.toJSONString(exampd)); hiddenCheckMap.put("exampd" + count, JSON.toJSONString(exampd));
count++; count++;
checkCount++; //本次的++ checkCount++; //本次的++
} }
@ -829,14 +812,12 @@ public class HiddenApiController extends BaseController {
hiddenApiService.repulseCheck(pd.getString("HIDDEN_ID")); hiddenApiService.repulseCheck(pd.getString("HIDDEN_ID"));
/** 记录打回 **/ /** 记录打回 **/
PageData exam = hiddenExamineApiService.saveRepulseCheck(pd.getString("HIDDEN_ID"), pd.getString("CONTENT")); PageData exam = hiddenExamineApiService.saveRepulseCheck(pd.getString("HIDDEN_ID"), pd.getString("CONTENT"));
pd.put("exam",JSON.toJSONString(exam)); pd.put("exam", JSON.toJSONString(exam));
/** 给隐患整改人发送站内信**/ /** 给隐患整改人发送站内信**/
messageService.sendMessageByParameter("HIDDEN_MAIL_002", "友情提示：有一条隐患被打回", messageService.sendMessageByParameter("HIDDEN_MAIL_002", "友情提示：有一条隐患被打回", hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"), hidden.getString("HIDDENDESCR"), "整改", "重新整改", "", "");
hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"),
hidden.getString("HIDDENDESCR"), "整改", "重新整改", "", "");
} }
map.put("check", check); map.put("check", check);
map.put("dockData",JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(pd));
return ResultCodeConstant.resMap(code, map); return ResultCodeConstant.resMap(code, map);
} }
@ -856,26 +837,26 @@ public class HiddenApiController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
// 增加隐患整改部门查询 开始 // 增加隐患整改部门查询 开始
if(StringUtils.isNotBlank(pd.getString("RECTIFICATIONDEPT"))){ if (StringUtils.isNotBlank(pd.getString("RECTIFICATIONDEPT"))) {
String url ="department_list.html?DEPARTMENT_ID="; String url = "department_list.html?DEPARTMENT_ID=";
List<Department> departments = departmentService.listAllDepartment(pd.getString("RECTIFICATIONDEPT"), url); List<Department> departments = departmentService.listAllDepartment(pd.getString("RECTIFICATIONDEPT"), url);
List<String> departmentIds = new ArrayList<>(); List<String> departmentIds = new ArrayList<>();
departmentIds.add(pd.getString("RECTIFICATIONDEPT")); departmentIds.add(pd.getString("RECTIFICATIONDEPT"));
for(Department department:departments){ for (Department department : departments) {
departmentIds.add(department.getDEPARTMENT_ID()); departmentIds.add(department.getDEPARTMENT_ID());
} }
pd.put("departmentIds",departmentIds); pd.put("departmentIds", departmentIds);
} }
// 增加发现整改部门查询 开始 // 增加发现整改部门查询 开始
if(StringUtils.isNotBlank(pd.getString("creatorUserDept"))){ if (StringUtils.isNotBlank(pd.getString("creatorUserDept"))) {
String url ="department_list.html?DEPARTMENT_ID="; String url = "department_list.html?DEPARTMENT_ID=";
List<Department> departments = departmentService.listAllDepartment(pd.getString("creatorUserDept"), url); List<Department> departments = departmentService.listAllDepartment(pd.getString("creatorUserDept"), url);
List<String> departmentIds = new ArrayList<>(); List<String> departmentIds = new ArrayList<>();
departmentIds.add(pd.getString("creatorUserDept")); departmentIds.add(pd.getString("creatorUserDept"));
for(Department department:departments){ for (Department department : departments) {
departmentIds.add(department.getDEPARTMENT_ID()); departmentIds.add(department.getDEPARTMENT_ID());
} }
pd.put("creatorUserDepts",departmentIds); pd.put("creatorUserDepts", departmentIds);
} }
// 增加隐患发现部门查询 结束 // 增加隐患发现部门查询 结束
@ -959,141 +940,145 @@ public class HiddenApiController extends BaseController {
return map; return map;
} }
/**导出某一个选中项到excel /**
* 导出某一个选中项到excel
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/excelSummary") @RequestMapping(value = "/excelSummary")
// @RequiresPermissions("toExcel") // @RequiresPermissions("toExcel")
public ModelAndView excelSummary() throws Exception{ public ModelAndView excelSummary() throws Exception {
ModelAndView mv = new ModelAndView(); ModelAndView mv = new ModelAndView();
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
Map<String,Object> dataMap = new HashMap<String,Object>(); Map<String, Object> dataMap = new HashMap<String, Object>();
List<String> titles = new ArrayList<String>(); List<String> titles = new ArrayList<String>();
titles.add("月份"); //1 titles.add("月份"); //1
titles.add("数量（公司）"); //2 titles.add("数量（公司）"); //2
titles.add("已完成（公司）"); //3 titles.add("已完成（公司）"); //3
titles.add("完成率（公司）"); //4 titles.add("完成率（公司）"); //4
titles.add("数量（装船部）"); //5 titles.add("数量（装船部）"); //5
titles.add("已完成（装船部）"); //6 titles.add("已完成（装船部）"); //6
titles.add("完成率（装船部）"); //7 titles.add("完成率（装船部）"); //7
titles.add("数量（卸车部）"); //8 titles.add("数量（卸车部）"); //8
titles.add("已完成（卸车部）"); //9 titles.add("已完成（卸车部）"); //9
titles.add("完成率（卸车部）"); //10 titles.add("完成率（卸车部）"); //10
titles.add("数量（生产保障部）"); //11 titles.add("数量（生产保障部）"); //11
titles.add("已完成（生产保障部）"); //12 titles.add("已完成（生产保障部）"); //12
titles.add("完成率（生产保障部）"); //13 titles.add("完成率（生产保障部）"); //13
titles.add("数量（其他部）"); //14 titles.add("数量（其他部）"); //14
titles.add("已完成（其他部）"); //15 titles.add("已完成（其他部）"); //15
titles.add("完成率（其他部）"); //16 titles.add("完成率（其他部）"); //16
dataMap.put("titles", titles); dataMap.put("titles", titles);
List<PageData> dataList = hiddenApiService.goSummaryTable(pd); List<PageData> dataList = hiddenApiService.goSummaryTable(pd);
List<PageData> varOList = hiddenApiService.dealData(dataList); List<PageData> varOList = hiddenApiService.dealData(dataList);
ArrayList<PageData> varList = new ArrayList<>(); ArrayList<PageData> varList = new ArrayList<>();
for(int i=0;i<varOList.size();i++){ for (int i = 0; i < varOList.size(); i++) {
PageData vpd = new PageData(); PageData vpd = new PageData();
vpd.put("var1", varOList.get(i).getString("MONTH")); //1 vpd.put("var1", varOList.get(i).getString("MONTH")); //1
vpd.put("var2", Tools.isEmpty(varOList.get(i).getString("TOTAL_COUNT_ALL")) ? "0" : varOList.get(i).getString("TOTAL_COUNT_ALL")); //2 vpd.put("var2", Tools.isEmpty(varOList.get(i).getString("TOTAL_COUNT_ALL")) ? "0" : varOList.get(i).getString("TOTAL_COUNT_ALL")); //2
vpd.put("var3", Tools.isEmpty(varOList.get(i).getString("REVISED_COUNT_ALL")) ? "0" : varOList.get(i).getString("REVISED_COUNT_ALL")); //3 vpd.put("var3", Tools.isEmpty(varOList.get(i).getString("REVISED_COUNT_ALL")) ? "0" : varOList.get(i).getString("REVISED_COUNT_ALL")); //3
vpd.put("var4", Tools.isEmpty(varOList.get(i).getString("COMPLERATE_ALL")) ? "0.00%" : varOList.get(i).getString("COMPLERATE_ALL")); //4 vpd.put("var4", Tools.isEmpty(varOList.get(i).getString("COMPLERATE_ALL")) ? "0.00%" : varOList.get(i).getString("COMPLERATE_ALL")); //4
vpd.put("var5", Tools.isEmpty(varOList.get(i).getString("TOTAL_COUNT_ONE")) ? "0" : varOList.get(i).getString("TOTAL_COUNT_ONE")); //5 vpd.put("var5", Tools.isEmpty(varOList.get(i).getString("TOTAL_COUNT_ONE")) ? "0" : varOList.get(i).getString("TOTAL_COUNT_ONE")); //5
vpd.put("var6", Tools.isEmpty(varOList.get(i).getString("REVISED_COUNT_ONE")) ? "0" : varOList.get(i).getString("REVISED_COUNT_ONE")); //6 vpd.put("var6", Tools.isEmpty(varOList.get(i).getString("REVISED_COUNT_ONE")) ? "0" : varOList.get(i).getString("REVISED_COUNT_ONE")); //6
vpd.put("var7", Tools.isEmpty(varOList.get(i).getString("COMPLERATE_ONE")) ? "0.00%" : varOList.get(i).getString("COMPLERATE_ONE")); //7 vpd.put("var7", Tools.isEmpty(varOList.get(i).getString("COMPLERATE_ONE")) ? "0.00%" : varOList.get(i).getString("COMPLERATE_ONE")); //7
vpd.put("var8", Tools.isEmpty(varOList.get(i).getString("TOTAL_COUNT_TWO")) ? "0" : varOList.get(i).getString("TOTAL_COUNT_TWO")); //8 vpd.put("var8", Tools.isEmpty(varOList.get(i).getString("TOTAL_COUNT_TWO")) ? "0" : varOList.get(i).getString("TOTAL_COUNT_TWO")); //8
vpd.put("var9", Tools.isEmpty(varOList.get(i).getString("REVISED_COUNT_TWO")) ? "0" : varOList.get(i).getString("REVISED_COUNT_TWO")); //9 vpd.put("var9", Tools.isEmpty(varOList.get(i).getString("REVISED_COUNT_TWO")) ? "0" : varOList.get(i).getString("REVISED_COUNT_TWO")); //9
vpd.put("var10", Tools.isEmpty(varOList.get(i).getString("COMPLERATE_TWO")) ? "0.00%" : varOList.get(i).getString("COMPLERATE_TWO")); //10 vpd.put("var10", Tools.isEmpty(varOList.get(i).getString("COMPLERATE_TWO")) ? "0.00%" : varOList.get(i).getString("COMPLERATE_TWO")); //10
vpd.put("var11", Tools.isEmpty(varOList.get(i).getString("TOTAL_COUNT_THREE")) ? "0" : varOList.get(i).getString("TOTAL_COUNT_THREE")); //11 vpd.put("var11", Tools.isEmpty(varOList.get(i).getString("TOTAL_COUNT_THREE")) ? "0" : varOList.get(i).getString("TOTAL_COUNT_THREE")); //11
vpd.put("var12", Tools.isEmpty(varOList.get(i).getString("REVISED_COUNT_THREE")) ? "0" : varOList.get(i).getString("REVISED_COUNT_THREE")); //12 vpd.put("var12", Tools.isEmpty(varOList.get(i).getString("REVISED_COUNT_THREE")) ? "0" : varOList.get(i).getString("REVISED_COUNT_THREE")); //12
vpd.put("var13", Tools.isEmpty(varOList.get(i).getString("COMPLERATE_THREE")) ? "0.00%" : varOList.get(i).getString("COMPLERATE_THREE")); //13 vpd.put("var13", Tools.isEmpty(varOList.get(i).getString("COMPLERATE_THREE")) ? "0.00%" : varOList.get(i).getString("COMPLERATE_THREE")); //13
vpd.put("var14", Tools.isEmpty(varOList.get(i).getString("TOTAL_COUNT_OTHER")) ? "0" : varOList.get(i).getString("TOTAL_COUNT_OTHER")); //14 vpd.put("var14", Tools.isEmpty(varOList.get(i).getString("TOTAL_COUNT_OTHER")) ? "0" : varOList.get(i).getString("TOTAL_COUNT_OTHER")); //14
vpd.put("var15", Tools.isEmpty(varOList.get(i).getString("REVISED_COUNT_OTHER")) ? "0" : varOList.get(i).getString("REVISED_COUNT_OTHER")); //15 vpd.put("var15", Tools.isEmpty(varOList.get(i).getString("REVISED_COUNT_OTHER")) ? "0" : varOList.get(i).getString("REVISED_COUNT_OTHER")); //15
vpd.put("var16", Tools.isEmpty(varOList.get(i).getString("COMPLERATE_OTHER")) ? "0.00%" : varOList.get(i).getString("COMPLERATE_OTHER")); //16 vpd.put("var16", Tools.isEmpty(varOList.get(i).getString("COMPLERATE_OTHER")) ? "0.00%" : varOList.get(i).getString("COMPLERATE_OTHER")); //16
varList.add(vpd); varList.add(vpd);
} }
dataMap.put("varList", varList); dataMap.put("varList", varList);
dataMap.put("filename","安全隐患汇总表"); dataMap.put("filename", "安全隐患汇总表");
ObjectExcelView erv = new ObjectExcelView(); ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap); mv = new ModelAndView(erv, dataMap);
return mv; return mv;
} }
/**导出某一个选中项到excel /**
* 导出某一个选中项到excel
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/excelDetailedList") @RequestMapping(value = "/excelDetailedList")
// @RequiresPermissions("toExcel") // @RequiresPermissions("toExcel")
public ModelAndView excelDetailedList() throws Exception{ public ModelAndView excelDetailedList() throws Exception {
ModelAndView mv = new ModelAndView(); ModelAndView mv = new ModelAndView();
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
Map<String,Object> dataMap = new HashMap<String,Object>(); Map<String, Object> dataMap = new HashMap<String, Object>();
List<String> titles = new ArrayList<String>(); List<String> titles = new ArrayList<String>();
titles.add("序号"); //1 titles.add("序号"); //1
titles.add("隐患类型"); //2 titles.add("隐患类型"); //2
titles.add("等级"); //3 titles.add("等级"); //3
titles.add("隐患位置"); //4 titles.add("隐患位置"); //4
titles.add("隐患简要情况"); //5 titles.add("隐患简要情况"); //5
titles.add("整改治理措施"); //6 titles.add("整改治理措施"); //6
titles.add("发现隐患日期"); //7 titles.add("发现隐患日期"); //7
titles.add("整改完成时限"); //8 titles.add("整改完成时限"); //8
titles.add("整改责任部门"); //9 titles.add("整改责任部门"); //9
titles.add("整改责任人"); //10 titles.add("整改责任人"); //10
titles.add("整改督办人"); //11 titles.add("整改督办人"); //11
titles.add("投入资金（元）"); //12 titles.add("投入资金（元）"); //12
titles.add("复查时间"); //13 titles.add("复查时间"); //13
titles.add("复查人"); //14 titles.add("复查人"); //14
titles.add("检查人员"); //15 titles.add("检查人员"); //15
dataMap.put("titles", titles); dataMap.put("titles", titles);
// 增加隐患整改部门查询 开始 // 增加隐患整改部门查询 开始
if(StringUtils.isNotBlank(pd.getString("RECTIFICATIONDEPT"))){ if (StringUtils.isNotBlank(pd.getString("RECTIFICATIONDEPT"))) {
String url ="department_list.html?DEPARTMENT_ID="; String url = "department_list.html?DEPARTMENT_ID=";
List<Department> departments = departmentService.listAllDepartment(pd.getString("RECTIFICATIONDEPT"), url); List<Department> departments = departmentService.listAllDepartment(pd.getString("RECTIFICATIONDEPT"), url);
List<String> departmentIds = new ArrayList<>(); List<String> departmentIds = new ArrayList<>();
departmentIds.add(pd.getString("RECTIFICATIONDEPT")); departmentIds.add(pd.getString("RECTIFICATIONDEPT"));
for(Department department:departments){ for (Department department : departments) {
departmentIds.add(department.getDEPARTMENT_ID()); departmentIds.add(department.getDEPARTMENT_ID());
} }
pd.put("departmentIds",departmentIds); pd.put("departmentIds", departmentIds);
} }
// 增加发现整改部门查询 开始 // 增加发现整改部门查询 开始
if(StringUtils.isNotBlank(pd.getString("creatorUserDept"))){ if (StringUtils.isNotBlank(pd.getString("creatorUserDept"))) {
String url ="department_list.html?DEPARTMENT_ID="; String url = "department_list.html?DEPARTMENT_ID=";
List<Department> departments = departmentService.listAllDepartment(pd.getString("creatorUserDept"), url); List<Department> departments = departmentService.listAllDepartment(pd.getString("creatorUserDept"), url);
List<String> departmentIds = new ArrayList<>(); List<String> departmentIds = new ArrayList<>();
departmentIds.add(pd.getString("creatorUserDept")); departmentIds.add(pd.getString("creatorUserDept"));
for(Department department:departments){ for (Department department : departments) {
departmentIds.add(department.getDEPARTMENT_ID()); departmentIds.add(department.getDEPARTMENT_ID());
} }
pd.put("creatorUserDepts",departmentIds); pd.put("creatorUserDepts", departmentIds);
} }
List<PageData> varOList = hiddenApiService.listForExcel(pd); List<PageData> varOList = hiddenApiService.listForExcel(pd);
List<PageData> varList = new ArrayList<PageData>(); List<PageData> varList = new ArrayList<PageData>();
for(int i=0;i<varOList.size();i++){ for (int i = 0; i < varOList.size(); i++) {
PageData vpd = new PageData(); PageData vpd = new PageData();
vpd.put("var1", i + 1); //1 vpd.put("var1", i + 1); //1
vpd.put("var2", Tools.isEmpty(varOList.get(i).getString("type1Name")) ? "" : varOList.get(i).getString("type1Name")); //2 vpd.put("var2", Tools.isEmpty(varOList.get(i).getString("type1Name")) ? "" : varOList.get(i).getString("type1Name")); //2
vpd.put("var3", Tools.isEmpty(varOList.get(i).getString("levelName")) ? "" : varOList.get(i).getString("levelName")); //3 vpd.put("var3", Tools.isEmpty(varOList.get(i).getString("levelName")) ? "" : varOList.get(i).getString("levelName")); //3
vpd.put("var4", Tools.isEmpty(varOList.get(i).getString("POSITIONDESC")) ? "" : varOList.get(i).getString("POSITIONDESC")); //4 vpd.put("var4", Tools.isEmpty(varOList.get(i).getString("POSITIONDESC")) ? "" : varOList.get(i).getString("POSITIONDESC")); //4
vpd.put("var5", Tools.isEmpty(varOList.get(i).getString("HIDDENDESCR")) ? "" : varOList.get(i).getString("HIDDENDESCR")); //5 vpd.put("var5", Tools.isEmpty(varOList.get(i).getString("HIDDENDESCR")) ? "" : varOList.get(i).getString("HIDDENDESCR")); //5
vpd.put("var6", Tools.isEmpty(varOList.get(i).getString("RECTIFYDESCR")) ? "" : varOList.get(i).getString("RECTIFYDESCR")); //6 vpd.put("var6", Tools.isEmpty(varOList.get(i).getString("RECTIFYDESCR")) ? "" : varOList.get(i).getString("RECTIFYDESCR")); //6
vpd.put("var7", Tools.isEmpty(varOList.get(i).getString("DISCOVERYTIME")) ? "" : varOList.get(i).getString("DISCOVERYTIME")); //7 vpd.put("var7", Tools.isEmpty(varOList.get(i).getString("DISCOVERYTIME")) ? "" : varOList.get(i).getString("DISCOVERYTIME")); //7
vpd.put("var8", Tools.isEmpty(varOList.get(i).getString("RECTIFICATIONDEADLINE")) ? "" : varOList.get(i).getString("RECTIFICATIONDEADLINE")); //8 vpd.put("var8", Tools.isEmpty(varOList.get(i).getString("RECTIFICATIONDEADLINE")) ? "" : varOList.get(i).getString("RECTIFICATIONDEADLINE")); //8
vpd.put("var9", Tools.isEmpty(varOList.get(i).getString("zgUserDeptName")) ? "" : varOList.get(i).getString("zgUserDeptName")); //9 vpd.put("var9", Tools.isEmpty(varOList.get(i).getString("zgUserDeptName")) ? "" : varOList.get(i).getString("zgUserDeptName")); //9
vpd.put("var10", Tools.isEmpty(varOList.get(i).getString("zgUserName")) ? "" : varOList.get(i).getString("zgUserName")); //10 vpd.put("var10", Tools.isEmpty(varOList.get(i).getString("zgUserName")) ? "" : varOList.get(i).getString("zgUserName")); //10
vpd.put("var11", Tools.isEmpty(varOList.get(i).getString("conUsername")) ? "" : varOList.get(i).getString("conUsername")); //11 vpd.put("var11", Tools.isEmpty(varOList.get(i).getString("conUsername")) ? "" : varOList.get(i).getString("conUsername")); //11
vpd.put("var12", Tools.isEmpty(varOList.get(i).getString("INVESTMENT_FUNDS")) ? "" : varOList.get(i).getString("INVESTMENT_FUNDS")); //12 vpd.put("var12", Tools.isEmpty(varOList.get(i).getString("INVESTMENT_FUNDS")) ? "" : varOList.get(i).getString("INVESTMENT_FUNDS")); //12
vpd.put("var13", Tools.isEmpty(varOList.get(i).getString("CHECK_TIME")) ? "" : varOList.get(i).getString("CHECK_TIME")+" 已完成"); //13 vpd.put("var13", Tools.isEmpty(varOList.get(i).getString("CHECK_TIME")) ? "" : varOList.get(i).getString("CHECK_TIME") + " 已完成"); //13
vpd.put("var14", Tools.isEmpty(varOList.get(i).getString("revieworName")) ? "" : varOList.get(i).getString("revieworName")); //14 vpd.put("var14", Tools.isEmpty(varOList.get(i).getString("revieworName")) ? "" : varOList.get(i).getString("revieworName")); //14
vpd.put("var15", Tools.isEmpty(varOList.get(i).getString("INSPECTION_USER")) ? varOList.get(i).getString("CREATER_NAME") : varOList.get(i).getString("INSPECTION_USER")); //15 vpd.put("var15", Tools.isEmpty(varOList.get(i).getString("INSPECTION_USER")) ? varOList.get(i).getString("CREATER_NAME") : varOList.get(i).getString("INSPECTION_USER")); //15
varList.add(vpd); varList.add(vpd);
} }
dataMap.put("varList", varList); dataMap.put("varList", varList);
dataMap.put("filename","隐患治理清单"); dataMap.put("filename", "隐患治理清单");
ObjectExcelView erv = new ObjectExcelView(); ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap); mv = new ModelAndView(erv, dataMap);
return mv; return mv;
} }
@ -1182,23 +1167,17 @@ public class HiddenApiController extends BaseController {
List<String> imgKeyId = new ArrayList<>();// 需要查询图片的id标识信息 List<String> imgKeyId = new ArrayList<>();// 需要查询图片的id标识信息
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id
String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件
if (Tools.notEmpty(KEYWORDS)) if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
pd.put("KEYWORDS", KEYWORDS.trim());
String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件 String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件
if (Tools.notEmpty(ISQUALIFIED)) if (Tools.notEmpty(ISQUALIFIED)) pd.put("ISQUALIFIED", ISQUALIFIED.trim());
pd.put("ISQUALIFIED", ISQUALIFIED.trim());
String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件 String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件
if (Tools.notEmpty(HIDDENLEVELE)) if (Tools.notEmpty(HIDDENLEVELE)) pd.put("HIDDENLEVELE", HIDDENLEVELE.trim());
pd.put("HIDDENLEVELE", HIDDENLEVELE.trim());
String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件
if (Tools.notEmpty(STARTTIME)) if (Tools.notEmpty(STARTTIME)) pd.put("STARTTIME", STARTTIME.trim());
pd.put("STARTTIME", STARTTIME.trim());
String STATE = pd.getString("STATE"); // 关键词检索条件 String STATE = pd.getString("STATE"); // 关键词检索条件
if (Tools.notEmpty(STATE)) if (Tools.notEmpty(STATE)) pd.put("STATE", STATE.trim());
pd.put("STATE", STATE.trim());
String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件
if (Tools.notEmpty(ENDTIME)) if (Tools.notEmpty(ENDTIME)) pd.put("ENDTIME", ENDTIME + " 23:59:59");
pd.put("ENDTIME", ENDTIME + " 23:59:59");
String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件
if (Tools.notEmpty(DISPOSESTATE)) { if (Tools.notEmpty(DISPOSESTATE)) {
pd.put("DISPOSESTATE", DISPOSESTATE.trim()); pd.put("DISPOSESTATE", DISPOSESTATE.trim());
@ -1206,8 +1185,7 @@ public class HiddenApiController extends BaseController {
pd.put("USERDEPT", Jurisdiction.getDEPARTMENT_ID()); pd.put("USERDEPT", Jurisdiction.getDEPARTMENT_ID());
} }
String IS_SELF = pd.getString("IS_SELF"); // 关键词检索条件 String IS_SELF = pd.getString("IS_SELF"); // 关键词检索条件
if (IS_SELF != null && IS_SELF.equals("1")) if (IS_SELF != null && IS_SELF.equals("1")) pd.put("SELF_USER_ID", Jurisdiction.getUSER_ID());
pd.put("SELF_USER_ID", Jurisdiction.getUSER_ID());
// 查看隐患信息 // 查看隐患信息
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
if (!Jurisdiction.getIS_MAIN().equals("1")) { //主账号 if (!Jurisdiction.getIS_MAIN().equals("1")) { //主账号
@ -1255,8 +1233,7 @@ public class HiddenApiController extends BaseController {
List<PageData> imgList = imgFilesService.listAllByIds(imgpd2); List<PageData> imgList = imgFilesService.listAllByIds(imgpd2);
Map<String, Integer> imgCount = new HashMap<>(); Map<String, Integer> imgCount = new HashMap<>();
Integer imgTypeMaxCount1 = 1, imgTypeMaxCount2 = 1, imgTypeMaxCount3 = 1, imgTypeMaxCount4 = 1, Integer imgTypeMaxCount1 = 1, imgTypeMaxCount2 = 1, imgTypeMaxCount3 = 1, imgTypeMaxCount4 = 1, imgTypeMaxCount5 = 1, imgTypeMaxCount6 = 1, imgTypeMaxCount7 = 1, imgTypeMaxCount8 = 1;
imgTypeMaxCount5 = 1, imgTypeMaxCount6 = 1, imgTypeMaxCount7 = 1, imgTypeMaxCount8 = 1;
Map<String, List<String>> imgMap = new HashMap<>(); Map<String, List<String>> imgMap = new HashMap<>();
for (int i = 0; i < imgList.size(); i++) { for (int i = 0; i < imgList.size(); i++) {
@ -1485,39 +1462,59 @@ public class HiddenApiController extends BaseController {
/** /**
* 查询隐患统计表 * 查询隐患统计表
*
* @param response * @param response
* @return * @return
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/getCountSelect") @RequestMapping(value = "/getCountSelect")
@ResponseBody @ResponseBody
public Object getCountSelect(HttpServletResponse response) throws Exception { public Object getCountSelect(HttpServletResponse response) throws Exception {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
//这里进入开始获取数据阶段 首先拿到所有部门数据 //这里进入开始获取数据阶段 首先拿到所有部门数据
String url ="department_list.html?DEPARTMENT_ID="; String url = "department_list.html?DEPARTMENT_ID=";
List<Department> departments = departmentService.listAllDepartment(Jurisdiction.getCORPINFO_ID(), url); List<Department> departments = departmentService.listAllDepartment(Jurisdiction.getCORPINFO_ID(), url);
//装船部 zcb id集合 89f3d30c4031432da53b75bed442ced8 //装船部 zcb id集合 89f3d30c4031432da53b75bed442ced8
List<String> zcbdepartmentIds = new ArrayList<>(); List<String> zcbdepartmentIds = new ArrayList<>();
//保障部 bzb id集合 fcae9cc13a354be699d85d6aea3b3450 //保障部 bzb id集合 fcae9cc13a354be699d85d6aea3b3450
List<String> bzbdepartmentIds = new ArrayList<>(); List<String> bzbdepartmentIds = new ArrayList<>();
//卸车部 xcb id集合 aad337cf728b4cc2b63e210caf4e185f //卸车部 xcb id集合 aad337cf728b4cc2b63e210caf4e185f
List<String> xcbdepartmentIds = new ArrayList<>(); List<String> xcbdepartmentIds = new ArrayList<>();
//0716 新加 机设部298b9a63ea704485913c5185545b4c66
List<String> mechanicalDepartmentIds = new ArrayList<>();
// 业务部599d9bfcf6c44cb0bc553b1b766aebc5
List<String> businessDepartmentIds = new ArrayList<>();
// 综合办公室31e47797873d4dd3abdbeb0d99a1f138
List<String> generalOfficeDepartmentIds = new ArrayList<>();
//安监部 ajb id集合 4c4b7bc93e3347978f5a3e1f0c4a0b56 //安监部 ajb id集合 4c4b7bc93e3347978f5a3e1f0c4a0b56
List<String> ajbdepartmentIds = new ArrayList<>(); List<String> ajbdepartmentIds = new ArrayList<>();
//开始处理数据 扔进对应结合中 //开始处理数据 扔进对应结合中
for(Department department:departments){ for (Department department : departments) {
if(StringUtils.equals("89f3d30c4031432da53b75bed442ced8",department.getDEPARTMENT_ID())){ if (StringUtils.equals("89f3d30c4031432da53b75bed442ced8", department.getDEPARTMENT_ID())) {
zcbdepartmentIds = getIdsList(department,zcbdepartmentIds); zcbdepartmentIds = getIdsList(department, zcbdepartmentIds);
} }
if(StringUtils.equals("fcae9cc13a354be699d85d6aea3b3450",department.getDEPARTMENT_ID())){ if (StringUtils.equals("fcae9cc13a354be699d85d6aea3b3450", department.getDEPARTMENT_ID())) {
bzbdepartmentIds = getIdsList(department,bzbdepartmentIds); bzbdepartmentIds = getIdsList(department, bzbdepartmentIds);
} }
if(StringUtils.equals("aad337cf728b4cc2b63e210caf4e185f",department.getDEPARTMENT_ID())){ if (StringUtils.equals("aad337cf728b4cc2b63e210caf4e185f", department.getDEPARTMENT_ID())) {
xcbdepartmentIds = getIdsList(department,xcbdepartmentIds); xcbdepartmentIds = getIdsList(department, xcbdepartmentIds);
} }
if(StringUtils.equals("4c4b7bc93e3347978f5a3e1f0c4a0b56",department.getDEPARTMENT_ID())){ if (StringUtils.equals("4c4b7bc93e3347978f5a3e1f0c4a0b56", department.getDEPARTMENT_ID())) {
ajbdepartmentIds = getIdsList(department,ajbdepartmentIds); ajbdepartmentIds = getIdsList(department, ajbdepartmentIds);
}
//0716 新加 机设部 业务部 综合办公室
if (StringUtils.equals("599d9bfcf6c44cb0bc553b1b766aebc5", department.getDEPARTMENT_ID())) {
businessDepartmentIds = getIdsList(department, ajbdepartmentIds);
}
if (StringUtils.equals("31e47797873d4dd3abdbeb0d99a1f138", department.getDEPARTMENT_ID())) {
generalOfficeDepartmentIds = getIdsList(department, ajbdepartmentIds);
}
if (StringUtils.equals("298b9a63ea704485913c5185545b4c66", department.getDEPARTMENT_ID())) {
generalOfficeDepartmentIds = getIdsList(department, ajbdepartmentIds);
} }
} }
//处理日期 类型 年 季度 月 //处理日期 类型 年 季度 月
@ -1527,34 +1524,34 @@ public class HiddenApiController extends BaseController {
String startTime = ""; String startTime = "";
String endTime = ""; String endTime = "";
//年 //年
if(StringUtils.equals("1",type)){ if (StringUtils.equals("1", type)) {
startTime = year+"-01-01 00:00:00"; startTime = year + "-01-01 00:00:00";
endTime = year+"-12-31 23:59:59"; endTime = year + "-12-31 23:59:59";
} }
//季度 //季度
if(StringUtils.equals("2",type)){ if (StringUtils.equals("2", type)) {
switch (num){ switch (num) {
case "1" : case "1":
startTime = year+"-01-01 00:00:00"; startTime = year + "-01-01 00:00:00";
endTime = year+"-03-31 23:59:59"; endTime = year + "-03-31 23:59:59";
break; break;
case "2" : case "2":
startTime = year+"-04-01 00:00:00"; startTime = year + "-04-01 00:00:00";
endTime = year+"-06-30 23:59:59"; endTime = year + "-06-30 23:59:59";
break; break;
case "3" : case "3":
startTime = year+"-07-01 00:00:00"; startTime = year + "-07-01 00:00:00";
endTime = year+"-09-30 23:59:59"; endTime = year + "-09-30 23:59:59";
break; break;
case "4" : case "4":
startTime = year+"-10-01 00:00:00"; startTime = year + "-10-01 00:00:00";
endTime = year+"-12-31 23:59:59"; endTime = year + "-12-31 23:59:59";
break; break;
} }
} }
//月 //月
if(StringUtils.equals("3",type)){ if (StringUtils.equals("3", type)) {
startTime = year+"-01 00:00:00"; startTime = year + "-01 00:00:00";
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// 解析字符串为LocalDateTime // 解析字符串为LocalDateTime
LocalDateTime dateTime = LocalDateTime.parse(startTime, formatter); LocalDateTime dateTime = LocalDateTime.parse(startTime, formatter);
@ -1566,76 +1563,81 @@ public class HiddenApiController extends BaseController {
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
// 格式化ZonedDateTime对象为仅包含日期的字符串 // 格式化ZonedDateTime对象为仅包含日期的字符串
String formattedDate = dateFormatter.format(zonedDateTime); String formattedDate = dateFormatter.format(zonedDateTime);
endTime = formattedDate+" 23:59:59"; endTime = formattedDate + " 23:59:59";
} }
//前置搜索条件处理完毕 //前置搜索条件处理完毕
pd.put("zcbdepartmentIds",zcbdepartmentIds); pd.put("zcbdepartmentIds", zcbdepartmentIds);
pd.put("bzbdepartmentIds",bzbdepartmentIds); pd.put("bzbdepartmentIds", bzbdepartmentIds);
pd.put("xcbdepartmentIds",xcbdepartmentIds); pd.put("xcbdepartmentIds", xcbdepartmentIds);
pd.put("ajbdepartmentIds",ajbdepartmentIds); pd.put("ajbdepartmentIds", ajbdepartmentIds);
pd.put("startTime",startTime);
pd.put("endTime",endTime); pd.put("mechanicalDepartmentIds", mechanicalDepartmentIds);
pd.put("businessDepartmentIds", businessDepartmentIds);
pd.put("generalOfficeDepartmentIds", generalOfficeDepartmentIds);
pd.put("startTime", startTime);
pd.put("endTime", endTime);
//这里获取数据 获取指定日期范围内和指定部门集合创建的隐患总数 //这里获取数据 获取指定日期范围内和指定部门集合创建的隐患总数
Map<String,Object> map = hiddenService.getExcelMap(pd); Map<String, Object> map = hiddenService.getExcelMap(pd);
//年 //年
if(StringUtils.equals("1",type)){ if (StringUtils.equals("1", type)) {
map.put("type","统计年度:"); map.put("type", "统计年度:");
map.put("num",year+"年"); map.put("num", year + "年");
} }
//季度 //季度
if(StringUtils.equals("2",type)){ if (StringUtils.equals("2", type)) {
map.put("type","统计季度:"); map.put("type", "统计季度:");
map.put("num",year+"年第"+num+"季度"); map.put("num", year + "年第" + num + "季度");
} }
//月 //月
if(StringUtils.equals("3",type)){ if (StringUtils.equals("3", type)) {
String[] month = year.split("-"); String[] month = year.split("-");
map.put("type","统计月度:"); map.put("type", "统计月度:");
map.put("num",month[0]+"年第"+month[1]+"月"); map.put("num", month[0] + "年第" + month[1] + "月");
} }
SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
String date =sdf.format(new Date()); String date = sdf.format(new Date());
map.put("date","填表日期:"+date); map.put("date", "填表日期:" + date);
map.put("weidu",map.get("type").toString()+map.get("num").toString()); map.put("weidu", map.get("type").toString() + map.get("num").toString());
Map<String, Object> Returnmap = new HashMap<String, Object>(); Map<String, Object> Returnmap = new HashMap<String, Object>();
Returnmap.put("result", "success"); Returnmap.put("result", "success");
Returnmap.put("pd",map); Returnmap.put("pd", map);
return Returnmap; return Returnmap;
} }
/** /**
* 导出隐患统计表 * 导出隐患统计表
*
* @param response * @param response
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/getCountExcel") @RequestMapping(value = "/getCountExcel")
public void exportExcels(HttpServletResponse response) throws Exception { public void exportExcels(HttpServletResponse response) throws Exception {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
//这里进入开始获取数据阶段 首先拿到所有部门数据 //这里进入开始获取数据阶段 首先拿到所有部门数据
String url ="department_list.html?DEPARTMENT_ID="; String url = "department_list.html?DEPARTMENT_ID=";
List<Department> departments = departmentService.listAllDepartment(Jurisdiction.getCORPINFO_ID(), url); List<Department> departments = departmentService.listAllDepartment(Jurisdiction.getCORPINFO_ID(), url);
//装船部 zcb id集合 89f3d30c4031432da53b75bed442ced8 //装船部 zcb id集合 89f3d30c4031432da53b75bed442ced8
List<String> zcbdepartmentIds = new ArrayList<>(); List<String> zcbdepartmentIds = new ArrayList<>();
//保障部 bzb id集合 fcae9cc13a354be699d85d6aea3b3450 //保障部 bzb id集合 fcae9cc13a354be699d85d6aea3b3450
List<String> bzbdepartmentIds = new ArrayList<>(); List<String> bzbdepartmentIds = new ArrayList<>();
//卸车部 xcb id集合 aad337cf728b4cc2b63e210caf4e185f //卸车部 xcb id集合 aad337cf728b4cc2b63e210caf4e185f
List<String> xcbdepartmentIds = new ArrayList<>(); List<String> xcbdepartmentIds = new ArrayList<>();
//安监部 ajb id集合 4c4b7bc93e3347978f5a3e1f0c4a0b56 //安监部 ajb id集合 4c4b7bc93e3347978f5a3e1f0c4a0b56
List<String> ajbdepartmentIds = new ArrayList<>(); List<String> ajbdepartmentIds = new ArrayList<>();
//开始处理数据 扔进对应结合中 //开始处理数据 扔进对应结合中
for(Department department:departments){ for (Department department : departments) {
if(StringUtils.equals("89f3d30c4031432da53b75bed442ced8",department.getDEPARTMENT_ID())){ if (StringUtils.equals("89f3d30c4031432da53b75bed442ced8", department.getDEPARTMENT_ID())) {
zcbdepartmentIds = getIdsList(department,zcbdepartmentIds); zcbdepartmentIds = getIdsList(department, zcbdepartmentIds);
} }
if(StringUtils.equals("fcae9cc13a354be699d85d6aea3b3450",department.getDEPARTMENT_ID())){ if (StringUtils.equals("fcae9cc13a354be699d85d6aea3b3450", department.getDEPARTMENT_ID())) {
bzbdepartmentIds = getIdsList(department,bzbdepartmentIds); bzbdepartmentIds = getIdsList(department, bzbdepartmentIds);
} }
if(StringUtils.equals("aad337cf728b4cc2b63e210caf4e185f",department.getDEPARTMENT_ID())){ if (StringUtils.equals("aad337cf728b4cc2b63e210caf4e185f", department.getDEPARTMENT_ID())) {
xcbdepartmentIds = getIdsList(department,xcbdepartmentIds); xcbdepartmentIds = getIdsList(department, xcbdepartmentIds);
} }
if(StringUtils.equals("4c4b7bc93e3347978f5a3e1f0c4a0b56",department.getDEPARTMENT_ID())){ if (StringUtils.equals("4c4b7bc93e3347978f5a3e1f0c4a0b56", department.getDEPARTMENT_ID())) {
ajbdepartmentIds = getIdsList(department,ajbdepartmentIds); ajbdepartmentIds = getIdsList(department, ajbdepartmentIds);
} }
} }
//处理日期 类型 年 季度 月 //处理日期 类型 年 季度 月
@ -1645,34 +1647,34 @@ public class HiddenApiController extends BaseController {
String startTime = ""; String startTime = "";
String endTime = ""; String endTime = "";
//年 //年
if(StringUtils.equals("1",type)){ if (StringUtils.equals("1", type)) {
startTime = year+"-01-01 00:00:00"; startTime = year + "-01-01 00:00:00";
endTime = year+"-12-31 23:59:59"; endTime = year + "-12-31 23:59:59";
} }
//季度 //季度
if(StringUtils.equals("2",type)){ if (StringUtils.equals("2", type)) {
switch (num){ switch (num) {
case "1" : case "1":
startTime = year+"-01-01 00:00:00"; startTime = year + "-01-01 00:00:00";
endTime = year+"-03-31 23:59:59"; endTime = year + "-03-31 23:59:59";
break; break;
case "2" : case "2":
startTime = year+"-04-01 00:00:00"; startTime = year + "-04-01 00:00:00";
endTime = year+"-06-30 23:59:59"; endTime = year + "-06-30 23:59:59";
break; break;
case "3" : case "3":
startTime = year+"-07-01 00:00:00"; startTime = year + "-07-01 00:00:00";
endTime = year+"-09-30 23:59:59"; endTime = year + "-09-30 23:59:59";
break; break;
case "4" : case "4":
startTime = year+"-10-01 00:00:00"; startTime = year + "-10-01 00:00:00";
endTime = year+"-12-31 23:59:59"; endTime = year + "-12-31 23:59:59";
break; break;
} }
} }
//月 //月
if(StringUtils.equals("3",type)){ if (StringUtils.equals("3", type)) {
startTime = year+"-01 00:00:00"; startTime = year + "-01 00:00:00";
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// 解析字符串为LocalDateTime // 解析字符串为LocalDateTime
LocalDateTime dateTime = LocalDateTime.parse(startTime, formatter); LocalDateTime dateTime = LocalDateTime.parse(startTime, formatter);
@ -1684,43 +1686,42 @@ public class HiddenApiController extends BaseController {
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
// 格式化ZonedDateTime对象为仅包含日期的字符串 // 格式化ZonedDateTime对象为仅包含日期的字符串
String formattedDate = dateFormatter.format(zonedDateTime); String formattedDate = dateFormatter.format(zonedDateTime);
endTime = formattedDate+" 23:59:59"; endTime = formattedDate + " 23:59:59";
} }
//前置搜索条件处理完毕 //前置搜索条件处理完毕
pd.put("zcbdepartmentIds",zcbdepartmentIds); pd.put("zcbdepartmentIds", zcbdepartmentIds);
pd.put("bzbdepartmentIds",bzbdepartmentIds); pd.put("bzbdepartmentIds", bzbdepartmentIds);
pd.put("xcbdepartmentIds",xcbdepartmentIds); pd.put("xcbdepartmentIds", xcbdepartmentIds);
pd.put("ajbdepartmentIds",ajbdepartmentIds); pd.put("ajbdepartmentIds", ajbdepartmentIds);
pd.put("startTime",startTime); pd.put("startTime", startTime);
pd.put("endTime",endTime); pd.put("endTime", endTime);
//这里获取数据 获取指定日期范围内和指定部门集合创建的隐患总数 //这里获取数据 获取指定日期范围内和指定部门集合创建的隐患总数
Map<String,Object> map = hiddenService.getExcelMap(pd); Map<String, Object> map = hiddenService.getExcelMap(pd);
//年 //年
if(StringUtils.equals("1",type)){ if (StringUtils.equals("1", type)) {
map.put("type","统计年度:"); map.put("type", "统计年度:");
map.put("num",year+"年"); map.put("num", year + "年");
} }
//季度 //季度
if(StringUtils.equals("2",type)){ if (StringUtils.equals("2", type)) {
map.put("type","统计季度:"); map.put("type", "统计季度:");
map.put("num",year+"年第"+num+"季度"); map.put("num", year + "年第" + num + "季度");
} }
//月 //月
if(StringUtils.equals("3",type)){ if (StringUtils.equals("3", type)) {
String[] month = year.split("-"); String[] month = year.split("-");
map.put("type","统计月度:"); map.put("type", "统计月度:");
map.put("num",month[0]+"年第"+month[1]+"月"); map.put("num", month[0] + "年第" + month[1] + "月");
} }
SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
String date =sdf.format(new Date()); String date = sdf.format(new Date());
map.put("date","填表日期:"+date); map.put("date", "填表日期:" + date);
//开始执行模板填充数据 //开始执行模板填充数据
String excelFilePath = hiddenCountExcel; // 替换为你的Excel文件路径 String excelFilePath = hiddenCountExcel; // 替换为你的Excel文件路径
//正则 //正则
String regex = "\\{\\{.*?\\}\\}"; String regex = "\\{\\{.*?\\}\\}";
Pattern pattern = Pattern.compile(regex); Pattern pattern = Pattern.compile(regex);
try (FileInputStream inputStream = new FileInputStream(new File(excelFilePath)); try (FileInputStream inputStream = new FileInputStream(new File(excelFilePath)); Workbook workbook = new XSSFWorkbook(inputStream)) {
Workbook workbook = new XSSFWorkbook(inputStream)) {
Sheet sheet = workbook.getSheetAt(0); // 获取第一个工作表 Sheet sheet = workbook.getSheetAt(0); // 获取第一个工作表
for (Row row : sheet) { for (Row row : sheet) {
for (Cell cell : row) { for (Cell cell : row) {
@ -1743,12 +1744,12 @@ public class HiddenApiController extends BaseController {
} }
} }
public List<String> getIdsList(Department department,List<String> ids){ public List<String> getIdsList(Department department, List<String> ids) {
ids.add(department.getDEPARTMENT_ID()); ids.add(department.getDEPARTMENT_ID());
for(Department dept :department.getSubDepartment() ){ for (Department dept : department.getSubDepartment()) {
if(dept.getSubDepartment().size()>0){ if (dept.getSubDepartment().size() > 0) {
getIdsList(dept,ids); getIdsList(dept, ids);
}else { } else {
ids.add(dept.getDEPARTMENT_ID()); ids.add(dept.getDEPARTMENT_ID());
} }
} }
@ -1770,21 +1771,21 @@ public class HiddenApiController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
if (pd.get("YEAR").equals("")){ if (pd.get("YEAR").equals("")) {
String year = DateUtil.getYear(); String year = DateUtil.getYear();
pd.put("YEAR",year); pd.put("YEAR", year);
} }
List<PageData> dataList = hiddenApiService.goSummaryTable(pd); List<PageData> dataList = hiddenApiService.goSummaryTable(pd);
List<PageData> dataTypeList = hiddenApiService.goSummaryTypeTable(pd); List<PageData> dataTypeList = hiddenApiService.goSummaryTypeTable(pd);
List<PageData> varList = hiddenApiService.dealData(dataList); List<PageData> varList = hiddenApiService.dealData(dataList);
List<PageData> varTypeList = hiddenApiService.dealData(dataTypeList); List<PageData> varTypeList = hiddenApiService.dealData(dataTypeList);
for(PageData pdDate:varList){ for (PageData pdDate : varList) {
for(PageData pdTypeDate:varTypeList){ for (PageData pdTypeDate : varTypeList) {
if(pdDate.getString("MONTH").equals(pdTypeDate.getString("MONTH"))){ if (pdDate.getString("MONTH").equals(pdTypeDate.getString("MONTH"))) {
pdDate.put("wdbaqztCount",pdTypeDate.getString("wdbaqztCount")); pdDate.put("wdbaqztCount", pdTypeDate.getString("wdbaqztCount"));
pdDate.put("gldqxCount",pdTypeDate.getString("gldqxCount")); pdDate.put("gldqxCount", pdTypeDate.getString("gldqxCount"));
pdDate.put("hjdbaqysCount",pdTypeDate.getString("hjdbaqysCount")); pdDate.put("hjdbaqysCount", pdTypeDate.getString("hjdbaqysCount"));
pdDate.put("rdbaqysCount",pdTypeDate.getString("rdbaqysCount")); pdDate.put("rdbaqysCount", pdTypeDate.getString("rdbaqysCount"));
} }
} }
} }

2
src/main/java/com/zcloud/controller/system/UsersController.java
View File

@ -36,8 +36,6 @@ import com.zcloud.entity.PageData;
import com.zcloud.entity.system.Role; import com.zcloud.entity.system.Role;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import sun.security.krb5.internal.PAData;
import sun.util.logging.resources.logging;
/** /**
* 说明：系统用户处理类 * 说明：系统用户处理类

1879
src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

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

@ -1,12 +1,19 @@
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
datasource.no1.url=jdbc:mysql://172.16.130.92:3306/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.url=jdbc:mysql://172.16.11.147:33068/qa-cmt-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no1.username=root datasource.no1.username=root
datasource.no1.password=Zcloud@888888 datasource.no1.password=Mysql@zcloud88888
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
datasource.no2.url=jdbc:mysql://172.16.130.92:3306/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.url=jdbc:mysql://172.16.11.147:33068/qa-cmt-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no2.username=root datasource.no2.username=root
datasource.no2.password=Zcloud@888888 datasource.no2.password=Mysql@zcloud88888
datasource.no3.driver-class-name: oracle.jdbc.driver.OracleDriver
datasource.no3.url=jdbc:oracle:thin:@172.16.11.75:1521:orcl
datasource.no3.username=jkqask
datasource.no3.password=Qask@1115
#druid??? #druid???
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
#????? #?????
@ -49,19 +56,30 @@ spring.http.encoding.force=true
spring.http.encoding.enabled=true spring.http.encoding.enabled=true
# ??springboot????banner # ??springboot????banner
spring.main.banner-mode=off spring.main.banner-mode=off
#jar????????
#web.upload-path=h:/
#web.front-path=h:/
#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path}
#???????????? #preventionxgf.api.url=http://192.168.0.79:8088
preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/ #
qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ #qa-regulatory-gwj.api.url=http://192.168.0.79:8008
smb.host=39.101.130.96 preventionxgf.api.url=http://192.168.0.79:8088/
smb.port=22 qa-regulatory-gwj.api.url=http://192.168.0.79:8092/
# tongbu地址
tongbu.api.url=http://192.168.192.201:8971/qa-prevention-gwj-tongbu/
#?????
smb.host=172.16.11.146
smb.port=18822
smb.user=root smb.user=root
smb.password=Zcloud@zcloud88888 smb.password=Sysadmin@m2q@XXB
smb.basePath=/mnt/wwag/file/ smb.basePath=/mnt/web/file/
#mq??????????? #Mq\u914D\u7F6E
rocketmq.name-server=172.16.130.91:9876 rocketmq.name-server=172.16.11.146:9876
rocketmq.producer.group=libmiddle rocketmq.producer.group=libmiddle
rocketmq.producer.send-message-timeout=300000 rocketmq.producer.send-message-timeout=300000
rocketmq.producer.compress-message-body-threshold=4096 rocketmq.producer.compress-message-body-threshold=4096
@ -69,29 +87,48 @@ rocketmq.producer.max-message-size=4194304
rocketmq.producer.retry-times-when-send-failed=3 rocketmq.producer.retry-times-when-send-failed=3
rocketmq.producer.retry-next-server=true rocketmq.producer.retry-next-server=true
rocketmq.producer.retry-times-when-send-async-failed=3 rocketmq.producer.retry-times-when-send-async-failed=3
## topic ???? ## topic \u524D\u7F00
mq.topic.info=info mq.topic.info=info
mq.topic.eightWork=eightWork mq.topic.eightWork=eightWork
mq.group.info=scheduled_tasks mq.group.info=scheduled_tasks
mq.group.eightWork=scheduled_tasks_eightWork mq.group.eightWork=scheduled_tasks_eightWork
# topic ????
mq.topic.docking=docking mq.topic.docking=docking
mq.topic.dockingPicture=dockingPicture mq.topic.dockingPicture=dockingPicture
mq.group.docking=scheduled_tasks_docking mq.group.docking=scheduled_tasks_docking
#???? ?????? # \u4EBA\u5458\u5BF9\u63A5
perLoc.url=http://172.16.130.86/gateway-service perLoc.url=http://172.16.11.145:8888
perLoc.userName=qaaqadmin # \u6E2F\u80A1\u4F01\u4E1A\u7AEF-app\u767B\u5F55\u9ED8\u8BA4 \u6587\u4EF6\u670D\u52A1\u5668\u5730\u5740\uFF08\u66F9\u7164\u70AD\u4E0D\u7528\uFF09
perLoc.pwd=Cfd2023@ corp.default.pic-path=https://qgqy.qhdsafety.com/file/
# \u6E2F\u80A1\u4F01\u4E1A\u7AEF-app\u767B\u5F55\u9ED8\u8BA4 \u540E\u53F0\u5730\u5740\u5730\u5740\uFF08\u66F9\u7164\u70AD\u4E0D\u7528\uFF09
corp.default.back-end-path=https://qgqy.qhdsafety.com/
# \u672C\u670D\u52A1\u56FE\u7247\u5730\u5740
http.file.url=http://172.16.11.146:8991/file/
# \u672C\u670D\u52A1\u56FE\u7247\u5730\u5740
baseimgpath =http://10.30.20.146:8991/file/
#????? ??????
corp.default.pic-path=https://qgqy.qhdsafety.com/
corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
#??????
http.file.url=http://172.16.130.91:9004/file/
#??????
baseimgpath =http://172.16.130.91:9004/file/
cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
spring.redis.database=0
# Redis\u670D\u52A1\u5668\u5730\u5740
spring.redis.host=172.16.11.146
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
spring.redis.port=63799
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
spring.redis.password=redis@zcloud88888
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-active=20
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-wait=-1
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.max-idle=10
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.min-idle=0
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
spring.redis.timeout=1000
# 隐患统计导出模板
hidden.count.excel=/mnt/web/excelFile/hiddenCountExcel.xlsx

132
src/main/resources/application-prod.properties
View File

@ -1,132 +0,0 @@
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no1.username=root
datasource.no1.password=Mysql@zcloud88888
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no2.username=root
datasource.no2.password=Mysql@zcloud88888
datasource.no3.driver-class-name: oracle.jdbc.driver.OracleDriver
datasource.no3.url=jdbc:oracle:thin:@172.16.11.75:1521:orcl
datasource.no3.username=jkqask
datasource.no3.password=Qask@1115
#druid???
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
#?????
spring.datasource.maxActive: 20
#?????
spring.datasource.initialSize: 1
#??????????
spring.datasource.maxWait: 60000
#??PSCache?????????PSCache???
spring.datasource.poolPreparedStatements: true
spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20
#??connectionProperties?????mergeSql????SQL??
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
spring.datasource.minIdle: 1
spring.datasource.timeBetweenEvictionRunsMillis: 60000
spring.datasource.minEvictableIdleTimeMillis: 300000
spring.datasource.validationQuery: select 1 from dual
spring.datasource.testWhileIdle: true
spring.datasource.testOnBorrow: false
spring.datasource.testOnReturn: false
#?????????filters????????sql?????,'wall'?????
filters: stat, wall, log4j
#????????
spring.cache.ehcache.cofnig=ehcache.xml
#?????,?????sql??
logging.level.com.zcloud.mapper=debug
#????????
spring.servlet.multipart.max-file-size=500MB
spring.servlet.multipart.max-request-size=500MB
#activiti????
spring.activiti.check-process-definitions=false
#??
spring.http.encoding.charset=UTF-8
spring.http.encoding.force=true
spring.http.encoding.enabled=true
# ??springboot????banner
spring.main.banner-mode=off
#jar????????
#web.upload-path=h:/
#web.front-path=h:/
#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path}
#preventionxgf.api.url=http://192.168.0.79:8088
#
#qa-regulatory-gwj.api.url=http://192.168.0.79:8008
preventionxgf.api.url=http://192.168.0.79:8088/
qa-regulatory-gwj.api.url=http://192.168.0.79:8092/
#????????????
baseimgpath = https://qgqy.qhdsafety.com/
#?????
smb.host=39.103.224.166
smb.port=22
smb.user=root
smb.password=Zcloud@zcloud88888
smb.basePath=/mnt/qgfile/file/
# \u6CA7\u5DDE\u77FF\u77F3\u7528\u6237\u6807\u8BC6
#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/
#\u5BF9\u63A5\u4EBA\u5458\u5B9A\u4F4D
perLoc.url=http://192.168.210.32:8084
perLoc.userName=qaaqadmin
perLoc.pwd=Cfd2023@
#\u6570\u636E\u540C\u6B65
mq.topic.docking=docking
mq.group.docking=scheduled_tasks_docking
cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
spring.redis.database=0
# Redis\u670D\u52A1\u5668\u5730\u5740
spring.redis.host=127.0.0.1
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
spring.redis.port=6379
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
spring.redis.password=
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-active=20
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-wait=-1
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.max-idle=10
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.min-idle=0
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
spring.redis.timeout=1000

120
src/main/resources/application-test.properties
View File

@ -1,120 +0,0 @@
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
datasource.no1.url=jdbc:mysql://172.16.130.92:3306/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no1.username=root
datasource.no1.password=Zcloud@888888
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
datasource.no2.url=jdbc:mysql://172.16.130.92:3306/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no2.username=root
datasource.no2.password=Zcloud@888888
datasource.no3.driver-class-name: oracle.jdbc.driver.OracleDriver
datasource.no3.url=jdbc:oracle:thin:@172.16.11.75:1521:orcl
datasource.no3.username=jkqask
datasource.no3.password=Qask@1115
#druid???
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
#?????
spring.datasource.maxActive: 20
#?????
spring.datasource.initialSize: 1
#??????????
spring.datasource.maxWait: 60000
#??PSCache?????????PSCache???
spring.datasource.poolPreparedStatements: true
spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20
#??connectionProperties?????mergeSql????SQL??
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
spring.datasource.minIdle: 1
spring.datasource.timeBetweenEvictionRunsMillis: 60000
spring.datasource.minEvictableIdleTimeMillis: 300000
spring.datasource.validationQuery: select 1 from dual
spring.datasource.testWhileIdle: true
spring.datasource.testOnBorrow: false
spring.datasource.testOnReturn: false
#?????????filters????????sql?????,'wall'?????
filters: stat, wall, log4j
#????????
spring.cache.ehcache.cofnig=ehcache.xml
#?????,?????sql??
logging.level.com.zcloud.mapper=debug
#????????
spring.servlet.multipart.max-file-size=500MB
spring.servlet.multipart.max-request-size=500MB
#activiti????
spring.activiti.check-process-definitions=false
#??
spring.http.encoding.charset=UTF-8
spring.http.encoding.force=true
spring.http.encoding.enabled=true
# ??springboot????banner
spring.main.banner-mode=off
#????????????
preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/
qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
smb.host=39.101.130.96
smb.port=22
smb.user=root
smb.password=Zcloud@zcloud88888
smb.basePath=/mnt/wwag/file/
#mq???????????
rocketmq.name-server=172.16.130.91:9876
rocketmq.producer.group=libmiddle
rocketmq.producer.send-message-timeout=300000
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 ????
mq.topic.info=info
mq.topic.eightWork=eightWork
mq.group.info=scheduled_tasks
mq.group.eightWork=scheduled_tasks_eightWork
# topic ????
mq.topic.docking=docking
mq.topic.dockingPicture=dockingPicture
mq.group.docking=scheduled_tasks_docking
#???? ??????
perLoc.url=http://172.16.130.86/gateway-service
perLoc.userName=qaaqadmin
perLoc.pwd=Cfd2023@
#????? ??????
corp.default.pic-path=https://qgqy.qhdsafety.com/
corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
#??????
http.file.url=http://172.16.130.91:9004/file/
#??????
baseimgpath =http://172.16.130.91:9004/file/
cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
spring.redis.database=0
# Redis\u670D\u52A1\u5668\u5730\u5740
spring.redis.host=127.0.0.1
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
spring.redis.port=6379
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
spring.redis.password=
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-active=20
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-wait=-1
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.max-idle=10
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.min-idle=0
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
spring.redis.timeout=1000

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

@ -1,7 +1,7 @@
spring.application.name=qa-prevention-cmt spring.application.name=qa-prevention-cmt
server.port=8091 server.port=8091
spring.profiles.active= @spring.profiles.active@ spring.profiles.active= master