From 4cd59354a33d72da0da52540adc4a0262e4aa9d0 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 04 十二月 2024 19:12:00 +0800
Subject: [PATCH] 调整宁夏接口
---
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 1 +
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java | 5 +++++
src/main/resources/application-pro.yml | 18 +++++++++---------
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java | 7 +++++++
src/main/java/com/fzzy/api/view/Api1205.view.xml | 9 +++++++++
5 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/Api1205.view.xml b/src/main/java/com/fzzy/api/view/Api1205.view.xml
index 3167b3d..bcea5f2 100644
--- a/src/main/java/com/fzzy/api/view/Api1205.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1205.view.xml
@@ -63,6 +63,10 @@
<Property></Property>
<Property name="label">鎵胯繍浜�</Property>
</PropertyDef>
+ <PropertyDef name="jjlx">
+ <Property></Property>
+ <Property name="label">妫�鏂ょ被鍨�</Property>
+ </PropertyDef>
<PropertyDef name="lxdh">
<Property></Property>
<Property name="label">鑱旂郴鐢佃瘽</Property>
@@ -655,6 +659,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">jjlx</Property>
+ <Property name="property">jjlx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">bzbdbz</Property>
<Property name="property">bzbdbz</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index f693c49..1a0ea79 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -462,6 +462,7 @@
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
api1206.setTyckjsdh(api1206.getCkjsdh().replace(apiData.getKqdm(), tykqbm));
}
+ api1206.setFpzt("1");
return api1206;
}
if (Constant.API_CODE_1207.equals(inteId)) {
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java
index c22d63e..98bbcfe 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java
@@ -3,6 +3,8 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
+
+import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -56,6 +58,9 @@
@PropertyDef(label = "妫�楠岀粨鏋�")
private String jyjg;
+ @PropertyDef(label = "椋熷搧瀹夊叏鎸囨爣鏄惁鍚堟牸")
+ private String spaqzbsfhg;
+
@PropertyDef(label = "绮鍝佺浠ｇ爜")
private String lspzdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java
index 18e2a76..0c3693e 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java
@@ -2,7 +2,10 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
+
+import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -83,6 +86,10 @@
@PropertyDef(label = "浜у湴浠ｇ爜")
private String cddm;
+ @PropertyDef(label = "妫�鏂ょ被鍨�", description = "0锛氱О閲嶅叆搴擄紙榛樿锛�1锛氭爣鍑嗗寘鍏ュ簱")
+ @JsonProperty("Jjlx")
+ private String jjlx = "0";
+
@PropertyDef(label = "鐨噸(鍏枻)")
private double pz;
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index eb88f33..3625350 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 涓婃捣鍢夊畾 -C鐩� pro ##########################
+########################## 瀹佸鐭冲槾灞辩孩鏋滃瓙绮簱 ##########################
server:
port: 8090
jetty:
@@ -9,13 +9,13 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://192.168.200.3:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
@@ -39,7 +39,7 @@
# Redis鐩稿叧閰嶇疆
redis:
database: 1
- host: 192.168.200.3
+ host: 127.0.0.1
port: 6379
password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
@@ -51,11 +51,11 @@
timeout: 6000
igds:
default:
- companyId: 5303
- file-path: C:/IGDS-API/FILE/
- img-path: C:/IGDS/FILE/
+ companyId: 5306
+ file-path: D:/IGDS-API/FILE/
+ img-path: D:/IGDS/FILE/
# 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
#鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
# 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
- #鍏挜锛歁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=
+ #鍏挜锛歁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==
--
Gitblit v1.9.3