From 68ae0e6a2dc077d8b85187ee3dbee4b87a6c9b90 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 21 三月 2024 18:02:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
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 3a3fb6b..17067e0 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
@@ -17,11 +17,14 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
+import com.doumee.dao.business.InterfaceLogMapper;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.InterfaceLogService;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,8 +37,12 @@
@Autowired
private InterfaceLogService interfaceLogService;
-
+ @Autowired
+ private SqlSessionFactory sqlSessionFactory;
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());
@@ -47,7 +54,8 @@
interfaceLog.setRepose(result);
interfaceLog.setName(path);
interfaceLog.setUrl(path);
- interfaceLogService.create(interfaceLog);
+ mapper2.insert(interfaceLog);
+ sqlSession2.commit();
}
@@ -107,6 +115,7 @@
int pageSize = 100;
boolean hasLast = true;
while (hasLast){
+ hasLast = false;
PageWrap<UserListRequest> pageWrap = new PageWrap<>();
pageWrap.setModel(param);
pageWrap.setPage(page);
@@ -115,14 +124,12 @@
if(StringUtils.isNotBlank(result)){
TypeReference typeReference =
new TypeReference<ERPApiResponse<PageData<ErpUserListResponse>>>(){};
- ERPApiResponse<PageData <ErpUserListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
+ ERPApiResponse<PageData <ErpUserListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
if(response!=null && response.getData()!=null && response.getData().getRecords()!=null){
list.addAll(response.getData().getRecords());
if(pageSize*page < response.getData().getTotal() ){
- hasLast =false;//杩樻湁涓嬩竴椤�
+ hasLast =true;//杩樻湁涓嬩竴椤�
}
- }else{
- hasLast =false;//杩樻湁涓嬩竴椤�
}
page++;
}
--
Gitblit v1.9.3