From 564295458c720206db9b5194b90481b711f4b010 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 11 十月 2023 12:09:22 +0800
Subject: [PATCH] 更改配置及筒仓偏移量
---
igds-core/src/main/java/com/ld/igds/models/Building.java | 4
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java | 19 ++-
igds-web/src/main/resources/application-pro.yml | 12 +-
igds-basic/src/main/java/com/ld/igds/grain/manager/GrainManager.java | 17 ++
igds-web/src/main/resources/application-fzzy.yml | 80 ++++++++++++++++
igds-web/src/main/resources/logback-spring.xml | 34 ++++++
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/message/IoMessage.java | 1
igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java | 3
igds-core/src/main/java/com/ld/igds/view/Building.view.xml | 9 +
igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/height/analysis/AnalysisHeightService.java | 47 ++++++++
igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java | 42 ++++++--
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java | 8 +
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java | 4
igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/ServerRunner.java | 5 +
igds-core/src/main/java/models/igds.model.xml | 11 +
15 files changed, 260 insertions(+), 36 deletions(-)
diff --git a/igds-basic/src/main/java/com/ld/igds/grain/manager/GrainManager.java b/igds-basic/src/main/java/com/ld/igds/grain/manager/GrainManager.java
index fffbd03..313cf9c 100644
--- a/igds-basic/src/main/java/com/ld/igds/grain/manager/GrainManager.java
+++ b/igds-basic/src/main/java/com/ld/igds/grain/manager/GrainManager.java
@@ -810,15 +810,19 @@
GrainData grainData;
Building building;
String height;
- Double length;
+ //鐩村緞
+ Double diameter;
Double bulkWeight;
Double storage = 0.0;
+ Double volume = 0.0;
+ Double deVolume;
for (Depot depot : depotList) {
//鑾峰彇浠撴埧淇℃伅锛岃缃缓绛戦珮搴�
height = null;
//鑾峰彇浠撴埧鐩村緞
- length = 0.0;
+ diameter = 0.0;
+ deVolume = 0.0;
//瀹归噸
bulkWeight = depot.getBulkWeight();
grainData = coreGrainService.listLiquidHeight(companyId, depot.getId());
@@ -833,7 +837,10 @@
height = building.getHeight() + "";
}
if (null != building.getLength()) {
- length = building.getLength();
+ diameter = building.getLength();
+ }
+ if (null != building.getDeVolume()) {
+ deVolume = building.getDeVolume();
}
}
}
@@ -842,7 +849,9 @@
grainData.setDepotHeight(height);
if (null != bulkWeight && StringUtils.isNotEmpty(grainData.getOilHeight())) {
Double oilHeight = Double.valueOf(grainData.getOilHeight());
- storage = 3.14 * Math.pow(length / 2, 2) * oilHeight * bulkWeight;
+ //璁＄畻浣撶Н
+ volume = 3.14 * Math.pow(diameter / 2, 2) * oilHeight - deVolume;
+ storage = volume * bulkWeight;
}
grainData.setStorage(storage);
diff --git a/igds-core/src/main/java/com/ld/igds/models/Building.java b/igds-core/src/main/java/com/ld/igds/models/Building.java
index a46af0b..5680532 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Building.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Building.java
@@ -72,6 +72,10 @@
@PropertyDef(label = "绛掍粨浣撶Н", description = "鍗曚綅锛氱珛鏂圭背")
private Double volume;
+ @Column(name = "DE_VOLUME_", precision = 16, scale = 2)
+ @PropertyDef(label = "鎵ｉ櫎浣撶Н", description = "鍗曚綅锛氱珛鏂圭背")
+ private Double deVolume;
+
@Column(name = "DOOR_NUM_")
@PropertyDef(label = "浠撻棬鏁�")
private Integer doorNum;
diff --git a/igds-core/src/main/java/com/ld/igds/view/Building.view.xml b/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
index 2a4c0c3..b42c9b7 100644
--- a/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
@@ -83,6 +83,10 @@
<Property name="property">height</Property>
<Property name="align">center</Property>
</DataColumn>
+ <DataColumn name="diameter">
+ <Property name="property">diameter</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
<DataColumn>
<Property name="property">ground</Property>
<Property name="name">ground</Property>
@@ -226,6 +230,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">deVolume</Property>
+ <Property name="property">deVolume</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">doorNum</Property>
<Property name="property">doorNum</Property>
<Editor/>
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java b/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java
index 11ae2f6..f3c0ec2 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java
@@ -3,13 +3,10 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
-
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.entity.EntityState;
import com.bstek.dorado.data.entity.EntityUtils;
@@ -25,6 +22,8 @@
*/
@Component
public class BuildingService extends HibernateDao {
+
+ String BEAN_ID = "core.buildingService";
@Autowired
private RedisUtil redisUtil;
@@ -62,7 +61,7 @@
}
data.setCompanyId(ContextUtil.getCompanyId());
session.saveOrUpdate(data);
- refreshCache(data.getCompanyId());
+ refreshCache(data.getCompanyId(), data.getDeptId());
} finally {
session.flush();
session.close();
@@ -102,7 +101,7 @@
}
}
- refreshCache(items.get(0).getCompanyId());
+ refreshCache(items.get(0).getCompanyId(), items.get(0).getDeptId());
} finally {
session.flush();
session.close();
@@ -121,23 +120,46 @@
List<Building> result = (List<Building>) redisUtil.get(key);
if (null == result) {
- refreshCache(companyId);
+ refreshCache(companyId, deptId);
return null;
}
if(null == deptId) return result;
- return result.stream().filter(item -> item.getDeptId().equals(deptId))
- .collect(Collectors.toList());
+ return result;
+ }
+
+ @SuppressWarnings("unchecked")
+ public Building getCacheBuilding(String companyId, String deptId, String buildingId) {
+ if(StringUtils.isEmpty(companyId)){
+ companyId = ContextUtil.getCompanyId();
+ }
+
+ String key = RedisConst.buildKey(companyId, RedisConst.KEY_BUILDING_LIST);
+
+ List<Building> result = (List<Building>) redisUtil.get(key);
+
+ if (null == result) {
+ refreshCache(companyId, deptId);
+
+ return null;
+ }
+ for (Building building : result) {
+ if(buildingId.equals(building.getId())){
+ return building;
+ }
+ }
+ return null;
}
- public void refreshCache(String companyId) {
+ public void refreshCache(String companyId, String deptId) {
Map<String, Object> parameter = new HashMap<String, Object>();
parameter.put("companyId", companyId);
+ parameter.put("deptId", deptId);
List<Building> list = this.loadData(parameter);
- redisUtil.set(RedisConst.buildKey(companyId, RedisConst.KEY_BUILDING_LIST),list);
+ redisUtil.set(RedisConst.buildKey(companyId, deptId, RedisConst.KEY_BUILDING_LIST),list);
}
}
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index 8cc3fe8..49293d4 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -97,13 +97,18 @@
<Property name="displayFormat">0.00 绫�</Property>
</PropertyDef>
<PropertyDef name="diameter">
- <Property name="label">绛掍粨鐩村緞</Property>
- <Property name="displayFormat">0.00 绫�</Property>
+ <Property name="label">绛掍粨/娌圭綈鐩村緞</Property>
+ <Property name="displayFormat">0.000 绫�</Property>
<Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="volume">
<Property name="label">绛掍粨浣撶Н</Property>
- <Property name="displayFormat">0.00 绔嬫柟绫�</Property>
+ <Property name="displayFormat">0.000 绔嬫柟绫�</Property>
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="deVolume">
+ <Property name="label">鎵ｉ櫎浣撶Н</Property>
+ <Property name="displayFormat">0.000 绔嬫柟绫�</Property>
<Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="doorNum">
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 5d4da2c..fb1ba89 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
@@ -29,14 +29,20 @@
@Override
public void run(String... strings) throws Exception {
+ if (configData.getActive().indexOf("fzzy") >= 0) {
+ bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
+ return;
+ }
+
if (configData.getActive().indexOf("pro") >= 0) {
- //寰愰椈銆丗ZZY浜戞湇鍔″櫒浣跨敤
+ //寰愰椈鏈嶅姟鍣ㄤ娇鐢�
bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
//姹熻タ璧ｅ窞銆佸箍涓滈珮宸炰娇鐢�
// bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
//骞夸笢楂樺窞浣跨敤
// bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
+ return;
}
if (configData.getActive().indexOf("dev") >= 0) {
bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java
index 7772715..4f54fce 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java
@@ -68,12 +68,19 @@
*/
public void analysis(String sessionKey, IoMessage message) throws Exception {
+ String companyId = ContextUtil.getDefaultCompanyId();
+ //FZZY浜戞湇鍔″櫒-璁告槍鍐涚伯
+ if("1000".equals(companyId)){
+ companyId = "5323";
+ }
+ message.setCompanyId(companyId);
//娉ㄥ唽
if (BhznGrainV1ServerUtils.FUNCTION_ID_F1.equals(message.getFunctionId())) {
//DO NOTHING
log.info("涓绘満------->>骞冲彴锛氭敞鍐屼俊鎭姤鏂�={}", message);
- DeviceSer ser = coreSerService.getCacheSerBySn("5323",message.getAddr());
+
+ DeviceSer ser = coreSerService.getCacheSerBySn(message.getCompanyId(), message.getAddr());
if(ser!= null ){
ser.setIp(message.getIp());
ser.setPort(message.getPort());
@@ -111,7 +118,7 @@
//鏍规嵁鍒嗘満鍦板潃鑾峰彇鍒嗘満淇℃伅
- DeviceSer ser = coreSerService.getCacheSer("5323", message.getAddr());
+ DeviceSer ser = coreSerService.getCacheSer(message.getCompanyId(), message.getAddr());
if (ser == null) {
replayGrain(message);
log.error("涓绘満-------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ紝鏈幏鍙栧埌绯荤粺绮儏涓绘満閰嶇疆锛�" + message.getAddr());
@@ -158,7 +165,7 @@
int cableY = 1;
int cableX = 1;
- if(DepotType.TYPE_01.equals(depot.getDepotType())){
+ if(DepotType.TYPE_01.getCode().equals(depot.getDepotType())){
cableZ = Integer.valueOf(attCable[0]);
cableY = Integer.valueOf(attCable[1]);
cableX = Integer.valueOf(attCable[2]);
@@ -239,7 +246,7 @@
int cableY = 1;
int cableX = 1;
- if(DepotType.TYPE_01.equals(depot.getDepotType())){
+ if(DepotType.TYPE_01.getCode().equals(depot.getDepotType())){
cableZ = Integer.valueOf(attCable[0]);
cableY = Integer.valueOf(attCable[1]);
cableX = Integer.valueOf(attCable[2]);
@@ -326,7 +333,7 @@
int cableY = 1;
int cableX = 1;
- if(DepotType.TYPE_01.equals(depot.getDepotType())){
+ if(DepotType.TYPE_01.getCode().equals(depot.getDepotType())){
cableZ = Integer.valueOf(attCable[0]);
cableY = Integer.valueOf(attCable[1]);
cableX = Integer.valueOf(attCable[2]);
@@ -476,7 +483,7 @@
private void analysisTh(IoMessage message) {
try {
THDto th = new THDto();
- th.setCompanyId("5323");
+ th.setCompanyId(message.getCompanyId());
String data = message.getContent();
String houseNo = data.substring(0, 2);
String t = data.substring(4, 8);
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/message/IoMessage.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/message/IoMessage.java
index d453ca3..4e6ffb8 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/message/IoMessage.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/message/IoMessage.java
@@ -9,6 +9,7 @@
private String ip;
private int port;
+ private String companyId;
private String pcAddr;
private String addr;
diff --git a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java
index 13ddaf6..2f5c2cb 100644
--- a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java
+++ b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java
@@ -22,6 +22,9 @@
@Override
public void run(String... strings) throws Exception {
+ if (configData.getActive().indexOf("fzzy") >= 0) {
+ FzzyServerEngine.start(FzzyServerEngine.default_port);
+ }
if (configData.getActive().indexOf("dev") >= 0) {
FzzyServerEngine.start(FzzyServerEngine.default_port);
}
diff --git a/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/ServerRunner.java b/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/ServerRunner.java
index 394f3f9..ef4564c 100644
--- a/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/ServerRunner.java
+++ b/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/ServerRunner.java
@@ -34,6 +34,11 @@
return;
}
+ //FZZY-浜戞湇鍔″櫒鐜
+ if (configData.getActive().indexOf("fzzy") >= 0) {
+ iotServerEngine.start(IotServerEngine.PORT);
+ }
+
if (configData.getActive().indexOf("pro") >= 0) {
iotServerEngine.start(IotServerEngine.PORT);
fzzyServerEngine.start(9307);
diff --git a/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/height/analysis/AnalysisHeightService.java b/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/height/analysis/AnalysisHeightService.java
index 51dd540..9700830 100644
--- a/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/height/analysis/AnalysisHeightService.java
+++ b/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/height/analysis/AnalysisHeightService.java
@@ -1,13 +1,18 @@
package com.ld.igds.protocol.iot.height.analysis;
+import com.ld.igds.common.CoreCommonService;
import com.ld.igds.constant.RedisConst;
import com.ld.igds.grain.dto.GrainData;
+import com.ld.igds.models.Building;
+import com.ld.igds.models.Depot;
import com.ld.igds.models.DeviceIot;
import com.ld.igds.models.DeviceSer;
import com.ld.igds.protocol.iot.height.analysis.message.DeviceAttr;
import com.ld.igds.protocol.iot.height.analysis.message.DeviceAttrInfo;
import com.ld.igds.util.RedisUtil;
+import com.ld.igds.view.service.BuildingService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -27,7 +32,10 @@
@Autowired
private RedisUtil redisUtil;
-
+ @Autowired
+ private CoreCommonService coreCommonService;
+ @Autowired
+ private BuildingService buildingService;
/**
* @param deviceAttr
@@ -36,12 +44,45 @@
public void analysis(DeviceAttr deviceAttr , DeviceSer ser ,DeviceIot deviceIot) {
try{
List<DeviceAttrInfo> deviceAttrInfos = deviceAttr.getTerminalAttrInfoList();
- String herght =(deviceAttrInfos.get(2).getValue());
+ String height =(deviceAttrInfos.get(2).getValue());
GrainData data = new GrainData();
- data.setOilHeight(herght);
+ data.setOilHeight(height);
data.setReceiveDate(new Date());
data.setDepotId(deviceIot.getDepotId());
data.setCompanyId(ser.getCompanyId());
+// //璁＄畻鍌ㄩ噺
+// Depot depot = coreCommonService.getCacheDepot(ser.getCompanyId(), deviceIot.getDepotId());
+//
+// if(null != depot){
+// Building building;
+// //瀹归噸
+// Double bulkWeight = depot.getBulkWeight();
+// if (null != depot.getBuildingId()) {
+// building = buildingService.getCacheBuilding(depot.getCompanyId(),depot.getDeptId(), depot.getBuildingId());
+// if (null != building) {
+// if (null != building.getHeight()) {
+// height = building.getHeight() + "";
+// }
+// if (null != building.getLength()) {
+// diameter = building.getLength();
+// }
+// if (null != building.getDeVolume()) {
+// deVolume = building.getDeVolume();
+// }
+// }
+// }
+//
+// grainData.setDepotData(depot);
+// grainData.setDepotHeight(height);
+// if (null != bulkWeight && StringUtils.isNotEmpty(grainData.getOilHeight())) {
+// Double oilHeight = Double.valueOf(grainData.getOilHeight());
+// //璁＄畻浣撶Н
+// volume = 3.14 * Math.pow(diameter / 2, 2) * oilHeight - deVolume;
+// storage = volume * bulkWeight;
+// }
+//
+// grainData.setStorage(storage);
+// }
redisUtil.set(RedisConst.buildKey(ser.getCompanyId(),RedisConst.KEY_DEPOT_HEIGHT,deviceIot.getDepotId()),data);
log.info("楂樺害瑙ｆ瀽瀹屾垚锛�" + data.toString());
}catch (Exception e){
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java
index c15bfff..d83863f 100644
--- a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java
@@ -23,7 +23,7 @@
@Override
public void run(String... strings) throws Exception {
//
- if ("fzzy".equals(configData.getActive())) {
+ if (configData.getActive().indexOf("fzzy") >= 0) {
ZldzServerEngine.start(9201);
return;
}
@@ -36,8 +36,6 @@
//椋庢鑷磋繙榛樿閮ㄧ讲鏈嶅姟褰撳墠搴旂敤浣跨敤9000绔彛
if (configData.getActive().indexOf("pro") >= 0) {
- //FZZY骞冲彴
-// ZldzServerEngine.start(9201);
//鍏朵粬骞冲彴
ZldzServerEngine.start(9000);
return;
diff --git a/igds-web/src/main/resources/application-fzzy.yml b/igds-web/src/main/resources/application-fzzy.yml
new file mode 100644
index 0000000..077e658
--- /dev/null
+++ b/igds-web/src/main/resources/application-fzzy.yml
@@ -0,0 +1,80 @@
+########################## 椋庢鑷磋繙-绮儏鏈嶅姟鍣� ##########################
+server:
+ port: 8201
+ 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_v35?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
+ remove-abandoned: true
+ remove-abandoned-timeout: 1800
+ log-abandoned: true
+ 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:/license/license.lic
+ publicKeysStorePath: C:/license/publicCerts.keystore
+
+########################## IGDS ##########################
+## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
+igds:
+ default:
+ companyId: 1000
+ sys-name: 鏅烘収绮簱绠＄悊绯荤粺
+ logo: logo-default.png
+ logo-title: logo-title-default.png
+ support: 鏅烘収绮儏绮儏浜戠鐞嗗钩鍙�
+ grian-add-point: N
+ media-ip: 124.71.162.207
+ media-port: 18000
+ file-path: C:/IGDS/FILE/
\ No newline at end of file
diff --git a/igds-web/src/main/resources/application-pro.yml b/igds-web/src/main/resources/application-pro.yml
index 220bdc0..1d4f61d 100644
--- a/igds-web/src/main/resources/application-pro.yml
+++ b/igds-web/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 骞夸笢浣涘北绂呭煄鍖� ##########################
+########################## 骞夸笢寰愰椈椤圭洰 ##########################
server:
port: 8888
context-path: /
@@ -64,17 +64,17 @@
subject: ld_license
publicAlias: publicCert
storePass: PUBLICFZZYXXJSGFYXGS888888
- licensePath: C:/IGDS/license/license.lic
- publicKeysStorePath: C:/IGDS/license/publicCerts.keystore
+ licensePath: D:/IGDS/license/license.lic
+ publicKeysStorePath: D:/IGDS/license/publicCerts.keystore
########################## IGDS ##########################
## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
igds:
default:
- companyId: 5329
+ companyId: 5322
sys-name: 鏅烘収绮簱绠＄悊绯荤粺
logo: logo-default.png
logo-title: logo-title-default.png
- support: 椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�
+ support: 鏅烘収绮簱缁煎悎绠＄悊骞冲彴
grian-add-point: N
- file-path: C:/IGDS/FILE/
\ No newline at end of file
+ file-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/igds-web/src/main/resources/logback-spring.xml b/igds-web/src/main/resources/logback-spring.xml
index 2b6af2e..0be5348 100644
--- a/igds-web/src/main/resources/logback-spring.xml
+++ b/igds-web/src/main/resources/logback-spring.xml
@@ -141,4 +141,38 @@
</root>
</springProfile>
+ <!-- FZZY-绮儏鐢熶骇鐜 -->
+ <springProfile name="fzzy">
+ <!-- 姣忓ぉ浜х敓涓�涓枃浠� -->
+ <appender name="PRO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!-- 鏂囦欢璺緞 -->
+ <file>${PRO_LOG_HOME}/${APP_MODEL}-info.log</file>
+ <!-- 鏃ュ織璁板綍鍣ㄧ殑婊氬姩绛栫暐锛屾寜鏃ユ湡锛屾寜澶у皬璁板綍 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 鏂囦欢鍚嶇О -->
+ <fileNamePattern>${PRO_LOG_HOME}/${APP_MODEL}-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <!--鏃ュ織鏂囦欢淇濈暀澶╂暟 -->
+ <maxHistory>60</maxHistory>
+ <!-- 鏃ュ織澶у皬 -->
+ <timeBasedFileNamingAndTriggeringPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>100MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ <charset>UTF-8</charset>
+ </encoder>
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <pattern>${PATTERN}</pattern>
+ </layout>
+ </appender>
+
+ <logger name="org.hibernate.tool" level="WARN"/>
+ <logger name="com.bstek.dorado" level="WARN"/>
+ <root level="info">
+ <appender-ref ref="PRO_FILE"/>
+ </root>
+ </springProfile>
+
</configuration>
\ No newline at end of file
--
Gitblit v1.9.3