UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

国家库权限验证

Browse Source
busUser
anthonyywj2 3 years ago
parent 7a647193a4
commit 100baa337e
8 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File

14
api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java
Unescape Escape View File

@ -24,13 +24,15 @@ import java.util.Map;
public class AsyncDiDlHelper { public class AsyncDiDlHelper {
@Value("${UDI_SERVER_URL}") @Value("${UDI_SERVER_URL}")
private String udiUrl; private String udiUrl;
@Resource
HttpClient httpClient;
public List<ProductInfoEntity> dlByTime(String udiUrl, int page, int limit, String updateTime) { public List<ProductInfoEntity> dlByTime(String udiUrl, int page, int limit, String updateTime) {
Map<String, Object> paramMap = new HashMap<>(16); Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("page", page); paramMap.put("page", page);
paramMap.put("limit", limit); paramMap.put("limit", limit);
paramMap.put("updateTime", updateTime); paramMap.put("updateTime", updateTime);
String response = HttpClient.mipsGet(udiUrl + "/udidl/udiwms/syncUdi", paramMap); String response = httpClient.mipsGetUdiHead(udiUrl + "/udidl/udiwms/syncUdi", paramMap);
try { try {
BaseResponse<List<ProductInfoEntity>> udiDlDeviceResponse = BaseResponse<List<ProductInfoEntity>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() {
@ -51,7 +53,7 @@ public class AsyncDiDlHelper {
paramMap.put("page", page); paramMap.put("page", page);
paramMap.put("limit", limit); paramMap.put("limit", limit);
paramMap.put("updateTime", updateTime); paramMap.put("updateTime", updateTime);
String response = HttpClient.mipsGet(udiUrl + "/udidl/udiwms/syncCompany", paramMap); String response = httpClient.mipsGetUdiHead(udiUrl + "/udidl/udiwms/syncCompany", paramMap);
try { try {
BaseResponse<List<UdiCompanyEntity>> baseResponse = BaseResponse<List<UdiCompanyEntity>> baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<UdiCompanyEntity>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<List<UdiCompanyEntity>>>() {
@ -70,7 +72,7 @@ public class AsyncDiDlHelper {
public List<ProductInfoEntity> dlByDi(String deviceId) { public List<ProductInfoEntity> dlByDi(String deviceId) {
Map<String, Object> paramMap = new HashMap<>(16); Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("deviceId", deviceId); paramMap.put("deviceId", deviceId);
String response = HttpClient.mipsGet(udiUrl + "/udidl/device/serchDlByDi", paramMap); String response = httpClient.mipsGetUdiHead(udiUrl + "/udidl/device/serchDlByDi", paramMap);
try { try {
BaseResponse<List<ProductInfoEntity>> baseResponse = BaseResponse<List<ProductInfoEntity>> baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() {
@ -92,7 +94,7 @@ public class AsyncDiDlHelper {
public BaseResponse<List<ProductInfoEntity>> dlByDiRes(String deviceId) { public BaseResponse<List<ProductInfoEntity>> dlByDiRes(String deviceId) {
Map<String, Object> paramMap = new HashMap<>(16); Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("deviceId", deviceId); paramMap.put("deviceId", deviceId);
String response = HttpClient.mipsGet(udiUrl + "/udidl/device/serchDlByDi", paramMap); String response = httpClient.mipsGetUdiHead(udiUrl + "/udidl/device/serchDlByDi", paramMap);
try { try {
BaseResponse<List<ProductInfoEntity>> baseResponse = BaseResponse<List<ProductInfoEntity>> baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() {
@ -108,7 +110,7 @@ public class AsyncDiDlHelper {
public BaseResponse<List<ProductInfoEntity>> dlLastVersionByDi(String deviceId) { public BaseResponse<List<ProductInfoEntity>> dlLastVersionByDi(String deviceId) {
Map<String, Object> paramMap = new HashMap<>(16); Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("deviceId", deviceId); paramMap.put("deviceId", deviceId);
String response = HttpClient.mipsGet(udiUrl + "/udidl/device/dlLastVersionByDi", paramMap); String response = httpClient.mipsGetUdiHead(udiUrl + "/udidl/device/dlLastVersionByDi", paramMap);
try { try {
BaseResponse<List<ProductInfoEntity>> baseResponse = BaseResponse<List<ProductInfoEntity>> baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() {
@ -131,7 +133,7 @@ public class AsyncDiDlHelper {
Map<String, Object> paramMap = new HashMap<>(16); Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("uuid", uuid); paramMap.put("uuid", uuid);
String response = HttpClient.mipsGet(udiUrl + "/udidl/device/searchDlByUuid", paramMap); String response = httpClient.mipsGetUdiHead(udiUrl + "/udidl/device/searchDlByUuid", paramMap);
try { try {
BaseResponse<List<ProductInfoEntity>> baseResponse = BaseResponse<List<ProductInfoEntity>> baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() {

2
api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java
Unescape Escape View File

@ -295,7 +295,7 @@ public class BasicUpdateProductService {
paramMap.put("zczbhhzbapzbh", productInfoFilterRequest.getZczbhhzbapzbh()); paramMap.put("zczbhhzbapzbh", productInfoFilterRequest.getZczbhhzbapzbh());
paramMap.put("uuid", productInfoFilterRequest.getUuid()); paramMap.put("uuid", productInfoFilterRequest.getUuid());
String response = httpClient.mipsGetHead(udiUrl + "/udidl/device/filterAllUdi", paramMap); String response = httpClient.mipsGetUdiHead(udiUrl + "/udidl/device/filterAllUdi", paramMap);
try { try {
BaseResponse<PageSimpleResponse<UdiInfoEntity>> udiDlDeviceResponse = BaseResponse<PageSimpleResponse<UdiInfoEntity>> udiDlDeviceResponse =

2
api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
Unescape Escape View File

@ -61,8 +61,6 @@ public class IoTransInoutService {
UdiRelevanceService udiRelevanceService; UdiRelevanceService udiRelevanceService;
@Resource @Resource
private UdiInfoService udiInfoService; private UdiInfoService udiInfoService;
@Value("${UDI_SERVER_URL}")
private String udiUrl;
@Resource @Resource
private CodesTempService codesTempService; private CodesTempService codesTempService;

12
api-admin/src/main/java/com/glxp/sale/admin/util/HttpClient.java
Unescape Escape View File

@ -20,8 +20,10 @@ import java.util.Map;
@Service @Service
public class HttpClient { public class HttpClient {
@Value("${UDI_KEY}") @Value("${UDI_APPID}")
private String udiKey; private String appId;
@Value("${UDI_SECRET}")
private String appSecret;
private static final Logger logger = LoggerFactory.getLogger(HttpClient.class); private static final Logger logger = LoggerFactory.getLogger(HttpClient.class);
@ -162,11 +164,12 @@ public class HttpClient {
} }
public String mipsGetHead(String url, Map params) { public String mipsGetUdiHead(String url, Map params) {
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json"); headers.add("Content-Type", "application/json");
headers.add("key", udiKey); headers.add("appId", appId);
headers.add("appSecret", appSecret);
StringBuffer stringBuffer = new StringBuffer(url); StringBuffer stringBuffer = new StringBuffer(url);
if (params instanceof Map) { if (params instanceof Map) {
Iterator iterator = ((Map) params).entrySet().iterator(); Iterator iterator = ((Map) params).entrySet().iterator();
@ -187,7 +190,6 @@ public class HttpClient {
} }
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list"; String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list";
logger.info(accessTokenRequestUrl+"---"+udiKey);
ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(headers), String.class); ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(headers), String.class);
// String response = restTemplate.getForObject(accessTokenRequestUrl, String.class, new HttpEntity<String>(headers)); // String response = restTemplate.getForObject(accessTokenRequestUrl, String.class, new HttpEntity<String>(headers));
return response.getBody(); return response.getBody();

5
api-admin/src/main/resources/application-dev.properties
Unescape Escape View File

@ -1,5 +1,5 @@
# \u751F\u4EA7\u73AF\u5883 # \u751F\u4EA7\u73AF\u5883
server.port=9906 server.port=9907
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root spring.datasource.username=root
@ -20,7 +20,8 @@ spring.servlet.multipart.max-request-size=200MB
server.connectionTimeout=180000 server.connectionTimeout=180000
#file_path=/home/glxpdata/udiwms #file_path=/home/glxpdata/udiwms
file_path=D:/glxpdata/udiwms file_path=D:/glxpdata/udiwms
UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_APPID=SPMS_DEV
UDI_SECRET=563ecd2323064aafb013ac50621575f9
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
#UDI_SERVER_URL=http://127.0.0.1:9994 #UDI_SERVER_URL=http://127.0.0.1:9994
#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server #UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server

3
api-admin/src/main/resources/application-pro.properties
Unescape Escape View File

@ -19,7 +19,8 @@ server.connectionTimeout=180000
logging.level.com.glxp.sale.admin.dao=debug logging.level.com.glxp.sale.admin.dao=debug
#file_path=/home/glxpdata/udiwms #file_path=/home/glxpdata/udiwms
file_path=D:/glxpdata/udiwms file_path=D:/glxpdata/udiwms
UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_APPID=SPMS_DEV
UDI_SECRET=563ecd2323064aafb013ac50621575f9
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8

3
api-admin/src/main/resources/application-test1.properties
Unescape Escape View File

@ -32,7 +32,8 @@ logging.level.com.glxp.api.admin.dao.thrsys=debug
file_path=/home/glxpdata/udiwms file_path=/home/glxpdata/udiwms
#file_path=D:/glxpdata/udiwms #file_path=D:/glxpdata/udiwms
#UDI\u6570\u636E\u4E0B\u8F7D #UDI\u6570\u636E\u4E0B\u8F7D
UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_APPID=SPMS_DEV
UDI_SECRET=563ecd2323064aafb013ac50621575f9
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
#UDI_SERVER_URL=http://127.0.0.1:9994 #UDI_SERVER_URL=http://127.0.0.1:9994
#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server #UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server

10
api-admin/src/main/resources/application-test2.properties
Unescape Escape View File

@ -32,15 +32,11 @@ logging.level.com.glxp.api.admin.dao.thrsys=debug
file_path=/home/glxpdata/udiwms file_path=/home/glxpdata/udiwms
#file_path=D:/glxpdata/udiwms #file_path=D:/glxpdata/udiwms
#UDI\u6570\u636E\u4E0B\u8F7D #UDI\u6570\u636E\u4E0B\u8F7D
UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_APPID=SPMS_DEV
UDI_SECRET=563ecd2323064aafb013ac50621575f9
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
#UDI_SERVER_URL=http://127.0.0.1:9994
#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server
#UCLOD\u670D\u52A1
#UCLOD_SERVER_URL=http://127.0.0.1:9997
#UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER
UCLOD_SERVER_URL=http://139.9.178.73/UDIC_UCLOUD_SERVER UCLOD_SERVER_URL=http://139.9.178.73/UDIC_UCLOUD_SERVER
#mips\u670D\u52A1\u5730\u5740
UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:8080/UDIC_MIPSDL_Server UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:8080/UDIC_MIPSDL_Server
#UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:9997 #UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:9997
UDIC_U8_URL="https://api.yonyoucloud.com/apis/u8c/uapbd/invmandoc_query" UDIC_U8_URL="https://api.yonyoucloud.com/apis/u8c/uapbd/invmandoc_query"

Write Preview
Loading…
Cancel
Save