导出动态执法数据

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/MhFireLawEnforcement.java

@@ -0,0 +1,18 @@
+package com.usky.fire.service;
+
+import com.usky.fire.service.vo.MhFireLawEnforcementDataExportVO;
+
+import java.util.List;
+
+/**
+ *
+ * @author fu
+ * @date 2024/8/28
+ */
+public interface MhFireLawEnforcement {
+
+    /**
+     * 导出消防执法数据
+     */
+    List<MhFireLawEnforcementDataExportVO> export();
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/MhFireLawEnforcementImpl.java

@@ -0,0 +1,35 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.usky.fire.domain.DemFireHazardsNotice;
+import com.usky.fire.mapper.DemFireHazardsNoticeMapper;
+import com.usky.fire.service.MhFireLawEnforcement;
+import com.usky.fire.service.vo.MhFireLawEnforcementDataExportVO;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ *
+ * @author fu
+ * @date 2024/8/28
+ */
+public class MhFireLawEnforcementImpl implements MhFireLawEnforcement {
+
+    @Autowired
+    private DemFireHazardsNoticeMapper demFireHazardsNoticeMapper;
+
+    @Override
+    public List<MhFireLawEnforcementDataExportVO> export() {
+        List<MhFireLawEnforcementDataExportVO> list = new ArrayList<>();
+        LambdaQueryWrapper<DemFireHazardsNotice> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select(DemFireHazardsNotice::getEnterBy)
+                .eq(DemFireHazardsNotice::getDeleteFlag, "0");
+        List<DemFireHazardsNotice> list1 = demFireHazardsNoticeMapper.selectList(queryWrapper);
+        
+
+        return Collections.emptyList();
+    }
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/MhFireLawEnforcementDataExportVO.java

@@ -0,0 +1,146 @@
+package com.usky.fire.service.vo;
+
+import com.usky.common.core.annotation.Excel;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ * @author fu
+ * @date 2024/8/28
+ */
+public class MhFireLawEnforcementDataExportVO {
+
+    /**
+     *  科室
+     */
+    @Excel(name = "科室", readConverterExp = "1=一科,2=二科,3=三科,4=四科,5=五科,6=法社科")
+    private Integer department;
+
+    /**
+     * 姓名
+     */
+    @Excel(name = "姓名")
+    private String name;
+
+    /**
+     * 总得分
+     */
+    @Excel(name = "总得分")
+    private Integer totalScore;
+
+    /**
+     * 总排名
+     */
+    @Excel(name = "总排名")
+    private Integer totalRank;
+
+    /**
+     * 检查单位
+     */
+    @Excel(name = "检查单位")
+    private Integer inspectionUnit;
+
+    @Excel(name = "排名")
+    private Integer unitRanking;
+
+    @Excel(name = "得分")
+    private Integer unitScore;
+
+    /**
+     * 发现隐患
+     */
+    @Excel(name = "发现隐患")
+    private Integer hiddenDangerFound;
+
+    @Excel(name = "排名")
+    private Integer dangerRanking;
+
+    @Excel(name = "得分")
+    private Integer dangerScore;
+
+    /**
+     * 督促整改隐患
+     */
+    @Excel(name = "督促整改隐患")
+    private Integer urgeRectification;
+
+    @Excel(name = "排名")
+    private Integer urgeRanking;
+
+    @Excel(name = "得分")
+    private Integer urgeScore;
+
+    /**
+     * 重大火灾隐患
+     */
+    @Excel(name = "重大火灾隐患")
+    private Integer majorFireHazards;
+
+    @Excel(name = "排名")
+    private Integer majorRanking;
+
+    @Excel(name = "得分")
+    private Integer majorScore;
+
+    /**
+     * 行政处罚立案
+     */
+    @Excel(name = "行政处罚立案")
+    private Integer administrativePenaltyFiling;
+
+    @Excel(name = "排名")
+    private Integer filingRanking;
+
+    @Excel(name = "得分")
+    private Integer filingScore;
+
+    /**
+     * 行政处罚
+     */
+    @Excel(name = "行政处罚")
+    private Integer administrativePenalty;
+
+    @Excel(name = "排名")
+    private Integer penaltyRanking;
+
+    @Excel(name = "得分")
+    private Integer penaltyScore;
+
+    /**
+     * 罚款金额
+     */
+    @Excel(name = "罚款金额")
+    private BigDecimal penaltyAmount;
+
+    @Excel(name = "排名")
+    private Integer amountRanking;
+
+    @Excel(name = "得分")
+    private Integer amountScore;
+
+    /**
+     * 临时查封
+     */
+    @Excel(name = "临时查封")
+    private Integer temporarySeizure;
+
+    @Excel(name = "排名")
+    private Integer seizureRanking;
+
+    @Excel(name = "得分")
+    private Integer seizureScore;
+
+    /**
+     * 责令三停
+     */
+    @Excel(name = "责令三停")
+    private Integer ceaseConstructionUseProduce;
+
+    @Excel(name = "排名")
+    private Integer constructionRanking;
+
+    @Excel(name = "得分")
+    private Integer constructionScore;
+
+}

service-fire/service-fire-biz/src/main/resources/application.yml

@@ -42,21 +42,21 @@ spring:
     dynamic:
       datasource:
         master:
-#          url: jdbc:mysql://172.16.120.165:3306/usky-fire?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&queryTimeout=2400
-#          username: usky
-#          password: Yt#75Usky
-          driver-class-name: dm.jdbc.driver.DmDriver
+          url: jdbc:mysql://172.16.120.166:3306/usky-fire?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&queryTimeout=2400
+          username: usky
           password: Yt#75Usky
-          url: jdbc:dm://localhost:5237/SYSDBA?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
-          username: SYSDBA
+#          driver-class-name: dm.jdbc.driver.DmDriver
+#          password: Yt#75Usky
+#          url: jdbc:dm://10.236.244.108:5237/SYSDBA?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
+#          username: SYSDBA
 #        mhsystem:
 #          password: mysql570
 #          url: url=jdbc:mysql://32.1.7.42:3306/minhangsystem?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true
 #          username: mhzd119
       druid:
-        initial-size: 5
-        min-idle: 5
-        maxActive: 20
+        initial-size: 25
+        min-idle: 25
+        maxActive: 125
         maxWait: 60000
         timeBetweenEvictionRunsMillis: 60000
         minEvictableIdleTimeMillis: 300000
@@ -67,7 +67,9 @@ spring:
         poolPreparedStatements: true
         maxPoolPreparedStatementPerConnectionSize: 20
         filters: stat,slf4j
-        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+        connectionProperties:
+          druid.stat.mergeSql: true
+          druid.stat.slowSqlMillis: 5000
       primary: master
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
@@ -90,7 +92,7 @@ spring:
 #        线程关闭时是否等所有任务结束
         await-termination: false
 #        线程最大的等待时间，防止线程陷入循环关不掉
-        await-termination-period: 10s  
+        await-termination-period: 10s
   tenant:
    enable: false
   servlet:
@@ -105,6 +107,6 @@ spring:
 #  sub-topics: mh/water/info,mh/water/alert,mh/water/statistics,device/info,device/alert,device/detail,device/aj
 #  url: tcp://47.98.201.73:1883
 #  username: usky
-   
+
 mhwater:
   path: http://180.169.15.121:1680

service-iot/service-iot-biz/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
       config:
         # 配置中心地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置