YYC
2023-09-28 390090537de2142e022f2e0c52825f2257bcb677
贝博粮情解析
已修改4个文件
54 ■■■■■ 文件已修改
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/pom.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/application-pro5329.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/application-uat.yml 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
@@ -82,11 +82,11 @@
        }
        //封装数据
        ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(hexStr);
        ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(result);
        reMessage.setIp(ip);
        reMessage.setPort(port);
        log.info("分机------->>平台:粮情完整报文信息={}", reMessage);
        result = "";
        if (!BeiboGrainServerUtils.MSG_START.startsWith(reMessage.getStartStr())) {
            log.error("分机------->>平台,解析粮情失败:报文起始符={}错误,不解析", reMessage.getStartStr());
            return;
igds-web/pom.xml
@@ -153,7 +153,7 @@
        </dependency>
        <!--  私有协议-风正致远-->
        <!--  私有协议-风正致远
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-fzzy3</artifactId>
@@ -168,7 +168,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->
        <!-- MODBUS-TCP
        <dependency>
@@ -188,7 +188,7 @@
        </dependency>-->
        <!-- 私有协议-风正致远IOT、制氮机-->
        <!-- 私有协议-风正致远IOT、制氮机
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-iot</artifactId>
@@ -203,7 +203,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->
        <!--  私有协议-贝博粮情-->
        <dependency>
igds-web/src/main/resources/application-pro5329.yml
@@ -5,7 +5,7 @@
  connection-timeout: 5000
  tomcat:
    uri-encoding: UTF-8
#######粮情,能耗,通风,气调,安防,综合管理,智能预警,数量检测,出入库,三维,贝博粮情,DLT645电表协议########
##########################  datasourcec   ##########################
spring:
  datasource:
@@ -18,9 +18,9 @@
      password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
      public-key:
      config-decrypt: true
      initial-size:  5
      min-idle:  5
      max-active:  50
      initial-size: 5
      min-idle: 5
      max-active: 50
      max-wait: 60000
      time-between-eviction-runs-millis: 60000
      min-evictable-idle-time-millis: 300000
igds-web/src/main/resources/application-uat.yml
@@ -1,5 +1,6 @@
##########################  广东佛山禅城区   ##########################
server:
  port: 8202
  port: 8888
  context-path: /
  connection-timeout: 5000
  tomcat:
@@ -11,15 +12,15 @@
    db-base:
      name: db-base
      type: com.alibaba.druid.pool.DruidDataSource
      url: jdbc:mysql://127.0.0.1:3306/igds_uat?useUnicode=true&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
      driver-class-name: com.mysql.jdbc.Driver
      username: root
      password: Abc123..
      publicKey:
      config-decrypt: false
      password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
      public-key:
      config-decrypt: true
      initial-size:  5
      min-idle:  5
      max-active:  30
      max-active:  50
      max-wait: 60000
      time-between-eviction-runs-millis: 60000
      min-evictable-idle-time-millis: 300000
@@ -35,6 +36,8 @@
      removeAbandoned: true
      removeAbandonedTimeout: 90
      logAbandoned: true
      poolPreparedStatements: true
      maxPoolPreparedStatementPerConnectionSize: 20
    db-sqlite:
      name: db-sqlite
      url: jdbc:sqlite:D:/app/igds/db/iot_cfg.db
@@ -45,7 +48,7 @@
  # Redis相关配置
  redis:
    database: 3
    database: 0
    host: 127.0.0.1
    port: 6379
    password: Abc123..
@@ -57,18 +60,21 @@
      min-idle: 0
      timeout: 6000
#License 配置示例
license:
  subject: ld_license
  publicAlias: publicCert
  storePass: PUBLICFZZYXXJSGFYXGS888888
  licensePath: C:/license/license.lic
  publicKeysStorePath: C:/license/publicCerts.keystore
  licensePath: C:/IGDS/license/license.lic
  publicKeysStorePath: C:/IGDS/license/publicCerts.keystore
##########################  IBMS   ##########################
##########################  IGDS   ##########################
## 系统接口路由配置 注意数字如果以0开头的话,后台会出现转义,请添加""
igds:
  default:
    companyId: 5000
  file-path: D:/IGDS-UAT/
    companyId: 5329
    sys-name: 智慧粮库管理系统
    logo: logo-default.png
    logo-title: logo-title-default.png
    support: 风正致远信息技术股份有限公司
    grian-add-point: N
  file-path: C:/IGDS/FILE/