pom.xml
@@ -302,8 +302,8 @@ <groupId>com.ld.license</groupId> <artifactId>license-cli</artifactId> <version>3.0.0-RELEASE</version> <scope>system</scope> <systemPath>${project.basedir}/src/main/resources/lib/license-cli-3.0.0-RELEASE.jar</systemPath> <!-- <scope>system</scope>--> <!-- <systemPath>${project.basedir}/src/main/resources/lib/license-cli-3.0.0-RELEASE.jar</systemPath>--> </dependency> <dependency> <groupId>de.schlichtherle.truelicense</groupId> src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java
@@ -343,7 +343,7 @@ outPut.setTemperature(temperature); List<GrainTH> ths = new ArrayList<>(); ths.add(new GrainTH(weather.getTem() != null ? weather.getTem() + "" : "", weather.getHumidity() != null ? weather.getHumidity() + "" : "", "1")); ths.add(new GrainTH(weather.getTem() != null ? weather.getTem() + "" : "", weather.getHumidity() != null ? weather.getHumidity().replaceAll("%","") + "" : "", "1")); outPut.setTemperatureAndhumidity(ths); grain.setOutput(JSONObject.toJSONString(outPut)); @@ -362,7 +362,7 @@ weatherStation.setId(device.getDeviceId()); } weatherStation.setAirPressure(weather.getPressure()); weatherStation.setHumidity(weather.getHumidity()); weatherStation.setHumidity(weather.getHumidity().replaceAll("%","")); weatherStation.setPm(weather.getAir_pm25()); weatherStation.setRadiation("0"); weatherStation.setRainfallAmount(weather.getWea()); src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
@@ -376,7 +376,7 @@ weatherStation.setId(device.getDeviceId()); } weatherStation.setAirPressure(weather.getPressure()); weatherStation.setHumidity(weather.getHumidity()); weatherStation.setHumidity(weather.getHumidity().replaceAll("%","")); weatherStation.setPm(weather.getAir_pm25()); weatherStation.setRadiation("0"); weatherStation.setRainfallAmount(weather.getWea()); @@ -521,7 +521,7 @@ weatherStation.setId(device.getDeviceId()); } weatherStation.setAirPressure(weather.getPressure()); weatherStation.setHumidity(weather.getHumidity()); weatherStation.setHumidity(weather.getHumidity().replaceAll("%","")); weatherStation.setPm(weather.getAir_pm25()); weatherStation.setRadiation("0"); weatherStation.setRainfallAmount(weather.getWea()); src/main/java/com/fzzy/protocol/bhzn/v0/analysis/AnalysisService.java
@@ -488,7 +488,7 @@ weatherStation.setId(device.getDeviceId()); } weatherStation.setAirPressure(weather.getPressure()); weatherStation.setHumidity(weather.getHumidity()); weatherStation.setHumidity(weather.getHumidity().replaceAll("%","")); weatherStation.setPm(weather.getAir_pm25()); weatherStation.setRadiation("0"); weatherStation.setRainfallAmount(weather.getWea()); src/main/java/com/fzzy/protocol/bhzn/v01/analysis/AnalysisService.java
@@ -480,13 +480,13 @@ weatherStation.setMessageId(ScConstant.getMessageId()); weatherStation.setMessgeId(weatherStation.getMessageId()); if (null != gatewayDeviceWeather) { if (null != gatewayDeviceWeather) { weatherStation.setId(gatewayDeviceWeather.getDeviceId()); } else { weatherStation.setId(device.getDeviceId()); } weatherStation.setAirPressure(weather.getPressure()); weatherStation.setHumidity(weather.getHumidity()); weatherStation.setHumidity(weather.getHumidity().replaceAll("%","")); weatherStation.setPm(weather.getAir_pm25()); weatherStation.setRadiation("0"); weatherStation.setRainfallAmount(weather.getWea()); src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java
@@ -184,7 +184,7 @@ weatherStation.setId(device.getDeviceId()); } weatherStation.setAirPressure(weather.getPressure()); weatherStation.setHumidity(weather.getHumidity()); weatherStation.setHumidity(weather.getHumidity().replaceAll("%","")); weatherStation.setPm(weather.getAir_pm25()); weatherStation.setRadiation("0"); weatherStation.setRainfallAmount(weather.getWea()); src/main/java/com/fzzy/protocol/sjLpr/GatewayLprApi.java
@@ -44,6 +44,8 @@ public @ResponseBody String pushLpr(HttpServletRequest request, HttpServletResponse response,@RequestBody String str) { try { log.info("-----------车牌数据推送报文-------------"); log.info(str); String carNumber = doPost(request,response,str); pushLpr(carNumber); } catch (Exception e) { @@ -253,4 +255,11 @@ { } } public static void main(String[] args) { String str = "wRPsGQgdj4Z8ErBDIvLYiw=="; String s = deCode(str); System.out.println(s); } } src/main/java/com/fzzy/protocol/wujia/analysis/AnalysisService.java
@@ -207,7 +207,7 @@ weatherStation.setId(device.getDeviceId()); } weatherStation.setAirPressure(weather.getPressure()); weatherStation.setHumidity(weather.getHumidity()); weatherStation.setHumidity(weather.getHumidity().replaceAll("%","")); weatherStation.setPm(weather.getAir_pm25()); weatherStation.setRadiation("0"); weatherStation.setRainfallAmount(weather.getWea()); src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
@@ -328,7 +328,7 @@ weatherStation.setId(device.getDeviceId()); } weatherStation.setAirPressure(weather.getPressure()); weatherStation.setHumidity(weather.getHumidity()); weatherStation.setHumidity(weather.getHumidity().replaceAll("%","")); weatherStation.setPm(weather.getAir_pm25()); weatherStation.setRadiation("0"); weatherStation.setRainfallAmount(weather.getWea()); src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java
@@ -279,7 +279,7 @@ weatherStation.setId(device.getDeviceId()); } weatherStation.setAirPressure(weather.getPressure()); weatherStation.setHumidity(weather.getHumidity()); weatherStation.setHumidity(weather.getHumidity().replaceAll("%","")); weatherStation.setPm(weather.getAir_pm25()); weatherStation.setRadiation("0"); weatherStation.setRainfallAmount(weather.getWea()); src/main/java/com/fzzy/protocol/zldz/analysis/AnalysisGrain.java
@@ -466,7 +466,7 @@ weatherStation.setId(device.getDeviceId()); } weatherStation.setAirPressure(weather.getPressure()); weatherStation.setHumidity(weather.getHumidity()); weatherStation.setHumidity(weather.getHumidity().replaceAll("%","")); weatherStation.setPm(weather.getAir_pm25()); weatherStation.setRadiation("0"); weatherStation.setRainfallAmount(weather.getWea()); src/main/resources/application-dev.yml
@@ -6,42 +6,13 @@ #主数据源 primary: url: jdbc:mysql://127.0.0.1:3306/igds_api_5012?useUnicode=true&useSSL=false&characterEncoding=utf-8 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #大湾区 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #上海嘉定 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广澳 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_002?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳分库-濠江区租赁库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-港口新仓 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-关埠老仓 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_3?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-直属仓库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-西胪-新仓粮库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-西胪-东凤粮库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_5?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-金灶一所粮库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_6?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-金灶二所粮库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_7?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-粮油转运站 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_8?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-河溪粮所 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_9?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-海门粮所 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_10?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-和平粮所 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东台山 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东韶关 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5322?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东徐闻 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #惠州惠新 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #武汉黄陂军粮 username: root password: Abc123.. driver-class-name: com.mysql.jdbc.Driver #次数据源 secondary: url: jdbc:mysql://127.0.0.1:3306/igds_5012?useUnicode=true&useSSL=false&characterEncoding=utf-8 # url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #大湾区 # url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #上海嘉定 # url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广澳 # url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳 # url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8 # url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8 # url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5322?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东徐闻 # url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #惠州惠新 # url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #武汉黄陂军粮 url: jdbc:mysql://127.0.0.1:3306/igdsv4?useUnicode=true&useSSL=false&characterEncoding=utf-8 username: root password: Abc123.. driver-class-name: com.mysql.jdbc.Driver @@ -67,7 +38,7 @@ database: 5 host: 127.0.0.1 port: 6379 password: Redispwd.. password: # 连接池最大连接数（使用负值表示没有限制） pool: max-active: 200 @@ -75,14 +46,8 @@ max-idle: 10 min-idle: 0 timeout: 6000 kafka: bootstrap-servers: 103.203.217.42:9092 security-protocol: SASL_PLAINTEXT sasl-mechanism: PLAIN sasl-jaas-config: org.apache.kafka.common.security.scram.ScramLoginModule required username=\"{username}\" password=\"{password}\";" sasl-username: sc001 sasl-password: wCV0ISwmoKwbx1lpBKMW bootstrap-servers: 103.203.217.16:9092 enabled: false producer: retries: 0 @@ -91,6 +56,12 @@ buffer-memory: 33554432 key-serializer: org.apache.kafka.common.serialization.StringSerializer value-serializer: org.apache.kafka.common.serialization.StringSerializer properties: security.protocol: SASL_PLAINTEXT sasl.mechanism: PLAIN sasl.username: sc001 sasl.password: wCV0ISwmoKwbx1lpBKMW sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username='sc001' password='wCV0ISwmoKwbx1lpBKMW'; consumer: group-id: fzzygroup enable-auto-commit: true @@ -98,3 +69,28 @@ auto-offset-reset: latest key-deserializer: org.apache.kafka.common.serialization.StringDeserializer value-deserializer: org.apache.kafka.common.serialization.StringDeserializer mqtt: host: tcp://127.0.0.1:1883 username: admin password: admin123321 client-inId: fzzy_client_id_in_igds_api client-outId: fzzy_client_id_out_igds_api completionTimeout: 3000 keep-alive-interval: 2 max-connect-times: 5 qos: 0 isOpen: false default-topic: mqtt/+/test1 topics: /device-message-sender/# license: subject: ld_license publicAlias: publicCert storePass: PUBLICFZZYXXJSGFYXGS888888 licensePath: D:/IGDS/license/license.lic publicKeysStorePath: D:/IGDS/license/publicCerts.keystore igds: default: companyId: 5338 file-path: D:/app/igds-api img-path: D:/IGDS/FILE/ weather-url: https://v1.yiketianqi.com/api?unescape=1&version=v61&appid={appId}&appsecret={appsecret}&cityid={cityid} src/main/resources/application-proGateway.yml
@@ -1,20 +1,23 @@ ########################## 仁寿 ########################## server: port: 8090 jetty: max-http-post-size: 209715200 tomcat: max-http-post-size: 209715200 spring: datasource: #主数据源 primary: url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&useSSL=false&characterEncoding=utf-8 url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8 username: root password: Abc123.. password: Fzzy@#$%5432..K driver-class-name: com.mysql.jdbc.Driver #次数据源 secondary: url: jdbc:mysql://127.0.0.1:3306/igdsv4?useUnicode=true&useSSL=false&characterEncoding=utf-8 url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8 username: root password: Abc123.. password: Fzzy@#$%5432..K driver-class-name: com.mysql.jdbc.Driver jpa: #主jpa配置 @@ -35,10 +38,10 @@ dialect: org.hibernate.dialect.MySQL5InnoDBDialect # Redis相关配置 redis: database: 5 database: 1 host: 127.0.0.1 port: 6379 password: password: Redispwd.. # 连接池最大连接数（使用负值表示没有限制） pool: max-active: 200 @@ -48,7 +51,6 @@ timeout: 6000 kafka: bootstrap-servers: 103.203.217.16:9092 enabled: false producer: retries: 0 acks: 1 @@ -69,6 +71,7 @@ auto-offset-reset: latest key-deserializer: org.apache.kafka.common.serialization.StringDeserializer value-deserializer: org.apache.kafka.common.serialization.StringDeserializer mqtt: host: tcp://127.0.0.1:1883 username: admin
