From f31db99e67cc3e4a4092b4957af1076b634e6b48 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 15 十二月 2023 17:23:55 +0800
Subject: [PATCH] 修复粮情数据转换
---
src/main/resources/application-dev.yml | 34 ++++++++--------
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java | 11 ++++-
src/main/resources/application-pro.yml | 16 ++++----
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java | 2
src/main/resources/application.yml | 2
5 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
index 0b51d0e..1f17c90 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
@@ -161,7 +161,7 @@
for (int i = 1; i <= l; i++) {
for (int j = 1; j <= h; j++) {
for (int z = 1; z <= c; z++) {
- result += ("|" + points[(i * j - 1) * c + z - 1] + "," + z + "," + j + "," + i);
+ result += ("|" + points[((i-1)*h+j-1)*c + z -1] + "," + z + "," + j + "," + i);
}
}
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
index bf19ffb..b093d1d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
@@ -155,12 +155,19 @@
}
+ public static void main(String[] args) {
+ String point = "31.8,20.0,15.1,18.6,28.2,14.3,11.3,16.1,28.1,15.6,13.3,18.4,28.8,16.6,10.2,14.4,27.8,14.3,10.8,16.0,27.5,14.5,11.7,17.1,26.5,13.6,10.1,15.0,29.7,17.4,13.8,17.8,29.7,18.6,15.0,18.6,26.4,13.5,9.2,13.1,27.6,11.8,8.9,13.5,28.1,12.0,8.6,12.8,27.8,11.6,7.6,12.4,26.1,10.8,7.5,12.6,27.8,10.3,7.1,12.0,26.1,11.3,8.5,12.7,28.6,16.9,12.9,17.7,29.1,12.3,8.8,12.1,27.4,11.9,8.6,12.8,29.0,11.5,7.6,11.1,26.9,10.2,8.0,12.7,27.0,9.6,7.7,13.5,26.7,9.5,7.1,12.3,26.3,10.7,8.4,13.4,27.6,15.9,11.5,15.8,28.7,12.6,8.7,12.2,28.1,12.2,8.8,12.5,30.3,11.9,8.0,12.0,27.9,11.1,7.8,11.5,26.3,10.1,7.8,12.0,27.2,10.5,6.9,11.1,27.1,11.6,9.5,13.6,27.4,14.8,10.7,16.6,27.7,12.4,9.1,13.0,27.7,13.2,9.0,12.8,27.5,12.1,8.1,12.6,26.6,11.8,7.3,12.3,26.8,10.5,8.0,13.3,26.3,11.0,7.6,12.5,26.1,10.6,8.5,13.5,29.8,21.3,15.5,17.8,28.3,18.2,11.6,12.8,29.4,17.4,13.0,16.1,28.4,22.3,14.6,15.4,28.7,17.5,11.8,15.2,26.5,14.6,10.9,14.8,27.8,15.3,10.3,14.8,27.6,16.7,13.6,17.4";
+ String cable = "4-6-8";
+ String tempPointList1 = getTempPointList1(point, cable);
+ System.out.println(tempPointList1);
+ }
+
/**
* 鑾峰彇骞虫柟浠撶殑娓╁害鍊奸泦鍚堬紝鏍煎紡锛氭俯搴﹀��,灞傛暟,琛屾暟,鍒楁暟|娓╁害鍊�,灞傛暟,琛屾暟,鍒楁暟|娓╁害鍊�,灞傛暟,琛屾暟,鍒楁暟
*
* @return
*/
- private String getTempPointList1(String point, String cable) {
+ private static String getTempPointList1(String point, String cable) {
String[] cab = cable.split("-");
int c = Integer.valueOf(cab[0]);
int h = Integer.valueOf(cab[1]);
@@ -174,7 +181,7 @@
for (int i = 1; i <= l; i++) {
for (int j = 1; j <= h; j++) {
for (int z = 1; z <= c; z++) {
- result += ("|" + points[(i * j - 1) * c + z - 1] + "," + z + "," + j + "," + i);
+ result += ("|" + points[((i-1)*h+j-1)*c + z -1] + "," + z + "," + j + "," + i);
}
}
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a14e508..6277997 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -6,22 +6,22 @@
#涓绘暟鎹簮
primary:
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
- url: jdbc:mysql://127.0.0.1:3306/igds_api_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8 #瀹佸鐭冲槾灞�
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8 #瀹佸鐭冲槾灞�
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞挎境
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_002?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼鍒嗗簱-婵犳睙鍖虹璧佸簱
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娓彛鏂颁粨
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鍏冲煚鑰佷粨
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_3?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鐩村睘浠撳簱
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-瑗胯儶-鏂颁粨绮簱
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-瑗胯儶-涓滃嚖绮簱
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_5?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-閲戠伓涓�鎵�绮簱
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_6?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-閲戠伓浜屾墍绮簱
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_7?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-绮补杞繍绔�
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_8?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娌虫邯绮墍
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_9?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娴烽棬绮墍
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_10?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鍜屽钩绮墍
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_001?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娓彛鏂颁粨-------鍏ㄩ儴瀹屾垚
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_002?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鍏冲煚鑰佷粨-------鍏ㄩ儴瀹屾垚
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_005?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼鍒嗗簱-婵犳睙鍖虹璧佸簱
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_101?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鐩村睘浠撳簱-------鍏ㄩ儴瀹屾垚
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_201?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-瑗胯儶-鏂颁粨绮簱--缂哄皯绮璐攢鍜岀鐞�
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_202?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-瑗胯儶-涓滃嚖绮簱--鍏ㄩ儴瀹屾垚
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_301?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-閲戠伓涓�鎵�绮簱
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_401?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-閲戠伓浜屾墍绮簱---鍏ㄩ儴瀹屾垚
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_501?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-绮补杞繍绔�
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_601?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娌虫邯绮墍
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_701?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娴烽棬绮墍
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_801?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鍜屽钩绮墍
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢鍙板北
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢闊跺叧
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5322?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢寰愰椈
@@ -34,8 +34,8 @@
#娆℃暟鎹簮
secondary:
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
-# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
- url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8 #瀹佸鐭冲槾灞�
+ url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8 #瀹佸鐭冲槾灞�
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞挎境
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
@@ -66,7 +66,7 @@
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
# Redis鐩稿叧閰嶇疆
redis:
- database: 9
+ database: 15
host: 127.0.0.1
port: 6379
password: Abc123..
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 3625350..1546be1 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 瀹佸鐭冲槾灞辩孩鏋滃瓙绮簱 ##########################
+########################## 涓婃捣鍢夊畾 ##########################
server:
port: 8090
jetty:
@@ -9,16 +9,16 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
- password: Abc123..
+ password: root
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
- password: Abc123..
+ password: root
jpa:
#涓籮pa閰嶇疆
primary:
@@ -51,11 +51,11 @@
timeout: 6000
igds:
default:
- companyId: 5306
+ companyId: 5303
file-path: D:/IGDS-API/FILE/
img-path: D:/IGDS/FILE/
# 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
#鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
# 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
- #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMsCJyl6EkjUEfB9Otl0bNmFD0Gr3g/v8DYnoq66EIviDNKT+bo5Aj6BRFngns1aCy1uyWgC5/+PIQ3sxs25nWXxFBYXy7cTiGwCCPfnmmI3rkXRGqRo6uh9K3BsucSE0kyhB8Eq76bQ6BPa5XpMyyq8V2oN2i0LLYpDhV97j3BwIDAQAB
- #绉侀挜锛歁IICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIywInKXoSSNQR8H062XRs2YUPQaveD+/wNieirroQi+IM0pP5ujkCPoFEWeCezVoLLW7JaALn/48hDezGzbmdZfEUFhfLtxOIbAII9+eaYjeuRdEapGjq6H0rcGy5xITSTKEHwSrvptDoE9rlekzLKrxXag3aLQstikOFX3uPcHAgMBAAECgYAOZvWPz4/ygvdYqt9zlNntsBsRci9f+hq3CPzCqg55K6WF+yQE1dCqrFZu7gfME+54gGIF4idgeGanbXd16WEtFslEJlFKGk3cF62gaX5Y/nZ4zS65CLTjQ650j6SJ7OC2QYjIejTWhJD0k1tSazXdzV70nP+X3DbGyyO3Rm+juQJBANMCi+9RnzcGvltN/AdWD0DgshRBNrqrHtDkmzRFSkFwIqVSL5J7qRvntjhSstQIBB5KCosCmwRYKxGWQ9Ou420CQQCqrz2byBz3w2pkEfPY3rv7T4zE/2CHC74XtW9sEUTieYaxqIKlnwJacactzx4ZOAg21dGCoqOG9Y9RIpH2mMfDAkEAlAucXIt61qOfmPXtFsSVrSI5LybWHEAFPfC2yAS5ZZIkbLNt9ytV6eM3oOq81zDMmue93+wzEOg/R3aTHgj9PQJALNGxUsu8V473y+ku596s6/PamgwZE70QoHcjF/R86x9QMCx4ifb0Dj3T0WKWm7ar6YJB7pS4bgLjLEHwpBlAMwJAUUG2NhfGXFxfyFOC+5BzFTEr7EdSeHPXJl7dIWmRHncHsv8Nl2yvWsIOfDOYKS3ynptMgeSZaJPnXhvFdX0TnQ==
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB
+ #绉侀挜锛歁IICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a862643..4f73abd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ##########################
spring:
profiles:
- active: dev
+ active: pro
application:
name: igds-api
main:
--
Gitblit v1.9.3