优化三维信息

CZT

2023-11-02 dba871c46eb05394e22e4b7600183b7a44c28244

优化三维信息

 igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java

@@ -99,7 +99,7 @@
                return ThreeRespUtil.error(ThreeCodeEnum.CODE_1111, "未查询到此uid的配置信息，请联系管理员！", req);
            }
            List<Depot> depotList = threeMapper.getDepotList(req.getCompanyId(), req.getDeptId(), threeConf.getDepotId());
            if(list.size() > 0){
            if(null != depotList && depotList.size() > 0){
                data1001 = new Data1001();
                data1001.setUid(threeConf.getUid());
                data1001.setDepotName(depotList.get(0).getName());

 igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java

@@ -42,7 +42,7 @@
            //江西赣州、广东高州使用
            bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
            //广东高州使用
            bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
//            bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
            return;
        }
        if (configData.getActive().indexOf("dev") >= 0) {

 igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java

@@ -87,8 +87,6 @@
        if (null == data.getDeptId()) {
            data.setDeptId(ContextUtil.subDeptId(null));
        }
        DefaultDept dept = sysDeptService.getDeptById(data.getDeptId());
        data.setDeptName(dept.getName());
        Session session = this.getSessionFactory().openSession();
        data.setUpdateTime(new Date());
        data.setUpdateUser(ContextUtil.getLoginUserCName());

 igds-recir/src/main/java/com/ld/igds/models/DrugLog.java

@@ -25,7 +25,7 @@

    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "熏蒸作业单号", description = "仓房代码+作业日期 (yyyyMMdd) +3 位顺序号")
    @PropertyDef(label = "熏蒸作业单号", description = "作业日期 (yyyyMMdd) +3 位顺序号")
    private String id;

    @Column(name = "COMPANY_ID_", length = 10)

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

@@ -1,6 +1,7 @@
##########################  上海嘉定   ##########################
server:
  port: 8088
#  port: 8098   #上海4.0版本演示-本地部署
  context-path: /
  connection-timeout: 5000
  tomcat:
@@ -13,7 +14,7 @@
      name: db-base
      type: com.alibaba.druid.pool.DruidDataSource
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
#      url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_master_4.0?useUnicode=true&characterEncoding=utf-8   #上海4.0版本演示-本地部署
      driver-class-name: com.mysql.jdbc.Driver
      username: igds
      password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==