diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 4dcb72a..8f15458 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1373,7 +1373,7 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - bwi.WELL_NAME AS "wellName", + dv.WELLCODE AS "wellName", dh2s.STRENGTH AS strength, dh2s.CELL AS cell, @@ -1384,17 +1384,14 @@ AS logtime, - bdt.TYPE_NAME AS "deviceTypeName", - bd.device_type as deviceType, - bwi.DEPTID AS deptid + dv.DEVICETYPENAME AS "deviceTypeName", + dv.DEVICETYPE as deviceType, + dv.DEPTID AS deptid FROM data_h2s dh2s - JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE - JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID + JOIN device_view dv ON dv.WELLCODE = dh2s.WELL_CODE - bd.VALID = '1' AND bwi.VALID = '1' - and bwi.DEPTID = #{deptid} + and dv.DEPTID = #{deptid} and dh2s.UPTIME = ]]> diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 4dcb72a..8f15458 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1373,7 +1373,7 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - bwi.WELL_NAME AS "wellName", + dv.WELLCODE AS "wellName", dh2s.STRENGTH AS strength, dh2s.CELL AS cell, @@ -1384,17 +1384,14 @@ AS logtime, - bdt.TYPE_NAME AS "deviceTypeName", - bd.device_type as deviceType, - bwi.DEPTID AS deptid + dv.DEVICETYPENAME AS "deviceTypeName", + dv.DEVICETYPE as deviceType, + dv.DEPTID AS deptid FROM data_h2s dh2s - JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE - JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID + JOIN device_view dv ON dv.WELLCODE = dh2s.WELL_CODE - bd.VALID = '1' AND bwi.VALID = '1' - and bwi.DEPTID = #{deptid} + and dv.DEPTID = #{deptid} and dh2s.UPTIME = ]]> diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 2956ae4..ceb4509 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,12 +1,28 @@ server: - port: 11308 + port: 11414 ################### spring配置 ################### spring: datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true - username: root - password: Casic203 + url: jdbc:dm://111.198.10.15:11211/SMARTWELL + driver-class-name: dm.jdbc.driver.DmDriver + username: SMARTWELL + password: Casic203! + dynamic: + primary: master #设置默认的数据源或者数据源组,默认值即为master + strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 + datasource: + master: + url: jdbc:dm://111.198.10.15:11211/SMARTWELL + driver-class-name: dm.jdbc.driver.DmDriver + username: SMARTWELL + password: Casic203! + log: + url: jdbc:dm://111.198.10.15:11211/SMARTWELL + driver-class-name: dm.jdbc.driver.DmDriver + username: SMARTWELL + password: Casic203! + session: + store-type: redis redis: host: 111.198.10.15 port: 11412 @@ -31,7 +47,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/** + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob,/user/login/token,/route/token db: init: enable: false @@ -44,21 +60,22 @@ #export-path: D:\export\ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\ - download-path: D:\v1.0\ + download-path: D:\v1.0\download\ device: redis: invalid-time: 86400 - host: 127.0.0.1 - port: 6379 + host: 111.198.10.15 + port: 11412 password: ew5T4K3#203lwh config-prefix: 'Casic:' getui: - app-id: 2QZ66VuyLI7LfcAXn5Kpe7 #城管APPid - app-key: GEgPZTsFyF66rtOdmgMGM1 #app key - master-secret: l0IL4f4sfT72k8NuaY1az2 + appId: HKv8K9qARd6WckZ1o2Vbu4 + appKey: 5cV2rugxAb8o28WK6RSFU6 + masterSecret: fQsKrOaFZy5tvKb3Vd3vv5 logging: - level.root: info - level.com.casic: debug + level: + root: info + com.casic: debug file: path: logs/ name: missiles.log \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 4dcb72a..8f15458 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1373,7 +1373,7 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - bwi.WELL_NAME AS "wellName", + dv.WELLCODE AS "wellName", dh2s.STRENGTH AS strength, dh2s.CELL AS cell, @@ -1384,17 +1384,14 @@ AS logtime, - bdt.TYPE_NAME AS "deviceTypeName", - bd.device_type as deviceType, - bwi.DEPTID AS deptid + dv.DEVICETYPENAME AS "deviceTypeName", + dv.DEVICETYPE as deviceType, + dv.DEPTID AS deptid FROM data_h2s dh2s - JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE - JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID + JOIN device_view dv ON dv.WELLCODE = dh2s.WELL_CODE - bd.VALID = '1' AND bwi.VALID = '1' - and bwi.DEPTID = #{deptid} + and dv.DEPTID = #{deptid} and dh2s.UPTIME = ]]> diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 2956ae4..ceb4509 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,12 +1,28 @@ server: - port: 11308 + port: 11414 ################### spring配置 ################### spring: datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true - username: root - password: Casic203 + url: jdbc:dm://111.198.10.15:11211/SMARTWELL + driver-class-name: dm.jdbc.driver.DmDriver + username: SMARTWELL + password: Casic203! + dynamic: + primary: master #设置默认的数据源或者数据源组,默认值即为master + strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 + datasource: + master: + url: jdbc:dm://111.198.10.15:11211/SMARTWELL + driver-class-name: dm.jdbc.driver.DmDriver + username: SMARTWELL + password: Casic203! + log: + url: jdbc:dm://111.198.10.15:11211/SMARTWELL + driver-class-name: dm.jdbc.driver.DmDriver + username: SMARTWELL + password: Casic203! + session: + store-type: redis redis: host: 111.198.10.15 port: 11412 @@ -31,7 +47,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/** + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob,/user/login/token,/route/token db: init: enable: false @@ -44,21 +60,22 @@ #export-path: D:\export\ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\ - download-path: D:\v1.0\ + download-path: D:\v1.0\download\ device: redis: invalid-time: 86400 - host: 127.0.0.1 - port: 6379 + host: 111.198.10.15 + port: 11412 password: ew5T4K3#203lwh config-prefix: 'Casic:' getui: - app-id: 2QZ66VuyLI7LfcAXn5Kpe7 #城管APPid - app-key: GEgPZTsFyF66rtOdmgMGM1 #app key - master-secret: l0IL4f4sfT72k8NuaY1az2 + appId: HKv8K9qARd6WckZ1o2Vbu4 + appKey: 5cV2rugxAb8o28WK6RSFU6 + masterSecret: fQsKrOaFZy5tvKb3Vd3vv5 logging: - level.root: info - level.com.casic: debug + level: + root: info + com.casic: debug file: path: logs/ name: missiles.log \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-dm.yml b/casic-web/src/main/resources/config/application-dm.yml index ceb4509..2b255ae 100644 --- a/casic-web/src/main/resources/config/application-dm.yml +++ b/casic-web/src/main/resources/config/application-dm.yml @@ -1,72 +1,72 @@ server: - port: 11414 + port: 11308 ################### spring配置 ################### spring: datasource: - url: jdbc:dm://111.198.10.15:11211/SMARTWELL + url: jdbc:dm://10.80.1.157:5236/schema=XLJC?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull driver-class-name: dm.jdbc.driver.DmDriver - username: SMARTWELL - password: Casic203! + username: XLJC + password: Xljc@2023 dynamic: primary: master #设置默认的数据源或者数据源组,默认值即为master strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 datasource: master: - url: jdbc:dm://111.198.10.15:11211/SMARTWELL + url: jdbc:dm://10.80.1.157:5236/schema=XLJC?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull driver-class-name: dm.jdbc.driver.DmDriver - username: SMARTWELL - password: Casic203! + username: XLJC + password: Xljc@2023 log: - url: jdbc:dm://111.198.10.15:11211/SMARTWELL + url: jdbc:dm://10.80.1.158:5236/CASIC203?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull driver-class-name: dm.jdbc.driver.DmDriver - username: SMARTWELL - password: Casic203! + username: XLJC + password: Xljc@2023 session: store-type: redis redis: - host: 111.198.10.15 - port: 11412 - password: ew5T4K3#203lwh + host: 10.80.0.171 + port: 6379 + password: redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer jms: pub-sub-domain: true # session: # store-type: redis redis-config: - host: 127.0.0.1 + host: 10.80.0.171 port: 6379 password: activemq: user: password: broker-url: tcp://192.168.0.203:61616 + #flowable数据源和多数据源配置 web: resources: - static-locations: file:C:\tmp\ -#flowable数据源和多数据源配置 + static-locations: /usr/local/xljcyj/smartwell/casic-web-2.0.0.alpha/config/image/ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob,/user/login/token,/route/token + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob,/user/login/token db: init: enable: false - file: - uploadPath: C:\tmp\ #必须配置项，该项配置完成后 静态资源路径配置才生效 + file-upload-path: /usr/local/xljcyj/smartwell/casic-web-2.0.0.alpha/config/image/ spring-session-open: false #开启spring session + file: + uploadPath: /usr/local/xljcyj/smartwell/casic-web-2.0.0.alpha/config/image/ smartcity: config: - export-path: D:\cz\203\管网\升级\2.0\casic-smartcity\casic-web\src\main\resources\config\export\ - #export-path: D:\export\ - image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\ - config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\ - download-path: D:\v1.0\download\ + export-path: /usr/local/xljcyj/smartwell/casic-web-2.0.0.alpha/config/export/ + image-path: /usr/local/xljcyj/smartwell/casic-web-2.0.0.alpha/config/image/ + config-path: //usr/local/xljcyj/smartwell/casic-web-2.0.0.alpha/config/temp/ + download-path: /usr/local/xljcyj/smartwell/casic-web-2.0.0.alpha/config/download/ device: redis: invalid-time: 86400 - host: 111.198.10.15 - port: 11412 - password: ew5T4K3#203lwh + host: 10.80.1.124 + port: 31681 + password: config-prefix: 'Casic:' getui: appId: HKv8K9qARd6WckZ1o2Vbu4 @@ -78,4 +78,4 @@ com.casic: debug file: path: logs/ - name: missiles.log \ No newline at end of file + name: missiles.log