From f06d894f2f15798d24a13d15360ac9fa5e8461d1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 13 九月 2023 18:21:06 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java | 1 +
server/src/main/java/doumeemes/core/utils/DateUtil.java | 26 ++++++++++++++++++++++++++
server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java | 1 +
server/src/main/resources/application.yml | 2 +-
server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java | 6 +++++-
server/src/main/java/doumeemes/core/utils/Constants.java | 1 +
6 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/core/utils/Constants.java b/server/src/main/java/doumeemes/core/utils/Constants.java
index 522faf8..2be921f 100644
--- a/server/src/main/java/doumeemes/core/utils/Constants.java
+++ b/server/src/main/java/doumeemes/core/utils/Constants.java
@@ -109,6 +109,7 @@
int dingding = 1;
int lingyang = 2;
int edgp = 3;
+ int wx = 4;
}
/**
diff --git a/server/src/main/java/doumeemes/core/utils/DateUtil.java b/server/src/main/java/doumeemes/core/utils/DateUtil.java
index fb8c603..10d7411 100644
--- a/server/src/main/java/doumeemes/core/utils/DateUtil.java
+++ b/server/src/main/java/doumeemes/core/utils/DateUtil.java
@@ -983,6 +983,17 @@
return dt1;
}
+ public static Date StringToDateShort(String DATE) {
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+ Date dt1 = null;
+ try {
+ dt1 = df.parse(DATE);
+ } catch (Exception exception) {
+ exception.printStackTrace();
+ }
+ return dt1;
+ }
+
/**
* 鑾峰彇杈撳叆鏍煎紡鐨勬棩鏈熷瓧绗︿覆锛屽瓧绗︿覆閬靛惊Oracle鏍煎紡
*
@@ -3025,4 +3036,19 @@
return from;
}
+ public static String afterDate(String date,int num){
+ Date today = DateUtil.StringToDateShort(date); //褰撳墠鏃堕棿
+ Calendar calendar = Calendar.getInstance(); //寰楀埌鏃ュ巻
+ calendar.setTime(today);//鎶婂綋鍓嶆椂闂磋祴缁欐棩鍘�
+ calendar.add(Calendar.DAY_OF_MONTH, num); //璁剧疆涓哄墠涓�澶�
+ Date yesterday = calendar.getTime(); //寰楀埌鍓嶄竴澶╃殑鏃堕棿
+ calendar.setTime(today);
+ calendar.add(Calendar.DAY_OF_MONTH, 1); //璁剧疆涓哄悗涓�澶�
+ Date tomorrow = calendar.getTime();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //璁剧疆鏃堕棿鏍煎紡
+ return sdf.format(calendar.getTime());
+ }
+
+
+
}
diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java
index cdd4609..ea8f3ab 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java
@@ -101,6 +101,7 @@
loginLog.setCompanyId(loginUser.getCompany()!=null?loginUser.getCompany().getId():null);
loginLog.setCompanyUserId(loginUser.getCompanyUser()!=null?loginUser.getCompanyUser().getId():null);
loginLog.setSuccess(Boolean.TRUE);
+ loginLog.setOrgin(Constants.USER_LOGIN_ORIGIN.pc);
systemLoginLogService.create(loginLog);
return (String)subject.getSession().getId();
}catch (AuthenticationException e) {
diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
index 229dc43..a3c21da 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
@@ -4,6 +4,7 @@
import com.github.pagehelper.PageInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
+import doumeemes.core.utils.DateUtil;
import doumeemes.dao.ext.dto.ActivityLoginDTO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
import doumeemes.dao.ext.vo.ActivityLoginVO;
@@ -20,11 +21,11 @@
import doumeemes.service.aware.DepartmentDataPermissionAware;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@@ -197,6 +198,9 @@
@Override
public List<ActivityLoginVO> activityLoginVOList(ActivityLoginDTO activityLoginDTO) {
+ if(StringUtils.isNotBlank(activityLoginDTO.getEndDate())){
+ activityLoginDTO.setEndDate(DateUtil.afterDate(activityLoginDTO.getEndDate(),1));
+ }
return systemUserMapper.activityLoginVOList(activityLoginDTO);
}
diff --git a/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
index 1c94047..77d7d74 100644
--- a/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
@@ -164,6 +164,7 @@
loginLog.setCompanyId(loginUser.getCompany()!=null?loginUser.getCompany().getId():null);
loginLog.setCompanyUserId(loginUser.getCompanyUser()!=null?loginUser.getCompanyUser().getId():null);
loginLog.setSuccess(Boolean.TRUE);
+ loginLog.setOrgin(Constants.USER_LOGIN_ORIGIN.wx);
systemLoginLogService.create(loginLog);
String session = (String)subject.getSession().getId();
wxLoginVO.setLoginStatus(Constants.ZERO);
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index f085ed5..c86705c 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -9,7 +9,7 @@
# application:
# name: doumeemes
profiles:
- active: standardTest
+ active: standard
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3