From 5180133179d3589a1c64cdf0a1431990b80f1bc2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 01 三月 2025 16:30:57 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/system/controller/LicenseCreatorController.java | 3
src/main/java/com/zy/asrs/controller/RgvController.java | 11
src/main/java/com/zy/asrs/utils/Utils.java | 840 +++++++++----------------------------------------------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3
src/main/webapp/views/index.html | 24
5 files changed, 166 insertions(+), 715 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 08ca18c..9ad1e2f 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -371,10 +371,13 @@
List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<>());
for (BasDevpPosition basDevpPosition : basDevpPositions){
RingThroughParam ringThroughParam = new RingThroughParam();
- ringThroughParam.setIndex(basDevpPosition.getDevNo());
- double[] doubles = Utils.RingThroughXYSta(perimeter, perimeter-basDevpPosition.getPlcPosition());
- ringThroughParam.setValueX(doubles[0]>50? doubles[0]+6:doubles[0]-1);
- ringThroughParam.setValueY(doubles[1]>50? doubles[1]+6:doubles[1]-1);
+ ringThroughParam.setIndex(basDevpPosition.getDevNo()-100);
+// double[] doubles = Utils.RingThroughXYSta(perimeter, perimeter-basDevpPosition.getPlcPosition());
+// ringThroughParam.setValueX(doubles[0]>50? doubles[0]+6:doubles[0]-1);
+// ringThroughParam.setValueY(doubles[1]>50? doubles[1]+6:doubles[1]-1);
+ double[] doubles = Utils.getRgvPosNew(basDevpPosition.getDevNo(),perimeter, basDevpPosition.getPlcPosition());
+ ringThroughParam.setValueX(doubles[0]);
+ ringThroughParam.setValueY(doubles[1]);
result.add(ringThroughParam);
}
return R.ok().add(result);
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a6dcf96..f6eea83 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -71,6 +71,9 @@
* */
public synchronized boolean licenseVerify() {
try{
+// if (true) {
+// return true;
+// }
return new LicenseVerify().verify();
} catch (Exception e){
log.info("璁稿彲璇侀獙璇佸け璐ワ紒锛佸紓甯革細{}",e.getMessage());
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 576a075..07c66a4 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -130,723 +130,165 @@
return new double[]{x, y};
}
+ public static double[] getRgvPosNew(Integer devNo,double a, double b) {
+ double[] rgvPosNew = getRgvPosNew(a, b);
+ switch (devNo){
+ case 101:
+ case 102:
+ case 103:
+ case 104:
+ case 105:
+ case 106:
+ case 107:
+ case 108:
+ case 109:
+ case 110:
+ case 111:
+ rgvPosNew[0] = rgvPosNew[0] - 30;
+ rgvPosNew[1] = rgvPosNew[1];
+ break;
+ case 112:
+ case 113:
+ case 114:
+ case 115:
+ rgvPosNew[0] = rgvPosNew[0] + 10;
+ rgvPosNew[1] = rgvPosNew[1];
+ break;
+ case 116:
+ case 117:
+ case 118:
+ case 119:
+ case 120:
+ case 121:
+ case 122:
+ case 123:
+ case 124:
+ case 125:
+ case 126:
+ case 127:
+ case 128:
+ case 129:
+ case 130:
+ case 131:
+ case 132:
+ case 133:
+ rgvPosNew[0] = rgvPosNew[0];
+ rgvPosNew[1] = rgvPosNew[1] + 30;
+ break;
+ case 134:
+ rgvPosNew[0] = rgvPosNew[0];
+ rgvPosNew[1] = rgvPosNew[1] - 10;
+ break;
+ }
+ return rgvPosNew;
+
+ }
public static double[] getRgvPosNew(double a, double b) {
- // 瀹氫箟鍖洪棿鍜屽搴旂殑 (x, y) 鍧愭爣
- double[][] intervals = {
- {0, 134400, 390, 775, 25, 830},
- {134400, 134900, 25, 830, 65, 882},
- {134900, 196000, 65, 882, 83, 882},
- {196000, 217480, 83, 882, 110, 882},
- {217480, 217980, 110, 882, 121, 882},
- {217980, 227777, 121, 882, 132, 882},
- {227777, 237574, 132, 882, 143, 882},
- {237574, 247371, 143, 882, 154, 882},
- {247371, 257168, 154, 882, 165, 882},
- {257168, 257668, 165, 882, 176, 882},
- {257668, 262455, 176, 882, 187, 882},
- {262455, 267242, 187, 882, 198, 882},
- {267242, 272029, 198, 882, 209, 882},
- {272029, 276817, 209, 882, 220, 882},
- {276817, 277317, 220, 882, 231, 882},
- {277317, 284630, 231, 882, 242, 882},
- {284630, 291943, 242, 882, 253, 882},
- {291943, 299256, 253, 882, 264, 882},
- {299256, 306570, 264, 882, 275, 882},
- {306570, 307070, 275, 882, 286, 882},
- {307070, 314399, 286, 882, 297, 882},
- {314399, 321729, 297, 882, 308, 882},
- {321729, 329058, 308, 882, 319, 882},
- {329058, 336388, 319, 882, 330, 882},
- {336388, 336888, 330, 882, 341, 882},
- {336888, 344181, 341, 882, 352, 882},
- {344181, 351474, 352, 882, 363, 882},
- {351474, 358767, 363, 882, 374, 882},
- {358767, 366061, 374, 882, 385, 882},
- {366061, 366561, 385, 882, 396, 882},
- {366561, 370134, 396, 882, 407, 882},
- {370134, 373708, 407, 882, 418, 882},
- {373708, 377282, 418, 882, 429, 882},
- {377282, 380856, 429, 882, 440, 882},
- {380856, 381356, 440, 882, 451, 882},
- {381356, 385021, 451, 882, 462, 882},
- {385021, 388687, 462, 882, 473, 882},
- {388687, 392352, 473, 882, 484, 882},
- {392352, 396018, 484, 882, 495, 882},
- {396018, 396518, 495, 882, 506, 882},
- {396518, 403768, 506, 882, 517, 882},
- {403768, 411018, 517, 882, 528, 882},
- {411018, 418268, 528, 882, 539, 882},
- {418268, 425518, 539, 882, 550, 882},
- {425518, 426018, 550, 882, 561, 882},
- {426018, 433329, 561, 882, 572, 882},
- {433329, 440641, 572, 882, 583, 882},
- {440641, 447952, 583, 882, 594, 882},
- {447952, 455264, 594, 882, 605, 882},
- {455264, 455764, 605, 882, 616, 882},
- {455764, 459352, 616, 882, 627, 882},
- {459352, 462940, 627, 882, 638, 882},
- {462940, 466528, 638, 882, 649, 882},
- {466528, 470117, 649, 882, 660, 882},
- {470117, 470617, 660, 882, 671, 882},
- {470617, 474207, 671, 882, 682, 882},
- {474207, 477797, 682, 882, 693, 882},
- {477797, 481387, 693, 882, 704, 882},
- {481387, 484977, 704, 882, 715, 882},
- {484977, 485477, 715, 882, 726, 882},
- {485477, 492773, 726, 882, 737, 882},
- {492773, 500069, 737, 882, 748, 882},
- {500069, 507365, 748, 882, 759, 882},
- {507365, 514662, 759, 882, 770, 882},
- {514662, 515162, 770, 882, 781, 882},
- {515162, 522479, 781, 882, 792, 882},
- {522479, 529797, 792, 882, 803, 882},
- {529797, 537114, 803, 882, 814, 882},
- {537114, 544432, 814, 882, 825, 882},
- {544432, 544932, 825, 882, 836, 882},
- {544932, 548520, 836, 882, 847, 882},
- {548520, 552108, 847, 882, 858, 882},
- {552108, 555696, 858, 882, 869, 882},
- {555696, 559284, 869, 882, 880, 882},
- {559284, 559784, 880, 882, 891, 882},
- {559784, 563356, 891, 882, 908, 882},
- {563356, 566928, 908, 882, 919, 882},
- {566928, 570500, 919, 882, 930, 882},
- {570500, 574073, 930, 882, 941, 882},
- {574073, 574573, 941, 882, 952, 882},
- {574573, 581878, 952, 882, 963, 882},
- {581878, 589183, 963, 882, 974, 882},
- {589183, 596488, 974, 882, 985, 882},
- {596488, 603793, 985, 882, 996, 882},
- {603793, 604293, 996, 882, 1007, 882},
- {604293, 611652, 1007, 882, 1018, 882},
- {611652, 619011, 1018, 882, 1029, 882},
- {619011, 626370, 1029, 882, 1, 882},
- {626370, 633730, 1, 882, 1040, 882},
- {633730, 634230, 1040, 882, 1050, 882},
- {634230, 641833, 1050, 882, 1060, 882},
- {641833, 649437, 1060, 882, 1070, 882},
- {649437, 657041, 1070, 882, 1080, 882},
- {657041, 664645, 1080, 882, 1090, 882},
- {664645, 672249, 1090, 882, 1100, 882},
- {672249, 679853, 1100, 882, 1115, 882},
- {679853, 680353, 1115, 882, 1125, 882},
- {680353, 685447, 1125, 882, 1125, 880},
- {685447, 690542, 1125, 880, 1135, 878},
- {690542, 695637, 1135, 878, 1145, 877},
- {695637, 700731, 1145, 877, 1155, 875},
- {700731, 705826, 1155, 875, 1190, 855},
- {705826, 710921, 1190, 855, 1200, 840},
- {710921, 716015, 1200, 840, 1210, 820},
- {716015, 721110, 1210, 820, 1215, 800},
- {721110, 726205, 1215, 800, 1215, 775},
- {726205, 746783, 1215, 775, 1215, 770},
- {746783, 750168, 1215, 770, 1215, 735},
- {750168, 753554, 1215, 735, 1215, 700},
- {753554, 756940, 1215, 700, 1215, 665},
- {756940, 760326, 1215, 665, 1215, 630},
- {760326, 763712, 1215, 630, 1215, 595},
- {763712, 767098, 1215, 595, 1215, 560},
- {767098, 770484, 1215, 560, 1215, 535},
- {770484, 773870, 1215, 535, 1215, 520},
- {773870, 774370, 1215, 520, 1215, 502},
- {774370, 780052, 1215, 502, 1215, 484},
- {780052, 785735, 1215, 484, 1215, 466},
- {785735, 791417, 1215, 466, 1215, 448},
- {791417, 797100, 1215, 448, 1215, 430},
- {797100, 797600, 1215, 430, 1215, 412},
- {797600, 815742, 1215, 412, 1215, 394},
- {815742, 833885, 1215, 394, 1215, 376},
- {833885, 852027, 1215, 376, 1215, 358},
- {852027, 870170, 1215, 358, 1215, 340},
- {870170, 870670, 1215, 340, 1215, 322},
- {870670, 877815, 1215, 322, 1215, 304},
- {877815, 884960, 1215, 304, 1215, 286},
- {884960, 892105, 1215, 286, 1215, 268},
- {892105, 899250, 1215, 268, 1215, 250},
- {899250, 899750, 1215, 250, 1215, 225},
- {899750, 914290, 1215, 225, 1215, 200},
- {914290, 928830, 1215, 200, 1215, 175},
- {928830, 943370, 1215, 175, 1215, 150},
- {943370, 957910, 1215, 150, 1215, 125},
- {957910, 972450, 1215, 125, 1215, 100},
- {972450, 972950, 1215, 100, 1164, 80},
- {972950, 1016193, 1164, 80, 1115, 125},
- {1016193, 1063563, 1115, 125, 1115, 150},
- {1063563, 1064063, 1115, 150, 1115, 175},
- {1064063, 1077711, 1115, 175, 1115, 200},
- {1077711, 1078211, 1115, 200, 1115, 225},
- {1078211, 1104788, 1115, 225, 1115, 250},
- {1104788, 1105288, 1115, 250, 1115, 275},
- {1105288, 1119213, 1115, 275, 1115, 300},
- {1119213, 1119713, 1115, 300, 1115, 325},
- {1119713, 1145902, 1115, 325, 1115, 350},
- {1145902, 1146402, 1115, 350, 1115, 375},
- {1146402, 1160380, 1115, 375, 1115, 400},
- {1160380, 1160880, 1115, 400, 1115, 425},
- {1160880, 1187314, 1115, 425, 1115, 450},
- {1187314, 1188214, 1115, 450, 1115, 475},
- {1188214, 1201849, 1115, 475, 1115, 500},
- {1201849, 1202349, 1115, 500, 1115, 525},
- {1202349, 1228831, 1115, 525, 1115, 550},
- {1228831, 1229331, 1115, 550, 1115, 575},
- {1229331, 1243204, 1115, 575, 1115, 600},
- {1243204, 1243704, 1115, 600, 1115, 625},
- {1243704, 1269708, 1115, 625, 1115, 650},
- {1269708, 1284750, 1115, 650, 1115, 720},
- {1284750, 1285250, 1115, 720, 1100, 750},
- {1285250, 1322829, 1100, 750, 1090, 775},
- {1322829, 1737000, 1090, 775, 1090, 775}
+ // 瀹氫箟鍖洪棿鍙婂搴旂殑鍑犱綍鍙傛暟锛堟柊澧炲渾寮у弬鏁帮級
+ // 缁撴瀯锛歿start, end, 绫诲瀷, 鍙傛暟...}
+ // 绫诲瀷璇存槑锛�0-鐩寸嚎锛�1-鍦嗗姬锛堥渶瑕佸渾蹇冨潗鏍囷級
+ Object[][] intervals = {
+ // 鐩寸嚎鍖洪棿锛�0-134400锛�
+ {0.0, 134400.0, 0, 390.0, 775.0, 25.0, 775.0},
+
+ // 寮х嚎鍖洪棿锛堟嫄鐐�-杞集-133锛変繚鎸佽礉濉炲皵鏇茬嚎
+ {134400.0, 134900.0, 1, 25.0, 775.0, 65.0, 882.0, 25.0, 882.0},
+
+ // 鐩寸嚎鍖洪棿
+ {134900.0, 680103.0,0, 65.0, 885.0, 1115.0, 882.0},
+
+// // 寮х嚎鍖洪棿锛堟嫄鐐�116-115锛夛紝鎺у埗鐐瑰亣璁句负(1125, 882)
+// {680103, 731550, 1115, 882, 1215, 775, 1125, 882},
+
+ // 鍦嗗姬鍖洪棿锛堟嫄鐐�116-115锛夋柊鍙傛暟锛氬渾蹇�(1115,775)
+ {680103.0, 731550.0, 2, 1115.0, 882.0, 1215.0, 775.0, 1115.0, 775.0}, // 淇缁堢偣鍧愭爣
+
+ // 鐩寸嚎鍖洪棿
+ {731550.0, 972950.0,0, 1215.0, 775.0, 1215.0, 125.0},
+ // 寮х嚎鍖洪棿锛堟嫄鐐�112-椤剁偣锛夛紝鎺у埗鐐瑰亣璁句负(1215, 80)
+ {972950.0, 1016193.0,0, 1215.0, 125.0, 1164.0, 80.0},
+ // 寮х嚎鍖洪棿锛堟嫄鐐�-椤剁偣-111锛夛紝鎺у埗鐐瑰亣璁句负(1164, 125)
+ {1016193.0, 1063563.0,0, 1164.0, 80.0, 1115.0, 125.0},
+ // 鐩寸嚎鍖洪棿
+ {1063563.0, 1315250.0,0, 1115.0, 150.0, 1115.0, 720.0},
+ // 寮х嚎鍖洪棿锛堟嫄鐐�101-杞集锛夛紝鎺у埗鐐瑰亣璁句负(1115, 750)
+ {1315250.0, 1322829.0,0, 1115.0, 720.0, 1100.0, 750.0},
+ // 鐩寸嚎鍖洪棿
+ {1322829.0, 1737000.0,0, 1090.0, 775.0, 390.0, 775.0},
};
- // 閬嶅巻鍖洪棿锛屾壘鍒� b 鎵�鍦ㄧ殑鍖洪棿
- for (double[] interval : intervals) {
- double start = interval[0];
- double end = interval[1];
- double startX = interval[2];
- double startY = interval[3];
- double endX = interval[4];
- double endY = interval[5];
+ for (Object[] interval : intervals) {
+ double start = (Double) interval[0];
+ double end = (Double) interval[1];
+ int type = (Integer) interval[2];
if (b >= start && b <= end) {
- // 绾挎�ф彃鍊艰绠� x 鍜� y
double t = (b - start) / (end - start);
- double x = startX + t * (endX - startX);
- double y = startY + t * (endY - startY);
- return new double[]{x, y};
+
+ // 鏍规嵁涓嶅悓绫诲瀷璁＄畻鍧愭爣
+ switch (type) {
+ case 0: // 鐩寸嚎
+ return linearInterpolation(interval, t);
+ case 1: // 璐濆灏旀洸绾�
+ return bezierInterpolation(interval, t);
+ case 2: // 鍦嗗姬
+ return circularInterpolation(interval, t);
+ }
}
}
-
- // 濡傛灉 b 涓嶅湪浠讳綍鍖洪棿鍐咃紝杩斿洖榛樿鍊�
return new double[]{0, 0};
}
- public static double[] getRgvPos(double a,double b) {
- // a 鏄�婚暱搴�
- // b 鏄綋鍓嶄綅缃�
-
- // 璁＄畻鐐圭殑鍧愭爣
- double x = 0;
- double y = 0;
+ // 鐩寸嚎鎻掑��
+ private static double[] linearInterpolation(Object[] interval, double t) {
+ double x1 = (Double) interval[3];
+ double y1 = (Double) interval[4];
+ double x2 = (Double) interval[5];
+ double y2 = (Double) interval[6];
+ return new double[]{
+ x1 + t * (x2 - x1),
+ y1 + t * (y2 - y1)
+ };
+ }
- if (b > 217480 && b <= 217980) { // 133 绔欑偣 217730
- x = 110;
- y = 882;
- } else if (b > 217980 && b <= 227777) {
- x = 121;
- y = 882;
- } else if (b > 227777 && b <= 237574) {
- x = 132;
- y = 882;
- } else if (b > 237574 && b <= 247371) {
- x = 143;
- y = 882;
- } else if (b > 247371 && b <= 257168) {
- x = 154;
- y = 882;
- } else if (b > 257168 && b <= 257668) { // 132 绔欑偣 257418
- x = 165;
- y = 882;
- } else if (b > 257668 && b <= 262455) {
- x = 176;
- y = 882;
- } else if (b > 262455 && b <= 267242) {
- x = 187;
- y = 882;
- } else if (b > 267242 && b <= 272029) {
- x = 198;
- y = 882;
- } else if (b > 272029 && b <= 276817) {
- x = 209;
- y = 882;
- } else if (b > 276817 && b <= 277317) { // 131 绔欑偣 277067
- x = 220;
- y = 882;
- } else if (b > 277317 && b <= 284630) {
- x = 231;
- y = 882;
- } else if (b > 284630 && b <= 291943) {
- x = 242;
- y = 882;
- } else if (b > 291943 && b <= 299256) {
- x = 253;
- y = 882;
- } else if (b > 299256 && b <= 306570) {
- x = 264;
- y = 882;
- } else if (b > 306570 && b <= 307070) { // 130 绔欑偣 306820
- x = 275;
- y = 882;
- } else if (b > 307070 && b <= 314399) {
- x = 286;
- y = 882;
- } else if (b > 314399 && b <= 321729) {
- x = 297;
- y = 882;
- } else if (b > 321729 && b <= 329058) {
- x = 308;
- y = 882;
- } else if (b > 329058 && b <= 336388) {
- x = 319;
- y = 882;
- } else if (b > 336388 && b <= 336888) { // 129 绔欑偣 336638
- x = 330;
- y = 882;
- } else if (b > 336888 && b <= 344181) {
- x = 341;
- y = 882;
- } else if (b > 344181 && b <= 351474) {
- x = 352;
- y = 882;
- } else if (b > 257168 && b <= 358767) {
- x = 363;
- y = 882;
- } else if (b > 358767 && b <= 366061) {
- x = 374;
- y = 882;
- } else if (b > 366061 && b <= 366561) { // 128 绔欑偣 366311
- x = 385;
- y = 882;
- } else if (b > 366561 && b <= 370134) {
- x = 396;
- y = 882;
- } else if (b > 370134 && b <= 373708) {
- x = 407;
- y = 882;
- } else if (b > 373708 && b <= 377282) {
- x = 418;
- y = 882;
- } else if (b > 377282 && b <= 380856) {
- x = 429;
- y = 882;
- } else if (b > 380856 && b <= 381356) { // 127 绔欑偣 381106
- x = 440;
- y = 882;
- } else if (b > 381356 && b <= 385021) {
- x = 451;
- y = 882;
- } else if (b > 385021 && b <= 388687) {
- x = 462;
- y = 882;
- } else if (b > 388687 && b <= 392352) {
- x = 473;
- y = 882;
- } else if (b > 392352 && b <= 396018) {
- x = 484;
- y = 882;
- } else if (b > 396018 && b <= 396518) { // 126 绔欑偣 396268
- x = 495;
- y = 882;
- } else if (b > 396518 && b <= 403768) {
- x = 506;
- y = 882;
- } else if (b > 403768 && b <= 411018) {
- x = 517;
- y = 882;
- } else if (b > 411018 && b <= 418268) {
- x = 528;
- y = 882;
- } else if (b > 418268 && b <= 425518) {
- x = 539;
- y = 882;
- } else if (b > 425518 && b <= 426018) { // 125 绔欑偣 425768
- x = 550;
- y = 882;
- } else if (b > 426018 && b <= 433329) {
- x = 561;
- y = 882;
- } else if (b > 433329 && b <= 440641) {
- x = 572;
- y = 882;
- } else if (b > 440641 && b <= 447952) {
- x = 583;
- y = 882;
- } else if (b > 426018 && b <= 455264) {
- x = 594;
- y = 882;
- } else if (b > 455264 && b <= 455764) { // 124 绔欑偣 455514
- x = 605;
- y = 882;
- } else if (b > 455764 && b <= 459352) {
- x = 616;
- y = 882;
- } else if (b > 459352 && b <= 462940) {
- x = 627;
- y = 882;
- } else if (b > 462940 && b <= 466528) {
- x = 638;
- y = 882;
- } else if (b > 466528 && b <= 470117) {
- x = 649;
- y = 882;
- } else if (b > 470117 && b <= 470617) { // 123 绔欑偣 470367
- x = 660;
- y = 882;
- } else if (b > 470617 && b <= 474207) {
- x = 671;
- y = 882;
- } else if (b > 474207 && b <= 477797) {
- x = 682;
- y = 882;
- } else if (b > 477797 && b <= 481387) {
- x = 693;
- y = 882;
- } else if (b > 481387 && b <= 484977) {
- x = 704;
- y = 882;
- } else if (b > 484977 && b <= 485477) { // 122 绔欑偣 485227
- x = 715;
- y = 882;
- } else if (b > 485477 && b <= 492773) {
- x = 726;
- y = 882;
- } else if (b > 492773 && b <= 500069) {
- x = 737;
- y = 882;
- } else if (b > 500069 && b <= 507365) {
- x = 748;
- y = 882;
- } else if (b > 507365 && b <= 514662) {
- x = 759;
- y = 882;
- } else if (b > 514662 && b <= 515162) { // 121 绔欑偣 514912
- x = 770;
- y = 882;
- } else if (b > 515162 && b <= 522479) {
- x = 781;
- y = 882;
- } else if (b > 522479 && b <= 529797) {
- x = 792;
- y = 882;
- } else if (b > 529797 && b <= 537114) {
- x = 803;
- y = 882;
- } else if (b > 537114 && b <= 544432) {
- x = 814;
- y = 882;
- } else if (b > 544432 && b <= 544932) { // 120 绔欑偣 544682
- x = 825;
- y = 882;
- } else if (b > 544932 && b <= 548520) {
- x = 836;
- y = 882;
- } else if (b > 548520 && b <= 552108) {
- x = 847;
- y = 882;
- } else if (b > 552108 && b <= 555696) {
- x = 858;
- y = 882;
- } else if (b > 555696 && b <= 559284) {
- x = 869;
- y = 882;
- } else if (b > 559284 && b <= 559784) { // 119 绔欑偣 559534
- x = 880;
- y = 882;
- } else if (b > 559784 && b <= 563356) {
- x = 891;
- y = 882;
- } else if (b > 563356 && b <= 566928) {
- x = 908;
- y = 882;
- } else if (b > 566928 && b <= 570500) {
- x = 919;
- y = 882;
- } else if (b > 570500 && b <= 574073) {
- x = 930;
- y = 882;
- } else if (b > 574073 && b <= 574573) { // 118 绔欑偣 574323
- x = 941;
- y = 882;
- } else if (b > 574573 && b <= 581878) {
- x = 952;
- y = 882;
- } else if (b > 581878 && b <= 589183) {
- x = 963;
- y = 882;
- } else if (b > 589183 && b <= 596488) {
- x = 974;
- y = 882;
- } else if (b > 596488 && b <= 603793) {
- x = 985;
- y = 882;
- } else if (b > 603793 && b <= 604293) { // 117 绔欑偣 604043
- x = 996;
- y = 882;
- } else if (b > 604293 && b <= 611652) {
- x = 1007;
- y = 882;
- } else if (b > 611652 && b <= 619011) {
- x = 1018;
- y = 882;
- } else if (b > 619011 && b <= 626370) {
- x = 1029;
- y = 882;
- } else if (b > 626370 && b <= 633730) {
- x = 1;
- y = 882;
- } else if (b > 633730 && b <= 634230) { // 116 绔欑偣 633980
- x = 1040;
- y = 882;
- } else if (b > 634230 && b <= 641833) {
- x = 1050;
- y = 882;
- } else if (b > 641833 && b <= 649437) {
- x = 1060;
- y = 882;
- } else if (b > 649437 && b <= 657041) {
- x = 1070;
- y = 882;
- } else if (b > 657041 && b <= 664645) {
- x = 1080;
- y = 882;
- } else if (b > 664645 && b <= 672249) {
- x = 1090;
- y = 882;
- } else if (b > 672249 && b <= 679853) {
- x = 1100;
- y = 882;
+ // 璐濆灏旀洸绾挎彃鍊�
+ private static double[] bezierInterpolation(Object[] interval, double t) {
+ double x0 = (Double) interval[3];
+ double y0 = (Double) interval[4];
+ double x2 = (Double) interval[5];
+ double y2 = (Double) interval[6];
+ double cx = (Double) interval[7];
+ double cy = (Double) interval[8];
+ return new double[]{
+ Math.pow(1-t, 2)*x0 + 2*(1-t)*t*cx + t*t*x2,
+ Math.pow(1-t, 2)*y0 + 2*(1-t)*t*cy + t*t*y2
+ };
+ }
- } else if (b > 679853 && b <= 680353) { // 116 鎷愮偣 680103
- x = 1115;
- y = 882;
+ // 鍦嗗姬鎻掑�硷紙鏂板锛�
+ private static double[] circularInterpolation(Object[] interval, double t) {
+ // 鍙傛暟瑙ｆ瀽
+ double startX = (Double) interval[3];
+ double startY = (Double) interval[4];
+ double endX = (Double) interval[5];
+ double endY = (Double) interval[6];
+ double centerX = (Double) interval[7];
+ double centerY = (Double) interval[8];
+ // 璁＄畻璧峰瑙掑害鍜岀粓姝㈣搴�
+ double startAngle = Math.atan2(startY - centerY, startX - centerX);
+ double endAngle = Math.atan2(endY - centerY, endX - centerX);
- } else if (b > 680353 && b <= 685447) {
- x = 1125;
- y = 882;
- } else if (b > 685447 && b <= 690542) {
- x = 1125;
- y = 880;
- } else if (b > 690542 && b <= 695637) {
- x = 1135;
- y = 878;
- } else if (b > 695637 && b <= 700731) {
- x = 1145;
- y = 877;
- } else if (b > 700731 && b <= 705826) {
- x = 1155;
- y = 875;
- } else if (b > 705826 && b <= 710921) {
- x = 1190;
- y = 855;
- } else if (b > 710921 && b <= 716015) {
- x = 1200;
- y = 840;
- } else if (b > 716015 && b <= 721110) {
- x = 1210;
- y = 820;
- } else if (b > 721110 && b <= 726205) {
- x = 1215;
- y = 800;
- } else if (b > 726205 && b <= 746783) { // 115 鎷愮偣 731550
- x = 1215;
- y = 775;
+ // 瑙掑害鎻掑��
+ double currentAngle = startAngle + t * (endAngle - startAngle);
+ double radius = Math.hypot(startX - centerX, startY - centerY);
- } else if (b > 746783 && b <= 750168) {
- x = 1215;
- y = 770;
- } else if (b > 750168 && b <= 753554) {
- x = 1215;
- y = 735;
-
- } else if (b > 753554 && b <= 756940) {
- x = 1215;
- y = 700;
- } else if (b > 756940 && b <= 760326) {
- x = 1215;
- y = 665;
- } else if (b > 760326 && b <= 763712) {
- x = 1215;
- y = 630;
- } else if (b > 763712 && b <= 767098) {
- x = 1215;
- y = 595;
- } else if (b > 767098 && b <= 770484) {
- x = 1215;
- y = 560;
- } else if (b > 770484 && b <= 773870) {
- x = 1215;
- y = 535;
- } else if (b > 773870 && b <= 774370) { // 115 绔欑偣 774120
- x = 1215;
- y = 520;
- } else if (b > 774370 && b <= 780052) {
- x = 1215;
- y = 502;
- } else if (b > 780052 && b <= 785735) {
- x = 1215;
- y = 484;
- } else if (b > 785735 && b <= 791417) {
- x = 1215;
- y = 466;
- } else if (b > 791417 && b <= 797100) {
- x = 1215;
- y = 448;
- } else if (b > 797100 && b <= 797600) { // 114 绔欑偣 797100
- x = 1215;
- y = 430;
- } else if (b > 797600 && b <= 815742) {
- x = 1215;
- y = 412;
- } else if (b > 815742 && b <= 833885) {
- x = 1215;
- y = 394;
- } else if (b > 833885 && b <= 852027) {
- x = 1215;
- y = 376;
- } else if (b > 852027 && b <= 870170) {
- x = 1215;
- y = 358;
- } else if (b > 870170 && b <= 870670) { // 113 绔欑偣 870420
- x = 1215;
- y = 340;
- } else if (b > 870670 && b <= 877815) {
- x = 1215;
- y = 322;
- } else if (b > 877815 && b <= 884960) {
- x = 1215;
- y = 304;
- } else if (b > 884960 && b <= 892105) {
- x = 1215;
- y = 286;
- } else if (b > 892105 && b <= 899250) {
- x = 1215;
- y = 268;
- } else if (b > 899250 && b <= 899750) { // 112 绔欑偣 899500
- x = 1215;
- y = 250;
- } else if (b > 899750 && b <= 914290) {
- x = 1215;
- y = 225;
- } else if (b > 914290 && b <= 928830) {
- x = 1215;
- y = 200;
- } else if (b > 928830 && b <= 943370) {
- x = 1215;
- y = 175;
- } else if (b > 943370 && b <= 957910) {
- x = 1215;
- y = 150;
- } else if (b > 972450 && b <= 972950) { // 鎷愮偣
- x = 1215;
- y = 125;
-
- } else if (b > 972950 && b <= 1016193) { // 椤剁偣
- x = 1164;
- y = 80;
- } else if (b > 1016193 && b <= 1063563) { // 鎷愮偣
- x = 1115;
- y = 125;
-
- } else if (b > 1063563 && b <= 1064063) { // 111 绔欑偣 1063813
- x = 1115;
- y = 150;
- } else if (b > 1064063 && b <= 1077711) {
- x = 1115;
- y = 175;
- } else if (b > 1077711 && b <= 1078211) { // 110 绔欑偣 1077961
- x = 1115;
- y = 200;
- } else if (b > 1078211 && b <= 1104788) {
- x = 1115;
- y = 225;
- } else if (b > 1104788 && b <= 1105288) { // 109 绔欑偣 1105038
- x = 1115;
- y = 250;
- } else if (b > 1105288 && b <= 1119213) {
- x = 1115;
- y = 275;
- } else if (b > 1119213 && b <= 1119713) { // 108 绔欑偣 1119463
- x = 1115;
- y = 300;
- } else if (b > 1119713 && b <= 1145902) {
- x = 1115;
- y = 325;
- } else if (b > 1145902 && b <= 1146402) { // 107 绔欑偣 1146152
- x = 1115;
- y = 350;
- } else if (b > 1146402 && b <= 1160380) {
- x = 1115;
- y = 375;
- } else if (b > 1160380 && b <= 1160880) { // 106 绔欑偣 1160630
- x = 1115;
- y = 400;
- } else if (b > 1160880 && b <= 1187314) {
- x = 1115;
- y = 425;
- } else if (b > 1187314 && b <= 1188214) { // 105 绔欑偣 1187564
- x = 1115;
- y = 450;
- } else if (b > 1188214 && b <= 1201849) {
- x = 1115;
- y = 475;
- } else if (b > 1201849 && b <= 1202349) { // 104 绔欑偣 1202099
- x = 1115;
- y = 500;
- } else if (b > 1202349 && b <= 1228831) {
- x = 1115;
- y = 525;
- } else if (b > 1228831 && b <= 1229331) { // 103 绔欑偣 1229081
- x = 1115;
- y = 550;
- } else if (b > 1229331 && b <= 1243204) {
- x = 1115;
- y = 575;
- } else if (b > 1243204 && b <= 1243704) { // 102 绔欑偣 1243454
- x = 1115;
- y = 600;
- } else if (b > 1243704 && b <= 1269708) {
- x = 1115;
- y = 625;
- } else if (b > 1269708 && b <= 1284750) { // 101 绔欑偣 1269958
- x = 1115;
- y = 650;
- } else if (b > 1284750 && b <= 1285250) { // 101 鎷愮偣
- x = 1115;
- y = 720;
-
- } else if (b > 1285250 && b <= 1322829) { // 101 鎷愮偣
- x = 1100;
- y = 750;
-
- } else if (b > 1322829 && b <= 1737000){
- double unit = (1737000 - 1322829) / 100.0;
- double startX = 1090;
- double unitX = 7;
- y = 775;
-
- for (int i = 0; i < 100; i++) {
- if (b > 1322829 + i * unit && b <= 1322829 + (i + 1) * unit) {
- x = startX - i * unitX;
- }
- }
-
- } else if (b >= 0 && b <= 134400){
- double unit = 134400 / 41.0;
- double startX = 390;
- double unitX = 8.17;
- y = 775;
-
- for (int i = 0; i < 41; i++) {
- if (b >= 0 + i * unit && b <= 0 + (i + 1) * unit) {
- x = startX - i * unitX;
- }
- }
- } else if (b > 134400 && b <= 134900) {
- x = 25;
- y = 830;
- } else if (b > 134900 && b <= 196000) {
- x = 65;
- y = 882;
- } else if (b > 196000 && b <= 217480) {
- x = 83;
- y = 882;
- }
-
-
-
- return new double[]{x, y};
+ return new double[]{
+ centerX + radius * Math.cos(currentAngle),
+ centerY + radius * Math.sin(currentAngle)
+ };
}
}
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index 88ffe42..693a640 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -69,6 +69,9 @@
*/
@RequestMapping(value = "/getLicenseDays")
public R getLicenseDays() {
+// if (true){
+// return R.ok().add(Cools.add("day",0));
+// }
LicenseVerify licenseVerify = new LicenseVerify();
LicenseContent verifyInfo = licenseVerify.getVerifyInfo();
if (verifyInfo == null) {
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 3fe1abe..9e060ac 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -59,7 +59,7 @@
}
.station {
position: absolute;
- width: 40px;
+ width: 20px;
height: 24px;
/*border-radius: 50%;*/
text-align: center;
@@ -218,17 +218,17 @@
"
style="fill:none; stroke:blue; stroke-width:4;" />
</svg>
- <div class="bus-station">
- <div v-for="(item,i) in devpPos1" class="bus-item-top" :style="'left:' + (75 + i * 15) + 'px'">{{item.dev_no}}</div>
- </div>
- <div class="bus-station" style="flex-direction: column">
- <div v-for="(item,i) in devpPos2" class="bus-item-left" :style="'top:' + (200 + i * 50) + 'px'">{{item.dev_no}}</div>
- </div>
- <div class="bus-station" style="flex-direction: column">
- <div v-for="(item,i) in devpPos3" class="bus-item-left2" :style="'top:' + (100 + i * 10) + 'px'">{{item.dev_no}}</div>
- </div>
- <!-- Stations on outer ring -->
-<!-- <div v-for="station in tableDataDev" class="station" :style="{ top: station.valueX + '%', left: station.valueY + '%' }">{{ station.index }}</div>-->
+<!-- <div class="bus-station">-->
+<!-- <div v-for="(item,i) in devpPos1" class="bus-item-top" :style="'left:' + (75 + i * 15) + 'px'">{{item.dev_no}}</div>-->
+<!-- </div>-->
+<!-- <div class="bus-station" style="flex-direction: column">-->
+<!-- <div v-for="(item,i) in devpPos2" class="bus-item-left" :style="'top:' + (200 + i * 50) + 'px'">{{item.dev_no}}</div>-->
+<!-- </div>-->
+<!-- <div class="bus-station" style="flex-direction: column">-->
+<!-- <div v-for="(item,i) in devpPos3" class="bus-item-left2" :style="'top:' + (100 + i * 10) + 'px'">{{item.dev_no}}</div>-->
+<!-- </div>-->
+<!-- Stations on outer ring-->
+ <div v-for="station in tableDataDev" class="station" :style="{ top: station.valueY + 'px', left: station.valueX + 'px' }">{{ station.index }}</div>
<div>
<el-switch
style="display: block"
--
Gitblit v1.9.1