vince
2024-08-13 6c76ad7d3c1e6b2a2cea4986f9bcb0f7215c3563
优化测温协议
已修改6个文件
33 ■■■■ 文件已修改
src/main/java/com/fzzy/api/utils/SnowflakeIdWorker.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/protocol/wujia/service/WujiaGatewayGrainService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-proGateway.yml 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/utils/SnowflakeIdWorker.java
@@ -116,7 +116,7 @@
    public static void main(String[] args) {
 
     // SnowflakeIdWorker    snowflakeIdWorker=  new SnowflakeIdWorker(2,2,2);
        for (int i = 0; i < 30; i++) {
        for (int i = 0; i < 100; i++) {
            System.out.println(SnowflakeIdWorker.nextId());
        }
    }
src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
@@ -107,8 +107,8 @@
     * 粮情每天8点采集粮情
     *
     */
//    @Scheduled(cron = "0 32 11 ? * *")
    @Scheduled(cron = "0 32 11 ? * 1,4")
    @Scheduled(cron = "0 30 5 ? * *")
//    @Scheduled(cron = "0 32 11 ? * 1,4")
    public void scheduledGrain2() {
        //获取设备配置,只针对粮情设备进行执行
        log.info("定时粮情采集kafka推送");
src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java
@@ -48,7 +48,7 @@
            String responseText = GatewayHttpUtil.doGet(device.getHttpUrl(), paramsMap);
            log.debug("--HTTP-WEIGHT-请求返回--{}", responseText);
            log.info("--HTTP-WEIGHT-请求返回--{}", responseText);
            if(StringUtils.isEmpty(responseText)) {
                return new BaseResp(500, "后台执行失败");
src/main/java/com/fzzy/protocol/wujia/service/WujiaGatewayGrainService.java
@@ -45,7 +45,7 @@
        depotGrainCmdMap.put("KEY_7",  "FC04070303140302EBBDDB");
        depotGrainCmdMap.put("KEY_8",  "FC04080603140303EBBDDB");
        depotGrainCmdMap.put("KEY_9",  "FC050901042A0401EBBDDB");
        depotGrainCmdMap.put("KEY_10", "FC050A0103240401EBBDDB");
        depotGrainCmdMap.put("KEY_10", "FC060A0103240401EBBDDB");
        depotGrainCmdMap.put("KEY_11", "FC060B04042A0402EBBDDB");
    }
src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
@@ -281,7 +281,7 @@
            if (curTemp > max) {
                max = curTemp;
            }
            if (curTemp < min) {
            if (curTemp < min && new Double(curTemp).intValue()!= -100) {
                min = curTemp;
            }
        }
src/main/resources/application-proGateway.yml
@@ -1,23 +1,20 @@
##########################  仁寿   ##########################
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&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&useSSL=false&characterEncoding=utf-8
      username: root
      password: Fzzy@#$%5432..K
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
    #次数据源
    secondary:
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igdsv4?useUnicode=true&useSSL=false&characterEncoding=utf-8
      username: root
      password: Fzzy@#$%5432..K
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
  jpa:
    #主jpa配置
@@ -38,10 +35,10 @@
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
  # Redis相关配置
  redis:
    database: 1
    database: 5
    host: 127.0.0.1
    port: 6379
    password: Redispwd..
    password:
    # 连接池最大连接数(使用负值表示没有限制)
    pool:
      max-active: 200
@@ -51,6 +48,7 @@
      timeout: 6000
  kafka:
    bootstrap-servers: 103.203.217.16:9092
    enabled: false
    producer:
      retries: 0
      acks: 1
@@ -71,7 +69,6 @@
      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