Merge remote-tracking branch 'origin/20210716' into 20210716

zoniot-rmcp/zoniot-rmcp-alarm/src/main/resources/application-dev.properties

@@ -1,4 +1,4 @@
-server.port=8327
+server.port=8329
 spring.application.name=zoniot-rmcp-alarm
 logging.level.root=info
 logging.path=../../logs/zoniot-rmcp-alarm

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

@@ -0,0 +1,82 @@
+server.port=8329
+spring.application.name=zoniot-rmcp-alarm
+logging.level.root=info
+logging.path=./logs
+
+
+
+# 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
+
+# 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
+
+# redis
+spring.redis.host=10.0.0.63
+spring.redis.port=6379
+spring.redis.database=2
+spring.redis.timeout=36000
+
+# Lettuce
+spring.redis.lettuce.pool.max-active=8
+spring.redis.lettuce.pool.max-wait=100
+spring.redis.lettuce.pool.max-idle=8
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.lettuce.shutdown-timeout=100
+
+
+
+
+#nacos
+spring.cloud.nacos.discovery.server-addr=10.0.0.63:8848
+
+
+#rabbitmq
+spring.rabbitmq.addresses=10.0.0.63:5672
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=100zone
+spring.rabbitmq.virtual-host=/
+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
+#spring.data.mongodb.uri=mongodb://127.0.0.1:27017/meter-reading-database
+logging.level.org.springframework.data.mongodb.core=DEBUG
+
+
+
+
+

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/alarm/AlarmTypeDto.java

@@ -84,9 +84,7 @@ public class AlarmTypeDto {
     @ApiModelProperty(value = "水表数目")
     private Integer numberOfWaterMeters;
     @ApiModelProperty(value = "产品类型")
-    @JsonIgnore
     private String categoryName;
     @ApiModelProperty(value = "设备型号")
-    @JsonIgnore
     private String productName;
 }

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

@@ -19,21 +19,24 @@ public class DownloadAlarmVo {
     @ExcelProperty(value = "告警时间" ,index = 1,converter = LocalDateTimeConverter.class)
     private LocalDateTime lastAlarmTime;
 
-    @ExcelProperty(value = "水表电子号" ,index = 2)
+    @ExcelProperty(value = "设备编号" ,index = 2)
+    private String deviceNo;
+
+    @ExcelProperty(value = "水表电子号" ,index = 3)
     private String meterNo;
 
-    @ExcelProperty(value = "设备型号" ,index = 3)
+    @ExcelProperty(value = "设备型号" ,index = 4)
     private String deviceTypeName;
 
-    @ExcelProperty(value = "公司" ,index = 4)
+    @ExcelProperty(value = "公司" ,index = 5)
     private String companyName;
 
-    @ExcelProperty(value = "部门" ,index = 5)
+    @ExcelProperty(value = "部门" ,index = 6)
     private String deptName;
 
-    @ExcelProperty(value = "安装地址" ,index = 6)
+    @ExcelProperty(value = "安装地址" ,index = 7)
     private String address;
 
-    @ExcelProperty(value = "处理时间" ,index = 7,converter = LocalDateTimeConverter.class)
+    @ExcelProperty(value = "处理时间" ,index = 8,converter = LocalDateTimeConverter.class)
     private LocalDateTime handleTime;
 }

zoniot-rmcp/zoniot-rmcp-dap/src/main/resources/application-dev.properties

@@ -1,4 +1,4 @@
-server.port=8326
+server.port=8328
 spring.application.name=zoniot-rmcp-dap
 logging.level.root=info
 logging.path=../../logs/zoniot-rmcp-dap

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

@@ -0,0 +1,82 @@
+server.port=8328
+spring.application.name=zoniot-rmcp-dap
+logging.level.root=info
+logging.path=./logs
+
+
+
+# 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
+
+# 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
+
+# redis
+spring.redis.host=10.0.0.63
+spring.redis.port=6379
+spring.redis.database=2
+spring.redis.timeout=36000
+
+# Lettuce
+spring.redis.lettuce.pool.max-active=8
+spring.redis.lettuce.pool.max-wait=100
+spring.redis.lettuce.pool.max-idle=8
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.lettuce.shutdown-timeout=100
+
+
+
+
+#nacos
+spring.cloud.nacos.discovery.server-addr=10.0.0.63:8848
+
+
+#utils
+spring.rabbitmq.addresses=10.0.0.63:5672
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=100zone
+spring.rabbitmq.virtual-host=/
+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
+#spring.data.mongodb.uri=mongodb://127.0.0.1:27017/meter-reading-database
+logging.level.org.springframework.data.mongodb.core=DEBUG
+
+
+
+
+

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

@@ -1,7 +1,7 @@
 server.port=8325
 spring.application.name=zoniot-rmcp-web
 logging.level.root=info
-logging.path=./logs/zoniot-rmcp-web
+logging.path=./logs
 
 files.path=/app/sit/uims/zoniot-rmcp-web/data
 rmcp.url=http://10.0.0.62:8325

zoniot-rmcp/zoniot-xxljob-client/src/main/resources/application-dev.properties

@@ -1,4 +1,4 @@
-server.port=8327
+server.port=8330
 spring.application.name=zoniot-xxljob-client
 logging.level.root=info
 logging.path=./logs/zoniot-xxljob-client

zoniot-rmcp/zoniot-xxljob-client/src/main/resources/application-sit.properties

@@ -1,85 +1,68 @@
-server.port=8327
-spring.application.name=user-center
+server.port=8330
+spring.application.name=zoniot-xxljob-client
 logging.level.root=info
-logging.path=./logs/user-center
-#\u6570\u636E\u5E93\u914D\u7F6E
-spring.datasource.url=jdbc:mysql://114.135.61.188:33306/uims?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+logging.path=./logs
+
+
+#xxl-job �������Ĺ��̵ĵ�ַ
+xxl.job.admin.addresses=http://10.0.0.62:8080/xxl-job-admin/
+xxl.job.executor.appname=zoniot-xxljob-client
+xxl.job.executor.ip=
+xxl.job.executor.port=9999
+xxl.job.executor.logpath=/app/sit/uims/zoniot-xxljob-client/xxl-job-log
+xxl.job.accessToken=
+xxl.job.executor.logretentiondays=30
+
+
+# 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@123
+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
-spring.redis.host=114.135.61.188
-spring.redis.port=26379
-spring.redis.password=zoniot
+#mongodb url
+spring.data.mongodb.uri=mongodb://10.0.0.63:27017/meter-reading-database
+logging.level.org.springframework.data.mongodb.core=DEBUG
+
+# redis
+spring.redis.host=10.0.0.63
+spring.redis.port=6379
 spring.redis.database=2
 spring.redis.timeout=36000
 
 # Lettuce
-# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.lettuce.pool.max-active=8
-# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.lettuce.pool.max-wait=100
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
 spring.redis.lettuce.pool.max-idle=8
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
 spring.redis.lettuce.pool.min-idle=0
-# \u5173\u95ED\u8D85\u65F6\u65F6\u95F4
 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.prefer-token-info=false
-
-
-spring.servlet.multipart.max-file-size=100MB
-spring.servlet.multipart.max-request-size=100MB
-spring.servlet.multipart.location=${logging.path}/data
-
-#kafka server
-spring.kafka.bootstrap-servers=114.135.61.188:36377
-#kafka consumer config
-spring.kafka.consumer.group-id=user-group-dev
-spring.kafka.consumer.auto-offset-reset=latest
-spring.kafka.consumer.enable-auto-commit=true
-#kafka producer config
-spring.kafka.producer.retries=0
-spring.kafka.producer.batch-size=4096
-spring.kafka.producer.buffer-memory=40960
-
-spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer
-spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer
-spring.kafka.consumer.properties.spring.json.trusted.packages=*
-
-#nacos
-spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
-UMIS.sys_config_path=/UMIS_USER_IMAGES/
-UMIS.sys_excel_path=/UMIS_USER_EXCEL/
-#utils
-spring.rabbitmq.addresses=114.135.61.188:55672
-spring.rabbitmq.username=zoniot
-spring.rabbitmq.password=zcxk100
-spring.rabbitmq.virtual-host=/
-spring.rabbitmq.connection-timeout=15000
-spring.rabbitmq.publisher-confirm-type=correlated
-spring.rabbitmq.publisher-returns=true
-spring.rabbitmq.template.mandatory=true
-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
-
-