From deee597fa30e9a40792a4eb094b6ce45a35bc13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 22 八月 2023 23:07:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml | 368 +++++++++++++++---------------
igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java | 2
igds-web/src/main/resources/application-pro5329.yml | 80 ++++++
igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java | 1
igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java | 35 ++
igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java | 19 +
igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java | 13
igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java | 110 ++++++--
igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java | 17 +
igds-web/src/main/resources/n2-conf.properties | 6
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java | 19 +
igds-web/src/main/resources/verb-conf.properties | 10
12 files changed, 438 insertions(+), 242 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java b/igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java
index 4f84db9..bf55d3a 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java
@@ -68,6 +68,7 @@
try {
if (StringUtils.isEmpty(data.getId())) {
data.setId(ContextUtil.getUUID());
+ data.setCreateDate(new Date());
session.save(data);
} else {
session.update(data);
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java
index e0bdf8f..81a16d8 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java
@@ -7,8 +7,10 @@
import com.ld.igds.models.*;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.RedisUtil;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -66,24 +68,35 @@
Session session = this.getSessionFactory().openSession();
data.setUpdateTime(new Date());
try {
- if (null == data.getId()) {
+ if (null == data.getXzbm()) {
String id = createId(data.getCompanyId());
- data.setId(id);
- session.save(data);
- } else {
- session.update(data);
+ data.setXzbm(id);
}
+ if (StringUtils.isEmpty(data.getDtlId())){
+ data.setDtlId(ContextUtil.getUUID());
+ }
+ if (StringUtils.isEmpty(data.getWayId())){
+ data.setWayId(ContextUtil.getUUID());
+ }
+ //娣诲姞绮儏瀛愯〃
+ saveDtl(data);
+ //娣诲姞澶囨鏂瑰紡瀛愯〃
+ saveWay(data);
+ //娣诲姞涓昏〃
+ session.saveOrUpdate(data);
+
if (!CollectionUtils.isEmpty(data.getDrugLogPeople())) {
for (DrugLogPeople drugLogPeople : data.getDrugLogPeople()) {
- if (null == drugLogPeople.getId()) {
- drugLogPeople.setId(ContextUtil.getUUID());
- drugLogPeople.setDrugLogId(data.getId());
- drugLogPeople.setCompanyId(data.getCompanyId());
+ if (null == drugLogPeople.getPropleId()) {
+ String tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
+ drugLogPeople.setPropleId(ContextUtil.getUUID());
+ drugLogPeople.setId(data.getXzbm() + data.getDeptId() + tbrq);
+ drugLogPeople.setTbrq(data.getTbrq());
+ drugLogPeople.setDrugLogId(data.getXzbm());
drugLogPeople.setDeptId(data.getDeptId());
- session.save(drugLogPeople);
- } else {
- session.update(drugLogPeople);
}
+ session.saveOrUpdate(drugLogPeople);
+ session.flush();
}
}
} catch (Exception e) {
@@ -95,6 +108,45 @@
return null;
}
+ private void saveWay(DrugLogApply data) {
+ Session session = this.getSessionFactory().openSession();
+
+ try {
+ DrugLogWay way = new DrugLogWay();
+ BeanUtils.copyProperties(data, way);
+ way.setWayId(ContextUtil.getUUID());
+ String tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
+ way.setId(data.getXzbm() + data.getDeptId() + tbrq);
+ session.saveOrUpdate(way);
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ }
+
+ /**
+ * 鏍规嵁涓昏〃淇℃伅娣诲姞绮儏瀛楄〃
+ *
+ * @param data
+ */
+ private void saveDtl(DrugLogApply data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ DrugLogDtl dtl = new DrugLogDtl();
+ BeanUtils.copyProperties(data, dtl);
+ String tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
+ dtl.setId(data.getXzbm() + data.getDeptId() + tbrq);
+ session.saveOrUpdate(dtl);
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ }
+
/**
* 鍒犻櫎鐔忚捀澶囨涓昏〃淇℃伅
*
@@ -104,7 +156,7 @@
public String delDrugLogApply(DrugLogApply data) {
Session session = this.getSessionFactory().openSession();
try {
- if (null != data.getId()) {
+ if (null != data.getXzbm()) {
session.delete(data);
for (DrugLogPeople drugLogPeople : data.getDrugLogPeople()) {
session.delete(drugLogPeople);
@@ -146,8 +198,6 @@
public List<DrugLogDtl> drugLogDtlList(Map<String, Object> param) throws Exception {
StringBuffer hql = new StringBuffer();
Map<String, Object> args = new HashMap<>();
- hql.append(" from " + DrugLogDtl.class.getName() + " where companyId=:companyId");
- args.put("companyId", ContextUtil.getCompanyId());
if (null != param) {
buildHql(hql, param, args);
}
@@ -161,9 +211,6 @@
* @return
*/
public String saveDrugLogDtl(DrugLogDtl data) {
- if (null == data.getCompanyId()) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
if (null == data.getDeptId()) {
data.setDeptId(ContextUtil.subDeptId(null));
}
@@ -216,9 +263,15 @@
public List<DrugLogPeople> drugLogPeopleList(Map<String, Object> param) throws Exception {
StringBuffer hql = new StringBuffer();
Map<String, Object> args = new HashMap<>();
- hql.append(" from " + DrugLogPeople.class.getName() + " where companyId=:companyId");
- args.put("companyId", ContextUtil.getCompanyId());
+
if (null != param) {
+
+ String xzbm = (String) param.get("xzbm");
+ String deptId = (String) param.get("deptId");
+ String tbrq = DateFormatUtils.format((Date) param.get("tbrq"), "yyyyMMdd");
+ String id = xzbm + deptId + tbrq;
+ hql.append(" from " + DrugLogPeople.class.getName() + " where id=:id");
+ args.put("id", id);
buildHql(hql, param, args);
}
return this.query(String.valueOf(hql), args);
@@ -231,9 +284,6 @@
* @return
*/
public String saveDrugLogPeople(DrugLogPeople data) {
- if (null == data.getCompanyId()) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
if (null == data.getDeptId()) {
data.setDeptId(ContextUtil.subDeptId(null));
}
@@ -285,9 +335,14 @@
public List<DrugLogWay> drugLogWayList(Map<String, Object> param) throws Exception {
StringBuffer hql = new StringBuffer();
Map<String, Object> args = new HashMap<>();
- hql.append(" from " + DrugLogWay.class.getName() + " where companyId=:companyId");
- args.put("companyId", ContextUtil.getCompanyId());
if (null != param) {
+
+ String xzbm = (String) param.get("xzbm");
+ String deptId = (String) param.get("deptId");
+ String tbrq = DateFormatUtils.format((Date) param.get("tbsj"), "yyMMdd");
+ String id = xzbm + deptId + tbrq;
+ hql.append(" from " + DrugLogWay.class.getName() + " where id=:id");
+ args.put("id", id);
buildHql(hql, param, args);
}
return this.query(String.valueOf(hql), args);
@@ -301,9 +356,6 @@
* @return
*/
public String saveDrugLogWay(DrugLogWay data) {
- if (null == data.getCompanyId()) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
if (null == data.getDeptId()) {
data.setDeptId(ContextUtil.subDeptId(null));
}
@@ -391,7 +443,7 @@
cacheId = "0001";
} else {
- String temp = drugLogApplies.get(0).getId();
+ String temp = drugLogApplies.get(0).getXzbm();
Integer i = Integer.valueOf(temp);
cacheId = String.format("%04d", ++i);
}
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
index 9b461dd..65db267 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
@@ -5,396 +5,248 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.ld.igds.models.DrugLogApply</Property>
- <PropertyDef name="id">
+ <PropertyDef name="xzbm">
<Property/>
<Property name="label">鐔忚捀澶囨缂栧彿</Property>
- <Property name="readOnly">true</Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="deptId">
<Property/>
<Property name="label">搴撳尯浠ｇ爜</Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="companyId">
<Property/>
<Property name="label">缁勭粐缂栫爜</Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="tbrq">
<Property name="dataType">Date</Property>
<Property name="label">濉姤鏃ユ湡</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="dwdm">
<Property/>
<Property name="label">鍗曚綅浠ｇ爜</Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="sqxzrq">
<Property name="dataType">Date</Property>
<Property name="label">鐢宠鐔忚捀鏃ユ湡</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="fzr">
<Property/>
<Property name="label">璐熻矗浜�</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="fzrdh">
<Property/>
<Property name="label">璐熻矗浜虹數璇�</Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="xcfzr">
<Property/>
<Property name="label">鐜板満璐熻矗浜�</Property>
- <Property name="required">true</Property>
</PropertyDef>
- <PropertyDef name="fzrzw">
+ <PropertyDef name="xcfzrzw">
<Property/>
- <Property name="label">璐熻矗浜鸿亴鍔�</Property>
- <Property name="required">true</Property>
+ <Property name="label">鐜板満璐熻矗浜鸿亴鍔�</Property>
</PropertyDef>
<PropertyDef name="xcfzrdh">
<Property/>
- <Property name="label">鐜板満璐熻矗浜�</Property>
- <Property name="required">false</Property>
+ <Property name="label">鐜板満璐熻矗浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="tbr">
<Property/>
<Property name="label">濉〃浜�</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="tbrdh">
<Property/>
<Property name="label">濉〃浜虹數璇�</Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="sfszjjxd">
<Property/>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(涓�)</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sfszjjxx">
<Property/>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(瑗�)</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sfszjjxn">
<Property/>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(鍗�)</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sfszjjxb">
<Property/>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(鍖�)</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="ssxzzystqybqk">
<Property/>
<Property name="label">瀹炴柦鐔忚捀浣滀笟鏃跺ぉ姘旈鎶ユ儏鍐�</Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="xzssgcap">
<Property/>
<Property name="label">鐔忚捀瀹夋帓鍙婂疄鏂借繃绋�</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="aqfhjyjcccs">
<Property/>
<Property name="label">瀹夊叏闃叉姢鍙婂簲鎬ュ缃帾鏂�</Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="xzzysx">
<Property/>
<Property name="label">鐔忚捀娉ㄦ剰浜嬮」</Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="fileStorageId">
<Property/>
<Property name="label">鏂囦欢瀛樺偍ID</Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="drugName">
<Property/>
<Property name="label">鑽墏鍚嶇О</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="drugType">
<Property/>
<Property name="label">鑽墏绫诲瀷/鍨嬪彿</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="yjyxqz">
<Property name="dataType">Date</Property>
<Property name="label">鑽墏鏈夋晥鏈熻嚦</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lqsl">
<Property name="dataType">Double</Property>
<Property name="label">棰嗗彇鏁伴噺</Property>
- <Property name="required">true</Property>
- <Property name="displayFormat">#0.000鍏枻</Property>
</PropertyDef>
<PropertyDef name="sysbjfs">
<Property/>
<Property name="label">鏂借嵂璁惧鍙婃柟寮�</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zcdd">
<Property/>
<Property name="label">鏆傚瓨鍦扮偣</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lqr">
<Property/>
<Property name="label">棰嗗彇浜�</Property>
- <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="lqsj">
+ <Property name="dataType">Date</Property>
+ <Property name="label">棰嗗彇鏃堕棿鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
- <Property name="required">false</Property>
- <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="depotId">
<Property/>
- <Property name="label">浠撴埧/娌圭綈鍚嶇О</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- <Property name="required">true</Property>
+ <Property name="label">浠撴埧/娌圭綈浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="foodVariety">
<Property/>
<Property name="label">绮鍝佺</Property>
- <Property name="required">true</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
</PropertyDef>
<PropertyDef name="foodType">
<Property/>
<Property name="label">绮鎬ц川</Property>
- <Property name="required">true</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
</PropertyDef>
<PropertyDef name="foodLevel">
<Property/>
<Property name="label">绮绛夌骇</Property>
- <Property name="required">true</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
</PropertyDef>
<PropertyDef name="number">
<Property name="dataType">Double</Property>
<Property name="label">绮鏁伴噺</Property>
- <Property name="required">true</Property>
- <Property name="displayFormat">#0.000鍚�</Property>
</PropertyDef>
<PropertyDef name="perWet">
<Property name="dataType">Double</Property>
<Property name="label">姘村垎</Property>
- <Property name="required">true</Property>
- <Property name="displayFormat">#0.000%</Property>
</PropertyDef>
<PropertyDef name="perImpurity">
<Property name="dataType">Double</Property>
<Property name="label">鏉傝川</Property>
- <Property name="required">true</Property>
- <Property name="displayFormat">#0.000%</Property>
</PropertyDef>
<PropertyDef name="lw">
<Property name="dataType">Double</Property>
<Property name="label">绮俯</Property>
- <Property name="required">true</Property>
- <Property name="displayFormat">#0.000鈩�</Property>
</PropertyDef>
<PropertyDef name="cnsd">
<Property name="dataType">Double</Property>
<Property name="label">浠撳唴婀垮害</Property>
- <Property name="required">true</Property>
- <Property name="displayFormat">#0.000%RH</Property>
</PropertyDef>
<PropertyDef name="clfs">
<Property/>
<Property name="label">瀛樼伯鏂瑰紡</Property>
- <Property name="mapping">
- <Property name="keyProperty">key</Property>
- <Property name="valueProperty">value</Property>
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="key">1</Property>
- <Property name="value">鏁ｈ鍌ㄧ伯</Property>
- </Entity>
- <Entity>
- <Property name="key">2</Property>
- <Property name="value">鍖呰</Property>
- </Entity>
- <Entity>
- <Property name="key">3</Property>
- <Property name="value">鍥村寘鏁ｅ瓨</Property>
- </Entity>
- <Entity>
- <Property name="key">9</Property>
- <Property name="value">鍏朵粬</Property>
- </Entity>
- </Collection>
- </Property>
- </Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="rkrq">
<Property name="dataType">Date</Property>
<Property name="label">鍏ュ簱鏃ユ湡</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="hc">
<Property/>
<Property name="label">瀹宠櫕</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="cldjpd">
<Property/>
<Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
- <Property name="required">true</Property>
- <Property name="mapping">
- <Property name="keyProperty">key</Property>
- <Property name="valueProperty">value</Property>
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="key">531</Property>
- <Property name="value">鍩烘湰鏃犺櫕绮�</Property>
- </Entity>
- <Entity>
- <Property name="key">532</Property>
- <Property name="value">涓�鑸櫕绮�</Property>
- </Entity>
- <Entity>
- <Property name="key">533</Property>
- <Property name="value">涓ラ噸铏伯</Property>
- </Entity>
- <Entity>
- <Property name="key">534</Property>
- <Property name="value">鍗遍櫓铏伯</Property>
- </Entity>
- </Collection>
- </Property>
- </Property>
</PropertyDef>
<PropertyDef name="ldtj">
<Property name="dataType">Double</Property>
<Property name="label">绮爢浣撶Н</Property>
- <Property name="required">true</Property>
- <Property name="displayFormat">#0.000m鲁</Property>
</PropertyDef>
<PropertyDef name="kjtj">
<Property name="dataType">Double</Property>
<Property name="label">绌洪棿浣撶Н</Property>
- <Property name="required">true</Property>
- <Property name="displayFormat">#0.000m鲁</Property>
</PropertyDef>
<PropertyDef name="lddwyyl">
<Property name="dataType">Double</Property>
<Property name="label">绮爢鍗曚綅鐢ㄨ嵂閲�</Property>
- <Property name="required">true</Property>
- <Property name="displayFormat">#0.000g/m鲁</Property>
</PropertyDef>
<PropertyDef name="kjdwyyl">
<Property name="dataType">Double</Property>
<Property name="label">绌洪棿鍗曚綅鐢ㄨ嵂閲�</Property>
- <Property name="required">true</Property>
- <Property name="displayFormat">#0.000g/m鲁</Property>
</PropertyDef>
<PropertyDef name="zyyl">
<Property name="dataType">Double</Property>
<Property name="label">鎬荤敤鑽噺</Property>
- <Property name="required">true</Property>
- <Property name="displayFormat">#0.000kg</Property>
</PropertyDef>
<PropertyDef name="qmx">
<Property/>
<Property name="label">姘斿瘑鎬�</Property>
- <Property name="required">true</Property>
- <Property name="mapping">
- <Property name="keyProperty">key</Property>
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="key">1</Property>
- <Property name="value">鈪犵骇;t鈮�300s</Property>
- </Entity>
- <Entity>
- <Property name="key">2</Property>
- <Property name="value">鈪＄骇;120s鈮<300s</Property>
- </Entity>
- <Entity>
- <Property name="key">3</Property>
- <Property name="value">鈪㈢骇;40s鈮<120s (骞虫埧浠�) ,60s鈮� t<120s (绔嬬瓛浠撱�佹祬鍦嗕粨)</Property>
- </Entity>
- <Entity>
- <Property name="key">4</Property>
- <Property name="value">鈪ｇ骇;t<40s (骞虫埧浠�) ,t<60s (绔嬬瓛浠撱�佹祬鍦嗕粨)</Property>
- </Entity>
- </Collection>
- </Property>
- <Property name="valueProperty">value</Property>
- </Property>
</PropertyDef>
<PropertyDef name="jhxzksrq">
<Property name="dataType">Date</Property>
<Property name="label">璁″垝鐔忚捀寮�濮嬫棩鏈�</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="jhxzjsrq">
<Property name="dataType">Date</Property>
<Property name="label">璁″垝鐔忚捀缁撴潫鏃ユ湡</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xznd">
<Property name="dataType">Double</Property>
<Property name="label">璁惧畾鐔忚捀娴撳害</Property>
- <Property name="required">true</Property>
- <Property name="displayFormat">#0.000ml/m鲁</Property>
</PropertyDef>
<PropertyDef name="mbsj">
<Property name="dataType">Integer</Property>
<Property name="label">瀵嗛棴鏃堕棿</Property>
- <Property name="required">true</Property>
- <Property name="displayFormat">#0澶�</Property>
</PropertyDef>
<PropertyDef name="xzfs">
<Property/>
<Property name="label">鐔忚捀鏂瑰紡</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sqfs">
<Property/>
<Property name="label">鏁ｆ皵鏂瑰紡</Property>
- <Property name="required">true</Property>
</PropertyDef>
<Reference name="drugLogPeople">
- <Property name="parameter">$${this.id}</Property>
<Property name="dataType">[dtPeople]</Property>
<Property name="dataProvider">drugLogApplyPR#peopleList</Property>
+ <Property name="parameter">
+ <Entity>
+ <Property name="xzbm">$${this.xzbm}</Property>
+ <Property name="deptId">$${this.deptId}</Property>
+ <Property name="tbrq">$${this.tbrq}</Property>
+ </Entity>
+ </Property>
</Reference>
</DataType>
<DataType name="dtPeople">
<Property name="creationType">com.ld.igds.models.DrugLogPeople</Property>
+ <PropertyDef name="propleId">
+ <Property/>
+ <Property name="label">propleId</Property>
+ </PropertyDef>
<PropertyDef name="id">
<Property/>
<Property name="label">id</Property>
@@ -407,44 +259,38 @@
<Property/>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
- <PropertyDef name="companyId">
- <Property/>
- <Property name="label">缁勭粐缂栫爜</Property>
+ <PropertyDef name="tbrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">濉姤鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="mx">
<Property/>
<Property name="label">濮撳悕</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zw">
<Property/>
<Property name="label">鑱屽姟</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zyzg">
<Property/>
<Property name="label">鑱屼笟璧勬牸</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="stzk">
<Property/>
<Property name="label">韬綋鐘跺喌</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xzrwfg">
<Property/>
<Property name="label">鐔忚捀浠诲姟鍒嗗伐</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sfwb">
<Property/>
<Property name="label">鏄惁澶栧寘</Property>
- <Property name="required">true</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
<PropertyDef name="depotId">
- <Property/>
+ <Property></Property>
<Property name="label">浠撴埧鍚嶇О</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
@@ -461,11 +307,158 @@
<Property name="label">澶囨缁撴潫鏃堕棿</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtDtl">
+ <Property name="creationType">com.ld.igds.models.DrugLogDtl</Property>
+ <PropertyDef name="id">
+ <Property/>
+ <Property name="label">id</Property>
+ </PropertyDef>
+ <PropertyDef name="drugLogId">
+ <Property/>
+ <Property name="label">鐔忚捀澶囨缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property/>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="tbrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">濉姤鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property/>
+ <Property name="label">浠撴埧/娌圭綈浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="foodVariety">
+ <Property/>
+ <Property name="label">绮鍝佺</Property>
+ </PropertyDef>
+ <PropertyDef name="foodType">
+ <Property/>
+ <Property name="label">绮鎬ц川</Property>
+ </PropertyDef>
+ <PropertyDef name="foodLevel">
+ <Property/>
+ <Property name="label">绮绛夌骇</Property>
+ </PropertyDef>
+ <PropertyDef name="number">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绮鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="perWet">
+ <Property name="dataType">Double</Property>
+ <Property name="label">姘村垎</Property>
+ </PropertyDef>
+ <PropertyDef name="perImpurity">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏉傝川</Property>
+ </PropertyDef>
+ <PropertyDef name="lw">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绮俯</Property>
+ </PropertyDef>
+ <PropertyDef name="cw">
+ <Property name="dataType">Double</Property>
+ <Property name="label">浠撴俯</Property>
+ </PropertyDef>
+ <PropertyDef name="cnsd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">浠撳唴婀垮害</Property>
+ </PropertyDef>
+ <PropertyDef name="clfs">
+ <Property/>
+ <Property name="label">瀛樼伯鏂瑰紡</Property>
+ </PropertyDef>
+ <PropertyDef name="rkrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍏ュ簱鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="hc">
+ <Property/>
+ <Property name="label">瀹宠櫕</Property>
+ </PropertyDef>
+ <PropertyDef name="cldjpd">
+ <Property/>
+ <Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
+ </PropertyDef>
+ <PropertyDef name="ldtj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绮爢浣撶Н</Property>
+ </PropertyDef>
+ <PropertyDef name="kjtj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绌洪棿浣撶Н</Property>
+ </PropertyDef>
+ <PropertyDef name="lddwyyl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绮爢鍗曚綅鐢ㄨ嵂閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="kjdwyyl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绌洪棿鍗曚綅鐢ㄨ嵂閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="zyyl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎬荤敤鑽噺</Property>
+ </PropertyDef>
+ <PropertyDef name="qmx">
+ <Property/>
+ <Property name="label">姘斿瘑鎬�</Property>
+ </PropertyDef>
+ <PropertyDef name="jhxzksrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">璁″垝鐔忚捀寮�濮嬫棩鏈�</Property>
+ </PropertyDef>
+ <PropertyDef name="jhxzjsrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">璁″垝鐔忚捀缁撴潫鏃ユ湡</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtWay">
+ <Property name="creationType">com.ld.igds.models.DrugLogWay</Property>
+ <PropertyDef name="id">
+ <Property/>
+ <Property name="label">id</Property>
+ </PropertyDef>
+ <PropertyDef name="drugLogId">
+ <Property/>
+ <Property name="label">鐔忚捀澶囨缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property/>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="tbrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">濉姤鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="xznd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">璁惧畾鐔忚捀娴撳害</Property>
+ </PropertyDef>
+ <PropertyDef name="mbsj">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">瀵嗛棴鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="xzfs">
+ <Property/>
+ <Property name="label">鐔忚捀鏂瑰紡</Property>
+ </PropertyDef>
+ <PropertyDef name="sqfs">
+ <Property/>
+ <Property name="label">鏁ｆ皵鏂瑰紡</Property>
+ </PropertyDef>
+ </DataType>
</Model>
<View layout="padding:5;regionPadding:5">
<ClientEvent name="onReady">view.get("#dsParam").insert({});</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
+ <Property name="dataProvider">drugLogApplyPR#pageData</Property>
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="pageSize">15</Property>
+ </DataSet>
+ <DataSet id="dsDtl">
<Property name="dataProvider">drugLogApplyPR#pageData</Property>
<Property name="dataType">[dtMain]</Property>
<Property name="pageSize">15</Property>
@@ -563,9 +556,11 @@
<RowNumColumn>
<Property name="caption">搴忓彿</Property>
</RowNumColumn>
- <DataColumn name="id">
- <Property name="property">id</Property>
+ <DataColumn>
+ <Property name="property">xzbm</Property>
<Property name="align">center</Property>
+ <Property name="name">xzbm</Property>
+ <Property name="visible">false</Property>
</DataColumn>
<DataColumn name="depotId">
<Property name="property">depotId</Property>
@@ -587,9 +582,10 @@
<Property name="property">xcfzr</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="fzrzw">
- <Property name="property">fzrzw</Property>
+ <DataColumn>
+ <Property name="property">xcfzrzw</Property>
<Property name="align">center</Property>
+ <Property name="name">xcfzrzw</Property>
</DataColumn>
<DataColumn name="drugName">
<Property name="property">drugName</Property>
@@ -649,8 +645,8 @@
<Property name="labelPosition">top</Property>
<Property name="labelSeparator">:</Property>
<AutoFormElement>
- <Property name="name">id</Property>
- <Property name="property">id</Property>
+ <Property name="name">xzbm</Property>
+ <Property name="property">xzbm</Property>
<Editor>
<TextEditor>
<Property name="blankText">---绯荤粺鑷姩鐢熸垚---</Property>
@@ -683,8 +679,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">fzrzw</Property>
- <Property name="property">fzrzw</Property>
+ <Property name="name">xcfzrzw</Property>
+ <Property name="property">xcfzrzw</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java
index f61c84b..0950c11 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java
@@ -6,6 +6,7 @@
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.drug.service.HDrugLogApplyService;
import com.ld.igds.models.DrugLogApply;
+import com.ld.igds.models.DrugLogDtl;
import com.ld.igds.models.DrugLogPeople;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -37,14 +38,12 @@
/**
* drugLogApplyPR#peopleList
*
- * @param id
+ * @param
* @return
* @throws Exception
*/
@DataProvider
- public List<DrugLogPeople> peopleList(String id) throws Exception {
- Map<String, Object> param = new HashMap<>();
- param.put("drugLogId", id);
+ public List<DrugLogPeople> peopleList(Map<String, Object> param) throws Exception {
return drugLogApplyService.drugLogPeopleList(param);
}
@@ -80,4 +79,16 @@
return drugLogApplyService.delDrugLogPeople(data);
}
+ /**
+ * drugLogApplyPR#peopleList
+ *
+ * @param
+ * @return
+ * @throws Exception
+ */
+ @DataProvider
+ public List<DrugLogDtl> dtlList(Map<String, Object> param) throws Exception {
+ return drugLogApplyService.drugLogDtlList(param);
+ }
+
}
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java
index 6d03bad..5b7cd4d 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java
@@ -20,9 +20,9 @@
public class DrugLogApply implements Serializable {
@Id
- @Column(name = "ID_", length = 4)
+ @Column(name = "xzbm", length = 4)
@PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
- private String id;
+ private String xzbm;
@Id
@Column(name = "DEPT_ID_", length = 21)
@@ -33,6 +33,7 @@
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
+ @Id
@Column(name = "tbrq")
@PropertyDef(label = "濉姤鏃ユ湡")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -60,11 +61,11 @@
private String xcfzr;
@Column(name = "fzrzw", length = 10)
- @PropertyDef(label = "璐熻矗浜鸿亴鍔�")
- private String fzrzw;
+ @PropertyDef(label = "鐜板満璐熻矗浜鸿亴鍔�")
+ private String xcfzrzw;
@Column(name = "xcfzrdh", length = 11)
- @PropertyDef(label = "鐜板満璐熻矗浜�")
+ @PropertyDef(label = "鐜板満璐熻矗浜虹數璇�")
private String xcfzrdh;
@Column(name = "tbr", length = 20)
@@ -139,15 +140,26 @@
@PropertyDef(label = "棰嗗彇浜�")
private String lqr;
+ @Column(name = "lqsj")
+ @PropertyDef(label = "棰嗗彇鏃堕棿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date lqsj;
+
@Column(name = "UPDATE_TIME_")
@PropertyDef(label = "鏇存柊鏃堕棿")
private Date updateTime;
+
/**
* 鍌ㄧ伯绮儏鏄庣粏琛�
+ *
*/
-// @Transient
-// private List<DrugLogDtl> drugLogDtls;
+ @Transient
+ private List<DrugLogDtl> drugLogDtls;
+
+ @Column(name = "DTL_ID_", length = 40)
+ @PropertyDef(label = "dtlId")
+ private String dtlId;
@Column(name = "DEPOT_ID_", length = 50)
@PropertyDef(label = "浠撴埧/娌圭綈浠ｇ爜")
@@ -245,8 +257,13 @@
/**
* 鐔忚捀澶囨鏂瑰紡
*/
-// @Transient
-// private List<DrugLogWay> drugLogWays;
+ @Transient
+ private List<DrugLogWay> drugLogWays;
+
+ @Column(name = "Way_ID_", length = 40)
+ @PropertyDef(label = "wayId")
+ private String wayId;
+
@Column(name = "xznd", precision = 20, scale = 3)
@PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")
private Double xznd;
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
index 633b681..fdf340d 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
@@ -19,11 +19,15 @@
@Entity
@Data
@Table(name = "D_DRUG_LOG_DTL")
-public class DrugLogDtl implements Serializable {
+ public class DrugLogDtl implements Serializable {
@Id
+ @Column(name = "DTL_ID_", length = 40)
+ @PropertyDef(label = "dtlId")
+ private String dtlId;
+
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "id")
+ @PropertyDef(label = "id", description = "鐔忚捀缂栧彿+搴撳尯浠ｇ爜+濉姤鏃ユ湡")
private String id;
@Column(name = "DRUG_LOG_ID_", length = 4)
@@ -34,9 +38,10 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String deptId;
- @Column(name = "COMPANY_ID_", length = 10)
- @PropertyDef(label = "缁勭粐缂栫爜")
- private String companyId;
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
@Column(name = "DEPOT_ID_", length = 50)
@PropertyDef(label = "浠撴埧/娌圭綈浠ｇ爜")
@@ -70,6 +75,10 @@
@PropertyDef(label = "绮俯")
private Double lw;
+ @Column(name = "cw", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撴俯")
+ private Double cw;
+
@Column(name = "cnsd", precision = 20, scale = 3)
@PropertyDef(label = "浠撳唴婀垮害")
private Double cnsd;
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
index eb48fe8..8707f80 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
@@ -1,6 +1,7 @@
package com.ld.igds.models;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.persistence.Column;
@@ -8,6 +9,7 @@
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
+import java.util.Date;
/**
* 鐔忚捀浣滀笟浜哄憳淇℃伅琛�
@@ -20,6 +22,10 @@
public class DrugLogPeople implements Serializable {
@Id
+ @Column(name = "PEOPLE_ID_", length = 40)
+ @PropertyDef(label = "propleId")
+ private String propleId;
+
@Column(name = "ID_", length = 40)
@PropertyDef(label = "id")
private String id;
@@ -32,9 +38,10 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String deptId;
- @Column(name = "COMPANY_ID_", length = 10)
- @PropertyDef(label = "缁勭粐缂栫爜")
- private String companyId;
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
@Column(name = "mx", length = 20)
@PropertyDef(label = "濮撳悕")
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
index 8c57292..08a7530 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
@@ -1,6 +1,8 @@
package com.ld.igds.models;
+import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.persistence.Column;
@@ -8,6 +10,7 @@
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
+import java.util.Date;
/**
* 鐔忚捀澶囨鏂瑰紡琛�
@@ -20,8 +23,12 @@
public class DrugLogWay implements Serializable {
@Id
+ @Column(name = "WAY_ID_", length = 40)
+ @PropertyDef(label = "wayId")
+ private String wayId;
+
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "id")
+ @PropertyDef(label = "id",description = "涓庡妗堜俊鎭叧鑱擨D 鐔忚捀缂栫爜+搴撳尯浠ｇ爜+濉姤鏃ユ湡")
private String id;
@Column(name = "DRUG_LOG_ID_", length = 4)
@@ -30,11 +37,13 @@
@Column(name = "DEPT_ID_", length = 21)
@PropertyDef(label = "搴撳尯浠ｇ爜")
+ @JSONField
private String deptId;
- @Column(name = "COMPANY_ID_", length = 10)
- @PropertyDef(label = "缁勭粐缂栫爜")
- private String companyId;
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
@Column(name = "xznd", precision = 20, scale = 3)
@PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")
diff --git a/igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java b/igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java
index 38ea75f..4880842 100644
--- a/igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java
+++ b/igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java
@@ -114,6 +114,8 @@
listResult.add(item);
if (item.getType().equals(DeviceType.TYPE_0C.getCode()))
listResult.add(item);
+ if (item.getType().equals(DeviceType.TYPE_04.getCode()))
+ listResult.add(item);
//娴呭渾浠撳姞涓婂叾浠栬澶�
if (DepotType.TYPE_02.getCode().equals(param.getDepotType())) {
diff --git a/igds-web/src/main/resources/application-pro5329.yml b/igds-web/src/main/resources/application-pro5329.yml
new file mode 100644
index 0000000..220bdc0
--- /dev/null
+++ b/igds-web/src/main/resources/application-pro5329.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: C:/IGDS/license/license.lic
+ publicKeysStorePath: C:/IGDS/license/publicCerts.keystore
+
+########################## IGDS ##########################
+## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
+igds:
+ default:
+ companyId: 5329
+ sys-name: 鏅烘収绮簱绠＄悊绯荤粺
+ logo: logo-default.png
+ logo-title: logo-title-default.png
+ support: 椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�
+ grian-add-point: N
+ file-path: C:/IGDS/FILE/
\ No newline at end of file
diff --git a/igds-web/src/main/resources/n2-conf.properties b/igds-web/src/main/resources/n2-conf.properties
index 5cd14af..639d665 100644
--- a/igds-web/src/main/resources/n2-conf.properties
+++ b/igds-web/src/main/resources/n2-conf.properties
@@ -108,4 +108,8 @@
n2.mapImg.5000_0137.a=default_qyc_a.png
n2.mapImg.5000_0137.b=default_qyc_b.png
n2.mapImg.5000_0138.a=default_qyc_a.png
-n2.mapImg.5000_0138.b=default_qyc_b.png
\ No newline at end of file
+n2.mapImg.5000_0138.b=default_qyc_b.png
+
+## 5329_001
+n2.mapImg.5329_001.a=default_qyc_a.png
+n2.mapImg.5329_001.b=default_qyc_b.png
\ No newline at end of file
diff --git a/igds-web/src/main/resources/verb-conf.properties b/igds-web/src/main/resources/verb-conf.properties
index 65147d3..fae8818 100644
--- a/igds-web/src/main/resources/verb-conf.properties
+++ b/igds-web/src/main/resources/verb-conf.properties
@@ -178,4 +178,12 @@
## 5325_001
verb.mapImg.5325_001.a=default_pfc_a.png
-verb.mapImg.5325_001.b=default_pfc_b.png
\ No newline at end of file
+verb.mapImg.5325_001.b=default_pfc_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
\ No newline at end of file
--
Gitblit v1.9.3