From d6820bd8c2bcd6114cb263e507908db8f3a40bde Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Tue, 13 Oct 2026 17:01:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=89=A7?= =?UTF-8?q?=E6=B3=95=E4=BA=BA=E5=91=98=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cim/CimDashboardOverviewController.java | 2 +- .../report/LawEnfOfficerController.java | 78 ++++++++++++++++++ .../domain/vo/EnforcementRegistrationVo.java | 10 +++ .../mapper/LawEnfOfficerMapper.java | 19 +++++ .../report/ILawEnfOfficerService.java | 18 ++++ .../report/impl/LawEnfOfficerSericeImpl.java | 36 ++++++++ .../enforcementcode/LawEnfOfficerMapper.xml | 82 +++++++++++++++++++ 7 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/LawEnfOfficerController.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/LawEnfOfficerMapper.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/ILawEnfOfficerService.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/LawEnfOfficerSericeImpl.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnfOfficerMapper.xml diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java index 8aa2de71..7ce679d8 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java @@ -62,7 +62,7 @@ public class CimDashboardOverviewController { * @return */ - @GetMapping("getAdminLawCount") + @GetMapping("/getAdminLawCount") public R getAdminLawCount(CimDashboardOverviewQueryBo bo){ CimDashboardOverviewVo vo = new CimDashboardOverviewVo(); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/LawEnfOfficerController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/LawEnfOfficerController.java new file mode 100644 index 00000000..08b14770 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/LawEnfOfficerController.java @@ -0,0 +1,78 @@ +package com.zdxt.enforcementcode.controller.web.supervision.report; + + +import cn.dev33.satoken.annotation.SaIgnore; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; +import com.zdxt.enforcementcode.domain.bo.dashboard.DashboardEnterpriseCheckListBo; +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; +import com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo; +import com.zdxt.enforcementcode.report.ILawEnfOfficerService; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 执法人员情况 + */ +@SaIgnore +@Slf4j +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/web/supervision/report/lawEnfOfficer") +public class LawEnfOfficerController { + + private final ILawEnfOfficerService lawEnfOfficerService; + + /** + * 重点企业-分页列表查询 + */ + @GetMapping("/list") + public TableDataInfo list(EnforcementRegistrationBo bo, PageQuery pageQuery) { + return lawEnfOfficerService.selectLawEnfOfficerPageList( pageQuery,bo); + } + + /** + * 重点企业-查询详情 + * @param bo + * @param pageQuery + * @return + */ + @GetMapping("/details") + public TableDataInfo detatils(EnforcementRegistrationBo bo, PageQuery pageQuery){ + TableDataInfo list=lawEnfOfficerService.selectLawEnfOfficerDetailsPageList(pageQuery,bo); + return list; + } + + + + /** + * 重点企业-导出Excel + */ + @PostMapping("/export") + public void export(EnforcementRegistrationBo bo, HttpServletResponse response) { + try { + List list = lawEnfOfficerService.selectLawEnfOfficerList(bo); + ExcelUtil.exportExcel(list, "重点企业", EnforcementRegistrationVo.class, response); + } catch (Exception e) { + log.error("导出重点企业Excel异常", e); + response.reset(); + response.setContentType("application/json; charset=utf-8"); + try { + response.getWriter().write("{\"code\":500,\"msg\":\"导出失败: " + e.getMessage() + "\"}"); + } catch (Exception ignored) { + log.error("响应重置异常", ignored); + } + } + } +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java index 857afc54..e97cec36 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java @@ -424,4 +424,14 @@ public class EnforcementRegistrationVo implements Serializable { * 字典标签 */ private String dictLabel; + + /** + * 区名称 + */ + private String districtName; + + /** + * 执法次数 + */ + private Long zfcs; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/LawEnfOfficerMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/LawEnfOfficerMapper.java new file mode 100644 index 00000000..b803d7eb --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/LawEnfOfficerMapper.java @@ -0,0 +1,19 @@ +package com.zdxt.enforcementcode.mapper; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface LawEnfOfficerMapper { + + Page selectLawEnfOfficerPageList(@Param("page") Page page, + @Param("bo") EnforcementRegistrationBo bo); + + List selectLawEnfOfficerList(@Param("bo") EnforcementRegistrationBo bo); + + Page selectLawEnfOfficerDetailsPageList(@Param("page") Page page, + @Param("bo") EnforcementRegistrationBo bo); +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/ILawEnfOfficerService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/ILawEnfOfficerService.java new file mode 100644 index 00000000..b45b0021 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/ILawEnfOfficerService.java @@ -0,0 +1,18 @@ +package com.zdxt.enforcementcode.report; + + +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +import java.util.List; + +public interface ILawEnfOfficerService { + + TableDataInfo selectLawEnfOfficerPageList(PageQuery pageQuery, EnforcementRegistrationBo bo); + + List selectLawEnfOfficerList(EnforcementRegistrationBo bo); + + TableDataInfo selectLawEnfOfficerDetailsPageList(PageQuery pageQuery,EnforcementRegistrationBo bo); +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/LawEnfOfficerSericeImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/LawEnfOfficerSericeImpl.java new file mode 100644 index 00000000..cafe6bd2 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/LawEnfOfficerSericeImpl.java @@ -0,0 +1,36 @@ +package com.zdxt.enforcementcode.report.impl; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; +import com.zdxt.enforcementcode.mapper.LawEnfOfficerMapper; +import com.zdxt.enforcementcode.report.ILawEnfOfficerService; +import lombok.RequiredArgsConstructor; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.springframework.stereotype.Service; + +import java.util.List; +@Service +@RequiredArgsConstructor +public class LawEnfOfficerSericeImpl implements ILawEnfOfficerService { + + private final LawEnfOfficerMapper lawEnfOfficerMapper; + @Override + public TableDataInfo selectLawEnfOfficerPageList(PageQuery pageQuery, EnforcementRegistrationBo bo) { + Page list=lawEnfOfficerMapper.selectLawEnfOfficerPageList(pageQuery.build(),bo); + return TableDataInfo.build(list); + } + + @Override + public List selectLawEnfOfficerList(EnforcementRegistrationBo bo) { + return lawEnfOfficerMapper.selectLawEnfOfficerList(bo); + } + + @Override + public TableDataInfo selectLawEnfOfficerDetailsPageList(PageQuery pageQuery, EnforcementRegistrationBo bo) { + Page list=lawEnfOfficerMapper.selectLawEnfOfficerDetailsPageList(pageQuery.build(),bo); + return TableDataInfo.build(list); + } +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnfOfficerMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnfOfficerMapper.xml new file mode 100644 index 00000000..6dff0699 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnfOfficerMapper.xml @@ -0,0 +1,82 @@ + + + + + + select + t1.lawEnforcerId, + t1.lawEnforcer, + t1.bureauDeptId, + t1.bureauDeptName, + t1.zfcs, + t4.name as districtName + from + ( + select + law_enforcer_id as lawEnforcerId, + law_enforcer as lawEnforcer, + bureau_dept_id as bureauDeptId, + bureau_dept_name as bureauDeptName, + count(1) as zfcs + from + enforcement_registration t1 + + t1.is_submit = 1 + and t1.is_delete = 0 + and t1.enterprise_name is not null + and t1.enterprise_number is not null + + and t1.law_enforcer LIKE CONCAT('%', #{bo.lawEnforcer}, '%') + + + and DATE_FORMAT(t1.enforcement_time,'%Y-%m') = DATE_FORMAT(#{bo.enforcementTime},'%Y-%m') + + + group by + lawEnforcerId, + lawEnforcer, + bureauDeptId, + bureauDeptName) t1 + left join sys_user t2 on + t1.lawEnforcerId = t2.user_id + left join sys_dept t3 on + t2.dept_id = t3.dept_id + left join dashboard_area_info t4 on + t3.area_node = t4.code + and t4.level = 3 + + + + + + + + From 7dc9f68fea53b52422a6d518326c262e715c3b81 Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Tue, 13 Oct 2026 17:29:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E7=9A=84redis=E5=9C=B0=E5=9D=80=E4=B8=A2=E4=B8=8A=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml index 9cbadd33..8fb237d6 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml @@ -112,16 +112,15 @@ spring: --- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) spring.data: redis: -#本地环境 -# host: 172.16.20.72 -# password: - # 联调环境 + # 地址 host: 146.56.223.227 - password: zdxt@123 +# host: 172.16.20.72 # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 + # redis 密码必须配置 + password: zdxt@123 # 连接超时时间 timeout: 10s # 是否开启ssl From ab3d301e84435c4b7fef12e6101e31feeb82eed3 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Wed, 14 Oct 2026 16:43:52 +0800 Subject: [PATCH 3/5] =?UTF-8?q?CIM-=E9=87=8D=E7=82=B9=E4=BC=81=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CimDashboardOverviewDataSumSserviceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java index 447000f6..e0352ee4 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java @@ -935,20 +935,20 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve // 获取当前系统时间 bo.setMonthTime(getDateTime().getMonthTime()); //查询重点企业 - if(bo.getEnterpriseNumber()== null || bo.getEnterpriseNumber().equals("")){ + //if(bo.getEnterpriseNumber()== null || bo.getEnterpriseNumber().equals("")){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DashboardEnterpriseCheck::getIsDelete, "0"); queryWrapper.eq(DashboardEnterpriseCheck::getStatYear, getDateTime().getYear()); queryWrapper.eq(DashboardEnterpriseCheck::getStatMonth, getDateTime().getMonth()); + queryWrapper.eq(bo.getEnterpriseNumber()!=null,DashboardEnterpriseCheck::getEnterpriseNumber,bo.getEnterpriseNumber()); queryWrapper.orderByDesc(DashboardEnterpriseCheck::getXzzfzs); queryWrapper.last("LIMIT 1"); DashboardEnterpriseCheck entity = dashboardEnterpriseCheckMapper.selectOne(queryWrapper); bo.setEnterpriseNumber(entity.getEnterpriseNumber()); - vo.setEnterpriseNumber(entity.getEnterpriseNumber()); vo.setEnterpriseName(entity.getEnterpriseName()); vo.setEnterpriseAddress(entity.getEnterpriseAddress()); - } + //} // 锁定基准月份：TbHbUtils.calculate 内部会通过 lambda 反复执行 bo.setMonthTime(...)， // 会导致 bo.monthTime 被污染，后续 calculate 的基准月以及趋势/明细查询都会取到错误月份。 From 11cb671cfb5f4bb28512e63cb55b9fd96a8d8e19 Mon Sep 17 00:00:00 2001 From: vincent Date: Wed, 14 Oct 2026 18:05:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 19 +- .../src/main/resources/application-test.yml | 407 ++++++++++++++++++ 2 files changed, 415 insertions(+), 11 deletions(-) create mode 100644 zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-test.yml diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml index 8fb237d6..14875c25 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml @@ -57,13 +57,13 @@ spring: datasource: # 主库数据源 master: - driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://146.56.223.227:3306/zfjd2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: zfjd - password: zdxt@1234 -# url: jdbc:mysql://172.16.20.72:3306/zfjd_ef20_1_2026_07_13?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: root -# password: zdxt@8888 +# driverClassName: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://146.56.223.227:3306/zfjd2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: zfjd +# password: zdxt@1234 + url: jdbc:mysql://172.16.20.72:3306/zfjd_ef20_1_2026_07_13?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: zdxt@8888 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) @@ -113,14 +113,11 @@ spring: spring.data: redis: # 地址 - host: 146.56.223.227 -# host: 172.16.20.72 + host: 172.16.20.72 # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 - # redis 密码必须配置 - password: zdxt@123 # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-test.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-test.yml new file mode 100644 index 00000000..8fb237d6 --- /dev/null +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-test.yml @@ -0,0 +1,407 @@ +zdxt: + file: + # Windows/Linux 本地开发均可用；生产环境在 application-prod.yml 覆盖 +# upload-path: D:\zfjdm\uploadPath + upload-path: /usr/local/uploadPath +# upload-path: /Users/vincent/uploadPath + url-prefix: /profile + qr_code_url: /usr/local/uploads/zfjd_logo.png + demo_enabled: false + # 登录使用的公私钥 + public-key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC00mFpXG09DFOL0HpeeLHuh6YGAa4vQJorH8xVz4ftvNgkbeXsl2xZwNSAW5scc5Z5BFFFoZy2800i3fg4zedruY2goiG4alg7haRHTu4FfYJOy+o+N//UgynHB/iA+wv8nEhKKRsuVPwD9pNKx2/nzXO6KjZEJCsvVJX53w+pQwIDAQAB + private-key: ENC(q/G0Iy/bTMpmx7MUmBo/Vr8J1lOXdh9aspSxPt+hAE7YrFmqGUUims4f3eJPMk/Ppc3Np+FcqISI82w2enkvImCfYo+FEYkuNNq2jpE7qMnti4yGAVhnuhrNrtNja2g3GJZ71SfoTsT9jQTLGh92wSSvqxl6OaOfb0hZB4P4cWHpEyH54UcXOaSX+Qa/IfouY60RwWJM61AQwZuyJ91U98ad7diiCso82AnBvMDQueSDM86C/lmvtiwKCKb4dfB5MRkSykFKANT0Mixu8qIr49CIpkusFfPdzbPyC3jgVyLZ5LnK1/6aDXCxj5Yulwic20EyFiAksKpMt+tF/pSAgy0QznvG4TpMH9XbsTqEmFfQWEHj7DkxCPf8u/1sl8xi3qcCKOeBX5w3t+/Ybhoje8fRPjJKTmooaU2gjxZHo3ozbUT1mX3VVfYUc6b6OjhwPUz88LhY9jEUVVUYzYVh9ENA/Ynp61ELArT+91ccqoHitSJBw/BMgBxcOD3+8v3SC1dpH/gtE5a4VuQetz/gWuLYHBdYaZZ9uzMZHySHYo1q2XmG2sTSG/A/U/KgatdOWwaV5DaSw74YOpelQjb2CUoqurVoQOMW1VZt/L3x1NDeZTUyNWsaNGyteW2beGTGf3BvTZeGG+/QJhGbX4CxigGpL+nFaCGOf8nwG21LaYHKtyQrC1o3YUApkMqZqSbWCB2FiR4sBE5bf3jJxJn9BK0Noa/Zp6anemSfoOgCB0igBBIfJqi52WMW4yChqslcByxFCYnayf02uM/l2jhfN3XEKS3uc1F+AkhoNleNBepFsJTviVYb2n/anWZZPRPGvbkBNV8NznCFSzdMx+bAql3noDcaTG8TV4eGWTaNFGS+ap+iCG/CdlhbrjR0RknxPSjkWAnzz2FE/a/n89aOVBYcU8LlGuRGT2ppf/wWrlFADWk7SfnpWyJyZdQT+iGZSaUCwQ2hVRYL43Fet6IBrDuqzb6oZEhONx4h2qEhhLEcerIuHAeU4COTUN6dqqxsc3a/5IPzAoyIg2Y6Rem7x2Hp9l2/xJtK1IPOayLX/XTPK4OIBzC/IMq3/nA+CtjJTXpuhceRkw6CbqVYV//JOQyGO9Bloyf+7FOdmuU6UMMTxiEgHROMW26nlETmr6+m) +# private-key: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALTSYWlcbT0MU4vQel54se6HpgYBri9AmisfzFXPh+282CRt5eyXbFnA1IBbmxxzlnkEUUWhnLbzTSLd+DjN52u5jaCiIbhqWDuFpEdO7gV9gk7L6j43/9SDKccH+ID7C/ycSEopGy5U/AP2k0rHb+fNc7oqNkQkKy9UlfnfD6lDAgMBAAECgYAd3qrsxrHc5c5fSD8OoA10g7/vOhPWBmvxN71/Z1ri8NEbo3PZ02G4qdvwoDFNT+LJduceA4ZpymMxoU1BxPG3WMXoWZQMSECEwi6ivg9q4HBr1mhhPPqgF5pDgGb8aW/3znOIlIV5WsZsb4pHd6NH38A7iv6IuKccWdstjtqCsQJBANq5GTDVVACe4DXAcvI+GtaRNM3izRJueYx6Kzhl22v2vMiGH8WcwgaEIlXg9G/6SrVnLh/hpTY/iEuTGaiBnTUCQQDTo6X1hZLNBYXP+ahEnGjVrzcO6GDklvU609tPcW1pVXHOeikQKUwwNKYJ6GrSW5ECewqdviOznI3ODBynTROXAkEAugGr8KGbPKPgXRX7KxOx00PNukHk0IXvDI5g7yeAQQKmbYnSv0Weo9f/MzWJ6yjaHAdRbH+C9u10xYCl023W+QJAYjaGVIrZFjWi5GG6GaTv7YHzLgLevBXl1ZftJU/A82nId4YvOiXACnrUNrLZp6cAg0MwKQXMsZRMJjturKDTHwJBAMDOLEBcnP2a0UVYXSwG3o3uVTBpLo1CvgN32aSF0xX7C+MuHTirDJStOLmNBGb+7TOINsnNHFVveXdhnDwrBTE= +# private-key: ENC(Jasypt加密后的私钥Base64) +--- # 监控中心配置 +spring.boot.admin.client: + # 增加客户端开关 + enabled: false + url: http://localhost:9090/admin + instance: + service-host-type: IP + metadata: + username: ${spring.boot.admin.client.username} + userpassword: ${spring.boot.admin.client.password} + username: + password: + +--- # snail-job 配置 +snail-job: + enabled: false + # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 + group: "ruoyi_group" + # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表 + token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" + server: + host: 127.0.0.1 + port: 17888 + # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段 + namespace: ${spring.profiles.active} + # 随主应用端口漂移 + port: 2${server.port} + # 客户端ip指定 + host: + +--- # 数据源配置 +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content + dynamic: + # 性能分析插件(有性能损耗 不建议生产环境使用) + p6spy: true + # 设置默认的数据源或者数据源组,默认值即为 master + primary: master + # 严格模式 匹配不到数据源则报错 + strict: true + datasource: + # 主库数据源 + master: + driverClassName: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://146.56.223.227:3306/zfjd2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: zfjd + password: zdxt@1234 +# url: jdbc:mysql://172.16.20.72:3306/zfjd_ef20_1_2026_07_13?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: root +# password: zdxt@8888 + # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 + # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) + +# # 从库数据源 +# slave: +# lazy: true +# type: ${spring.datasource.type} +# driverClassName: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true +# username: +# password: +# oracle: +# type: ${spring.datasource.type} +# driverClassName: oracle.jdbc.OracleDriver +# url: jdbc:oracle:thin:@//localhost:1521/XE +# username: ROOT +# password: root +# postgres: +# type: ${spring.datasource.type} +# driverClassName: org.postgresql.Driver +# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true +# username: root +# password: root +# sqlserver: +# type: ${spring.datasource.type} +# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true +# username: SA +# password: root + hikari: + # 最大连接池数量 + maxPoolSize: 20 + # 最小空闲线程数量 + minIdle: 10 + # 配置获取连接等待超时的时间 + connectionTimeout: 30000 + # 校验超时时间 + validationTimeout: 5000 + # 空闲连接存活最大时间，默认10分钟 + idleTimeout: 600000 + # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟 + maxLifetime: 1800000 + # 多久检查一次连接的活性 + keepaliveTime: 30000 + +--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) +spring.data: + redis: + # 地址 + host: 146.56.223.227 +# host: 172.16.20.72 + # 端口，默认为6379 + port: 6379 + # 数据库索引 + database: 0 + # redis 密码必须配置 + password: zdxt@123 + # 连接超时时间 + timeout: 10s + # 是否开启ssl + ssl.enabled: false + +# redisson 配置 +redisson: + # redis key前缀 + keyPrefix: + # 线程池数量 + threads: 4 + # Netty线程池数量 + nettyThreads: 8 + # 单节点配置 + singleServerConfig: + # 客户端名称 不能用中文 + clientName: zdxt-Vue-Plus + # 最小空闲连接数 + connectionMinimumIdleSize: 8 + # 连接池大小 + connectionPoolSize: 32 + # 连接空闲超时，单位：毫秒 + idleConnectionTimeout: 10000 + # 命令等待超时，单位：毫秒 + timeout: 3000 + # 发布和订阅连接池大小 + subscriptionConnectionPoolSize: 50 + +--- # mail 邮件发送 +mail: + enabled: false + host: smtp.163.com + port: 465 + # 是否需要用户名密码验证 + auth: true + # 发送方，遵循RFC-822标准 + from: xxx@163.com + # 用户名（注意：如果使用foxmail邮箱，此处user为qq号） + user: xxx@163.com + # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助） + pass: xxxxxxxxxx + # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。 + starttlsEnable: true + # 使用SSL安全连接 + sslEnable: true + # SMTP超时时长，单位毫秒，缺省值不超时 + timeout: 0 + # Socket连接超时值，单位毫秒，缺省值不超时 + connectionTimeout: 0 + +--- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商 +# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置，可以配置多个同时使用 +sms: + # 配置源类型用于标定配置来源(interface,yaml) + config-type: yaml + # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制 + restricted: true + # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效 + minute-max: 1 + # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效 + account-max: 30 + # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中 + blends: + # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可 + # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户 + config1: + # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 + supplier: alibaba + # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。 + access-key-id: 您的accessKey + # 称为accessSecret有些称之为apiSecret + access-key-secret: 您的accessKeySecret + signature: 您的短信签名 + sdk-app-id: 您的sdkAppId + config2: + # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 + supplier: tencent + access-key-id: 您的accessKey + access-key-secret: 您的accessKeySecret + signature: 您的短信签名 + sdk-app-id: 您的sdkAppId + + +--- # 三方授权 +justauth: + # 前端外网访问地址 + address: http://localhost:80 + type: + maxkey: + # maxkey 服务器地址 + # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据 + server-url: http://sso.maxkey.top + client-id: 876892492581044224 + client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8 + redirect-uri: ${justauth.address}/social-callback?source=maxkey + topiam: + # topiam 服务器地址 + server-url: http://127.0.0.1:1898/api/v1/authorize/y0q************spq***********8ol + client-id: 449c4*********937************759 + client-secret: ac7***********1e0************28d + redirect-uri: ${justauth.address}/social-callback?source=topiam + scopes: [openid, email, phone, profile] + qq: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=qq + union-id: false + weibo: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=weibo + gitee: + client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98 + client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac + redirect-uri: ${justauth.address}/social-callback?source=gitee + dingtalk: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=dingtalk + baidu: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=baidu + csdn: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=csdn + coding: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=coding + coding-group-name: xx + oschina: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=oschina + alipay_wallet: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet + alipay-public-key: MIIB**************DAQAB + wechat_open: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_open + wechat_mp: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_mp + wechat_enterprise: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise + agent-id: 1000002 + gitlab: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=gitlab + gitea: + # 前端改动 https://gitee.com/JavaLionLi/plus-ui/pulls/204 + # gitea 服务器地址 + server-url: https://demo.gitea.com + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=gitea + +#深i企对接密钥 测试环境 +siq: + #正式 + # siqUrl: http://10.76.108.3/siqApi + # code: zfjdm +# secretKey: SXRpWEhVN3RHM3ZFbzRQcQ== + #测试 + siqUrl: https://egbpub.siqhz.com/egb/api/thirdauth + siqBaseUrl: https://egbpub.siqhz.com + code: TEST + appId: CE07DEE723E241DFB34D80090A569B12 + secretKey: ENC(6+WSjXj7UebpPJGq69e7aVZ1ZIrL9wnPcD+rU5XDFCNYGQM8fVvtcQ==) + msgAppId: CE07DEE723E241DFB34D80090A569B12 + msgSecretKey: 0C4E08DCC7DD490E86EF2B79E81691D1 + msgTemplateId: 2076972618633498625 + # 模拟数据开关（true=使用模拟数据，false=调用真实接口） + mock: + enabled: false + +#民生诉求工单接口 测试环境 +mssq: + appId: ENC(iYSWCYHguGJTOxTcUjFcq4Tkp0HpU/7UqmxGtda3ORKF7a5UZiz612YlxZ9I4zL+) + appKey: ENC(m81tKAp6NtfW/97e3NNfnfq/1TN79M9JL9UY82dhKPxWJkedAuRJPNDBULZDv4ue5vFXcAHDGtWMsH6flq06B7MdjoYGrDc7) + apiUrl: ENC(2fR5TkUb/A0p4+Gp/As+LJsVCjq7pgNwJIG2OAk2yWLXY/q7DNaCDQ==) + hcpappid: zfjdm + hcpsign: ENC(SZL+KT860YpMBuK6GbNWTp0TYVeSu/DTYjKPRCm5xVJk9tI+O6/hqsE5zH9orApgjX6ggAS2hbGefmUsJwIkos0YtIgueK89ilDHtEy6/S0RWrnoi6F9aByxVG/mAwPxTPIXxwUECjvuET1rByTi7juNbufzWzJfYrH4dFXLmzbF5Cv5jJHM8R7Rq6DGL9X9UCqmROJygXv9KvrxN3OcnVoTHb0wQepEq6kplkd3SswLnPSDpb7q5vcs1XMxYcFRDLyqjmQYVRcx3HMsQZOGkTahOdzIfI/tL4D4upgYK1TFpaCiBL98vX/bh/s9RPmiHkyqMd8/R/NnoB8q5/5LldqxBhPCBi6RbPFGM/UfojdXeS5z2Uk/2w==) + hcptimestamp: 20240710172956 + + +#深圳易平台对接密钥 +szypt: + #测试 + agentid: ENC(JHe/LoW7bh5Cxpn8BJ2Q6Q==) + url: ENC(pRnuGFcSRfkkLTp7NLU5EvD5QpSdkobiPlxjRhGE5l/Uvrur9isTzMkqYoYgMrHt) + corpid: ENC(jrCQGAujvdFRc5tCE8g8oM9F0Ln7shZoXB7WeM3Tzhs=) + corpsecret: ENC(Z8hjBADO1lZDAhOB7/ku9FpPIkYk4mGwyFH01vSwefMxweTeGaMuajSc9vD4bPL1wdgVhS/ZPeI=) + # Mock 开关 (true: 使用模拟数据, false: 调用真实接口) + mock: + enabled: true + # 模拟用户登录名 (对应 sys_user 表的 login_name) + mock-user-id: kangxiaoyuan + +#市认证网关 +srnwg: + #正式 + url: ENC(pHNm/o0+6S+HjrM5nuMiPRfkrHS1tXYD5i25OBtM4dWSi6MvH6iXfw==) + systemCode: ENC(cHDdxMKpJ/rbuj4PVCxylN+zPd9I2KT0) + integrationKey: ENC(txSndcPbZK5mYjW7Doa/n9Ips2PLa9NV) + paasId: szsfj_zhifajianduma_001 + paasToken: ENC(VfUgR5OXHJcKvBBfq/2ysuNPH6I7tCCeWHYSzXKicGChlMiw9mVPGD51naX9w42E) + #市认证数据加密字符 + secretKey: ENC(xWBA5VwT23j14A8+6I15HCerJvo3zaRxzVE2xc0i7wZ7wq/SCflOEkHCc8wwdi0KHkDGjKIoHhs=) + # RSA 公钥 + rsa-public-key: ENC(待用Jasypt加密后的公钥密文) + # RSA 私钥 + rsa-private-key: ENC(待用Jasypt加密后的私钥密文) +# #测试 +# url: ENC(jFwf6bYIMn+FOtbCkyPr0r+TBOPrp84tNotl912ilUZy2e9Y8cbH3uDQ5jtr6SAa) +# systemCode: ENC(ECOnqNVVPmCmnqhde6tsS5JEQYPtlmCv) +# integrationKey: ENC(8RZtrfL4t5tsEk7lfrw00+4hSxbjxcVM) +# paasId: szsfj_zhifajianduma_001 +# paasToken: ENC(0Cg8Vtpay+3hwRm+vJB0utikr4dXcEguwSaxlbTWkgQ4parB8pN2rL2xrhQ8eUd5) + +--- # XSS过滤配置 +xss: + # 开启XSS过滤 + enabled: true + # 排除链接(不进行XSS过滤的URL,这些接口需要接收富文本HTML内容) + excludeUrls: + - /web/enforcementcode/educationServices/add + - /web/enforcementcode/educationServices/edit + +--- # 业务数据双向同步配置 +business-data-sync: + # 是否启用同步功能 + enabled: true + # 是否允许同步删除动作(总闸,false时所有表的删除动作降级为SKIP,防止误清库级联删除) + delete-sync-enabled: false + # 单次扫描批量大小(默认) + scan-batch-size: 1000 + # 单行失败最大重试次数(默认) + max-retry: 5 + # 日志保留天数 + log-retention-days: 30 + + +springdoc: + api-docs: + enabled: true + swagger-ui: + enabled: true + info: + # 标题 + title: '执法监督码接口文档' + # 描述 + description: '执法监督码系统接口文档' + # 版本 + version: '版本号: ${project.version}' + # Swagger UI 安全认证配置（Token 登录入口） + components: + security-schemes: + Authorization: + type: HTTP + scheme: bearer + bearer-format: JWT + description: "请输入 Token，格式：Bearer {token} 或直接输入 {token}" + clientid: + type: apiKey + in: header + name: clientid + description: "客户端ID，例如：enterprise_app" + + #这里定义了两个分组，可定义多个，也可以不定义 + group-configs: + - group: 1、执法监督码 + packages-to-scan: com.zdxt.enforcementcode + - group: 3.系统模块 + packages-to-scan: org.dromara.system From 21b2dd469cd1aa0fa42d4a29165b0c28126965ee Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Thu, 15 Oct 2026 09:53:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?CIM-=E6=9F=A5=E8=AF=A2=E9=87=8D=E7=82=B9?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A1=88=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CimDashboardOverviewDataSumSserviceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java index e0352ee4..4c16c55d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java @@ -854,14 +854,20 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DashboardCheckRegisterDomain::getIsDelete, "0"); + queryWrapper.eq(DashboardCheckRegisterDomain::getYear, getDateTime().getYear()); + queryWrapper.eq(DashboardCheckRegisterDomain::getMonth,getDateTime().getMonth()); List list = dashboardCheckRegisterDomainMapper.selectList(queryWrapper); LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.eq(DashboardCheckRegisterZfajDomain::getIsDelete, "0"); + queryWrapper1.eq(DashboardCheckRegisterZfajDomain::getYear, getDateTime().getYear()); + queryWrapper1.eq(DashboardCheckRegisterZfajDomain::getMonth,getDateTime().getMonth()); List list1 = dashboardCheckRegisterZfajDomainMapper.selectList(queryWrapper1); LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); queryWrapper2.eq(DashboardCheckRegisterZfajdetailsDomain::getIsDelete, "0"); + queryWrapper2.eq(DashboardCheckRegisterZfajdetailsDomain::getYear, getDateTime().getYear()); + queryWrapper2.eq(DashboardCheckRegisterZfajdetailsDomain::getMonth,getDateTime().getMonth()); List list2 = dashboardCheckRegisterZfajdetailsDomainMapper.selectList(queryWrapper2); Map map = new HashMap<>(); map.put("domainOverList", list); @@ -945,9 +951,12 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve queryWrapper.last("LIMIT 1"); DashboardEnterpriseCheck entity = dashboardEnterpriseCheckMapper.selectOne(queryWrapper); - bo.setEnterpriseNumber(entity.getEnterpriseNumber()); - vo.setEnterpriseName(entity.getEnterpriseName()); - vo.setEnterpriseAddress(entity.getEnterpriseAddress()); + if(entity!=null){ + bo.setEnterpriseNumber(entity.getEnterpriseNumber()); + vo.setEnterpriseName(entity.getEnterpriseName()); + vo.setEnterpriseAddress(entity.getEnterpriseAddress()); + } + //} // 锁定基准月份：TbHbUtils.calculate 内部会通过 lambda 反复执行 bo.setMonthTime(...)，