福建永泰

YYC

2023-09-12 20d5489c67cafe09cb862930fe67e05b631a1944

福建永泰

 igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java

@@ -195,6 +195,7 @@
        List<DepotSerData> listAll = (List<DepotSerData>) redisUtil.get(key);
        if (null == listAll || listAll.isEmpty()) {
            log.error("没有获取到仓库与分机的关系数据，请联系管理员！");
            return null;
        }

        Map<String, DepotSerData> tempMap = new HashMap<>();

 igds-web/pom.xml

@@ -170,7 +170,7 @@
            </exclusions>
        </dependency>

        <!-- MODBUS-TCP -->
        <!-- MODBUS-TCP
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-modbus</artifactId>
@@ -186,7 +186,7 @@
                </exclusion>
            </exclusions>
        </dependency>

-->

        <!-- ç§æœ‰åè®®-风正致远IOT、制氮机
        <dependency>
@@ -222,7 +222,7 @@
            </exclusions>
        </dependency>-->

        <!--  ç§æœ‰åè®®-邦海智能-->
        <!--  ç§æœ‰åè®®-邦海智能
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-bhzn</artifactId>
@@ -238,7 +238,7 @@
                </exclusion>
            </exclusions>
        </dependency>

-->
        <!--  ç§æœ‰åè®®-正来电子
        <dependency>
            <groupId>com.ld.igds</groupId>

 igds-web/src/main/resources/application-linux.yml

@@ -1,4 +1,4 @@
##########################  æ­¦æ±‰é»„陂军粮   ##########################
##########################  ç¦å»ºæ°¸æ³°-Linux   ##########################
server:
  port: 8888
  context-path: /
@@ -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
@@ -71,7 +71,7 @@
## ç³»ç»ŸæŽ¥å£è·¯ç”±é…ç½® æ³¨æ„æ•°å­—如果以0开头的话，后台会出现转义，请添加""
igds:
  default:
    companyId: 5327
    companyId: 5330
    sys-name: æ™ºæ…§ç²®åº“管理系统
    logo: logo-default.png
    logo-title: logo-title-default.png

 igds-web/src/main/resources/application-pro5330.yml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,80 @@
##########################  ç¦å»ºæ°¸æ³°-Linux   ##########################
server:
  port: 8888
  context-path: /
  connection-timeout: 5000
  tomcat:
    uri-encoding: UTF-8

##########################  datasourcec   ##########################
spring:
  datasource:
    db-base:
      name: db-base
      type: com.alibaba.druid.pool.DruidDataSource
      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: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
      public-key:
      config-decrypt: true
      initial-size: 5
      min-idle: 5
      max-active: 50
      max-wait: 60000
      time-between-eviction-runs-millis: 60000
      min-evictable-idle-time-millis: 300000
      validation-query: select 1 from dual
      test-whileIdle: true
      test-on-borrow: false
      test-on-return: false
      pool-prepared-statements: true
      max-pool-prepared-statement-per-connection-size: 20
      filters: stat
      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
      use-global-data-source-stat: true
      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
      driver-class-name: org.sqlite.JDBC
      type: com.alibaba.druid.pool.DruidDataSource
      username:
      password:

  # Redis相关配置
  redis:
    database: 0
    host: 127.0.0.1
    port: 6379
    password:
    # è¿žæŽ¥æ± æœ€å¤§è¿žæŽ¥æ•°ï¼ˆä½¿ç”¨è´Ÿå€¼è¡¨ç¤ºæ²¡æœ‰é™åˆ¶ï¼‰
    pool:
      max-active: 200
      max-wait: -1
      max-idle: 10
      min-idle: 0
      timeout: 6000

license:
  subject: ld_license
  publicAlias: publicCert
  storePass: PUBLICFZZYXXJSGFYXGS888888
  licensePath: /usr/local/igds/license/license.lic
  publicKeysStorePath: /usr/local/igds/license/publicCerts.keystore

##########################  IGDS   ##########################
## ç³»ç»ŸæŽ¥å£è·¯ç”±é…ç½® æ³¨æ„æ•°å­—如果以0开头的话，后台会出现转义，请添加""
igds:
  default:
    companyId: 5330
    sys-name: æ™ºæ…§ç²®åº“管理系统
    logo: logo-default.png
    logo-title: logo-title-default.png
    support: æ™ºæ…§ç²®åº“云管理平台
    grian-add-point: N
  file-path: /usr/local/igds/file/

 igds-web/src/main/resources/application.yml

@@ -1,7 +1,7 @@
##########################  Server   ########################## ä¸¹æ£±åŸŽå…³çœç²®é£Ÿå‚¨å¤‡åº“
spring:
  profiles:
    active: dev
    active: linux
  application:
    name: igds
  main:
@@ -14,15 +14,15 @@
    date-format: yyyy-MM-dd HH:mm:ss
    joda-date-time-format: yyyy-MM-dd HH:mm:ss
    time-zone: GMT+8
    
##########################  thymeleaf模板配置   ##########################

  ##########################  thymeleaf模板配置   ##########################
  thymeleaf:
    prefix: classpath:/templates/
    suffix: .html
    mode: LEGACYHTML5
    encoding: UTF-8
    cache:  false
##########################  æ‰‹æœºAPP值仓图片上传大小   ##########################
    cache: false
  ##########################  æ‰‹æœºAPP值仓图片上传大小   ##########################
  http:
    multipart:
      maxFileSize: 50Mb

 igds-web/src/main/resources/verb-conf.properties

@@ -2,12 +2,10 @@
## 5000_001
verb.mapImg.5000_001.a=default_pfc_a.png
verb.mapImg.5000_001.b=default_pfc_b.png

verb.mapImg.5000_0137.a=default_qyc_a.png
verb.mapImg.5000_0137.b=default_qyc_b.png
verb.mapImg.5000_0138.a=default_qyc_a.png
verb.mapImg.5000_0138.b=default_qyc_b.png

## 5013_001 \u5206\u5E93\u7F16\u7801
verb.mapImg.5013_001.a=default_pfc_a.png
verb.mapImg.5013_001.b=default_pfc_b.png
@@ -142,13 +140,9 @@
## 5307_001
verb.mapImg.5307_001.a=default_qyc_a.png
verb.mapImg.5307_001.b=default_qyc_b.png


## 5322_001 å¹¿ä¸œå¾é—»
verb.mapImg.5322_001.a=default_pfc_a.png
verb.mapImg.5322_001.b=default_pfc_b.png


## 5322_001 å¹¿ä¸œå¾é—»
verb.mapImg.5324_001.a=default_pfc_a.png
verb.mapImg.5324_001.b=default_pfc_b.png
@@ -174,8 +168,6 @@
verb.mapImg.5324_10.b=pfc_b.png
verb.mapImg.5324_11.a=pfc_a.png
verb.mapImg.5324_11.b=pfc_b.png


## 5325_001 æ±Ÿè¥¿èµ£å·ž-大公
verb.mapImg.5325_001.a=default_pfc2_a.png
verb.mapImg.5325_001.b=default_pfc2_b.png
@@ -191,11 +183,12 @@
verb.mapImg.5325_Q010501.b=default_qyc_b.png
verb.mapImg.5325_Q010601.a=default_qyc_a.png
verb.mapImg.5325_Q010601.b=default_qyc_b.png

## 5328_001
verb.mapImg.5328_001.a=default_pfc_a.png
verb.mapImg.5328_001.b=default_pfc_b.png

## 5329_001
verb.mapImg.5329_001.a=default_qyc_a.png
verb.mapImg.5329_001.b=default_qyc_b.png
verb.mapImg.5329_001.b=default_qyc_b.png
## 5330_001
verb.mapImg.5330_001.a=default_pfc2_a.png
verb.mapImg.5330_001.b=default_pfc2_b.png