From fae4bd828a6b81b95f53e285fcb4749fbd80c7bf Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 04 九月 2023 17:31:46 +0800
Subject: [PATCH] 增加粮情层行转换配置
---
igds-web/src/main/resources/static/img/aerial-5317_001.png | 0
igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java | 2
igds-web/src/main/resources/static/img/aerial-5317_001_1.png | 0
igds-web/src/main/resources/application-pro5303.yml | 81 +++++++++++
igds-core/src/main/java/com/ld/igds/view/DepotPR.java | 16 ++
igds-core/src/main/java/com/ld/igds/models/DepotConf.java | 10 +
igds-web/src/main/resources/application.yml | 2
igds-core/src/main/java/com/ld/igds/grain/GrainUtil.java | 53 +++++++
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java | 4
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java | 114 ++++------------
igds-core/src/main/java/com/ld/igds/constant/Constant.java | 7 +
igds-core/src/main/java/com/ld/igds/models/MQuality.java | 4
igds-web/pom.xml | 110 ++++++++-------
igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml | 9
igds-core/src/main/java/models/igds.model.xml | 8 +
15 files changed, 269 insertions(+), 151 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
index 3cc6230..535937f 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
@@ -84,7 +84,7 @@
//閲嶆柊鎺掑簭
Collator sortChina = Collator.getInstance(Locale.CHINA);
- Collections.sort(list, (a, b) -> sortChina.compare(a.getId(), b.getId()));
+ Collections.sort(list, (a, b) -> sortChina.compare(a.getName(), b.getName()));
return list;
}
diff --git a/igds-core/src/main/java/com/ld/igds/constant/Constant.java b/igds-core/src/main/java/com/ld/igds/constant/Constant.java
index f2cf62c..f82d4a6 100644
--- a/igds-core/src/main/java/com/ld/igds/constant/Constant.java
+++ b/igds-core/src/main/java/com/ld/igds/constant/Constant.java
@@ -196,6 +196,13 @@
public static final String GRAIN_START_POINT_TOP = "top"; //椤堕儴
public static final String GRAIN_START_POINT_BELOW = "below"; //搴曢儴
+ /**
+ * 琛屽眰杞崲(榛樿涓嶈浆鎹�)
+ */
+ public static final String GRAIN_CONVERT_DEFAULT = "default"; //榛樿
+ public static final String GRAIN_CONVERT_CLOCKWISE = "clockwise"; //椤烘椂閽�
+ public static final String GRAIN_CONVERT_ANTICLOCKWISE = "anticlockwise"; //閫嗘椂閽�
+
//绛掍粨閿ュ舰-鏃犻獙璇�
public static final String CABLE_CONE_0 = "0";
diff --git a/igds-core/src/main/java/com/ld/igds/grain/GrainUtil.java b/igds-core/src/main/java/com/ld/igds/grain/GrainUtil.java
index 762ce32..04e47b0 100644
--- a/igds-core/src/main/java/com/ld/igds/grain/GrainUtil.java
+++ b/igds-core/src/main/java/com/ld/igds/grain/GrainUtil.java
@@ -293,4 +293,57 @@
return list;
}
+ /**
+ * 灞傝杞崲--椤烘椂閽�
+ *
+ * @param temps
+ * @param cable
+ * @return
+ */
+ public List<Double> convertRight(List<Double> temps, String cable) {
+ String[] attCable = cable.split("-");
+ int cableZ = Integer.valueOf(attCable[0]);
+ int cableY = Integer.valueOf(attCable[1]);
+ int cableX = Integer.valueOf(attCable[2]);
+ List<Double> list = new ArrayList<>();
+
+ int index;
+ for (int x = 1; x <= cableX; x++) {
+ for(int z = cableZ; z >= 1; z--){
+ for (int y = 1; y <= cableY; y++) {
+ index = z*y*x -1;
+ list.add(temps.get(index));
+ }
+ }
+ }
+
+ return list;
+ }
+
+ /**
+ * 灞傝杞崲--閫嗘椂閽�
+ *
+ * @param temps
+ * @param cable
+ * @return
+ */
+ public List<Double> convertLeft(List<Double> temps, String cable) {
+ String[] attCable = cable.split("-");
+ int cableZ = Integer.valueOf(attCable[0]);
+ int cableY = Integer.valueOf(attCable[1]);
+ int cableX = Integer.valueOf(attCable[2]);
+ List<Double> list = new ArrayList<>();
+
+ int index;
+ for (int x = 1; x <= cableX; x++) {
+ for (int z = 1; z <= cableZ; z++) {
+ for (int y = cableY; y >= cableY; y--) {
+ index = z*y*x -1;
+ list.add(temps.get(index));
+ }
+ }
+ }
+
+ return list;
+ }
}
\ No newline at end of file
diff --git a/igds-core/src/main/java/com/ld/igds/models/DepotConf.java b/igds-core/src/main/java/com/ld/igds/models/DepotConf.java
index aee0f85..18e7618 100644
--- a/igds-core/src/main/java/com/ld/igds/models/DepotConf.java
+++ b/igds-core/src/main/java/com/ld/igds/models/DepotConf.java
@@ -84,17 +84,21 @@
private int cableEnd;
@Column(name = "START_ORIENTATION_", length = 20)
- @PropertyDef(label = "鐢电紗寮�濮嬫柟浣�", description = "榛樿鍙宠竟(鍙宠竟銆佸彸涓娿�佸乏杈广�佸乏涓�)")
+ @PropertyDef(label = "鐢电紗璧峰鏂逛綅", description = "榛樿鍙宠竟(鍙宠竟銆佸彸涓娿�佸乏杈广�佸乏涓�)")
private String startOrientation = Constant.GRAIN_START_ORIENTATION_RIGHT;
@Column(name = "START_DIRECTION_", length = 20)
- @PropertyDef(label = "鐢电紗寮�濮嬫柟鍚�", description = "榛樿绾靛悜(绾靛悜銆佹í鍚�)")
+ @PropertyDef(label = "鐢电紗璧峰鏂瑰悜", description = "榛樿绾靛悜(绾靛悜銆佹í鍚�)")
private String startDirection = Constant.GRAIN_START_DIRECTION_PORTRAIT;
@Column(name = "START_POINT_", length = 20)
- @PropertyDef(label = "鐢电紗寮�濮嬬偣浣�", description = "榛樿椤堕儴(椤堕儴銆佸簳閮�)")
+ @PropertyDef(label = "鐢电紗璧峰鐐逛綅", description = "榛樿椤堕儴(椤堕儴銆佸簳閮�)")
private String startPoint = Constant.GRAIN_START_POINT_TOP;
+ @Column(name = "START_CONVERT_", length = 20)
+ @PropertyDef(label = "灞傝杞崲", description = "榛樿涓嶈浆鎹�(榛樿銆侀『鏃堕拡銆侀�嗘椂閽�)")
+ private String startConvert = Constant.GRAIN_CONVERT_DEFAULT;
+
@Column(name = "TEMP_MAX_")
@PropertyDef(label = "娓╁害涓婇檺")
private Double tempMax;
diff --git a/igds-core/src/main/java/com/ld/igds/models/MQuality.java b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
index a8000d3..6ee6f21 100644
--- a/igds-core/src/main/java/com/ld/igds/models/MQuality.java
+++ b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
@@ -120,11 +120,11 @@
@PropertyDef(label = "鏍峰搧鏁伴噺", required = true)
@Column(name = "ypsl", precision = 20, scale = 6)
- private double ypsl;
+ private Double ypsl;
@PropertyDef(label = "浠ｈ〃鏁伴噺")
@Column(name = "dbsl", precision = 20, scale = 6)
- private double dbsl;
+ private Double dbsl;
@PropertyDef(label = "鏍峰搧绛夌骇")
@Column(name = "ypdj", length = 2)
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml b/igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml
index 4aba95d..fae18e5 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml
@@ -212,24 +212,27 @@
<Property name="property">startOrientation</Property>
<Property name="name">startOrientation</Property>
<Property name="editable">false</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="property">startDirection</Property>
<Property name="name">startDirection</Property>
<Property name="editable">false</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="property">startPoint</Property>
<Property name="name">startPoint</Property>
<Property name="editable">false</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="property">startConvert</Property>
+ <Property name="name">startConvert</Property>
+ <Property name="editable">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="property">cableCone</Property>
<Property name="name">cableCone</Property>
<Property name="editable">false</Property>
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotPR.java b/igds-core/src/main/java/com/ld/igds/view/DepotPR.java
index 05a67d6..177ac2f 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotPR.java
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotPR.java
@@ -187,6 +187,22 @@
}
/**
+ * 灞傝杞崲
+ * ${dorado.getDataProvider("depotPR#triggerStartConvert").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerStartConvert() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger(Constant.GRAIN_CONVERT_DEFAULT, "榛樿"));
+ list.add(new DicTrigger(Constant.GRAIN_CONVERT_CLOCKWISE, "椤烘椂閽�"));
+ list.add(new DicTrigger(Constant.GRAIN_CONVERT_ANTICLOCKWISE, "閫嗘椂閽�"));
+
+ return list;
+ }
+
+ /**
* 绛掍粨閿ュ舰
* ${dorado.getDataProvider("depotPR#triggerCableCone").getResult()}
*
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index 861700c..8cc3fe8 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -922,6 +922,14 @@
<Property name="mapValues">${dorado.getDataProvider("depotPR#triggerStartPoint").getResult()}</Property>
</Property>
</PropertyDef>
+ <PropertyDef name="startConvert">
+ <Property name="label">灞傝杞崲</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#triggerStartConvert").getResult()}</Property>
+ </Property>
+ </PropertyDef>
<PropertyDef name="depotName">
<Property></Property>
</PropertyDef>
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 5b1223b..c15bfff 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
@@ -37,9 +37,9 @@
//椋庢鑷磋繙榛樿閮ㄧ讲鏈嶅姟褰撳墠搴旂敤浣跨敤9000绔彛
if (configData.getActive().indexOf("pro") >= 0) {
//FZZY骞冲彴
- ZldzServerEngine.start(9201);
+// ZldzServerEngine.start(9201);
//鍏朵粬骞冲彴
-// ZldzServerEngine.start(ZldzServerEngine.PORT);
+ ZldzServerEngine.start(9000);
return;
}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java
index 5d1339d..983803d 100644
--- a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java
@@ -508,6 +508,17 @@
temps = grainUtil.reversalUpAndDown(temps, depotConf.getCableRule());
}
+ //鑻ラ厤缃眰琛岃浆鎹紝鍒欏皢绮儏鏁版嵁杩涜灞傝杞崲
+ if (StringUtils.isNotEmpty(depotConf.getStartConvert())) {
+ temps = convertGrainPoint(temps, depotConf);
+ String[] cableRule = depotConf.getCableRule().split("-");
+ //杞崲灞傝鍒楅厤缃�
+ if(Constant.GRAIN_CONVERT_CLOCKWISE.equals(depotConf.getStartConvert())
+ || Constant.GRAIN_CONVERT_ANTICLOCKWISE.equals(depotConf.getStartConvert())){
+ depotConf.setCableRule(Integer.valueOf(cableRule[1]) + "-" + Integer.valueOf(cableRule[0]) + "-" + Integer.valueOf(cableRule[2]));
+ }
+ }
+
String[] attCable = depotConf.getCableRule().split("-");
int cableZ = Integer.valueOf(attCable[0]);
int cableY = Integer.valueOf(attCable[1]);
@@ -671,6 +682,24 @@
sysConf, notifyWeb, exeRequest);
}
+ private List<Double> convertGrainPoint(List<Double> temps, DepotConf conf) {
+ if (Constant.GRAIN_CONVERT_DEFAULT.equals(conf.getStartConvert())) {
+ //鑻ュ眰琛岃浆鎹负榛樿锛屽垯鐩存帴杩斿洖
+ return temps;
+ }
+
+ //椤烘椂閽堣浆鎹�
+ if(Constant.GRAIN_CONVERT_CLOCKWISE.equals(conf.getStartConvert())){
+ return grainUtil.convertRight(temps, conf.getCableRule());
+ }
+ //閫嗘椂閽堣浆鎹�
+ if(Constant.GRAIN_CONVERT_ANTICLOCKWISE.equals(conf.getStartConvert())){
+ return grainUtil.convertLeft(temps, conf.getCableRule());
+ }
+
+ return temps;
+ }
+
private List<Double> reversalGrainPoint(List<Double> temps, DepotConf conf) {
if (StringUtils.isEmpty(conf.getStartOrientation())) {
//鑻ヨ捣濮嬫柟浣嶄负绌猴紝鍒欓粯璁よ捣濮嬫柟浣嶅拰鏂瑰悜锛岀洿鎺ヨ繑鍥�
@@ -730,90 +759,5 @@
}
return temps;
- }
-
- /**
- * 鍙嶈浆鍒� 鐜板疄涓粠宸﹁竟寮�濮嬶紝寮鸿灏嗗彸杈硅В鏋愪负绗竴鍒�
- *
- * @return
- */
- private List<Double> reversalCable(List<Double> temps, String cable) {
- String[] attCable = cable.split("-");
- int cableZ = Integer.valueOf(attCable[0]);
- int cableY = Integer.valueOf(attCable[1]);
- int cableX = Integer.valueOf(attCable[2]);
- List<Double> t = new ArrayList<>();
- for (int i = 1; i <= temps.size(); i++) {
- t.add(temps.get((cableX - 1) * cableY * cableZ + ((i - 1) % (cableY * cableZ))));
- if (i % (cableY * cableZ) == 0) {
- cableX = cableX - 1;
- }
- }
- return t;
- }
-
- /**
- * 鐢电紗浠庝笅闈㈠紑濮嬫椂锛屽皢绮儏鐢电紗涓婁笅缈昏浆
- *
- * @param pointsData 绮儏鏁版嵁
- * @param cable 灞傝鍒楅厤缃紝濡傦細4-7-11
- * @return
- */
- private String reversalUpAndDown(String pointsData, String cable) {
- String str = "";
- if (StringUtils.isEmpty(cable)) {
- str = pointsData;
- }
- String[] attCable = cable.split("-");
- int cableZ = Integer.valueOf(attCable[0]); //灞�
-
- String[] points = pointsData.split(",");
- for (int i = 0; i <= points.length - cableZ; i += cableZ) {
- for (int j = cableZ - 1; j >= 0; j--) {
- str += points[i + j];
- str += ",";
- }
- }
- return str;
- }
-
- /**
- * 鍙嶈浆鍒楀彿楠岃瘉
- * 2022骞�5鏈�30鏃� 12:11:18
- * vince
- *
- * @param args
- */
- public static void main(String[] args) {
- List<Double> temps = new ArrayList<>();
- int cableZ = 3;
- int cableY = 4;
- int cableX = 6;
- for (int i = 1; i < (cableX * cableY * cableZ + 1); i++) {
- temps.add(i + 0.0);
- }
-
- List<Double> t = new ArrayList<>();
- for (int i = 1; i <= temps.size(); i++) {
- t.add(temps.get((cableX - 1) * cableY * cableZ + ((i - 1) % (cableY * cableZ))));
- if (i % (cableY * cableZ) == 0) {
- cableX = cableX - 1;
- }
- }
- for (Double x : t) {
- System.out.print(x);
- System.out.print(",");
- }
-
-
- System.out.println("--------------------------");
- int i = 15;
- int layMax = 10;
-
- System.out.println(i % layMax);
-
-
- System.out.println(i / layMax);
-
}
}
\ No newline at end of file
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 6515ad6..ff463ac 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -202,10 +202,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
- -->
+ </dependency>-->
- <!-- 绉佹湁鍗忚-璐濆崥绮儏-->
+ <!-- 绉佹湁鍗忚-璐濆崥绮儏
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-beibo</artifactId>
@@ -220,9 +219,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
- <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘-->
+ <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-bhzn</artifactId>
@@ -237,7 +236,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
+
+ <!-- 绉佹湁鍗忚-姝ｆ潵鐢靛瓙 -->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-zldz</artifactId>
@@ -253,6 +254,7 @@
</exclusion>
</exclusions>
</dependency>
+
<!-- 娴峰悍杞︾墝璇嗗埆-SDK -->
<dependency>
<groupId>com.ld.igds</groupId>
@@ -320,54 +322,54 @@
</plugin>
<!-- YUI Compressor Maven鍘嬬缉鎻掍欢 寮�鍙戝寘涓嶅疄鐢�-->
-<!-- <plugin>-->
-<!-- <groupId>net.alchim31.maven</groupId>-->
-<!-- <artifactId>yuicompressor-maven-plugin</artifactId>-->
-<!-- <version>1.5.1</version>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <goals>-->
-<!-- <goal>compress</goal>-->
-<!-- </goals>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- <configuration>-->
-<!-- <encoding>UTF-8</encoding>-->
-<!-- <!–涓嶆樉绀簀s鍙兘鐨勯敊璇� –>-->
-<!-- <jswarn>false</jswarn>-->
-<!-- <!–鏄惁娣锋穯 –>-->
-<!-- <nomunge>true</nomunge>-->
-<!-- <!–鑻ュ瓨鍦ㄥ凡鍘嬬缉鐨勬枃浠讹紝浼氬厛瀵规瘮婧愭枃浠舵槸鍚︽湁鏀瑰姩 鏈夋敼鍔ㄤ究鍘嬬缉锛屾棤鏀瑰姩灏变笉鍘嬬缉 –>-->
-<!-- <force>false</force>-->
-<!-- <!–鍦ㄦ寚瀹氱殑鍒楀彿鍚庢彃鍏ユ柊琛� –>-->
-<!-- <linebreakpos>-1</linebreakpos>-->
-<!-- <!–鍘嬬缉涔嬪墠鍏堟墽琛岃仛鍚堟枃浠舵搷浣� –>-->
-<!-- <preProcessAggregates>true</preProcessAggregates>-->
-<!-- <!–鍘嬬缉鍚庝繚瀛樻枃浠跺悗缂� 鏃犲悗缂� –>-->
-<!-- <nosuffix>true</nosuffix>-->
-<!-- <!–婧愮洰褰曪紝鍗抽渶鍘嬬缉鐨勬牴鐩綍 –>-->
-<!-- <sourceDirectory>src/main/resources</sourceDirectory>-->
-<!-- <!–杈撳嚭鐩綍锛屽嵆鍘嬬缉鍚庣殑鐩綍 –>-->
-<!-- <outputDirectory>target/classes</outputDirectory>-->
-<!-- <force>true</force>-->
-<!-- <!–鍘嬬缉js鍜宑ss鏂囦欢 –>-->
-<!-- <includes>-->
-<!-- <include>**/*.js</include>-->
-<!-- <include>**/*.css</include>-->
-<!-- </includes>-->
-<!-- <!– 浠ヤ笅鐩綍鍜屾枃浠朵笉浼氳鍘嬬缉 –>-->
-<!-- <excludes>-->
-<!-- <exclude>**/*.min.js</exclude>-->
-<!-- <exclude>**/*.min.css</exclude>-->
-<!-- <exclude>**/d7/**</exclude>-->
-<!-- <exclude>**/dorado-home/**</exclude>-->
-<!-- <exclude>**/bdf2/**</exclude>-->
-<!-- <exclude>**/css/**</exclude>-->
-<!-- <exclude>**/js/**</exclude>-->
-<!-- <exclude>**/plugins/**</exclude>-->
-<!-- </excludes>-->
-<!-- </configuration>-->
-<!-- </plugin>-->
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <version>1.5.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <!--涓嶆樉绀簀s鍙兘鐨勯敊璇� -->
+ <jswarn>false</jswarn>
+ <!--鏄惁娣锋穯 -->
+ <nomunge>true</nomunge>
+ <!--鑻ュ瓨鍦ㄥ凡鍘嬬缉鐨勬枃浠讹紝浼氬厛瀵规瘮婧愭枃浠舵槸鍚︽湁鏀瑰姩 鏈夋敼鍔ㄤ究鍘嬬缉锛屾棤鏀瑰姩灏变笉鍘嬬缉 -->
+ <force>false</force>
+ <!--鍦ㄦ寚瀹氱殑鍒楀彿鍚庢彃鍏ユ柊琛� -->
+ <linebreakpos>-1</linebreakpos>
+ <!--鍘嬬缉涔嬪墠鍏堟墽琛岃仛鍚堟枃浠舵搷浣� -->
+ <preProcessAggregates>true</preProcessAggregates>
+ <!--鍘嬬缉鍚庝繚瀛樻枃浠跺悗缂� 鏃犲悗缂� -->
+ <nosuffix>true</nosuffix>
+ <!--婧愮洰褰曪紝鍗抽渶鍘嬬缉鐨勬牴鐩綍 -->
+ <sourceDirectory>src/main/resources</sourceDirectory>
+ <!--杈撳嚭鐩綍锛屽嵆鍘嬬缉鍚庣殑鐩綍 -->
+ <outputDirectory>target/classes</outputDirectory>
+ <force>true</force>
+ <!--鍘嬬缉js鍜宑ss鏂囦欢 -->
+ <includes>
+ <include>**/*.js</include>
+ <include>**/*.css</include>
+ </includes>
+ <!-- 浠ヤ笅鐩綍鍜屾枃浠朵笉浼氳鍘嬬缉 -->
+ <excludes>
+ <exclude>**/*.min.js</exclude>
+ <exclude>**/*.min.css</exclude>
+ <exclude>**/d7/**</exclude>
+ <exclude>**/dorado-home/**</exclude>
+ <exclude>**/bdf2/**</exclude>
+ <exclude>**/css/**</exclude>
+ <exclude>**/js/**</exclude>
+ <exclude>**/plugins/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
diff --git a/igds-web/src/main/resources/application-pro5303.yml b/igds-web/src/main/resources/application-pro5303.yml
new file mode 100644
index 0000000..9418919
--- /dev/null
+++ b/igds-web/src/main/resources/application-pro5303.yml
@@ -0,0 +1,81 @@
+########################## 涓婃捣鍢夊畾 ##########################
+server:
+ port: 8088
+ 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
+# url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
+ username: igds
+ 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: 5303
+ sys-name: 鏅烘収绮簱绠＄悊绯荤粺
+ logo: logo-default.png
+ logo-title: logo-title-default.png
+ support: 鏅烘収绮儏绮儏浜戠鐞嗗钩鍙�
+ grian-add-point: N
+ file-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/igds-web/src/main/resources/application.yml b/igds-web/src/main/resources/application.yml
index 3cfe1d9..776890c 100644
--- a/igds-web/src/main/resources/application.yml
+++ b/igds-web/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ########################## 涓规１鍩庡叧鐪佺伯椋熷偍澶囧簱
spring:
profiles:
- active: dev
+ active: pro
application:
name: igds
main:
diff --git a/igds-web/src/main/resources/static/img/aerial-5317_001.png b/igds-web/src/main/resources/static/img/aerial-5317_001.png
index 05d7536..2ae77e3 100644
--- a/igds-web/src/main/resources/static/img/aerial-5317_001.png
+++ b/igds-web/src/main/resources/static/img/aerial-5317_001.png
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5317_001_1.png b/igds-web/src/main/resources/static/img/aerial-5317_001_1.png
new file mode 100644
index 0000000..05d7536
--- /dev/null
+++ b/igds-web/src/main/resources/static/img/aerial-5317_001_1.png
Binary files differ
--
Gitblit v1.9.3