From 0b5b682f3682da1392fa948b715f1c59f68c4cdf Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Tue, 30 Jul 2024 18:28:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=A2=84=E8=AD=A6=E5=92=8C?= =?UTF-8?q?=E6=89=A7=E6=B3=95=E9=83=A8=E9=97=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnterpriseComplaintController.java | 11 ++ .../auth/framework/config/CorsFilter.java | 2 +- .../EnterpriseComplaintController.java | 12 ++ .../com/zdxt/code/domain/EnforceRegCount.java | 13 ++ .../zdxt/code/domain/EnforcementEvaluate.java | 93 ++++++++++++++ .../domain/EnforcementInspectionProgram.java | 25 ++++ .../domain/LawEnforcementWarningList.java | 14 ++ .../mapper/EnforcementRegistrationMapper.java | 13 ++ .../EnforcementRegistrationServiceImpl.java | 121 ++++++++++-------- .../com/zdxt/code/task/EarlyWarningTask.java | 8 +- .../EnforcementInspectionProgramMapper.xml | 13 +- .../mapper/EnforcementRegistrationMapper.xml | 27 ++++ .../LawEnforcementWarningListMapper.xml | 6 +- 13 files changed, 303 insertions(+), 55 deletions(-) create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementEvaluate.java diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java index ab9f7ddc..687e9701 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java @@ -97,6 +97,17 @@ public class AppEnterpriseComplaintController extends BaseController { ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); } + /** + * 查询在线投诉详情 + */ + @GetMapping( "/queryById") + @ResponseBody + public ZDResponse queryById(String id) + { + EnterpriseComplaint enterpriseComplaint = enterpriseComplaintService.selectEnterpriseComplaintById(id); + return ZDResponse.success("投诉详情查询",enterpriseComplaint); + } + /** * 删除企业执法-在线投诉 */ diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java index 9c28fe31..f1a2bf06 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java @@ -61,7 +61,7 @@ public class CorsFilter implements Filter { public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { //配置可信域名 String[] authhosts = {"http://10.132.108.3:85","http://jdm.szssfj.cn","http://localhost:85","http://192.168.31.196:3301","http://192.168.31.196:85","http://127.0.0.1:85", - "http://localhost:3301","http://192.168.110.35:3301"}; + "http://localhost:3301","http://192.168.110.35:3301","http://localhost:86"}; String authost = ""; HttpServletRequest httprequest = (HttpServletRequest) request; String origin = httprequest.getHeader("Origin"); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseComplaintController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseComplaintController.java index d58e1881..cf4aab0e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseComplaintController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseComplaintController.java @@ -104,4 +104,16 @@ public class EnterpriseComplaintController extends BaseController return enterpriseComplaintService.deleteEnterpriseComplaintByIds(ids) > 0 ? ZDResponse.success("删除成功") : ZDResponse.error("删除失败"); } + + + /** + * 查询在线投诉详情 + */ + @GetMapping( "/queryById") + @ResponseBody + public ZDResponse queryById(String id) + { + EnterpriseComplaint enterpriseComplaint = enterpriseComplaintService.selectEnterpriseComplaintById(id); + return ZDResponse.success("投诉详情查询",enterpriseComplaint); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java index b4f62947..50f710aa 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java @@ -30,6 +30,11 @@ public class EnforceRegCount /** 级别 */ private String level; + /** + * 预警类型 0本部门 1 本企业 + */ + private Integer warnType; + public String getLawEnforcement() { return lawEnforcement; } @@ -69,4 +74,12 @@ public class EnforceRegCount public void setEnterpriseNumber(String enterpriseNumber) { this.enterpriseNumber = enterpriseNumber; } + + public Integer getWarnType() { + return warnType; + } + + public void setWarnType(Integer warnType) { + this.warnType = warnType; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementEvaluate.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementEvaluate.java new file mode 100644 index 00000000..9131a272 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementEvaluate.java @@ -0,0 +1,93 @@ +package com.zdxt.code.domain; + +import com.zdxt.common.BaseDomain; + +/** + * 执法评价 + */ +public class EnforcementEvaluate extends BaseDomain { + + /** + * 系统主键ID + */ + private String id; + /** + * 案件名称 + */ + private String enforcementName; + /** + * 案件ID + */ + private String enforcementId; + + /** + * 评价｜意见建议 + */ + private String evaluateDescription; + + /** 联系人 */ + private String linkman; + + /** 联系方式 */ + private String linkmanTel; + + /** 是否授权 */ + private int authorization; + + + public String getEnforcementName() { + return enforcementName; + } + + public void setEnforcementName(String enforcementName) { + this.enforcementName = enforcementName; + } + + public String getEnforcementId() { + return enforcementId; + } + + public void setEnforcementId(String enforcementId) { + this.enforcementId = enforcementId; + } + + public String getEvaluateDescription() { + return evaluateDescription; + } + + public void setEvaluateDescription(String evaluateDescription) { + this.evaluateDescription = evaluateDescription; + } + + public String getLinkman() { + return linkman; + } + + public void setLinkman(String linkman) { + this.linkman = linkman; + } + + public String getLinkmanTel() { + return linkmanTel; + } + + public void setLinkmanTel(String linkmanTel) { + this.linkmanTel = linkmanTel; + } + + public int getAuthorization() { + return authorization; + } + + public void setAuthorization(int authorization) { + this.authorization = authorization; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java index 752d4fe1..05733def 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java @@ -56,6 +56,15 @@ public class EnforcementInspectionProgram extends BaseDomain */ private FileObject fileObject; + /** + * 局级部门ID + */ + private String bureauDeptId; + /** + * 局级部门名称 + */ + private String bureauDeptName; + /** * 关键字搜索 */ @@ -228,6 +237,22 @@ public class EnforcementInspectionProgram extends BaseDomain this.fileListObj = fileListObj; } + public String getBureauDeptId() { + return bureauDeptId; + } + + public void setBureauDeptId(String bureauDeptId) { + this.bureauDeptId = bureauDeptId; + } + + public String getBureauDeptName() { + return bureauDeptName; + } + + public void setBureauDeptName(String bureauDeptName) { + this.bureauDeptName = bureauDeptName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java index f9d7f633..c50b897f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java @@ -37,6 +37,11 @@ public class LawEnforcementWarningList extends BaseDomain /** 执法次数 */ private Integer enforcementNumber; + /** + * 预警类型 0本部门 1 本企业 + */ + private Integer warnType; + /** * 搜索日期 */ @@ -117,6 +122,15 @@ public class LawEnforcementWarningList extends BaseDomain this.searchDate = searchDate; } + + public Integer getWarnType() { + return warnType; + } + + public void setWarnType(Integer warnType) { + this.warnType = warnType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java index f9b91473..7542d001 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java @@ -68,4 +68,17 @@ public interface EnforcementRegistrationMapper */ public List countMentByTime(@Param("timeMonth") Long timeMonth, @Param("searchValue") String searchValue); public List countMentByTime2(@Param("timeMonth") Long timeMonth, @Param("searchValue") String searchValue); + + /** + * 执法预警-统计执法部门执法数量 + * @param timeMonth + * @return + */ + public List countMentByTimeLawNew(@Param("timeMonth") Long timeMonth); + /** + * 执法预警-统计企业执法数量 + * @param timeMonth + * @return + */ + public List countMentByTimeQyNew(@Param("timeMonth") Long timeMonth); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index f4701f2c..b337359f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -15,6 +15,7 @@ import com.zdxt.code.domain.*; import com.zdxt.code.mapper.LinkageDictMapper; import com.zdxt.code.service.ILawEnforcementWarningListService; import com.zdxt.code.service.IRuleItemListService; +import com.zdxt.code.service.IRuleListService; import com.zdxt.common.annotation.DataScope; import com.zdxt.common.config.RuoYiConfig; import com.zdxt.common.util.DateUtils; @@ -44,6 +45,9 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat @Autowired private IRuleItemListService iRuleItemListService; + @Autowired + private IRuleListService ruleListService; + @Autowired private ZdxtFileCommonApi zdxtFileCommonApi; @@ -233,64 +237,79 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat @Override public List queryEarlyWarning(String searchValue) { - // 先获取规则 - RuleItemList ruleItem = new RuleItemList(); - ruleItem.setStatus(0L); - List ruleItemLists = iRuleItemListService.selectRuleItemListList(ruleItem); - // 根据规则作为条件查询复合要求的数据 - List regList = new ArrayList<>(); - for (RuleItemList rule : ruleItemLists) { - List tmpList = enforcementRegistrationMapper.countMentByTime2(rule.getCycleTime(), searchValue); - regList.addAll(tmpList); - } - // 对数据进行组合 - Map maxItems = regList.stream() - .collect(Collectors.groupingBy( - EnforceRegCount::getLawEnforcementId, - Collectors.collectingAndThen( - Collectors.maxBy(Comparator.comparingInt(EnforceRegCount::getNum)), - Optional::get - ) - )); - - Date nowDate = DateUtils.getNowDate(); - List lawEnforcementWarningLists = new ArrayList<>(); + //存储查询结果 List results = new ArrayList<>(); - Iterator> iterator = maxItems.entrySet().iterator(); - while (iterator.hasNext()) { - EnforceRegCount reg = iterator.next().getValue(); - // 判断预警级别 + //查询规则 + RuleList ruleList = new RuleList(); + ruleList.setStatus(0); + List ruleLists = ruleListService.selectRuleListList(ruleList); + for (RuleList list : ruleLists) { + // 先获取规则 + RuleItemList ruleItem = new RuleItemList(); + ruleItem.setStatus(0L); + ruleItem.setRuleId(list.getId()); + List ruleItemLists = iRuleItemListService.selectRuleItemListList(ruleItem); + // 根据规则作为条件查询符合要求的数据 + List regList = new ArrayList<>(); for (RuleItemList rule : ruleItemLists) { - if (reg.getNum() >= rule.getExistAlarm() && reg.getNum() <= rule.getExistAlarmEnd()) { - reg.setLevel(rule.getAlarmType()); - LawEnforcementWarningList lawEnforcementWarningList = new LawEnforcementWarningList(); - lawEnforcementWarningList.setId(IdUtil.simpleUUID()); - //获取执法次数 - lawEnforcementWarningList.setEnforcementNumber(reg.getNum()); - //企业名称 - lawEnforcementWarningList.setEnterpriseName(reg.getLawEnforcement()); - //企业统一信用代码 - lawEnforcementWarningList.setEnterpriseNumber(reg.getEnterpriseNumber()); - //预警原因 - lawEnforcementWarningList.setWarningCause(""+ reg.getNum() +""); - //预警时间 - lawEnforcementWarningList.setWarningTime(nowDate); - //创建时间 - lawEnforcementWarningList.setCreateTime(nowDate); - //存储告警信息 - lawEnforcementWarningLists.add(lawEnforcementWarningList); + List tmpList = new ArrayList<>(); + if(list.getRuleCode().equals("zf_warn")){ + tmpList = enforcementRegistrationMapper.countMentByTimeLawNew(rule.getCycleTime()); + }else if (list.getRuleCode().equals("qy_warn")){ + tmpList = enforcementRegistrationMapper.countMentByTimeQyNew(rule.getCycleTime()); + }else { + tmpList = enforcementRegistrationMapper.countMentByTime2(rule.getCycleTime(), searchValue); + } + regList.addAll(tmpList); + } + + // 对数据进行组合 + Map maxItems = regList.stream() + .collect(Collectors.groupingBy( + EnforceRegCount::getLawEnforcementId, + Collectors.collectingAndThen( + Collectors.maxBy(Comparator.comparingInt(EnforceRegCount::getNum)), + Optional::get))); + Date nowDate = DateUtils.getNowDate(); + List lawEnforcementWarningLists = new ArrayList<>(); - break; + Iterator> iterator = maxItems.entrySet().iterator(); + while (iterator.hasNext()) { + EnforceRegCount reg = iterator.next().getValue(); + // 判断预警级别 + for (RuleItemList rule : ruleItemLists) { +// if (reg.getNum() >= rule.getExistAlarm() && reg.getNum() <= rule.getExistAlarmEnd()) { + if (reg.getNum() >= rule.getExistAlarm()) { + reg.setLevel(rule.getAlarmType()); + LawEnforcementWarningList lawEnforcementWarningList = new LawEnforcementWarningList(); + lawEnforcementWarningList.setId(IdUtil.simpleUUID()); + //获取执法次数 + lawEnforcementWarningList.setEnforcementNumber(reg.getNum()); + //企业名称 + lawEnforcementWarningList.setEnterpriseName(reg.getLawEnforcement()); + //企业统一信用代码 + lawEnforcementWarningList.setEnterpriseNumber(reg.getEnterpriseNumber()); + //预警原因 + lawEnforcementWarningList.setWarningCause(""+ reg.getNum() +""); + //预警时间 + lawEnforcementWarningList.setWarningTime(nowDate); + //创建时间 + lawEnforcementWarningList.setCreateTime(nowDate); + if(list.getRuleCode().equals("zf_warn")){ + lawEnforcementWarningList.setWarnType(0); + }else if (list.getRuleCode().equals("qy_warn")){ + lawEnforcementWarningList.setWarnType(1); + } + //存储告警信息 + lawEnforcementWarningLists.add(lawEnforcementWarningList); + + break; + } } + results.add(reg); } - results.add(reg); } - //添加预警信息 -// for (LawEnforcementWarningList lawEnforcementWarningList : lawEnforcementWarningLists) { -// lawEnforcementWarningListService.insertLawEnforcementWarningList(lawEnforcementWarningList); -// } - return results; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java index f18d9e03..b267a47c 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java @@ -2,6 +2,7 @@ package com.zdxt.code.task; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.UserApi; import com.zdxt.code.domain.EnforceRegCount; @@ -42,16 +43,19 @@ public class EarlyWarningTask { try{ List list = iEnforcementRegistrationService.queryEarlyWarning(null); for (EnforceRegCount warn : list) { + if(StrUtil.isEmpty(warn.getLevel())){ + continue; + } LawEnforcementWarningList params = new LawEnforcementWarningList(); params.setEnterpriseNumber(warn.getEnterpriseNumber()); params.setWarningLevel(Integer.parseInt(warn.getLevel())); + params.setWarnType(warn.getWarnType()); List res = lawEnforcementWarningListService.selectLawEnforcementWarningListList(params); if (null == res || res.size() < 1) { LawEnforcementWarningList warning = new LawEnforcementWarningList(); warning.setWarningTime(DateUtils.getNowDate()); warning.setWarningCause("本月对该企业已检查" + warn.getNum() + "次"); warning.setWarningLevel(Integer.parseInt(warn.getLevel())); -// warning.setEnterpriseName(warn.get()); EnterpriseInformation enterpriseInformation = new EnterpriseInformation(); enterpriseInformation.setEnterpriseNumber(warn.getEnterpriseNumber()); List enterpriseInformations = @@ -64,6 +68,8 @@ public class EarlyWarningTask { warning.setId(IdUtil.simpleUUID()); warning.setCreateTime(DateUtils.getNowDate()); + //预警类型 + warning.setWarnType(warn.getWarnType()); lawEnforcementWarningListService.insertLawEnforcementWarningList(warning); } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml index 0c1f9d2a..99ca2798 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml @@ -18,10 +18,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, plan_year, plan_name, enforcement_department, enforcement_department_id, enforcement_time, enforcement_area, create_time, create_by, user_id, dept_id, is_delete,is_publish from enforcement_inspection_program + select id, plan_year, plan_name, enforcement_department, + enforcement_department_id, enforcement_time, enforcement_area, + create_time, create_by, user_id, dept_id, is_delete,is_publish, + bureau_dept_id,bureau_dept_name from enforcement_inspection_program + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml index fb580cb8..f9a270cc 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml @@ -13,10 +13,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, warning_time, warning_cause, warning_level, create_time, enterprise_name, enterprise_number,enforcement_number from law_enforcement_warning_list + select id, warning_time, warning_cause, warning_level, + create_time, enterprise_name, enterprise_number,enforcement_number,warn_type from law_enforcement_warning_list