From dba871c46eb05394e22e4b7600183b7a44c28244 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 02 十一月 2023 08:48:38 +0800
Subject: [PATCH] 优化三维信息
---
igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java | 2 --
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java | 2 +-
igds-web/src/main/resources/application-pro5303.yml | 3 ++-
igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java | 2 +-
igds-recir/src/main/java/com/ld/igds/models/DrugLog.java | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java b/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java
index d0cb7ee..c975486 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java
@@ -99,7 +99,7 @@
return ThreeRespUtil.error(ThreeCodeEnum.CODE_1111, "鏈煡璇㈠埌姝id鐨勯厤缃俊鎭紝璇疯仈绯荤鐞嗗憳锛�", 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());
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
index 2568c6d..d257254 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
+++ b/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) {
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java
index ec6a803..f34431c 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java
+++ b/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());
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
index 63f37bf..76f75f2 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
+++ b/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)
diff --git a/igds-web/src/main/resources/application-pro5303.yml b/igds-web/src/main/resources/application-pro5303.yml
index 9418919..bae5fe7 100644
--- a/igds-web/src/main/resources/application-pro5303.yml
+++ b/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==
--
Gitblit v1.9.3