From be565da67e8a2257771896da5f7347ec127cdd10 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 25 九月 2024 10:03:46 +0800
Subject: [PATCH] 调整上海嘉定纪委接口：增加指令上传
---
src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023OrderServiceImpl.java | 120 ++++++++++++++++++++++++++++++++++++++++
src/main/resources/application-pro5303-jw.yml | 14 ++--
src/main/resources/application-pro2.yml | 20 +++---
src/main/resources/application-pro.yml | 18 +++---
src/main/resources/application-pro5317.yml | 2
5 files changed, 147 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023OrderServiceImpl.java b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023OrderServiceImpl.java
new file mode 100644
index 0000000..acc1223
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023OrderServiceImpl.java
@@ -0,0 +1,120 @@
+package com.fzzy.push.shjdjw2023;
+
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.order.common.OrderCommonService;
+import com.fzzy.order.common.data.OrderCommonConstant;
+import com.fzzy.order.common.data.OrderCommonData;
+import com.fzzy.push.impl.ComPushService11;
+import com.fzzy.push.impl.ComPushService12;
+import com.fzzy.push.impl.ComPushService13;
+import com.fzzy.push.impl.ComPushService14;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.text.ParseException;
+
+/**
+ * 涓婃捣鍢夊畾绾鎺ュ彛鎸囦护涓婃姤-浠呮祴璇曚娇鐢�
+ *
+ * @Description
+ * @Author CZT
+ * @Date 2024/9/25 9:36
+ */
+@Slf4j
+@Service
+public class Shjdjw2023OrderServiceImpl implements OrderCommonService {
+
+ @Autowired
+ private ShjdjwApiRemoteService2023 apiRemoteService;
+ @Autowired
+ private ComPushService11 pushService11;
+ @Autowired
+ private ComPushService12 pushService12;
+ @Autowired
+ private ComPushService13 pushService13;
+ @Autowired
+ private ComPushService14 pushService14;
+
+ @Override
+ public String getProtocol() {
+ return PushProtocol.SB_SHJdJW_2023.getCode();
+ }
+
+ @Override
+ public void execute(OrderCommonData req, String orderType, ApiConfs conf, String orderid) throws ParseException {
+
+ // 鑻ユ寚浠ょ被鍨嬩笉涓�1锛屽垯杩斿洖
+ if(!OrderCommonConstant.ORDER_TYPE_1.equals(orderType)){
+ log.error("鎸囦护绫诲瀷涓嶄负1锛屼笉杩涜鏁版嵁涓婃姤={}", req);
+ return;
+ }
+ String ids = req.getContent();
+ if(StringUtils.isEmpty(ids)){
+ log.error("鎸囦护鎺ュ彛涓虹┖锛屼笉杩涜鏁版嵁涓婃姤={}", req);
+ return;
+ }
+
+ ApiParam param = new ApiParam();
+ param.setPushProtocol(conf.getPushProtocol());
+ param.setKqdm(conf.getKqdm());
+ param.setStart(DateUtils.parseDate(req.getStarttime(), new String[]{"yyyy-MM-dd HH:mm:ss"}));
+ param.setEnd(DateUtils.parseDate(req.getEndtime(), new String[]{"yyyy-MM-dd HH:mm:ss"}));
+ param.setDeptId(conf.getDeptId());
+
+ log.info("鎺ユ敹鐨勬寚浠や腑鎺ュ彛鍐呭涓�={}", req.getContent());
+ String[] interfaces = ids.split(";");
+ for (String inteId : interfaces) {
+ log.info("鎵ц鎺ュ彛={}鐨勬暟鎹笂鎶�", inteId);
+ getDataToPush(param, inteId);
+ }
+ }
+
+ private void getDataToPush(ApiParam param, String inteId) {
+
+ switch (inteId) {
+ case "1101":
+ pushService11.pushData1101(apiRemoteService, param);
+ break;
+ case "1102":
+ pushService11.pushData1102(apiRemoteService, param);
+ break;
+ case "1103":
+ pushService11.pushData1103(apiRemoteService, param);
+ break;
+ case "1104":
+ pushService11.pushData1104(apiRemoteService, param);
+ break;
+ case "1105":
+ pushService11.pushData1105(apiRemoteService, param);
+ break;
+ case "1202":
+ pushService12.pushData1202(apiRemoteService, param);
+ break;
+ case "1203":
+ pushService12.pushData1203(apiRemoteService, param);
+ break;
+ case "1205":
+ pushService12.pushData1205(apiRemoteService, param);
+ break;
+ case "1209":
+ pushService12.pushData1209(apiRemoteService, param);
+ break;
+ case "1310":
+ pushService13.pushData1310(apiRemoteService, param);
+ break;
+ case "1403":
+ pushService14.pushData1403(apiRemoteService, param);
+ break;
+ case "1404":
+ pushService14.pushData1404(apiRemoteService, param);
+ break;
+ default:
+ log.error("-----鍢夊畾绾骞冲彴锛氭湭鍖归厤鍒版帴鍙ｇ紪鐮侊紝涓嶆帹閫�-----");
+ break;
+ }
+ }
+}
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 3625350..eb88f33 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://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://192.168.200.3:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
#娆℃暟鎹簮
secondary:
- 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&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
@@ -39,7 +39,7 @@
# Redis鐩稿叧閰嶇疆
redis:
database: 1
- host: 127.0.0.1
+ host: 192.168.200.3
port: 6379
password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
@@ -51,11 +51,11 @@
timeout: 6000
igds:
default:
- companyId: 5306
- file-path: D:/IGDS-API/FILE/
- img-path: D:/IGDS/FILE/
+ companyId: 5303
+ file-path: C:/IGDS-API/FILE/
+ img-path: C:/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-pro2.yml b/src/main/resources/application-pro2.yml
index 6d0e245..3002e73 100644
--- a/src/main/resources/application-pro2.yml
+++ b/src/main/resources/application-pro2.yml
@@ -1,4 +1,4 @@
-########################## 瀹佸鐭冲槾灞辩孩鏋滃瓙绮簱-pro2 ##########################
+########################## 涓婃捣鍢夊畾-绾 ##########################
server:
port: 8091
jetty:
@@ -9,13 +9,13 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api_gb?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://192.168.200.3:3306/igds_api_jw?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
#娆℃暟鎹簮
secondary:
- 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&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
@@ -38,8 +38,8 @@
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
# Redis鐩稿叧閰嶇疆
redis:
- database: 3
- host: 127.0.0.1
+ database: 10
+ host: 192.168.200.3
port: 6379
password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
@@ -51,11 +51,11 @@
timeout: 6000
igds:
default:
- companyId: 5306
- file-path: D:/IGDS-API/FILE-GB/
- img-path: D:/IGDS/FILE/
+ companyId: 5303
+ file-path: C:/IGDS-API-jw/FILE/
+ img-path: C:/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-pro5303-jw.yml b/src/main/resources/application-pro5303-jw.yml
index 77520d5..3002e73 100644
--- a/src/main/resources/application-pro5303-jw.yml
+++ b/src/main/resources/application-pro5303-jw.yml
@@ -9,16 +9,16 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api_jw?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ url: jdbc:mysql://192.168.200.3:3306/igds_api_jw?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
- password: root
+ password: Abc123..
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
- password: root
+ password: Abc123..
jpa:
#涓籮pa閰嶇疆
primary:
@@ -39,7 +39,7 @@
# Redis鐩稿叧閰嶇疆
redis:
database: 10
- host: 127.0.0.1
+ host: 192.168.200.3
port: 6379
password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
@@ -52,8 +52,8 @@
igds:
default:
companyId: 5303
- file-path: D:/IGDS-API-jw/FILE/
- img-path: D:/IGDS/FILE/
+ file-path: C:/IGDS-API-jw/FILE/
+ img-path: C:/IGDS/FILE/
# 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
#鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
# 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
diff --git a/src/main/resources/application-pro5317.yml b/src/main/resources/application-pro5317.yml
index 97fc489..2c51c37 100644
--- a/src/main/resources/application-pro5317.yml
+++ b/src/main/resources/application-pro5317.yml
@@ -38,7 +38,7 @@
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
# Redis鐩稿叧閰嶇疆
redis:
- database: 0
+ database: 1
host: 127.0.0.1
port: 6379
password: Abc123..
--
Gitblit v1.9.3