From 451f8ceb451519c029a0bcd0373b7b493e6265fc Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 18 三月 2025 14:38:42 +0800
Subject: [PATCH] 优化上海对农数据解析
---
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java | 5 +++--
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | 2 +-
src/main/java/com/fzzy/inte/sh2023/controller/ControllerSh2023.java | 20 ++++++++------------
src/main/resources/application-pro.yml | 27 ++++++++++++++++-----------
4 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
index 9bb34b3..9828554 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -79,7 +79,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40DrugLogApply> list = fzzy40Sync1023Rep.listDrugLogApply(deptId);
+ List<Fz40DrugLogApply> list = fzzy40Sync1023Rep.listDrugLogApply(deptId, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮啅钂稿妗堜俊鎭�------------------");
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java
index f15f98c..ca2bb2f 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java
@@ -5,6 +5,7 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
+import java.util.Date;
import java.util.List;
/**
@@ -15,7 +16,7 @@
public interface Fzzy40Sync1023Rep extends JpaRepository<Fz40DrugLogApply, String> {
//鏌ヨ鐔忚捀澶囨涓昏〃
- @Query("from Fz40DrugLogApply where deptId =:deptId")
- List<Fz40DrugLogApply> listDrugLogApply(@Param("deptId") String deptId);
+ @Query("from Fz40DrugLogApply where deptId =:deptId and updateTime >=:start and updateTime <=:end")
+ List<Fz40DrugLogApply> listDrugLogApply(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/inte/sh2023/controller/ControllerSh2023.java b/src/main/java/com/fzzy/inte/sh2023/controller/ControllerSh2023.java
index 2a051aa..bd639d1 100644
--- a/src/main/java/com/fzzy/inte/sh2023/controller/ControllerSh2023.java
+++ b/src/main/java/com/fzzy/inte/sh2023/controller/ControllerSh2023.java
@@ -1,13 +1,11 @@
package com.fzzy.inte.sh2023.controller;
import com.alibaba.fastjson.JSONObject;
-import com.fzzy.api.entity.Api9109;
import com.fzzy.api.utils.RSAUtils;
import com.fzzy.inte.sh2023.constant.ApiRespCode;
import com.fzzy.inte.sh2023.dto.ApiResp;
import com.fzzy.inte.sh2023.dto.SHDN2023ReqDto;
import com.fzzy.inte.sh2023.service.SHDNService;
-import com.fzzy.push.sh2023.SH2023Constant;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,9 +14,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-
import javax.servlet.http.HttpServletRequest;
-import java.util.List;
/**
* 涓婃捣瀵瑰啘鎺ュ彛
@@ -31,6 +27,7 @@
private SHDNService shdnService;
private static final String PRIVATE_KEY = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=";
+ private static final String PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB";
private static final String SIGN = "JD-DNSGSJ";
private static final String DEPT_ID = "5303_003";
@@ -42,23 +39,22 @@
return new ApiResp(ApiRespCode.R_500.getCode(),ApiRespCode.R_500.getMsg());
}
- //瑙ｅ瘑鎶ユ枃
- dataStr = RSAUtils.decrypt(dataStr, PRIVATE_KEY);
- if(StringUtils.isEmpty(dataStr)){
- return new ApiResp(ApiRespCode.R_500.getCode(),ApiRespCode.R_500.getMsg());
- }
-
SHDN2023ReqDto shdn2023ReqDto = JSONObject.parseObject(dataStr, SHDN2023ReqDto.class);
if(null == shdn2023ReqDto){
return new ApiResp(ApiRespCode.R_500.getCode(),ApiRespCode.R_500.getMsg());
}
-
if(!shdn2023ReqDto.getSign().equals(SIGN) || !shdn2023ReqDto.getDeptId().equals(DEPT_ID)) {
return new ApiResp(ApiRespCode.R_500.getCode(),ApiRespCode.R_500.getMsg());
}
+ //瑙ｅ瘑鎶ユ枃
+ String data = RSAUtils.decrypt(shdn2023ReqDto.getData(), PRIVATE_KEY);
+ if(StringUtils.isEmpty(data)){
+ return new ApiResp(ApiRespCode.R_500.getCode(),ApiRespCode.R_500.getMsg());
+ }
+
//寮傛淇濆瓨
- shdnService.syncData(interfaceId, shdn2023ReqDto.getData(), shdn2023ReqDto.getDeptId());
+ shdnService.syncData(interfaceId, data, shdn2023ReqDto.getDeptId());
return new ApiResp();
}
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index d5033e8..eb88f33 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,6 +1,6 @@
-########################## 闄曡タ鏌炴按鍘� ##########################
+########################## 涓婃捣鍢夊畾 -C鐩� pro ##########################
server:
- port: 8091
+ port: 8090
jetty:
max-http-post-size: 209715200
tomcat:
@@ -9,16 +9,16 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api_2024?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ 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: Fzzy@#$%5432..K
+ 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: Fzzy@#$%5432..K
+ password: Abc123..
jpa:
#涓籮pa閰嶇疆
primary:
@@ -39,9 +39,9 @@
# Redis鐩稿叧閰嶇疆
redis:
database: 1
- host: 127.0.0.1
+ host: 192.168.200.3
port: 6379
- password: Redispwd..
+ password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
pool:
max-active: 200
@@ -51,6 +51,11 @@
timeout: 6000
igds:
default:
- companyId: 5348
- file-path: D:/IGDS-API/FILE/
- img-path: D:/IGDS/FILE/
\ No newline at end of file
+ companyId: 5303
+ file-path: C:/IGDS-API/FILE/
+ img-path: C:/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=
--
Gitblit v1.9.3