版本更新

gateway/src/main/java/com/zcxk/gateway/config/SwaggerProvider.java

@@ -33,6 +33,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider {
         resources.add(swaggerResource("调度中心接口", "/sms-water/v2/api-docs?group=api"));
         resources.add(swaggerResource("运维管理接口", "/operation-manager/v2/api-docs?group=api"));
         resources.add(swaggerResource("消息中心接口", "/uims-message/v2/api-docs?group=api"));
+        resources.add(swaggerResource("集抄中心接口", "/zoniot-rmcp-web/v2/api-docs?group=api"));
         return resources;
     }
 

gateway/src/main/resources/application-dev.properties

@@ -7,7 +7,6 @@ logging.level.com.alibaba.nacos.client.naming=error
 spring.application.name=gateway
 spring.redis.host=10.0.0.63
 spring.redis.port=6379
-spring.redis.password=zoniot
 spring.redis.database=2
 spring.redis.timeout=36000
 #nacos

gateway/src/main/resources/application-sit.properties

@@ -46,5 +46,10 @@ spring.cloud.gateway.routes[5].uri=lb://operation-manager
 spring.cloud.gateway.routes[5].predicates[0]=Path=/operation-manager/**
 spring.cloud.gateway.routes[5].filters[0]=StripPrefix=1
 
+spring.cloud.gateway.routes[6].id=zoniot-rmcp-web
+spring.cloud.gateway.routes[6].uri=lb://zoniot-rmcp-web
+spring.cloud.gateway.routes[6].predicates[0]=Path=/zoniot-rmcp-web/**
+spring.cloud.gateway.routes[6].filters[0]=StripPrefix=1
+
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB

message/src/main/java/com/zcxk/MessageMain.java

@@ -1,18 +1,31 @@
 package com.zcxk;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ApplicationContext;
+import org.springframework.core.env.Environment;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 @EnableDiscoveryClient
 @SpringBootApplication
 @EnableFeignClients
+@Slf4j
 public class MessageMain {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws UnknownHostException {
         ApplicationContext context = SpringApplication.run(MessageMain.class, args);
-
+        context.getApplicationName();
+        Environment env = context.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        log.info("\n----------------------------------------------------------\n\t" +
+                "Application user_auth is running! Access URLs:\n\t" +
+                "接口Doc: \t\thttp://" + ip + ":" + port + "/swagger-ui.html\n" +
+                "----------------------------------------------------------");
 
     }
 }

message/src/main/resources/application-dev.properties

@@ -39,6 +39,7 @@ security.oauth2.client.client-id=smart-city-v2
 security.oauth2.client.client-secret=smart-city-v2-123
 security.oauth2.resource.id=smartcity-deivice-service
 security.oauth2.resource.user-info-uri=http://localhost:8321/user/principal
+
 security.oauth2.resource.prefer-token-info=false
 
 

message/src/main/resources/application-sit.properties

@@ -39,6 +39,7 @@ security.oauth2.client.client-id=smart-city-v2
 security.oauth2.client.client-secret=smart-city-v2-123
 security.oauth2.resource.id=smartcity-deivice-service
 security.oauth2.resource.user-info-uri=http://10.0.0.62:8321/user/principal
+
 security.oauth2.resource.prefer-token-info=false
 
 
@@ -47,7 +48,7 @@ spring.servlet.multipart.max-request-size=100MB
 spring.servlet.multipart.location=${logging.path}/data
 ######################################################RabbitMq\u914D\u7F6E#####################################################
 spring.rabbitmq.addresses=10.0.0.63:5672
-spring.rabbitmq.username=admin  
+spring.rabbitmq.username=admin
 spring.rabbitmq.password=100zone
 spring.rabbitmq.virtual-host=/
 spring.rabbitmq.connection-timeout=15000
@@ -55,11 +56,10 @@ spring.rabbitmq.publisher-confirm-type=correlated
 spring.rabbitmq.publisher-returns=true
 spring.rabbitmq.template.mandatory=true
 user.connections=userConnection
-dispath.queue=dispathTest1
-receive.queue.name=receiveTest1
-receive.exchange.name=messageExchangeTest
-dispath.routing.key=dipathKeyTest1
-receive.routing.key=receiveKeyTest1
-
+dispath.queue=dispath
+receive.queue.name=receive
+receive.exchange.name=messageExchange
+receive.routing.key=receiveKey
+dispath.routing.key=dipathKey
 spring.cloud.nacos.discovery.server-addr=10.0.0.63:8848
 

user_auth/src/main/resources/application-sit.properties

@@ -59,7 +59,7 @@ spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.seria
 spring.kafka.consumer.properties.spring.json.trusted.packages=*
 
 #nacos
-spring.cloud.nacos.discovery.server-addr=10.0.0.62:8848
+spring.cloud.nacos.discovery.server-addr=10.0.0.63:8848
 maxSendCodeNum=3
 getSendCodeMax=2
 receive.exchange.name=messageExchangeTest

user_center/src/main/resources/application-sit.properties

@@ -64,7 +64,7 @@ spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.seria
 spring.kafka.consumer.properties.spring.json.trusted.packages=*
 
 #nacos
-spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.server-addr=10.0.0.63:8848
 UMIS.sys_config_path=/UMIS_USER_IMAGES/
 UMIS.sys_excel_path=/UMIS_USER_EXCEL/
 #rabbit

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/StatisticsReadRateVo.java

@@ -34,6 +34,12 @@ public class StatisticsReadRateVo {
      * @return
      */
     public String getReadRate(){
-        return StringUtils.isEmpty(readRate) ? "0%" : BigDecimalUtils.subtract(readRate, "100").toEngineeringString() + "%";
+        return StringUtils.isEmpty(readRate) ? "0%" : (BigDecimalUtils.subtract(readRate, "100").toEngineeringString() + "%");
+    }
+
+
+    public static void main(String[] args) {
+        StatisticsReadRateVo vo = new StatisticsReadRateVo();
+        System.out.println(StringUtils.isEmpty(vo.getReadRate()));
     }
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/mongo/MeterReadRecordDao.java

@@ -176,7 +176,6 @@ public class MeterReadRecordDao extends BaseDao<MeterReadRecord, String> impleme
      * @updateTime 2021/7/28 10:25
      * @throws
      */
-
     public List<MeterReadRecord> querySettlementWaterConsumption(Device device, Date clearingStartDate, Date clearingEndDate) {
         Criteria criteria = new Criteria();
         criteria.and("deviceId").is(device.getId());

zoniot-rmcp/zoniot-rmcp-sync/pom.xml

@@ -29,4 +29,22 @@
             <artifactId>fastjson</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <classifier>execute</classifier>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

zoniot-rmcp/zoniot-rmcp-web/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>zoniot-rmcp-web</artifactId>
     <version>1.0-SNAPSHOT</version>
-
+    <packaging>jar</packaging>
     <properties>
         <jdk.version>1.8</jdk.version>
     </properties>
@@ -74,6 +74,25 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.yml</include>
+                    <include>**/*.xml</include>
+                    <include>**/*.tld</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -86,9 +105,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -100,6 +116,7 @@
                     <showWarnings>true</showWarnings>
                 </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-sit.properties

@@ -1,23 +1,49 @@
-server.port=8322
-spring.application.name=user-center
+server.port=8325
+spring.application.name=zoniot-rmcp-web
 logging.level.root=info
-logging.path=./logs/user-center
-#\u6570\u636E\u5E93\u914D\u7F6E
-spring.datasource.url=jdbc:mysql://10.0.0.63:3306/uims?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+logging.path=./logs/zoniot-rmcp-web
+
+files.path=/app/sit/uims/zoniot-rmcp-web/data
+rmcp.url=http://10.0.0.62:8325
+
+
+# mysql
+spring.datasource.url=jdbc:mysql://10.0.0.63:3306/rmcp_v2?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=100zone
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.hikari.max-lifetime=30000
-mybatis-plus.mapper-locations=classpath:mapper/*.xml
-mybatis-plus.type-aliases-package=com.zcxk.entity
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-mybatis-plus.global-config.db-config.logic-delete-value=0 
-mybatis-plus.global-config.db-config.logic-not-delete-value=1
+
+# druid
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.druid.initial-size=5
+spring.datasource.druid.min-idle=5
+spring.datasource.druid.max-active=20
+spring.datasource.druid.max-wait=60000
+spring.datasource.druid.time-between-eviction-runs-millis=60000
+spring.datasource.druid.min-evictable-idle-time-millis=300000
+spring.datasource.druid.validation-query=SELECT 1
+spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=true
+spring.datasource.druid.test-on-return=false
+spring.datasource.druid.pool-prepared-statements=true
+spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
+spring.datasource.druid.filters=stat,wall
+spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+# mybatis
+mybatis.mapper-locations=classpath:com/zcxk/rmcp/core/mapper/*.xml
+mybatis.type-aliases-package=com.zcxk.rmcp.core.entity
+mybatis.configuration.map-underscore-to-camel-case=true
+mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis.configuration.use-column-label=true
+
+
 spring.jackson.time-zone=GMT+8
 #spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 #spring.jackson.joda-date-time-format: yyyy-MM-dd HH:mm:ss
 
-# utils
+# redis
 spring.redis.host=10.0.0.63
 spring.redis.port=6379
 spring.redis.database=2
@@ -39,7 +65,7 @@ spring.redis.lettuce.shutdown-timeout=100
 security.oauth2.client.client-id=smart-city-v2
 security.oauth2.client.client-secret=smart-city-v2-123
 security.oauth2.resource.id=smartcity-deivice-service
-security.oauth2.resource.user-info-uri=http://localhost:8321/user/principal
+security.oauth2.resource.user-info-uri=http://10.0.0.62:8321/user/principal
 security.oauth2.resource.prefer-token-info=false
 
 
@@ -64,8 +90,9 @@ spring.kafka.consumer.properties.spring.json.trusted.packages=*
 
 #nacos
 spring.cloud.nacos.discovery.server-addr=10.0.0.63:8848
-UMIS.sys_config_path=/UMIS_USER_IMAGES/
-UMIS.sys_excel_path=/UMIS_USER_EXCEL/
+rmcp.sys_config_path=/UMIS_USER_IMAGES/
+rmcp.sys_excel_path=/UMIS_USER_EXCEL/
+
 #utils
 spring.rabbitmq.addresses=10.0.0.63:5672
 spring.rabbitmq.username=admin
@@ -75,10 +102,23 @@ spring.rabbitmq.connection-timeout=15000
 spring.rabbitmq.publisher-confirm-type=correlated
 spring.rabbitmq.publisher-returns=true
 spring.rabbitmq.template.mandatory=true
+
+#mongodb url
+spring.data.mongodb.uri=mongodb://10.0.0.63:27017/meter-reading-database
+logging.level.org.springframework.data.mongodb.core=DEBUG
+
 receive.exchange.name=messageExchangeTest
 dispath.routing.key=dipathKeyTest1
 dispath.queue=dispathTest1
-add_iot_user_url=http://114.135.61.188:58080/api/integration/user/savePlatformUser
+
+
+ribbon.OkToRetryOnAllOperations=false
+ribbon.ReadTimeout=5000:
+ribbon.ConnectTimeout=3000
+xxl.job.admin.addresses=http://10.0.0.62:8080/xxl-job-admin/
+xxl.job.group.id=8
+
+
 
 
 

zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 #开发环境：dev  测试环境：sit  线上环境：prd
-spring.profiles.active=dev
+spring.profiles.active=sit