提交代码

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderMapper.xml

@@ -98,7 +98,7 @@
         and hygf_rectification_order.rectification_status  = '已作废'  and hygf_rectification_order.rectification_source = hygf_work_order_power_station.work_order_power_station_node and hygf_rectification_order.rectification_source in ('area','engineering','design')order by rec_date desc limit 1) as rollbackOrderId,
         (select hygf_rectification_order.sequence_nbr  from  hygf_rectification_order
         where hygf_rectification_order.peasant_househole_id = hygf_work_order_power_station.peasant_household_id
-          and hygf_rectification_order.rectification_status  in ('待整改','待提交','整改中','整改待审核','待审核') and hygf_rectification_order.rectification_source in ('area','engineering','design')) as rectificationNum
+          and hygf_rectification_order.rectification_status  in ('待整改','待提交','整改中','整改待审核','待审核') and hygf_rectification_order.rectification_source in ('area','engineering','design') LIMIT 1) as rectificationNum
         from   hygf_work_order_power_station LEFT join hygf_work_order
         on hygf_work_order.sequence_nbr=hygf_work_order_power_station.work_order_id
         LEFT JOIN hygf_peasant_household on  hygf_peasant_household.sequence_nbr=hygf_work_order_power_station.peasant_household_id

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application-kingbase.properties

+## DB properties:
+## db1-production database
+spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
+#spring.db1.datasource.url=jdbc:mysql://172.16.4.23:3306/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db1.datasource.url=jdbc:kingbase8://192.168.0.68:54321/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root&binaryTransferDisable=TINYINT
+
+spring.db1.datasource.username=root
+spring.db1.datasource.password=Yeejoin@2020
+spring.db1.datasource.driver-class-name: com.kingbase8.Driver
+## db2-sync_data
+spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
+#spring.db2.datasource.url=jdbc:mysql://172.16.4.23:3306/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db2.datasource.url=jdbc:kingbase8://192.168.0.68:54321/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root&binaryTransferDisable=TINYINT
+
+
+spring.db2.datasource.username=root
+spring.db2.datasource.password=Yeejoin@2020
+spring.db2.datasource.driver-class-name: com.kingbase8.Driver
+
+## db4-equip
+spring.db4.datasource.type: com.alibaba.druid.pool.DruidDataSource
+#spring.db4.datasource.url=jdbc:mysql://172.16.4.23:3306/equipment?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db4.datasource.url=jdbc:kingbase8://192.168.0.68:54321/equipment?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root&binaryTransferDisable=TINYINT
+
+spring.db4.datasource.username=root
+spring.db4.datasource.password=Yeejoin@2020
+spring.db4.datasource.driver-class-name: com.kingbase8.Driver
+
+## db3-td-engine
+#spring.db3.datasource.type: com.alibaba.druid.pool.DruidDataSource
+spring.db3.datasource.url=jdbc:TAOS-RS://192.168.0.61:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.db3.datasource.username=root
+spring.db3.datasource.password=taosdata
+spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+
+## db5-equip
+spring.db5.datasource.type: com.alibaba.druid.pool.DruidDataSource
+#spring.db5.datasource.url=jdbc:mysql://172.16.4.23:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db5.datasource.url=jdbc:kingbase8://192.168.0.68:54321/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root&binaryTransferDisable=TINYINT
+
+spring.db5.datasource.username=root
+spring.db5.datasource.password=Yeejoin@2020
+spring.db5.datasource.driver-class-name: com.kingbase8.Driver
+
+## eureka properties:
+eureka.instance.prefer-ip-address = true
+eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.46:10001/eureka/
+spring.security.user.name=admin
+spring.security.user.password=a1234560
+## redis properties:
+spring.redis.database=1
+spring.redis.host=192.168.0.70
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.expire.time=30000
+
+
+spring.cache.type=GENERIC
+j2cache.open-spring-cache=true
+j2cache.cache-clean-mode=passive
+j2cache.allow-null-values=true
+j2cache.redis-client=lettuce
+j2cache.l2-cache-open=true
+j2cache.broadcast=net.oschina.j2cache.cache.support.redis.SpringRedisPubSubPolicy
+j2cache.L1.provider_class=caffeine
+j2cache.L2.provider_class=net.oschina.j2cache.cache.support.redis.SpringRedisProvider
+j2cache.L2.config_section=lettuce
+j2cache.sync_ttl_to_redis=true
+j2cache.default_cache_null_object=false
+j2cache.serialization=fst
+caffeine.properties=/caffeine.properties
+lettuce.mode=single
+lettuce.namespace=
+lettuce.storage=generic
+lettuce.channel=j2cache
+lettuce.scheme=redis
+lettuce.hosts=${spring.redis.host}:${spring.redis.port}
+lettuce.password=${spring.redis.password}
+lettuce.database=${spring.redis.database}
+lettuce.sentinelMasterId=
+lettuce.maxTotal=100
+lettuce.maxIdle=10
+lettuce.minIdle=10
+lettuce.timeout=10000
+
+
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://192.168.0.70:2883
+emqx.client-user-name=admin
+emqx.client-password=Yeejoin@2020
+mqtt.scene.host=mqtt://192.168.0.70:8083/mqtt
+mqtt.client.product.id=mqtt
+mqtt.topic=topic_mqtt
+spring.mqtt.completionTimeout=3000
+
+
+# influxDB
+#spring.influx.url= http://192.168.120.102:18086
+#spring.influx.password=Yeejoin@2020
+#spring.influx.user=root
+#spring.influx.database=iot_platform
+#spring.influx.retention_policy=default
+#spring.influx.retention_policy_time=30d
+#spring.influx.actions=10000
+#spring.influx.bufferLimit=20000
+
+knife4j.production=false
+knife4j.enable=true
+knife4j.basic.enable=true
+knife4j.basic.username=admin
+knife4j.basic.password=a1234560
+
+management.security.enabled=true
+spring.security.user.name=admin
+spring.security.user.password=a1234560
+
+fire-rescue=123
+
+mybatis-plus.global-config.db-config.update-strategy=ignored
+
+# user-amos setting : This value is the secretkey for person manage moudle accout password encryption.please don't change it!!!
+amos.secret.key=qaz
+# if your service can't be access ,you can use this setting , you need change ip as your.
+#eureka.instance.prefer-ip-address=true
+#eureka.instance.ip-address=172.16.3.122
+
+
+spring.activemq.broker-url=tcp://192.168.0.70:61616
+spring.activemq.user=admin
+spring.activemq.password=admin
+spring.jms.pub-sub-domain=false
+myqueue=amos.privilege.v1.JXIOP.AQSC_FDGL.userBusiness
+
+# ?????????
+fan.statuts.stattuspath=upload/jxiop/device_status
+
+pictureUrl=upload/jxiop/syz/
+
+daily.power.generation.cron=* * * * * 1
+moon.power.generation.cron=* * * * * 1
+year.power.generation.cron=* * * * * 1
+
+spring.elasticsearch.rest.uris=http://192.168.0.52:9200
+spring.elasticsearch.rest.connection-timeout=30000
+spring.elasticsearch.rest.username=elastic
+spring.elasticsearch.rest.password=Yeejoin@2020
+spring.elasticsearch.rest.read-timeout=30000
+
+logic=false
+
+coreIp=192.168.0.48
+jxdzIp=223.71.240.230:9003
+jxdzTokenUserName=jiangxi_epc
+jxdzTokenPassword=123456
+jxdzPublicKey=04508e9c4df8463c784df2dde2536e792851a8f3fd0e5ff29b7bf1a5d9e3f566aa49a7a5fe7683e3dc4dc30dd7bc8773838a9e4fbcf7dfac53461c8777a6aed691
+jxdzScheduledEnable=true
+
+amos.system.user.user-name=hygf_robot
+amos.system.user.password=a123456789
+amos.system.user.app-key=AMOS_STUDIO
+amos.system.user.product=AMOS_STUDIO_WEB
+
+
+core.feign.url=http://192.168.0.46:10005
+
+budun.baseurl=http://192.168.0.50:8000/screen_api

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=AMOS-JXIOP-MONITOR-CT
 server.servlet.context-path=/jxiop-monitor
 server.port=33200
 server.uri-encoding=UTF-8
-spring.profiles.active=dev2
+spring.profiles.active=kingbase
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 #logging.config=classpath:logback-${spring.profiles.active}.xml