diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppUserServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppUserServiceImpl.java index 68d18247a..e68679422 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppUserServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppUserServiceImpl.java @@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pig4cloud.pigx.admin.api.constant.UserStateEnum; import com.pig4cloud.pigx.app.api.dto.AppUserDTO; import com.pig4cloud.pigx.app.api.dto.AppUserInfo; import com.pig4cloud.pigx.app.api.entity.AppRole; @@ -239,7 +240,7 @@ public class AppUserServiceImpl extends ServiceImpl impl AppUser app = new AppUser(); BeanUtils.copyProperties(appUser, app); appUser.setUsername(app.getPhone()); - appUser.setDelFlag(CommonConstants.STATUS_NORMAL); + appUser.setDelFlag(UserStateEnum.NORMAL.getCode()); appUser.setPassword(ENCODER.encode(appUser.getPassword())); baseMapper.insert(appUser); return null; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/NodeUserTypeEnum.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/NodeUserTypeEnum.java deleted file mode 100644 index 61466eaab..000000000 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/NodeUserTypeEnum.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.pig4cloud.pigx.admin.api.constant; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 用户节点类型枚举 - */ -@Getter -@AllArgsConstructor -public enum NodeUserTypeEnum { - - USER("user", "用户"), DEPT("dept", "部门"), ROLE("role", "角色"),; - - private String key; - - private String name; - -} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/OrgTypeEnum.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/OrgTypeEnum.java new file mode 100644 index 000000000..09b109765 --- /dev/null +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/OrgTypeEnum.java @@ -0,0 +1,38 @@ +package com.pig4cloud.pigx.admin.api.constant; + +/** + * 组织类型 + * + * @author lengleng + * @date 2023/11/15 + */ +public enum OrgTypeEnum { + + USER("user", "用户"), ROLE("role", "角色"), DEPT("dept", "部门"); + + private String type; + + private String desc; + + OrgTypeEnum(String type, String desc) { + this.type = type; + this.desc = desc; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + +} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/ScheduleStateEnum.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/ScheduleStateEnum.java new file mode 100644 index 000000000..cf6f91221 --- /dev/null +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/ScheduleStateEnum.java @@ -0,0 +1,38 @@ +package com.pig4cloud.pigx.admin.api.constant; + +import lombok.Getter; + +/** + * @author lengleng + * @date 2023/11/14 + *

+ * 日程状态枚举 + */ +public enum ScheduleStateEnum { + + /** + * 计划中 + */ + SCHEDULE("0", "计划中"), + + /** + * 未开始 + */ + NOT_START("1", "未开始"), + + /** + * 结束 + */ + END("3", "结束"); + + @Getter + private String code; + + private String desc; + + ScheduleStateEnum(String code, String desc) { + this.code = code; + this.desc = desc; + } + +} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/TenantStateEnum.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/TenantStateEnum.java new file mode 100644 index 000000000..6f2421955 --- /dev/null +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/TenantStateEnum.java @@ -0,0 +1,43 @@ +package com.pig4cloud.pigx.admin.api.constant; + +import lombok.Getter; + +/** + * 租户状态 + * + * @author lengleng + * @date 2023/11/15 + *

+ * "0" 正常 "9" 冻结 + */ +public enum TenantStateEnum { + + /** + * 正常 + */ + NORMAL("0", "正常"), + + /** + * 冻结 + */ + FREEZE("9", "冻结"); + + @Getter + private final String code; + + private final String desc; + + TenantStateEnum(String code, String desc) { + this.code = code; + this.desc = desc; + } + + public String getCode() { + return code; + } + + public String getDesc() { + return desc; + } + +} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/UserStateEnum.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/UserStateEnum.java new file mode 100644 index 000000000..0397ca88a --- /dev/null +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/UserStateEnum.java @@ -0,0 +1,32 @@ +package com.pig4cloud.pigx.admin.api.constant; + +import lombok.Getter; + +/** + * 用户状态 + * + * @author lengleng + * @date 2023/11/14 + */ +public enum UserStateEnum { + + /** + * 正常 + */ + NORMAL("0", "正常"), + /** + * 锁定 + */ + LOCK("9", "锁定"); + + @Getter + private final String code; + + private final String desc; + + UserStateEnum(String code, String desc) { + this.code = code; + this.desc = desc; + } + +} diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysScheduleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysScheduleController.java index a8c266245..a77aa031c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysScheduleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysScheduleController.java @@ -33,6 +33,7 @@ import org.springdoc.api.annotations.ParameterObject; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; +import java.time.LocalDate; import java.util.List; /** @@ -122,8 +123,9 @@ public class SysScheduleController { @Operation(summary = "列表查询", description = "列表查询") @GetMapping("/list") - public R list(String month) { - List list = sysScheduleService.selectListByScope(month); + public R list(@RequestParam(required = false) LocalDate startDate, + @RequestParam(required = false) LocalDate endDate) { + List list = sysScheduleService.selectListByScope(startDate, endDate); return R.ok(list); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysScheduleService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysScheduleService.java index 860cdb334..4668b76cf 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysScheduleService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysScheduleService.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.entity.SysScheduleEntity; +import java.time.LocalDate; import java.util.List; /** @@ -32,8 +33,19 @@ import java.util.List; */ public interface SysScheduleService extends IService { + /** + * 根据分页信息和日程实体获取指定范围的日程列表 + * @param page 分页信息 + * @param sysSchedule 日程实体 + * @return 日程列表 + */ IPage getScheduleByScope(Page page, SysScheduleEntity sysSchedule); - List selectListByScope(String month); + /** + * 根据月份查询日程列表 + * @return 日程列表 + */ + List selectListByScope(LocalDate startDate, LocalDate endDate); } + diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java index 719295b8a..e2c75757f 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java @@ -27,7 +27,7 @@ import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pigx.admin.api.constant.NodeUserTypeEnum; +import com.pig4cloud.pigx.admin.api.constant.OrgTypeEnum; import com.pig4cloud.pigx.admin.api.entity.*; import com.pig4cloud.pigx.admin.api.utils.DataUtil; import com.pig4cloud.pigx.admin.api.vo.DeptExcelVO; @@ -70,7 +70,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl /** * 删除部门 - * * @param id 部门 ID * @return 成功、失败 */ @@ -87,7 +86,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl /** * 查询全部部门树 - * * @param deptName * @param parentId * @return 树 部门名称 @@ -140,7 +138,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl /** * 导出部门 - * * @return */ @Override @@ -186,7 +183,8 @@ public class SysDeptServiceImpl extends ServiceImpl impl sysDept.setParentId(one.getDeptId()); sysDept.setSortOrder(item.getSortOrder()); baseMapper.insert(sysDept); - } else { + } + else { // 数据不合法情况 errorMessageList.add(new ErrorMessage(item.getLineNum(), errorMsg)); } @@ -199,7 +197,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl /** * 查询所有子节点 （包含当前节点） - * * @param deptId 部门ID 目标部门ID * @return ID */ @@ -219,9 +216,8 @@ public class SysDeptServiceImpl extends ServiceImpl impl /** * 获取部门负责人 - *

- * 1. 根据dept 查询用户 2. 筛选用户列表中 post * + * 1. 根据dept 查询用户 2. 筛选用户列表中 post * @param deptId deptId * @return user id list */ @@ -249,16 +245,15 @@ public class SysDeptServiceImpl extends ServiceImpl impl /** * 根据父部门ID和类型获取组织树 - * * @param parentDeptId 父部门ID - * @param type 类型 + * @param type 类型 * @return 组织树信息 */ public Map listOrgTree(Long parentDeptId, String type) { List orgs = new LinkedList<>(); - if (StrUtil.equals(type, "role")) { + if (StrUtil.equals(type, OrgTypeEnum.ROLE.getType())) { // 角色 List roleList = roleMapper.selectList(Wrappers.emptyWrapper()); @@ -266,7 +261,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl OrgTreeVO orgTreeVo = new OrgTreeVO(); orgTreeVo.setId(role.getRoleId()); orgTreeVo.setName(role.getRoleName()); - orgTreeVo.setType("role"); + orgTreeVo.setType(OrgTypeEnum.ROLE.getType()); orgTreeVo.setSelected(false); orgs.add(orgTreeVo); }); @@ -291,13 +286,13 @@ public class SysDeptServiceImpl extends ServiceImpl impl OrgTreeVO orgTreeVo = new OrgTreeVO(); orgTreeVo.setId(dept.getDeptId()); orgTreeVo.setName(dept.getName()); - orgTreeVo.setType("dept"); + orgTreeVo.setType(OrgTypeEnum.DEPT.getType()); orgTreeVo.setSelected(false); deptVoList.add(orgTreeVo); }); dict.set("childDepartments", deptVoList); - if (!StrUtil.equals(type, "dept")) { + if (!StrUtil.equals(type, OrgTypeEnum.DEPT.getType())) { List userVoList = new ArrayList<>(); @@ -308,7 +303,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl OrgTreeVO orgTreeVo = new OrgTreeVO(); orgTreeVo.setId(user.getUserId()); orgTreeVo.setName(user.getUsername()); - orgTreeVo.setType("user"); + orgTreeVo.setType(OrgTypeEnum.USER.getType()); orgTreeVo.setSelected(false); orgTreeVo.setAvatar(user.getAvatar()); userVoList.add(orgTreeVo); @@ -327,7 +322,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl /** * 模糊搜索用户 - * * @param username 用户名/拼音/首字母 * @return 匹配到的用户 */ @@ -338,7 +332,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl OrgTreeVO orgTreeVo = new OrgTreeVO(); orgTreeVo.setId(user.getUserId()); orgTreeVo.setName(user.getUsername()); - orgTreeVo.setType(NodeUserTypeEnum.USER.getKey()); + orgTreeVo.setType(OrgTypeEnum.USER.getType()); orgTreeVo.setSelected(false); orgTreeVo.setAvatar(user.getAvatar()); return orgTreeVo; @@ -348,9 +342,8 @@ public class SysDeptServiceImpl extends ServiceImpl impl /** * 递归查询所有子节点。 - * * @param allDeptList 所有部门列表 - * @param parentId 父部门ID + * @param parentId 父部门ID * @param resDeptList 结果集合 */ private void recursiveDept(List allDeptList, Long parentId, List resDeptList) { diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java index b8d0eb297..b6e0c7c41 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java @@ -33,6 +33,7 @@ import com.pig4cloud.pigx.admin.service.SysLogService; import com.pig4cloud.pigx.common.core.constant.CommonConstants; import com.pig4cloud.pigx.common.data.tenant.TenantBroker; import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; +import com.pig4cloud.pigx.common.log.util.LogTypeEnum; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -52,58 +53,60 @@ import java.util.stream.Collectors; @Service public class SysLogServiceImpl extends ServiceImpl implements SysLogService { - /** - * 批量插入前端错误日志 - * @param preLogVoList 日志信息 - * @return true/false - */ - @Override - public Boolean saveBatchLogs(List preLogVoList) { - List sysLogs = preLogVoList.stream().map(pre -> { - SysLog log = new SysLog(); - log.setLogType(CommonConstants.STATUS_LOCK); - log.setTitle(pre.getInfo()); - log.setException(pre.getStack()); - log.setParams(pre.getMessage()); - log.setCreateTime(LocalDateTime.now()); - log.setRequestUri(pre.getUrl()); - log.setCreateBy(pre.getUser()); - return log; - }).collect(Collectors.toList()); - return this.saveBatch(sysLogs); - } + /** + * 批量插入前端错误日志 + * + * @param preLogVoList 日志信息 + * @return true/false + */ + @Override + public Boolean saveBatchLogs(List preLogVoList) { + List sysLogs = preLogVoList.stream().map(pre -> { + SysLog log = new SysLog(); + log.setLogType(LogTypeEnum.ERROR.getType()); + log.setTitle(pre.getInfo()); + log.setException(pre.getStack()); + log.setParams(pre.getMessage()); + log.setCreateTime(LocalDateTime.now()); + log.setRequestUri(pre.getUrl()); + log.setCreateBy(pre.getUser()); + return log; + }).collect(Collectors.toList()); + return this.saveBatch(sysLogs); + } - @Override - public Page getLogByPage(Page page, SysLogDTO sysLog) { + @Override + public Page getLogByPage(Page page, SysLogDTO sysLog) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - if (StrUtil.isNotBlank(sysLog.getLogType())) { - wrapper.eq(SysLog::getLogType, sysLog.getLogType()); - } + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + if (StrUtil.isNotBlank(sysLog.getLogType())) { + wrapper.eq(SysLog::getLogType, sysLog.getLogType()); + } - if (ArrayUtil.isNotEmpty(sysLog.getCreateTime())) { - wrapper.ge(SysLog::getCreateTime, sysLog.getCreateTime()[0]).le(SysLog::getCreateTime, - sysLog.getCreateTime()[1]); - } + if (ArrayUtil.isNotEmpty(sysLog.getCreateTime())) { + wrapper.ge(SysLog::getCreateTime, sysLog.getCreateTime()[0]).le(SysLog::getCreateTime, + sysLog.getCreateTime()[1]); + } - return baseMapper.selectPage(page, wrapper); - } + return baseMapper.selectPage(page, wrapper); + } - /** - * 插入日志 - * @param sysLog 日志对象 - * @return true/false - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean saveLog(SysLogDTO sysLog) { - TenantBroker.applyAs(sysLog::getTenantId, tenantId -> { - TenantContextHolder.setTenantId(tenantId); - SysLog log = new SysLog(); - BeanUtils.copyProperties(sysLog, log, "createTime"); - return baseMapper.insert(log); - }); - return Boolean.TRUE; - } + /** + * 插入日志 + * + * @param sysLog 日志对象 + * @return true/false + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean saveLog(SysLogDTO sysLog) { + TenantBroker.applyAs(sysLog::getTenantId, tenantId -> { + TenantContextHolder.setTenantId(tenantId); + SysLog log = new SysLog(); + BeanUtils.copyProperties(sysLog, log, "createTime"); + return baseMapper.insert(log); + }); + return Boolean.TRUE; + } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysScheduleServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysScheduleServiceImpl.java index 0704a874d..d07c09527 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysScheduleServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysScheduleServiceImpl.java @@ -16,12 +16,15 @@ */ package com.pig4cloud.pigx.admin.service.impl; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pig4cloud.pigx.admin.api.constant.ScheduleStateEnum; import com.pig4cloud.pigx.admin.api.entity.SysScheduleEntity; import com.pig4cloud.pigx.admin.mapper.SysScheduleMapper; import com.pig4cloud.pigx.admin.service.SysScheduleService; @@ -30,8 +33,6 @@ import com.pig4cloud.pigx.common.security.util.SecurityUtils; import org.springframework.stereotype.Service; import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.time.temporal.TemporalAdjusters; import java.util.List; import java.util.Objects; @@ -45,6 +46,12 @@ import java.util.Objects; public class SysScheduleServiceImpl extends ServiceImpl implements SysScheduleService { + /** + * 根据范围获取计划列表 + * @param page 分页对象 + * @param sysSchedule 计划实体对象 + * @return 分页对象 + */ @Override public IPage getScheduleByScope(Page page, SysScheduleEntity sysSchedule) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); @@ -56,13 +63,20 @@ public class SysScheduleServiceImpl extends ServiceImpl selectListByScope(String month) { - LocalDate parse = LocalDate.parse(month, DateTimeFormatter.ofPattern("yyyy-MM-dd")); - LocalDate firstDay = parse.with(TemporalAdjusters.firstDayOfMonth()); // 获取当前月的第一天 - LocalDate lastDay = parse.with(TemporalAdjusters.lastDayOfMonth()); + public List selectListByScope(LocalDate startDate, LocalDate endDate) { + DateTime beginOfWeek = DateUtil.beginOfWeek(DateUtil.date()); + DateTime endOfWeek = DateUtil.endOfWeek(DateUtil.date()); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.between(SysScheduleEntity::getDate, firstDay, lastDay); + wrapper.between(SysScheduleEntity::getDate, Objects.isNull(startDate) ? beginOfWeek : startDate, + Objects.isNull(endDate) ? endOfWeek : endDate); + wrapper.ne(SysScheduleEntity::getState, ScheduleStateEnum.END.getCode()); DataScope dataScope = new DataScope(); dataScope.setUsername(SecurityUtils.getUser().getUsername()); return baseMapper.selectListByScope(wrapper, dataScope); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java index 7248e5d88..03c98cd41 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java @@ -20,6 +20,7 @@ import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pig4cloud.pigx.admin.api.constant.TenantStateEnum; import com.pig4cloud.pigx.admin.api.entity.*; import com.pig4cloud.pigx.admin.config.ClientDetailsInitRunner; import com.pig4cloud.pigx.admin.mapper.SysRoleMenuMapper; @@ -90,7 +91,7 @@ public class SysTenantServiceImpl extends ServiceImpl getNormalTenant() { return baseMapper - .selectList(Wrappers.lambdaQuery().eq(SysTenant::getStatus, CommonConstants.STATUS_NORMAL)); + .selectList(Wrappers.lambdaQuery().eq(SysTenant::getStatus, TenantStateEnum.NORMAL.getCode())); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java index 470892aca..460b99003 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java @@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pig4cloud.pigx.admin.api.constant.UserStateEnum; import com.pig4cloud.pigx.admin.api.dto.UserDTO; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.*; @@ -99,8 +100,8 @@ public class SysUserServiceImpl extends ServiceImpl impl public Boolean saveUser(UserDTO userDto) { SysUser sysUser = new SysUser(); BeanUtils.copyProperties(userDto, sysUser); - sysUser - .setDelFlag(StrUtil.isBlank(userDto.getLockFlag()) ? CommonConstants.STATUS_NORMAL : userDto.getDelFlag()); + sysUser.setLockFlag( + StrUtil.isBlank(userDto.getLockFlag()) ? UserStateEnum.NORMAL.getCode() : UserStateEnum.LOCK.getCode()); sysUser.setCreateBy(userDto.getUsername()); sysUser.setUpdateBy(userDto.getUsername()); sysUser.setPassword(ENCODER.encode(userDto.getPassword())); @@ -438,7 +439,7 @@ public class SysUserServiceImpl extends ServiceImpl impl SysUser sysUser = baseMapper.selectOne(Wrappers.lambdaQuery().eq(SysUser::getUsername, username)); if (Objects.nonNull(sysUser)) { - sysUser.setLockFlag(CommonConstants.STATUS_LOCK); + sysUser.setLockFlag(UserStateEnum.LOCK.getCode()); baseMapper.updateById(sysUser); } return R.ok();