添加mapper和生产环境账号密码

mhfire-controller/src/main/resources/application-prod.properties

@@ -2,7 +2,7 @@ debug=true
 spring.main.lazy-initialization=false
 spring.main.allow-bean-definition-overriding=true
 # application
-server.port=8082
+server.port=8083
 # mybatis-plus
 mybatis-plus.mapper-locations=classpath*:mapper/**/*.xml
 mybatis-plus.configuration.lazy-loading-enabled=true
@@ -15,15 +15,11 @@ mybatis.refresh.delay-seconds=10
 mybatis.refresh.sleep-seconds=20
 # datasource
 spring.autoconfigure.exclude=com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-spring.datasource.dynamic.primary=product
-spring.datasource.dynamic.datasource.product.url=jdbc:mysql://dev1.shuqian.com:3306/product?allowMultiQueries=true&createDatabaseIfNotExist=true&autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&useCompression=true
-spring.datasource.dynamic.datasource.product.username=dev
-spring.datasource.dynamic.datasource.product.password=Coozo0628
-#老库
-spring.datasource.dynamic.datasource.old.url=jdbc:mysql://dev1.shuqian.com:3306/amazonold?allowMultiQueries=true&createDatabaseIfNotExist=true&autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true
-spring.datasource.dynamic.datasource.old.username=dev
-spring.datasource.dynamic.datasource.old.password=Coozo0628
-spring.datasource.dynamic.druid.initial-size=5
+spring.datasource.dynamic.primary=mhfire
+spring.datasource.dynamic.datasource.mhfire.url=jdbc:mysql://32.0.15.104:3306/mhxf?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&characterEncoding=utf8
+spring.datasource.dynamic.datasource.mhfire.username=root
+spring.datasource.dynamic.datasource.mhfire.password=xfzdadmin#2021
+spring.datasource.dynamic.druid.initial-size=5                                                                       
 spring.datasource.dynamic.druid.min-idle=5
 spring.datasource.dynamic.druid.max-active=30
 spring.datasource.dynamic.druid.max-wait=60000
@@ -54,7 +50,7 @@ spring.datasource.druid.filter.slf4j.statement-close-after-log-enabled=false
 spring.datasource.druid.filter.slf4j.result-set-open-after-log-enabled=false
 spring.datasource.druid.filter.slf4j.result-set-close-after-log-enabled=false
 # jackson
-spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ssZ
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+0
 spring.jackson.default-property-inclusion=always
 #spring.jackson.serialization.indent_output=true
@@ -65,3 +61,14 @@ spring.jackson.parser.allow-single-quotes=true
 # gzip
 server.compression.enabled=true
 server.compression.mime-types=application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
+
+
+# eureka
+#eureka.client.service-url.defaultZone=http://172.31.101.251:8099/eureka/,http://172.31.101.252:8099/eureka/
+#eureka.client.service-url.defaultZone=http://localhost:8088/eureka/
+##eureka.client.healthcheck.enabled=true
+#eureka.instance.prefer-ip-address=true
+#eureka.instance.instance-id=${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
+#eureka.instance.lease-renewal-interval-in-seconds=30
+#eureka.instance.lease-expiration-duration-in-seconds=90
+#eureka.client.registryFetchIntervalSeconds=30

mhfire-controller/src/main/resources/log4j2-spring-dev.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration status="OFF">
     <properties>
-        <property name="LOG_HOME">./logs/product</property>
+        <property name="LOG_HOME">./logs/mhfire</property>
         <Property name="CONSOLE_LOG_PATTERN">%clr{%d{yyyy-MM-dd HH:mm:ss.SSS}}{blue} %clr{%-5level}
             %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%l}{cyan} %clr{:}{faint} %m%n%xwEx
         </Property>

mhfire-controller/src/main/resources/log4j2-spring-prod.xml

@@ -2,7 +2,7 @@
 <configuration status="OFF">
 
     <properties>
-        <property name="LOG_HOME">/data/logs/product</property>
+        <property name="LOG_HOME">/home/xfzdadmin/data/logs/mhfire</property>
         <Property name="CONSOLE_LOG_PATTERN">%clr{%d{yyyy-MM-dd HH:mm:ss.SSS}}{blue} %clr{%-5level}
             %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%l}{cyan} %clr{:}{faint} %m%n%xwEx
         </Property>

mhfire-mapping/src/main/resources/mapper/mysql/SiAeAllMapper.xml

@@ -3,14 +3,14 @@
 <mapper namespace="com.bizmatics.mhfire.persistence.mapper.SiAeAllMapper">
     <select id="selectAeAllCollect" resultType="java.util.Map">
         select
-        sum(`检查单位（家、次）`) as checkUnit,
-        sum(`发现火灾隐患或违法行为（处）`) as findFireDanger,
-        sum(`督促整改火灾隐患或违法行为`) as rectifyFireDanger,
-        sum(`当场处罚罚款金额`) as fineMoney,
-        sum(`发责令改正通知书`) as beganChange,
-        sum(`发处罚决定书（份）`) as punish,
-        sum(`责令“三停”`) threeStop,
-        sum(`发临时查封决定书（份）`) as seal
+        COALESCE(sum(`检查单位（家、次）`),0) as checkUnit,
+        COALESCE(sum(`发现火灾隐患或违法行为（处）`),0) as findFireDanger,
+        COALESCE(sum(`督促整改火灾隐患或违法行为`),0) as rectifyFireDanger,
+        COALESCE(sum(`当场处罚罚款金额`),0) as fineMoney,
+        COALESCE(sum(`发责令改正通知书`),0) as beganChange,
+        COALESCE(sum(`发处罚决定书（份）`),0) as punish,
+        COALESCE(sum(`责令“三停”`),0) threeStop,
+        COALESCE(sum(`发临时查封决定书（份）`),0) as seal
         FROM `jdjc-xzzftj-all`
         <where>
             <if test="startTime !=null">