From 1beab335e114e2587fefba2fac8b433ee46cdd11 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 22 十二月 2023 16:07:14 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 10 ++++++++--
server/dmvisit_web/src/main/java/com/doumee/api/ScheduleTool.java | 12 ++++++++++--
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java | 7 -------
4 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java b/server/dmvisit_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
index 4e3cfcc..6237e62 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -58,13 +58,6 @@
@Override
public void updateByIdNew(SystemDictData systemDictData) {
- SystemDictData queryDto = new SystemDictData();
- queryDto.setId(systemDictData.getId());
- queryDto.setCode(systemDictData.getCode());
- SystemDictData dictData = systemDictDataService.findOne(queryDto);
- if (dictData != null && !dictData.getId().equals(systemDictData.getId())) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鍊煎凡瀛樺湪");
- }
systemDictDataService.updateById(systemDictData);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index e14ae63..7fa419f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -289,7 +289,7 @@
List<DeviceRole> deviceRoleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
.eq(DeviceRole::getType,type)
.eq(DeviceRole::getIsdeleted, Constants.ZERO)
- .eq(DeviceRole::getStatus, Constants.ZERO)
+ .eq(DeviceRole::getStatus, Constants.ONE)
);
List<DeviceRoleVO> deviceRoleVOList = new ArrayList<>();
for (DeviceRole deviceRole:deviceRoleList) {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index f448df3..bccd0bd 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -738,8 +738,9 @@
List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>()
.lambda().eq(Member::getIsdeleted,Constants.ZERO)
.eq(Member::getType,Constants.memberType.internal)
+ .eq(Member::getStatus,Constants.ZERO)
.isNotNull(Member::getHkId)
- .notExists(" SELECT 1 FROM device_event b WHERE b.ext_event_person_no = HK_ID AND TO_DAYS( NOW()) - TO_DAYS( b.CREATE_DATE ) > "+systemDictData.getCode()+" ")
+ .exists(" SELECT 1 FROM device_event b WHERE b.ext_event_person_no = HK_ID AND TO_DAYS( NOW()) - TO_DAYS( b.CREATE_DATE ) > "+systemDictData.getCode()+" ")
);
if(CollectionUtils.isEmpty(memberList)){
return;
@@ -749,6 +750,7 @@
//鍐荤粨鐘舵��
memberMapper.update(null,new UpdateWrapper<Member>()
.lambda().set(Member::getStatus,Constants.TWO)
+ .set(Member::getEditDate,new Date())
.in(Member::getId,memberIds)
);
//澶勭悊涓嬪彂鏁版嵁
@@ -810,7 +812,11 @@
.last(" limit 1 ")
);
MemberVO memberVO = new MemberVO();
- BeanUtils.copyProperties(member,memberVO);
+ if(!Objects.isNull(member)){
+ BeanUtils.copyProperties(member,memberVO);
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
return memberVO;
}
diff --git a/server/dmvisit_web/src/main/java/com/doumee/api/ScheduleTool.java b/server/dmvisit_web/src/main/java/com/doumee/api/ScheduleTool.java
index 63d5a5a..a0fc90a 100644
--- a/server/dmvisit_web/src/main/java/com/doumee/api/ScheduleTool.java
+++ b/server/dmvisit_web/src/main/java/com/doumee/api/ScheduleTool.java
@@ -7,6 +7,7 @@
import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.service.system.SystemDictDataService;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
@@ -14,6 +15,8 @@
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.mgt.DefaultSecurityManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.EnableScheduling;
@@ -32,14 +35,16 @@
* @date 2021-10-10 14:40:35
* https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
*/
-@Slf4j
@Component
@EnableScheduling
+@Slf4j
public class ScheduleTool {
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private SystemDictDataService systemDictDataService;
/**
* 鏄惁寮�鍙戣��
*/
@@ -52,6 +57,9 @@
*/
@Scheduled(fixedDelay=1000 * 60 * 90)
public void updAccessToken(){
+ DefaultSecurityManager securityManager = new DefaultSecurityManager();
+ SecurityUtils.setSecurityManager(securityManager);
+
String appId = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode();
String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode();
//鐢熸垚寰俊token
@@ -62,7 +70,7 @@
if(!Objects.isNull(systemDictData)){
systemDictData.setCode(json.getString("access_token"));
systemDictData.setUpdateTime(new Date());
- systemDictDataBiz.updateByIdNew(systemDictData);
+ systemDictDataService.updateById(systemDictData);
log.info(" 鏇存柊寰俊鍏紬鍙� ACCESS_TOKEN =========> " + systemDictData.getCode() );
}
}
--
Gitblit v1.9.3