From e1ac26d7d749012a04afa8f98acf8607cbf0fbfe Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 九月 2025 14:19:58 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 8
server/system_service/pom.xml | 6
server/system_service/src/main/java/com/doumee/core/utils/TspSolver.java | 158 +++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 5
admin/src/components/business/OperaPlatformWindow.vue | 10
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 6
server/system_service/src/main/java/com/doumee/core/utils/GraphByMatrix.java | 258 +++++++++++++++++++++++++
admin/src/views/platform/set/index.vue | 8
server/system_service/src/main/java/com/doumee/core/utils/DijkstraUtil.java | 108 ++++++++++
server/doc/月台自动加号数据库变动脚本.md | 6
admin/src/views/platform/platform.vue | 4
11 files changed, 556 insertions(+), 21 deletions(-)
diff --git a/admin/src/components/business/OperaPlatformWindow.vue b/admin/src/components/business/OperaPlatformWindow.vue
index d8d4ff0..617e97b 100644
--- a/admin/src/components/business/OperaPlatformWindow.vue
+++ b/admin/src/components/business/OperaPlatformWindow.vue
@@ -35,11 +35,11 @@
<el-form-item label="LED绌洪棽鏂囨锛�" prop="ledContent">
<el-input type="text" v-model="form.ledContent" placeholder="璇疯緭鍏ED绌洪棽鏂囨" v-trim />
</el-form-item>
- <el-form-item label="鍚屾椂浣滀笟鏁伴噺锛�" prop="workingNum">
- <el-input type="number" v-model="form.workingNum" placeholder="璇疯緭鍏ュ悓鏃朵綔涓氭暟閲�" v-trim />
+ <el-form-item label="鍚屾椂鍙彿鏁伴噺锛�" prop="workingNum">
+ <el-input type="number" v-model="form.workingNum" placeholder="璇疯緭鍏ュ悓鏃跺彨鍙锋暟閲�" v-trim />
</el-form-item>
- <el-form-item label="鍚屾椂鍑嗗浣滀笟鏁伴噺锛�" prop="callReadyNum">
- <el-input type="number" v-model="form.callReadyNum" placeholder="璇疯緭鍏ュ悓鏃跺噯澶囦綔涓氭暟閲�" v-trim />
+ <el-form-item label="鍚屾椂鍑嗗鏁伴噺锛�" prop="callReadyNum">
+ <el-input type="number" v-model="form.callReadyNum" placeholder="璇疯緭鍏ュ悓鏃跺噯澶囨暟閲�" v-trim />
</el-form-item>
<el-form-item label="鏈堝彴浣滀笟鏁堢巼(涓囨敮/灏忔椂)锛�" prop="workRate">
<el-input type="number" v-model="form.workRate" placeholder="璇疯緭鍏ユ湀鍙颁綔涓氭晥鐜�(涓囨敮/灏忔椂)" v-trim />
@@ -93,7 +93,7 @@
},
// 楠岃瘉瑙勫垯
rules: {
- workingNum: [{ required: true, validator: numRuleGtZero, message: '璇疯緭鍏ュ悓鏃朵綔涓氭暟閲�,蹇呴』澶т簬0! ', trigger: 'blur' }],
+ workingNum: [{ required: true, validator: numRuleGtZero, message: '璇疯緭鍏ュ悓鏃跺彨鍙锋暟閲�,蹇呴』澶т簬0! ', trigger: 'blur' }],
type: [{ required: true, message: '鏈堝彴绫诲瀷涓嶈兘涓虹┖锛�', trigger: 'blur' }],
sortnum: [{ required: true, message: '鎺掑簭鐮佷笉鑳戒负绌猴紒', trigger: 'blur' }]
}
diff --git a/admin/src/views/platform/platform.vue b/admin/src/views/platform/platform.vue
index f68914c..3446e39 100644
--- a/admin/src/views/platform/platform.vue
+++ b/admin/src/views/platform/platform.vue
@@ -49,8 +49,8 @@
</el-table-column>
<el-table-column prop="groupName" label="鎵�灞炴湀鍙扮粍" fixed min-width="150px"></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="90px"></el-table-column>
- <el-table-column prop="workingNum" label="鍚屾椂浣滀笟鏁伴噺" min-width="120px"></el-table-column>
- <el-table-column prop="callReadyNum" label="鍚屾椂鍑嗗浣滀笟鏁伴噺" min-width="120px"></el-table-column>
+ <el-table-column prop="workingNum" label="鍚屾椂鍙彿鏁伴噺" min-width="120px"></el-table-column>
+ <el-table-column prop="callReadyNum" label="鍚屾椂鍑嗗鏁伴噺" min-width="120px"></el-table-column>
<el-table-column prop="stayTimeoutAlarmTime" label="鍋滅暀瓒呮椂鎶ヨ鏃堕棿(鍒嗛挓锛�" min-width="180px">
<template scope="{row}">{{ row.stayTimeoutAlarmTime ? (row.stayTimeoutAlarmTime) : '-' }}</template>
</el-table-column>
diff --git a/admin/src/views/platform/set/index.vue b/admin/src/views/platform/set/index.vue
index 6d59b5c..a839c01 100644
--- a/admin/src/views/platform/set/index.vue
+++ b/admin/src/views/platform/set/index.vue
@@ -25,13 +25,13 @@
</el-table-column>
<el-table-column
prop="workingNum"
- label="鍚屾椂浣滀笟鏁伴噺"
+ label="鍚屾椂鍙彿鏁伴噺"
min-width="100"
show-overflow-tooltip
/>
<el-table-column
prop="callReadyNum"
- label="鍚屾椂鍑嗗杞﹁締鏁�"
+ label="鍚屾椂鍑嗗鏁伴噺"
min-width="100"
show-overflow-tooltip
/>
@@ -122,11 +122,11 @@
format="HH:mm"
/>
</el-form-item>
- <el-form-item label="鍚屾椂浣滀笟鏁伴噺">
+ <el-form-item label="鍚屾椂鍙彿鏁伴噺">
<el-input v-model="param.workingNum" class="w300"></el-input>
<span class="ml10">涓�</span>
</el-form-item>
- <el-form-item label="鍚屾椂鍑嗗浣滀笟鏁伴噺">
+ <el-form-item label="鍚屾椂鍑嗗鏁伴噺">
<el-input v-model="param.callReadyNum" class="w300"></el-input>
<span class="ml10">涓�</span>
</el-form-item>
diff --git "a/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md" "b/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md"
index d27091e..77584e9 100644
--- "a/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md"
+++ "b/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md"
@@ -13,9 +13,9 @@
ALTER TABLE `antaiwuliu`.`platform_job`
-ADD COLUMN `TAG_VIRTUAL` int NULL COMMENT '鏄惁鏍囪铏氭嫙鏈堝彴缁� 0鍚� 1鏄�' AFTER `ORIGIN`,
-ADD COLUMN `TAG_VIRTUAL_TIME` datetime NULL COMMENT '鏍囪铏氭嫙鏈堝彴缁勬椂闂�' AFTER `TAG_VIRTUAL`,
-ADD COLUMN `TAG_VIRTUAL_USER` int NULL COMMENT '鏍囪铏氭嫙鏈堝彴缁勪汉鍛樼紪鐮�' AFTER `TAG_VIRTUAL_TIME`,
+ADD COLUMN `TAG_VIRTUAL` int NULL COMMENT '鏄惁鏇存崲鏈堝彴缁� 0鍚� 1鏄�' AFTER `ORIGIN`,
+ADD COLUMN `TAG_VIRTUAL_TIME` datetime NULL COMMENT '鏇存崲鏈堝彴缁勬椂闂�' AFTER `TAG_VIRTUAL`,
+ADD COLUMN `TAG_VIRTUAL_USER` int NULL COMMENT '鏇存崲鏈堝彴缁勪汉鍛樼紪鐮�' AFTER `TAG_VIRTUAL_TIME`,
ADD COLUMN `CALL_WAY` int NULL COMMENT '鍙彿鏂瑰紡 0鎵嬪姩鍙彿 1鑷姩鍙彿' AFTER `TAG_VIRTUAL_USER`,
ADD COLUMN `URGE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '鍔犳�ユ椂闂�' AFTER `CALL_WAY`,
ADD COLUMN `URGE_USER` int NULL DEFAULT NULL COMMENT '鍔犳�ヤ汉鍛樼紪鐮�' AFTER `URGE_TIME`;
diff --git a/server/system_service/pom.xml b/server/system_service/pom.xml
index 22a532c..9ac1dbf 100644
--- a/server/system_service/pom.xml
+++ b/server/system_service/pom.xml
@@ -335,5 +335,11 @@
<type>pom</type>
<scope>import</scope>
</dependency>-->
+ <dependency>
+ <groupId>com.google.ortools</groupId>
+ <artifactId>ortools-java</artifactId>
+ <version>9.14.6206</version>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DijkstraUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DijkstraUtil.java
new file mode 100644
index 0000000..6cd9413
--- /dev/null
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DijkstraUtil.java
@@ -0,0 +1,108 @@
+package com.doumee.core.utils;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Queue;
+
+public class DijkstraUtil {
+ private Queue visited;
+ int[] distance;
+
+ public DijkstraUtil(int len) {
+ // TODO Auto-generated constructor stub
+ visited = new LinkedList();
+ distance = new int[len];
+
+ }
+
+ private int getIndex(Queue q, int[] dis) {
+ int k = -1;
+ int min_num = Integer.MAX_VALUE;
+ for (int i = 0; i < dis.length; i++) {
+ if (!q.contains(i)) {
+ if (dis[i] < min_num) {
+ min_num = dis[i];
+ k = i;
+ }
+ }
+ }
+ return k;
+ }
+
+ public void dijkstra(int[][] weight, Object[] str, int v) {
+ HashMap path;
+ path = new HashMap();
+ for (int i = 0; i < str.length; i++)
+ path.put(i, "");
+
+ //鍒濆鍖栬矾寰勯暱搴︽暟缁刣istance
+ for (int i = 0; i < str.length; i++) {
+ path.put(i, path.get(i) + "" + str[v]);
+ if (i == v)
+ distance[i] = 0;
+ else if (weight[v][i] != -1) {
+ distance[i] = weight[v][i];
+ path.put(i, path.get(i) + "-->" + str[i]);
+ } else
+ distance[i] = Integer.MAX_VALUE;
+ }
+ visited.add(v);
+ while (visited.size() < str.length) {
+ int k = getIndex(visited, distance);//鑾峰彇鏈闂偣涓窛绂绘簮鐐规渶杩戠殑鐐�
+ visited.add(k);
+ if (k != -1) {
+
+ for (int j = 0; j < str.length; j++) {
+ //鍒ゆ柇k鐐硅兘澶熺洿鎺ュ埌杈剧殑鐐�
+ if (weight[k][j] != -1) {
+ //閫氳繃閬嶅巻鍚勭偣锛屾瘮杈冩槸鍚︽湁姣斿綋鍓嶆洿鐭殑璺緞锛屾湁鐨勮瘽锛屽垯鏇存柊distance锛屽苟鏇存柊path銆�
+ if (distance[j] > distance[k] + weight[k][j]) {
+ distance[j] = distance[k] + weight[k][j];
+ path.put(j, path.get(k) + "-->" + str[j]);
+ }
+ }
+
+ }
+ }
+ }
+ for (int h = 0; h < str.length; h++) {
+ System.out.printf(str[v] + "-->" + str[h] + ":" + distance[h] + " ");
+ if (distance[h] == Integer.MAX_VALUE)
+ System.out.print(str[v] + "-->" + str[h] + "涔嬮棿娌℃湁鍙�氳璺緞");
+ else
+ System.out.print(str[v] + "-" + str[h] + "涔嬮棿鏈夋渶鐭矾寰勶紝鍏蜂綋璺緞涓猴細" + path.get(h).toString());
+ System.out.println();
+ }
+ visited.clear();
+
+ }
+
+ public static void main(String[] args) {
+ // TODO Auto-generated method stub
+ /* int[][] weight = {
+ {0, 10, 12, -1, -1, -1},
+ {-1, 0, -1, 16, 25, -1},
+ {4, 3, 0, 12, -1, 8},
+ {-1, -1, -1, 0, 7, -1},
+ {-1, -1, -1, -1, 0, -1},
+ {-1, -1, -1, 2, -1, 0}};
+ String[] str = {"V1", "V2", "V3", "V4", "V5", "V6"};
+ int len = str.length;
+ DijkstraUtil dijkstra = new DijkstraUtil(len);
+ //渚濇璁╁悇鐐瑰綋婧愮偣锛屽苟璋冪敤dijkstra鍑芥暟
+ for (int i = 0; i < str.length; i++) {
+ dijkstra.dijkstra(weight, str, i);
+ }*/
+
+ int[][] weight = {
+ {0, 10, 5, 7, -1},
+ {-1, 0, 4, 5, 10},
+ {-1, 4, 0, 6, 5},
+ {-1, 5, 6, 0, 7},
+ {-1, -1, -1, -1, 0}};
+ String[] str = {"A", "B", "C", "D", "E"};
+ DijkstraUtil dijkstra = new DijkstraUtil(str.length);
+ dijkstra.dijkstra(weight, str, 0);
+ }
+
+}
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/GraphByMatrix.java b/server/system_service/src/main/java/com/doumee/core/utils/GraphByMatrix.java
new file mode 100644
index 0000000..77f5a8b
--- /dev/null
+++ b/server/system_service/src/main/java/com/doumee/core/utils/GraphByMatrix.java
@@ -0,0 +1,258 @@
+package com.doumee.core.utils;
+
+import java.util.*;
+
+/**
+ * 鏈�鐭矾寰勨�擠ijkstra绠楁硶鍜孎loyd绠楁硶
+ * Dijkstra(杩澃鏂壒鎷�)绠楁硶鏄吀鍨嬬殑鍗曟簮鏈�鐭矾寰勭畻娉曪紝鐢ㄤ簬璁＄畻涓�涓妭鐐瑰埌鍏朵粬鎵�鏈夎妭鐐圭殑鏈�鐭矾寰勩�備富瑕佺壒鐐规槸浠ヨ捣濮嬬偣涓轰腑蹇冨悜澶栧眰灞傛墿灞曪紝鐩村埌鎵╁睍鍒扮粓鐐逛负姝€�侱ijkstra绠楁硶鏄緢鏈変唬琛ㄦ�х殑鏈�鐭矾寰勭畻娉曪紝鍦ㄥ緢澶氫笓涓氳绋嬩腑閮戒綔涓哄熀鏈唴瀹规湁璇︾粏鐨勪粙缁嶏紝濡傛暟鎹粨鏋勶紝鍥捐锛岃繍绛瑰绛夌瓑銆傛敞鎰忚绠楁硶瑕佹眰鍥句腑涓嶅瓨鍦ㄨ礋鏉冭竟銆�
+ *
+ * 闂鎻忚堪锛氬湪鏃犲悜鍥� G=(V,E) 涓紝鍋囪姣忔潯杈� E[i] 鐨勯暱搴︿负 w[i]锛屾壘鍒扮敱椤剁偣 V0 鍒板叾浣欏悇鐐圭殑鏈�鐭矾寰勩�傦紙鍗曟簮鏈�鐭矾寰勶級
+ */
+
+public class GraphByMatrix {
+ public static final boolean UNDIRECTED_GRAPH = false;//鏃犲悜鍥炬爣蹇�
+ public static final boolean DIRECTED_GRAPH = true;//鏈夊悜鍥炬爣蹇�
+
+ public static final boolean ADJACENCY_MATRIX = true;//閭绘帴鐭╅樀瀹炵幇
+ public static final boolean ADJACENCY_LIST = false;//閭绘帴琛ㄥ疄鐜�
+
+ public static final int MAX_VALUE = Integer.MAX_VALUE;
+ private boolean graphType;
+ private boolean method;
+ private int vertexSize;
+ private int matrixMaxVertex;
+
+ //瀛樺偍鎵�鏈夐《鐐逛俊鎭殑涓�缁存暟缁�
+ private Object[] vertexesArray;
+ //瀛樺偍鍥句腑椤剁偣涔嬮棿鍏宠仈鍏崇郴鐨勪簩缁存暟缁�,鍙婅竟鐨勫叧绯�
+ private int[][] edgesMatrix;
+
+ // 璁板綍绗琲涓妭鐐规槸鍚﹁璁块棶杩�
+ private boolean[] visited;
+
+ /**
+ * @param graphType 鍥剧殑绫诲瀷锛氭湁鍚戝浘/鏃犲悜鍥�
+ * @param method 鍥剧殑瀹炵幇鏂瑰紡锛氶偦鎺ョ煩闃�/閭绘帴琛�
+ */
+ public GraphByMatrix(boolean graphType, boolean method, int size) {
+ this.graphType = graphType;
+ this.method = method;
+ this.vertexSize = 0;
+ this.matrixMaxVertex = size;
+
+ if (this.method) {
+ visited = new boolean[matrixMaxVertex];
+ vertexesArray = new Object[matrixMaxVertex];
+ edgesMatrix = new int[matrixMaxVertex][matrixMaxVertex];
+
+ //瀵规暟缁勮繘琛屽垵濮嬪寲锛岄《鐐归棿娌℃湁杈瑰叧鑱旂殑鍊间负Integer绫诲瀷鐨勬渶澶у��
+ for (int row = 0; row < edgesMatrix.length; row++) {
+ for (int column = 0; column < edgesMatrix.length; column++) {
+ edgesMatrix[row][column] = MAX_VALUE;
+ }
+ }
+
+ }
+ }
+
+ /********************鏈�鐭矾寰�****************************/
+ //璁＄畻涓�涓《鐐瑰埌鍏跺畠涓�涓《鐐圭殑鏈�鐭窛绂�
+ public void Dijkstra(Object obj) throws Exception {
+ Dijkstra(getVertexIndex(obj));
+ }
+ public void Dijkstra(int v0) {
+ int[] dist = new int[matrixMaxVertex];
+ int[] prev = new int[matrixMaxVertex];
+
+ //鍒濆鍖杤isited銆乨ist鍜宲ath
+ for (int i = 0; i < vertexSize; i++) {
+ //涓�寮�濮嬪亣瀹氬彇鐩磋揪璺緞鏈�鐭�
+ dist[i] = edgesMatrix[v0][i];
+ visited[i] = false;
+
+ //鐩磋揪鎯呭喌涓嬬殑鏈�鍚庣粡鐢辩偣灏辨槸鍑哄彂鐐�
+ if (i != v0 && dist[i] < MAX_VALUE)
+ prev[i] = v0;
+ else
+ prev[i] = -1; //鏃犵洿杈捐矾寰�
+ }
+
+ //鍒濆鏃舵簮鐐箆0鈭坴isited闆嗭紝琛ㄧずv0 鍒皏0鐨勬渶鐭矾寰勫凡缁忔壘鍒�
+ visited[v0] = true;
+
+ // 涓嬫潵鍋囪缁忕敱涓�涓偣涓浆鍒拌揪鍏朵綑鍚勭偣,浼氳繎浜�,楠岃瘉涔�
+ // 鍐嶅亣璁剧粡鐢变袱涓偣涓浆,浼氭洿杩戜簺,楠岃瘉涔�,.....
+ // 鐩村埌绌蜂妇瀹屾墍鏈夊彲鑳界殑涓浆鐐�
+ int minDist;
+ int v = 0;
+ for (int i = 1; i < vertexSize; i++) {
+ //鎸戜竴涓窛绂绘渶杩戠粡鐢辩偣,涓嬫爣瑁呭叆 v
+ minDist = MAX_VALUE;
+
+ for (int j = 0; j < vertexSize; j++) {
+ if ((!visited[j]) && dist[j] < minDist) {
+ v = j; // 缁忕敱椤剁偣j涓浆鍒欒窛绂绘洿鐭�
+ minDist = dist[j];
+ }
+ }
+ visited[v] = true;
+
+ /*椤剁偣v骞跺叆S锛岀敱v0鍒拌揪v椤剁偣鐨勬渶鐭矾寰勪负min.
+ 鍋囧畾鐢眝0鍒皏锛屽啀鐢眝鐩磋揪鍏朵綑鍚勭偣锛屾洿鏂板綋鍓嶆渶鍚庝竴涓粡鐢辩偣鍙婅窛绂�*/
+ for (int j = 0; j < vertexSize; j++) {
+ if ((!visited[j]) && edgesMatrix[v][j] < MAX_VALUE) {
+
+ if (minDist + edgesMatrix[v][j] <= dist[j]) {
+ //濡傛灉澶氱粡鐢变竴涓獀鐐瑰埌杈緅鐐圭殑 鏈�鐭矾寰勫弽鑰岃鐭�,灏辨洿鏂�
+ dist[j] = minDist + edgesMatrix[v][j];
+
+ prev[j] = v; //缁忕敱鐐圭殑搴忓彿
+ }
+
+ }
+ }
+
+ }
+
+ for (int i = 1; i < matrixMaxVertex; i++) {
+ System.out.println("**" + vertexesArray[v0] + "-->" +vertexesArray[i] + " 鐨勬渶鐭矾寰勬槸锛�" + dist[i]);
+ }
+ }
+
+ //鑾峰彇椤剁偣鍊煎湪鏁扮粍閲屽搴旂殑绱㈠紩
+ private int getVertexIndex(Object obj) throws Exception {
+ int index = -1;
+ for (int i = 0; i < vertexSize; i++) {
+ if (vertexesArray[i].equals(obj)) {
+ index = i;
+ break;
+ }
+ }
+ if (index == -1) {
+ throw new Exception("娌℃湁杩欎釜鍊硷紒");
+ }
+
+ return index;
+ }
+
+ /**
+ * 鍗曟簮鏈�鐭矾寰勭畻娉曪紝鐢ㄤ簬璁＄畻涓�涓妭鐐瑰埌鍏朵粬!!鎵�鏈夎妭鐐�!!鐨勬渶鐭矾寰�
+ */
+ public void Dijkstra2(int v0) {
+ // LinkedList瀹炵幇浜哘ueue鎺ュ彛 FIFO
+ Queue<Integer> queue = new LinkedList<>();
+ for (int i = 0; i < vertexSize; i++) {
+ visited[i] = false;
+ }
+ List<Map<String,Object>> result = new ArrayList<>();
+ //杩欎釜寰幆鏄负浜嗙‘淇濇瘡涓《鐐归兘琚亶鍘嗗埌
+ int lastRow =0;
+ for (int i = 0; i < vertexSize; i++) {
+ if (!visited[i]) {
+ queue.add(i);
+ visited[i] = true;
+ while (!queue.isEmpty()) {
+ int row = queue.remove();
+ Map<String,Object> map = new HashMap<>();
+ map.put("name", vertexesArray[row]);
+ map.put("row", row);
+ int tempDis =0;
+ if(row>0){
+ tempDis = edgesMatrix[lastRow][row];
+ lastRow =row;
+ }
+ map.put("dis", tempDis);
+ result.add(map);
+ System.out.print(vertexesArray[row] + "-->");
+ for (int k = getMin(row); k >= 0; k = getMin(row)) {
+ if (!visited[k]) {
+ queue.add(k);
+ visited[k] = true;
+ }
+ }
+ }
+ }
+ }
+ System.out.println("");
+ int totalDis =0;
+ for(Map<String,Object> c :result){
+ totalDis += (Integer) c.get("dis");
+ System.out.print( c.get("name") + "--"+c.get("dis")+"-->");
+ }
+ System.out.println("");
+ System.out.println("鏈�鐭窛绂�"+totalDis);
+ }
+
+ private int getMin( int row) {
+ int minDist = MAX_VALUE;
+ int index = 0;
+ for (int j = 0; j < vertexSize; j++) {
+ if ((!visited[j]) && edgesMatrix[row][j] < minDist) {
+ minDist = edgesMatrix[row][j];
+ index = j;
+ }
+ }
+ if (index == 0) {
+ return -1;
+ }
+ return index;
+ }
+
+ public boolean addVertex(Object val) {
+ assert (val != null);
+ vertexesArray[vertexSize] = val;
+ vertexSize++;
+ return true;
+ }
+
+ public boolean addEdge(int vnum1, int vnum2, int weight) {
+ assert (vnum1 >= 0 && vnum2 >= 0 && vnum1 != vnum2 && weight >= 0);
+
+ //鏈夊悜鍥�
+ if (graphType) {
+ edgesMatrix[vnum1][vnum2] = weight;
+
+ } else {
+ edgesMatrix[vnum1][vnum2] = weight;
+ edgesMatrix[vnum2][vnum1] = weight;
+ }
+
+ return true;
+ }
+
+ public static void main(String[] args) throws Exception {
+ GraphByMatrix graph = new GraphByMatrix(GraphByMatrix.DIRECTED_GRAPH, GraphByMatrix.ADJACENCY_MATRIX, 9);
+
+ graph.addVertex("A");//0
+ graph.addVertex("B");//1
+ graph.addVertex("C");//2
+ graph.addVertex("D");//3
+ graph.addVertex("E");//4
+
+ //A->B銆丆銆丏
+ graph.addEdge(0, 1,10);
+ graph.addEdge(0, 2,5);
+ graph.addEdge(0, 3,7);
+ //B->C銆丏銆丒
+ graph.addEdge(1, 2,4);
+ graph.addEdge(1, 3,5);
+ graph.addEdge(1, 4,10);
+ //C->B銆丏銆丒
+ graph.addEdge(2, 1,4);
+ graph.addEdge(2, 3,6);
+ graph.addEdge(2, 4,5);
+ //D->B銆丆銆丒
+ graph.addEdge(3, 1,5);
+ graph.addEdge(3, 2,6);
+ graph.addEdge(3, 4,7);
+
+
+ graph.Dijkstra(0);
+ System.out.println();
+ graph.Dijkstra("C");
+ System.out.println();
+ graph.Dijkstra2(0);
+ System.out.println();
+ }
+
+}
\ No newline at end of file
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/TspSolver.java b/server/system_service/src/main/java/com/doumee/core/utils/TspSolver.java
new file mode 100644
index 0000000..06e17e2
--- /dev/null
+++ b/server/system_service/src/main/java/com/doumee/core/utils/TspSolver.java
@@ -0,0 +1,158 @@
+package com.doumee.core.utils;
+
+import com.google.ortools.Loader;
+import com.google.ortools.constraintsolver.*;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class TspSolver {
+ public static void main(String[] args) throws Exception {
+ // 鍒濆鍖栨暟鎹ā鍨�
+ Loader.loadNativeLibraries();
+ DataModel data = new DataModel();
+ data.initDataList();//鏋勯�犳暟鎹�
+
+ long start =System.currentTimeMillis();
+ System.out.println("=============start=========="+start);
+ //鍒涘缓姹傝В鍣╩anager瀵硅薄锛屽垵濮嬪寲姹傝В鍣ㄦ暟鎹�
+ RoutingIndexManager manager = new RoutingIndexManager(data.distanceMatrix.length, data.vehicleNumber, data.depot);
+
+ // 鍒濆鍖栨眰瑙ｅ櫒
+ RoutingModel routing = new RoutingModel(manager);
+
+// // 娉ㄥ唽鍥炶皟鍑芥暟
+ final int transitCallbackIndex =
+ routing.registerTransitCallback((long fromIndex, long toIndex) -> {
+ int fromNode = manager.indexToNode(fromIndex);
+ int toNode = manager.indexToNode(toIndex);
+ return data.distanceMatrix[fromNode][toNode];
+ });
+
+ // 瀹氫箟鍥炶皟鍑芥暟鑷虫瘡鏉¤矾绾�
+ routing.setArcCostEvaluatorOfAllVehicles(transitCallbackIndex);
+ // 澧炲姞璺濈缁村害绾︽潫
+ routing.addDimension(transitCallbackIndex, 0, 30000,
+ true,
+ "Distance");
+ RoutingDimension distanceDimension = routing.getMutableDimension("Distance");
+ distanceDimension.setGlobalSpanCostCoefficient(100);
+// // 娣诲姞瀹归噺闄愬埗
+ final int demandCallbackIndex = routing.registerUnaryTransitCallback((long fromIndex) -> {
+ int fromNode = manager.indexToNode(fromIndex);
+ return data.demands[fromNode];
+ });
+ routing.addDimensionWithVehicleCapacity(demandCallbackIndex, 0, data.vehicleCapacities, true, "Capacity");
+
+ Solver solver = routing.solver();
+
+
+ //璁剧疆鎼滅储鏂规硶
+ RoutingSearchParameters searchParameters =
+ main.defaultRoutingSearchParameters()
+ .toBuilder()
+ .setFirstSolutionStrategy(FirstSolutionStrategy.Value.PATH_CHEAPEST_ARC)
+ .build();
+
+ // 鎵ц绠楁硶
+ Assignment solution = routing.solveWithParameters(searchParameters);
+
+ // 鎵撳嵃璺嚎
+ printSolution(data, routing, manager, solution);
+ long end =System.currentTimeMillis();
+ System.out.println("=============end=========="+end);
+
+ System.out.println("=============鑰楁椂=========="+(end -start)+"锛坢s锛�"+(end -start)/1000 +"s"+(end -start)/60/1000 +"m");
+ }
+
+ static void printSolution(
+ DataModel data, RoutingModel routing, RoutingIndexManager manager, Assignment solution) {
+ long maxRouteDistance = 0;
+ for (int i = 0; i < data.vehicleNumber; ++i) {
+ long index = routing.start(i);
+ log.info("Route for Vehicle " + i + ":");
+ long routeDistance = 0;
+ int routeDemand = 0;
+ String route = "";
+ while (!routing.isEnd(index)) {
+ route += manager.indexToNode(index) + " -> ";
+ routeDemand += data.demands[manager.indexToNode(index)];
+ long previousIndex = index;
+ index = solution.value(routing.nextVar(index));
+ routeDistance += routing.getArcCostForVehicle(previousIndex, index, i);
+ }
+ log.info(route + manager.indexToNode(index));
+ log.info("Distance of the route: " + routeDistance + "m"+" Capacity of the route:"+routeDemand+"/"+data.vehicleCapacities[i]);
+ maxRouteDistance = Math.max(routeDistance, maxRouteDistance);
+ }
+ log.info("Maximum of the route distances: " + maxRouteDistance + "m");
+ }
+
+ static class DataModel {
+ //璺濈鐭╅樀
+ public int lenght;
+ //鏈�澶ц溅杈嗛檺鍒�
+ public int vehicleNumber;
+ //璧风偣
+ public static final int depot = 0;
+
+ //姣忎竴涓偣鐨勫晢鍝佺殑鏁伴噺
+ public long[] demands;
+ //杞﹁締鏈�澶у杞�
+ public long[] vehicleCapacities ;
+ public long[][] distanceMatrix ;
+ public void initDataList(){
+ lenght = 500;
+ vehicleNumber = 8;
+ demands = new long[lenght];
+ vehicleCapacities =new long[vehicleNumber];
+ distanceMatrix = new long[lenght][lenght];
+ int total0 =0;
+ for (int i = 0; i <vehicleNumber ; i++) {
+ long tem = (long) (Math.random() * 1000 + 20000);
+ vehicleCapacities[i] = tem;
+ total0+=tem;
+ System.out.print(tem+" ,");
+ }
+ System.out.println( "\ntotal Capacity:"+total0+"=====================");
+ long total = 0;
+ for (int i = 0; i <lenght ; i++) {
+ long tem = (int)(Math.random()*100+100);
+ demands[i] =tem;
+ total+=tem;
+ System.out.print(tem+" ,");
+ for (int j = 0; j <lenght ; j++) {
+ if(i == j){
+ distanceMatrix[i][j] =0;
+ }
+ if(i<j){
+ distanceMatrix[i][j] =(int)(Math.random()*1000+1);
+ distanceMatrix[j][i] = distanceMatrix[i][j];
+ }
+ }
+ }
+
+ System.out.println( "\ntotal Demands:"+total+"=====================");
+ }
+ /* public final long[][] distanceMatrix = {
+ {0, 548, 776, 696, 582, 274, 502, 194, 308, 194, 536, 502, 388, 354, 468, 776, 662},
+ {548, 0, 684, 308, 194, 502, 730, 354, 696, 742, 1084, 594, 480, 674, 1016, 868, 1210},
+ {776, 684, 0, 992, 878, 502, 274, 810, 468, 742, 400, 1278, 1164, 1130, 788, 1552, 754},
+ {696, 308, 992, 0, 114, 650, 878, 502, 844, 890, 1232, 514, 628, 822, 1164, 560, 1358},
+ {582, 194, 878, 114, 0, 536, 764, 388, 730, 776, 1118, 400, 514, 708, 1050, 674, 1244},
+ {274, 502, 502, 650, 536, 0, 228, 308, 194, 240, 582, 776, 662, 628, 514, 1050, 708},
+ {502, 730, 274, 878, 764, 228, 0, 536, 194, 468, 354, 1004, 890, 856, 514, 1278, 480},
+ {194, 354, 810, 502, 388, 308, 536, 0, 342, 388, 730, 468, 354, 320, 662, 742, 856},
+ {308, 696, 468, 844, 730, 194, 194, 342, 0, 274, 388, 810, 696, 662, 320, 1084, 514},
+ {194, 742, 742, 890, 776, 240, 468, 388, 274, 0, 342, 536, 422, 388, 274, 810, 468},
+ {536, 1084, 400, 1232, 1118, 582, 354, 730, 388, 342, 0, 878, 764, 730, 388, 1152, 354},
+ {502, 594, 1278, 514, 400, 776, 1004, 468, 810, 536, 878, 0, 114, 308, 650, 274, 844},
+ {388, 480, 1164, 628, 514, 662, 890, 354, 696, 422, 764, 114, 0, 194, 536, 388, 730},
+ {354, 674, 1130, 822, 708, 628, 856, 320, 662, 388, 730, 308, 194, 0, 342, 422, 536},
+ {468, 1016, 788, 1164, 1050, 514, 514, 662, 320, 274, 388, 650, 536, 342, 0, 764, 194},
+ {776, 868, 1552, 560, 674, 1050, 1278, 742, 1084, 810, 1152, 274, 388, 422, 764, 0, 798},
+ {662, 1210, 754, 1358, 1244, 708, 480, 856, 514, 468, 354, 844, 730, 536, 194, 798, 0},
+ };*/
+
+ }
+
+}
\ No newline at end of file
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index ee4d51f..8bc6458 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -94,11 +94,11 @@
@ExcelColumn(name="宸ヤ綔缁撴潫鏃堕棿")
private String endTime;
- @ApiModelProperty(value = "鍚屾椂浣滀笟鏁伴噺", example = "1")
- @ExcelColumn(name="鍚屾椂浣滀笟鏁伴噺")
+ @ApiModelProperty(value = "鍚屾椂鍙彿鏁伴噺", example = "1")
+ @ExcelColumn(name="鍚屾椂鍙彿鏁伴噺")
private Integer workingNum;
- @ApiModelProperty(value = "鍚屾椂鍑嗗浣滀笟鏁伴噺", example = "1")
- @ExcelColumn(name="鍚屾椂鍑嗗浣滀笟鏁伴噺")
+ @ApiModelProperty(value = "鍚屾椂鍑嗗鍙彿鏁伴噺", example = "1")
+ @ExcelColumn(name="鍚屾椂鍑嗗鍙彿鏁伴噺")
private Integer callReadyNum;
@ApiModelProperty(value = "浣滀笟瓒呮椂鎶ヨ鏃堕棿(绉掞級", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
index 48cd55f..36c418c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -246,11 +246,11 @@
@ApiModelProperty(value = "绛惧埌搴忓彿", example = "1")
private Integer signNum;
- @ApiModelProperty(value = "鏄惁鏍囪铏氭嫙鏈堝彴缁� 0鍚� 1鏄�", example = "1")
+ @ApiModelProperty(value = "鏄惁鏇存崲杩囨湀鍙扮粍 0鍚� 1鏄�", example = "1")
private Integer tagVirtual;
- @ApiModelProperty(value = "鏍囪铏氭嫙鏈堝彴缁勬椂闂�", example = "1")
+ @ApiModelProperty(value = "鏇存崲杩囨湀鍙扮粍鏃堕棿", example = "1")
private Date tagVirtualTime;
- @ApiModelProperty(value = "鏍囪铏氭嫙鏈堝彴缁勪汉鍛樼紪鐮�", example = "1")
+ @ApiModelProperty(value = "鏇存崲杩囨湀鍙扮粍浜哄憳缂栫爜", example = "1")
private Integer tagVirtualUser;
@ApiModelProperty(value = "鍙彿鏂瑰紡 0鎵嬪姩鍙彿 1鑷姩鍙彿", example = "1")
private Integer callWay;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 44c182b..6debdc9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -2494,11 +2494,16 @@
BeanUtils.copyProperties(model,platformJob);
platformJob.setPlatformGroupId(param.getPlatformGroupId());
platformJob.setEditDate(new Date());
+ platformJob.setTagVirtual(Constants.ONE);
+ platformJob.setTagVirtualUser(platformJob.getEditor());
+ platformJob.setTagVirtualTime(platformJob.getEditDate());
platformJob.setEditor(loginUser.getId());
int flag = platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
.set(PlatformJob::getEditDate,platformJob.getEditDate())
+ .set(PlatformJob::getTagVirtualTime,platformJob.getTagVirtualTime())
.set(PlatformJob::getEditor,platformJob.getEditor())
.set(PlatformJob::getPlatformGroupId,param.getPlatformGroupId())
+ .set(PlatformJob::getTagVirtualUser,platformJob.getEditor())
.set(PlatformJob::getPlatformId,null)//缃┖鍒嗛厤鐨勬湀鍙颁俊鎭�
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey(),
Constants.PlatformJobStatus.WART_SIGN_IN.getKey(),
--
Gitblit v1.9.3