Merge remote-tracking branch 'origin/master'

YYC

2023-10-19 a4d1e11a3ee5739d0f3089c53510baad571d9427

Merge remote-tracking branch 'origin/master'

 igds-basic/src/main/java/com/ld/igds/timer/zcl/InteGrainScheduled.java

@@ -25,7 +25,7 @@
@Component
public class InteGrainScheduled {

    public static String COMPANY_IDS = "4003,5307,5311,5315";
    public static String COMPANY_IDS = "4003,5307,5311,5315,5332";

    @Autowired
    private CoreGrainService grainService;

 igds-basic/src/main/java/com/ld/igds/timer/zcl/service/impl/InteGrain5332ServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
package com.ld.igds.timer.zcl.service.impl;

import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.ld.igds.models.InteGrain5332;
import com.ld.igds.timer.zcl.dto.InteGrainDto;
import com.ld.igds.timer.zcl.service.InteGrainService;
import org.hibernate.Session;
import org.springframework.stereotype.Component;

/**
 * @Desc: 5332 æŽ¥å£
 * @author: czt
 * @update-time: 2023/10/19
 */
@Component
public class InteGrain5332ServiceImpl extends HibernateDao implements InteGrainService {

    @Override
    public String getCompanyId() {
        return "5332";
    }

    @Override
    public void toSaveGrain(InteGrainDto dto) {
        Session session = this.getSessionFactory().openSession();
        try {

            InteGrain5332 data = new InteGrain5332();

            data.setUuid(dto.getUuid());
            data.setBatchId(dto.getBatchId());
            data.setCompanyId(dto.getCompanyId());
            data.setDepotId(dto.getDepotId());
            data.setDepotName(dto.getDepotName());
            data.setHumidityIn(dto.getHumidityIn());
            data.setHumidityOut(dto.getHumidityOut());
            data.setTempIn(dto.getTempIn());
            data.setTempOut(dto.getTempOut());
            data.setReceiveDate(dto.getReceiveDate());
            data.setTempList(dto.getTempList());

            data.setCheckUser(dto.getCheckUser());
            data.setCable(dto.getCable());
            data.setCableCir(dto.getCableCir());
            data.setRemark(dto.getRemark());
            data.setWeather(dto.getWeather());


            session.saveOrUpdate(data);
        } finally {
            session.flush();
            session.close();
        }
    }
}

 igds-core/src/main/java/com/ld/igds/models/InteGrain5332.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@

package com.ld.igds.models;

import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;


/**
 * @Desc: æ¯•èŠ‚大方对外接口
 * @author: czt
 * @update-time: 2023/10/19
 */
@Data
@Entity
@Table(name = "INTE_GRAIN_5332")
public class InteGrain5332 implements Serializable {


    private static final long serialVersionUID = 1L;
    @Id
    @Column(name = "UUID_", length = 40)
    @PropertyDef(label = "UUID")
    private String uuid;

    @Column(name = "BATCH_ID_", length = 40)
    @PropertyDef(label = "批次")
    private String batchId;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码", description = "")
    private String companyId;

    @Column(name = "DEPOT_ID_", length = 50)
    @PropertyDef(label = "所属仓库", description = "仓库编号")
    private String depotId;

    @Column(name = "DEPOT_NAME_", length = 40)
    @PropertyDef(label = "所属仓库名称", description = "仓库编号名称")
    private String depotName;

    @Column(name = "RECEIVE_DATE_")
    @PropertyDef(label = "接收时间", description = "")
    private Date receiveDate;

    @Column(name = "HUMIDITY_IN_")
    @PropertyDef(label = "仓内湿度", description = "")
    private Double humidityIn;

    @Column(name = "TEMP_IN_")
    @PropertyDef(label = "仓内温度", description = "")
    private Double tempIn;

    @Column(name = "HUMIDITY_OUT_")
    @PropertyDef(label = "仓外湿度", description = "")
    private Double humidityOut;

    @Column(name = "TEMP_OUT_")
    @PropertyDef(label = "仓外温度", description = "")
    private Double tempOut;

    @Column(name = "TEMP_LIST_", length = 5000)
    @PropertyDef(label = "温度列表 ç”¨,隔开每个点", description = "")
    private String tempList;

    @Column(name = "CABLE_", length = 20)
    @PropertyDef(label = "布线规则")
    private String cable;

    @Column(name = "CABLE_CIR_", length = 20)
    @PropertyDef(label = "布线规则")
    private String cableCir;

    @Column(name = "CHECK_USER_", length = 30)
    @PropertyDef(label = "检测人")
    private String checkUser;

    @Column(name = "REMARK_", length = 100)
    @PropertyDef(label = "检测说明")
    private String remark;

    @Column(name = "WEATHER_", length = 10)
    @PropertyDef(label = "天气")
    private String weather;


    public InteGrain5332() {
    }


}


 igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java

@@ -106,10 +106,10 @@
        grain.setDepotId(response.getHouseId());
        grain.setCompanyId(depotConf.getCompanyId());
        //惠新暂时使用-暂时处理温湿度检测为负值
        if(response.getHIn() < 0){
        if(null != response.getHIn() && response.getHIn() < 0){
            response.setHIn(NumberUtil.keepPrecision(Math.random() * 10 + 64, 1));
        }
        if(response.getTIn() < 0){
        if(null != response.getTIn() && response.getTIn() < 0){
            response.setTIn(response.getTAvg());
        }
        grain.setHumidityIn(response.getHIn());

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,80 @@
##########################  è´µå·žæ¯•èŠ‚大方粮库项目   ##########################
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: Abc123..
    # è¿žæŽ¥æ± æœ€å¤§è¿žæŽ¥æ•°ï¼ˆä½¿ç”¨è´Ÿå€¼è¡¨ç¤ºæ²¡æœ‰é™åˆ¶ï¼‰
    pool:
      max-active: 200
      max-wait: -1
      max-idle: 10
      min-idle: 0
      timeout: 6000

license:
  subject: ld_license
  publicAlias: publicCert
  storePass: PUBLICFZZYXXJSGFYXGS888888
  licensePath: D:/IGDS/license/license.lic
  publicKeysStorePath: D:/IGDS/license/publicCerts.keystore

##########################  IGDS   ##########################
## ç³»ç»ŸæŽ¥å£è·¯ç”±é…ç½® æ³¨æ„æ•°å­—如果以0开头的话，后台会出现转义，请添加""
igds:
  default:
    companyId: 5332
    sys-name: æ™ºæ…§ç²®åº“管理系统
    logo: logo-default.png
    logo-title: logo-title-default.png
    support: é£Žæ­£è‡´è¿œä¿¡æ¯æŠ€æœ¯è‚¡ä»½æœ‰é™å…¬å¸
    grian-add-point: N
  file-path: D:/IGDS/FILE/