From 09d99ea81d11f675cb7b4be640d9bbaf162a55ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Fri, 11 Aug 2023 10:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=BC=82=E5=B8=B8=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E7=BB=A9=E6=95=88=E8=80=83=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../interceptor/AuthTokenServiceImpl.java | 4 ++--
.../xhx/base/login/web/LoginController.java | 19 ++++++++++++++++++-
.../AttendanceRecordErrorServiceImpl.java | 17 +++++++----------
.../mortals/xhx/feign/user/IUserFeign.java | 2 +-
4 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java
index c825e64e..80c2ce27 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java
@@ -90,9 +90,9 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
Claims claims = parseToken(token);
String uuid = (String) claims.get(SysConstains.LOGIN_USER_KEY);
String userKey = getTokenKey(uuid);
- //cacheService.select(portalDb);
+ cacheService.select(portalDb);
String userStr = cacheService.get(userKey);
- //cacheService.select(db);
+ cacheService.select(db);
if (StringUtils.isNotEmpty(userStr)) {
UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);
userEntity.setToken(token);
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
index d22bdfd2..6134fb63 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
@@ -25,6 +25,8 @@ import com.mortals.xhx.common.code.GoWorkResultEnum;
import com.mortals.xhx.common.code.OffWorkResultEnum;
import com.mortals.xhx.common.key.RedisKey;
import com.mortals.xhx.common.pdu.HomeStatInfo;
+import com.mortals.xhx.common.pdu.user.UserPdu;
+import com.mortals.xhx.feign.user.IUserFeign;
import com.mortals.xhx.module.attendance.model.AttendanceRecordEntity;
import com.mortals.xhx.module.attendance.model.AttendanceRecordQuery;
import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceQuery;
@@ -80,10 +82,25 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
@Autowired
private DeptService deptService;
+ @Autowired
+ private IUserFeign userFeign;
+
@RequestMapping("login")
public String login(@RequestBody LoginForm loginForm) throws Exception {
+ String loginName = loginForm.getLoginName();
+ String password = loginForm.getPassword();
+
+ UserPdu userPdu = new UserPdu();
+ userPdu.setLoginName(loginName);
+ userPdu.setPassword(password);
+ String resp = userFeign.portalLogin(userPdu);
+
+ return resp;
+
+/*
+
JSONObject ret = new JSONObject();
String loginName = loginForm.getLoginName();
String password = loginForm.getPassword();
@@ -137,7 +154,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, super.convertException(e));
return ret.toJSONString();
- }
+ }*/
}
@RequestMapping("logout")
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java
index 6b07a3ff..2afa2499 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java
@@ -83,11 +83,6 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
//鍒ゆ柇鍚庢墦缁╂晥
String ruleCode = "";
if (ErrorStatusEnum.鏃╅€€.getValue() == DataUtil.converStr2Int(entity.getProcessResult(), 3)) {
-
- if (ObjectUtils.isEmpty(entity.getErrorDateTime()) || ObjectUtils.isEmpty(entity.getGoOffDateTime())) {
- //鏃╅€€5鍒嗛挓鍐�
- ruleCode = "ATTEND1002";
- }
if (!ObjectUtils.isEmpty(entity.getErrorDateTime()) && !ObjectUtils.isEmpty(entity.getGoOffDateTime())) {
//鍒ゆ柇鏃堕棿宸畾涔�
Long earlyMin = DateUtil.between(entity.getErrorDateTime(), entity.getGoOffDateTime(), DateUnit.MINUTE);
@@ -104,12 +99,11 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
//鏃╅€€5鍒嗛挓鍐�
ruleCode = "ATTEND1006";
}
+ }else {
+ ruleCode = "ATTEND1002";
}
} else if (ErrorStatusEnum.杩熷埌.getValue() == DataUtil.converStr2Int(entity.getProcessResult(), 3)) {
- if (ObjectUtils.isEmpty(entity.getErrorDateTime()) || ObjectUtils.isEmpty(entity.getGoOffDateTime())) {
- //鏃╅€€5鍒嗛挓鍐�
- ruleCode = "ATTEND1001";
- }
+
if (!ObjectUtils.isEmpty(entity.getErrorDateTime()) && !ObjectUtils.isEmpty(entity.getGoOffDateTime())) {
Long lateMin = DateUtil.between(entity.getErrorDateTime(), entity.getGoOffDateTime(), DateUnit.MINUTE);
@@ -125,6 +119,9 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
//杩熷埌60鍒嗛挓浠ヤ笂
ruleCode = "ATTEND1005";
}
+ }else{
+ //鏃╅€€5鍒嗛挓鍐�
+ ruleCode = "ATTEND1001";
}
} else if (ErrorStatusEnum.缂哄崱.getValue() == DataUtil.converStr2Int(entity.getProcessResult(), 3)) {
ruleCode = "ATTEND1007";
@@ -139,7 +136,7 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
attendSaveReq.setActualAttendTime(entity.getActualAttendanceDateTime());
attendSaveReq.setErrorResult(entity.getRemark());
- // attendSaveReq.setTitle("鑰冨嫟:" + ErrorStatusEnum.getByValue(entity.getErrorStatus()).getDesc());
+ attendSaveReq.setTitle("鑰冨嫟");
attendSaveReq.setHappenTime(entity.getErrorDateTime());
attendSaveReq.setRuleCode(ruleCode);
attendSaveReq.setStaffId(entity.getStaffId());
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java
index 44dbc67d..41065a67 100644
--- a/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java
@@ -18,7 +18,7 @@ import java.util.List;
* @author zxfei
* @date 2022-07-06
*/
-//@FeignClient(name = "portal-manager", path = "/zwfw", fallbackFactory = UserFeignFallbackFactory.class)
+@FeignClient(name = "portal-manager", path = "/zwfw", fallbackFactory = UserFeignFallbackFactory.class)
public interface IUserFeign extends IFeign {
--
2.24.3