From b0ea50dd24a7ed5ada38dc6c8209f78fc09f0441 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 六月 2024 17:45:33 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseResponse.java | 4 +
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FaceAddOrEditesponse.java | 4 +
server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 17 +++--
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 29 +++++----
server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java | 42 ++++++-------
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 29 +++++----
8 files changed, 71 insertions(+), 58 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
index 87a1866..5cc9bcd 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -64,7 +64,7 @@
* 姣忓垎閽熸媺鍙栦竴娆′粖鏃ョ殑璁垮棰勭害鏁版嵁
* @throws Exception
*/
- @Scheduled(fixedRate= 30*1000)
+ @Scheduled(fixedRate= 3*60*1000)
public void syncVistAppointData() throws Exception {
if(Constants.DEALING_FROM_HK_VISIT){
return ;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
index 17067e0..1d6699c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
@@ -35,27 +35,23 @@
@Service
public class ErpTool {
- @Autowired
- private InterfaceLogService interfaceLogService;
- @Autowired
- private SqlSessionFactory sqlSessionFactory;
+ public static InterfaceLogService interfaceLogService;
public void saveInterfaceLog(Object param, String path,String result,Integer type) {
- SqlSession sqlSession2 = sqlSessionFactory.openSession(true);
- InterfaceLogMapper mapper2 = sqlSession2.getMapper(InterfaceLogMapper.class);
-
- InterfaceLog interfaceLog=new InterfaceLog();
- interfaceLog.setType(type);
- interfaceLog.setCreateDate(new Date());
- interfaceLog.setIsdeleted(Constants.ZERO);
- if(param!=null){
- interfaceLog.setRequest(JSONObject.toJSONString(param));
+ if(interfaceLogService !=null) {
+ InterfaceLog interfaceLog = new InterfaceLog();
+ interfaceLog.setType(type);
+ interfaceLog.setCreateDate(new Date());
+ interfaceLog.setIsdeleted(Constants.ZERO);
+ if (param != null) {
+ interfaceLog.setRequest(JSONObject.toJSONString(param));
+ }
+ interfaceLog.setPlat(Constants.ONE);
+ interfaceLog.setRepose(result);
+ interfaceLog.setName(path);
+ interfaceLog.setUrl(path);
+ interfaceLogService.create(interfaceLog);
}
- interfaceLog.setPlat(Constants.ONE);
- interfaceLog.setRepose(result);
- interfaceLog.setName(path);
- interfaceLog.setUrl(path);
- mapper2.insert(interfaceLog);
- sqlSession2.commit();
+
}
@@ -94,7 +90,7 @@
}
}
}catch (Exception e){
- throw e;
+ e.printStackTrace();
}finally {
saveInterfaceLog(param,url,JSONArray.toJSONString(list),Constants.ZERO);
}
@@ -135,7 +131,7 @@
}
}
}catch (Exception e){
- throw e;
+ e.printStackTrace();
}finally {
saveInterfaceLog(param,url, JSONArray.toJSONString(list),Constants.ZERO);
}
@@ -166,7 +162,7 @@
}
}
}catch (Exception e){
- throw e;
+ e.printStackTrace();
}finally {
saveInterfaceLog(param,url,JSONObject.toJSONString(result),Constants.ZERO);
}
@@ -191,7 +187,7 @@
}
}
}catch (Exception e){
- throw e;
+ e.printStackTrace();
}finally {
saveInterfaceLog(param,url,JSONObject.toJSONString(result),Constants.ZERO);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 383da4e..f6b12c8 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -61,17 +61,20 @@
}
public static InterfaceLogService interfaceLogService = null;
private static void saveInterfaceLog(String s, String result,Map<String, String> path) {
-// InterfaceLogService bean = SpringContextUtil.getBean(InterfaceLogService.class);
- if(interfaceLogService !=null){
- InterfaceLog hkMonitoryLogDO=new InterfaceLog();
- hkMonitoryLogDO.setType(0);
- hkMonitoryLogDO.setCreateDate(new Date());
- hkMonitoryLogDO.setIsdeleted(0);
- hkMonitoryLogDO.setRequest(s);
- hkMonitoryLogDO.setRepose(result);
- hkMonitoryLogDO.setName(path.get(HKConstants.https));
- hkMonitoryLogDO.setUrl(HKConstants.https + ArtemisConfig.host+path.get(HKConstants.https));
- interfaceLogService.create(hkMonitoryLogDO);
+ try {
+ if(interfaceLogService !=null){
+ InterfaceLog hkMonitoryLogDO=new InterfaceLog();
+ hkMonitoryLogDO.setType(0);
+ hkMonitoryLogDO.setCreateDate(new Date());
+ hkMonitoryLogDO.setIsdeleted(0);
+ hkMonitoryLogDO.setRequest(s);
+ hkMonitoryLogDO.setRepose(result);
+ hkMonitoryLogDO.setName(path.get(HKConstants.https));
+ hkMonitoryLogDO.setUrl(HKConstants.https + ArtemisConfig.host+path.get(HKConstants.https));
+ interfaceLogService.create(hkMonitoryLogDO);
+ }
+ }catch (Exception e){
+ e.printStackTrace();
}
}
@@ -188,7 +191,7 @@
public static String addFace(String body) {
Map<String, String> path = getPath(HKConstants.InterfacePath.addFace);
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
+ saveInterfaceLog(null,result,path);
return result;
}
/**
@@ -199,7 +202,7 @@
public static String editFace(String body) {
Map<String, String> path = getPath(HKConstants.InterfacePath.editFace);
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
+ saveInterfaceLog(null,result,path);
return result;
}
/**
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseResponse.java
index cb4b066..1754640 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseResponse.java
@@ -2,8 +2,10 @@
import lombok.Data;
+import java.io.Serializable;
+
@Data
-public class BaseResponse<T> {
+public class BaseResponse<T> implements Serializable {
private T data;
/**
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FaceAddOrEditesponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FaceAddOrEditesponse.java
index 2b6f0a6..ad00c11 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FaceAddOrEditesponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FaceAddOrEditesponse.java
@@ -2,8 +2,10 @@
import lombok.Data;
+import java.io.Serializable;
+
@Data
-public class FaceAddOrEditesponse {
+public class FaceAddOrEditesponse implements Serializable {
private String faceId;// string False 浜鸿劯Id
private String faceUrl;// string False 浜鸿劯鍥剧墖Url
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index b61accf..1a63ab1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -171,13 +171,12 @@
* @return
*/
public static BaseResponse<FaceAddOrEditesponse> addFace( FaceAddRequest param){
- log.info("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================寮�濮�====" );
try {
String res = HKTools.addFace(JSONObject.toJSONString(param));
- TypeReference typeReference =
- new TypeReference< BaseResponse<FaceAddOrEditesponse>>(){};
+ TypeReference typeReference = new TypeReference< BaseResponse<FaceAddOrEditesponse>>(){};
BaseResponse<FaceAddOrEditesponse> result = JSONObject.parseObject(res, typeReference.getType());
- logResult(result,"娴峰悍娣诲姞浜鸿劯淇℃伅");
+ logResult(res,"娴峰悍娣诲姞浜鸿劯淇℃伅");
return result;
}catch (Exception e){
log.error("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================澶辫触====锛歕n"+ e.getMessage());
@@ -189,13 +188,14 @@
* @return
*/
public static BaseResponse<FaceAddOrEditesponse> editFace( FaceEditRequest param){
- log.info("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================寮�濮�====" );
+ String res =null;
try {
- String res = HKTools.editFace(JSONObject.toJSONString(param));
+ res = HKTools.editFace(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference< BaseResponse<FaceAddOrEditesponse>>(){};
BaseResponse<FaceAddOrEditesponse> result = JSONObject.parseObject(res, typeReference.getType());
- logResult(result,"娴峰悍缂栬緫浜鸿劯淇℃伅");
+ logResult(res,"娴峰悍缂栬緫浜鸿劯淇℃伅");
return result;
}catch (Exception e){
log.error("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================澶辫触====锛歕n"+ e.getMessage());
@@ -1024,6 +1024,9 @@
log.error("銆�"+name+"銆�================澶辫触====锛歕n"+ res);
}
}
+ private static void logResult(String res,String name) {
+ log.info("銆�"+name+"銆�================缁撴灉====\n"+res);
+ }
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java
index 4fe3c6e..a954de4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java
@@ -1,6 +1,7 @@
package com.doumee.service.business.impl.hksync;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.erp.ErpTool;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.HKTools;
import com.doumee.core.utils.Constants;
@@ -31,6 +32,7 @@
ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode();
HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode();
HKTools.interfaceLogService=interfaceLogService;
+ ErpTool.interfaceLogService=interfaceLogService;
return 0;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 9af2a01..0073884 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -690,10 +690,10 @@
//濡傛灉鏈変汉鑴哥収鐗囷紝澶勭悊浜鸿劯鐓х墖鍚屾
String faceid = dealMemberFace(c,path);
if(StringUtils.isBlank(faceid)){
- noticeErpFail(c,Constants.ZERO,"浜鸿劯淇℃伅鏇存柊澶辫触锛岃妫�鏌ヤ汉鑴哥収鐗囨槸鍚﹀悎娉曪紒");
c.setHkStatus(Constants.TWO);
c.setFaceStatus(Constants.TWO);
c.setRemark("浜鸿劯淇℃伅鏇存柊澶辫触锛岃妫�鏌ヤ汉鑴哥収鐗囨槸鍚﹀悎娉曪紒锛�"+result.getMsg());
+ noticeErpFail(c,Constants.ZERO,"浜鸿劯淇℃伅鏇存柊澶辫触锛岃妫�鏌ヤ汉鑴哥収鐗囨槸鍚﹀悎娉曪紒");
}else{
c.setFaceId(faceid);
c.setFaceStatus(Constants.ONE);
@@ -773,20 +773,25 @@
* @return
*/
public static String dealMemberFace(Member c,String path) {
- if(StringUtils.isBlank(c.getFaceId())){
- BaseResponse<FaceAddOrEditesponse> response = HKService.addFace(getFaceAddModel(c,path));
- if(response !=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)&& response.getData()!=null ){
- return response.getData().getFaceId();
- }
- }else{
- FaceEditRequest param =getFaceUpdateModel(c,path);
- if(param !=null){
- BaseResponse response = HKService.editFace(param);
- if(StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) ){
- return c.getFaceId();
+ try {
+ if(StringUtils.isBlank(c.getFaceId())){
+ BaseResponse<FaceAddOrEditesponse> response = HKService.addFace(getFaceAddModel(c,path));
+ if(response !=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)&& response.getData()!=null ){
+ return response.getData().getFaceId();
+ }
+ }else{
+ FaceEditRequest param =getFaceUpdateModel(c,path);
+ if(param !=null){
+ BaseResponse response = HKService.editFace(param);
+ if(response!=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) ){
+ return c.getFaceId();
+ }
}
}
+ }catch (Exception e){
+
}
+
return null;
}
--
Gitblit v1.9.3