diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html index 063156af..a1cfbd1d 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html @@ -13,8 +13,10 @@

  • 执法部门：

    - + + +

  • 执法人员：

    diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LawEnforcementWarningListController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LawEnforcementWarningListController.java index 58672e22..e82fc918 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LawEnforcementWarningListController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LawEnforcementWarningListController.java @@ -132,8 +132,10 @@ public class LawEnforcementWarningListController extends BaseController { LawEnforcementWarningList lawEnforcementWarningList = lawEnforcementWarningListService.selectLawEnforcementWarningListById(id); - mmp.put("time", DateUtils.parseDateToStr("yyyy-MM",lawEnforcementWarningList.getWarningTime())); +// mmp.put("time", DateUtils.parseDateToStr("yyyy-MM",lawEnforcementWarningList.getWarningTime())); mmp.put("enterpriseNumber", lawEnforcementWarningList.getEnterpriseNumber()); + mmp.put("beginTime", lawEnforcementWarningList.getBeginTime()); + mmp.put("endTime", lawEnforcementWarningList.getEndTime()); return prefix + "/registrationDetail"; } 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 54df8a09..161b6c20 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 @@ -17,9 +17,9 @@ public class EnforceRegCount { private static final long serialVersionUID = 1L; - /** 企业名称 */ + /** 执法部门名称 */ private String lawEnforcement; - /** 企业id */ + /** 执法部门ID */ private String lawEnforcementId; /** * 企业统一信用代码 @@ -52,6 +52,16 @@ public class EnforceRegCount */ private String enforcementDepartmentId; + /** + * 预警规则- 开始时间 + */ + private String beginTime; + + /** + * 预警规则-结束时间 + */ + private String endTime; + public String getLawEnforcement() { return lawEnforcement; } @@ -122,4 +132,20 @@ public class EnforceRegCount public void setEnterpriseName(String enterpriseName) { this.enterpriseName = enterpriseName; } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } } 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 50e68f49..5eda8aad 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 @@ -57,6 +57,17 @@ public class LawEnforcementWarningList extends BaseDomain */ private String enforcementDepartmentId; + /** + * 开始时间 + */ + private String beginTime; + + /** + * 结束时间 + */ + private String endTime; + + public void setId(String id) { this.id = id; @@ -157,6 +168,22 @@ public class LawEnforcementWarningList extends BaseDomain this.enforcementDepartmentId = enforcementDepartmentId; } + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + @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 7542d001..bac1a6b8 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 @@ -71,14 +71,14 @@ public interface EnforcementRegistrationMapper /** * 执法预警-统计执法部门执法数量 - * @param timeMonth + * @param beginTime * @return */ - public List countMentByTimeLawNew(@Param("timeMonth") Long timeMonth); + public List countMentByTimeLawNew(@Param("beginTime") String beginTime,@Param("endTime") String endTime); /** * 执法预警-统计企业执法数量 - * @param timeMonth + * @param beginTime * @return */ - public List countMentByTimeQyNew(@Param("timeMonth") Long timeMonth); + public List countMentByTimeQyNew(@Param("beginTime") String beginTime,@Param("endTime") String endTime); } 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 e58d7b94..cf776dcd 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 @@ -1,5 +1,8 @@ package com.zdxt.code.service.impl; +import java.time.LocalDate; +import java.time.Month; +import java.time.temporal.TemporalAdjusters; import java.util.*; import java.util.stream.Collectors; @@ -258,9 +261,21 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat for (RuleItemList rule : ruleItemLists) { List tmpList = new ArrayList<>(); if(list.getRuleCode().equals("zf_warn")){ - tmpList = enforcementRegistrationMapper.countMentByTimeLawNew(rule.getCycleTime()); + String time = getTime(rule.getCycleTime().intValue()); + String[] timeArr = time.split(","); + tmpList = enforcementRegistrationMapper.countMentByTimeLawNew(timeArr[0],timeArr[1]); + tmpList.forEach(res ->{ + res.setBeginTime(timeArr[0]); + res.setEndTime(timeArr[1]); + }); }else if (list.getRuleCode().equals("qy_warn")){ - tmpList = enforcementRegistrationMapper.countMentByTimeQyNew(rule.getCycleTime()); + String time = getTime(rule.getCycleTime().intValue()); + String[] timeArr = time.split(","); + tmpList = enforcementRegistrationMapper.countMentByTimeQyNew(timeArr[0],timeArr[1]); + tmpList.forEach(res ->{ + res.setBeginTime(timeArr[0]); + res.setEndTime(timeArr[1]); + }); }else { tmpList = enforcementRegistrationMapper.countMentByTime2(rule.getCycleTime(), searchValue); } @@ -275,7 +290,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat Collectors.maxBy(Comparator.comparingInt(EnforceRegCount::getNum)), Optional::get))); Date nowDate = DateUtils.getNowDate(); - List lawEnforcementWarningLists = new ArrayList<>(); +// List lawEnforcementWarningLists = new ArrayList<>(); Iterator> iterator = maxItems.entrySet().iterator(); while (iterator.hasNext()) { @@ -285,32 +300,31 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat // 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); +// 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")){ reg.setWarnType(0); }else if (list.getRuleCode().equals("qy_warn")){ reg.setWarnType(1); } //存储告警信息 - lawEnforcementWarningLists.add(lawEnforcementWarningList); - +// lawEnforcementWarningLists.add(lawEnforcementWarningList); + results.add(reg); break; } } - results.add(reg); } } return results; @@ -373,4 +387,18 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat } return result; } + + public static String getTime(Integer mouthTime){ + int year = LocalDate.now().getYear(); + int nowMonth = LocalDate.now().getMonth().getValue() - (mouthTime -1); + int month = LocalDate.now().getMonth().getValue(); + // 获取x月的第一天 + LocalDate firstDayOfMonth = LocalDate.of(year, nowMonth, 1); + // 获取x月的第一天 + LocalDate lastLocalDate = LocalDate.of(year, month, 1); + // 获取当前月的最后一天 + LocalDate lastDayOfMonth = lastLocalDate.with(TemporalAdjusters.lastDayOfMonth()); + return firstDayOfMonth +"," + lastDayOfMonth; + } + } 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 55ed900a..178e6745 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 @@ -68,13 +68,25 @@ public class EarlyWarningTask { warning.setId(IdUtil.simpleUUID()); warning.setCreateTime(DateUtils.getNowDate()); - if(StrUtil.isNotEmpty(warn.getLawEnforcementId())){ - warning.setEnforcementDepartment(warn.getEnforcementDepartment()); - warning.setEnforcementDepartmentId(warn.getEnforcementDepartmentId()); + if(StrUtil.isNotEmpty(warn.getLawEnforcementId()) && warn.getWarnType() == 0){ + warning.setEnforcementDepartment(warn.getLawEnforcement()); + warning.setEnforcementDepartmentId(warn.getLawEnforcementId()); } + //开始时间结束时间 + warning.setBeginTime(warn.getBeginTime()); + warning.setEndTime(warn.getEndTime()); //预警类型 warning.setWarnType(warn.getWarnType()); lawEnforcementWarningListService.insertLawEnforcementWarningList(warning); + }else{ + //如预警数据已存在，更新企业预警次数数值 + for (LawEnforcementWarningList re : res) { + LawEnforcementWarningList warning = new LawEnforcementWarningList(); + warning.setWarningCause("本月对该企业已检查" + warn.getNum() + "次"); + warning.setEnforcementNumber(warn.getNum()); + warning.setId(re.getId()); + lawEnforcementWarningListService.updateLawEnforcementWarningList(warning); + } } } }catch (Exception e){ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 72bc9ea3..15561ea2 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -129,6 +129,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(enforcement_time,'%Y-%m') <= #{endTime} + + + and enforcement_time >= #{params.beginTime} + + + and enforcement_time <= #{params.endTime} + ${params.dataScope} @@ -314,7 +321,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM ( SELECT enterprise_name, enterprise_number, law_enforcement_id,law_enforcement, unite_check, create_time , count( enterprise_number ) AS total FROM enforcement_registration - WHERE create_time >= DATE_SUB( CURDATE(), INTERVAL #{timeMonth} MONTH ) AND law_enforcement_id IS NOT NULL GROUP BY unite_check ,law_enforcement_id ) AS t1 + WHERE = #{beginTime} AND create_time <= #{endTime} ]]> AND law_enforcement_id IS NOT NULL GROUP BY unite_check ,law_enforcement_id ) AS t1 GROUP BY t1.law_enforcement_id \ 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 494d85c5..57148477 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml @@ -16,12 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select id, warning_time, warning_cause, warning_level, create_time, enterprise_name, enterprise_number,enforcement_number,warn_type, - enforcement_department,enforcement_department_id from law_enforcement_warning_list + enforcement_department,enforcement_department_id,begin_time,end_time from law_enforcement_warning_list