From a420e7ca7049593d2e30b963df2471ea6b0714c5 Mon Sep 17 00:00:00 2001 From: caojianbin <1910336823> Date: Tue, 17 Dec 2024 15:47:28 +0800 Subject: [PATCH] =?UTF-8?q?APP=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ecell-internationalize-app/pom.xml | 1 + .../auth/controller/AuthController.java | 1 + .../auth/service/impl/SysUserLoginServiceImpl.java | 2 +- .../security/config/MybatisPlusPageConfig.java | 32 +++++++++++++++++++++- .../security/controller/SysUserController.java | 3 ++ .../system/config/MybatisPlusPageConfig.java | 30 ++++++++++++++++++-- .../system/constant/DeviceModelEnum.java | 2 +- .../system/entity/vo/RemoteControlVO.java | 1 + .../system/mapper/DeviceInfoMapper.xml | 2 +- 9 files changed, 68 insertions(+), 6 deletions(-) diff --git a/ecell-internationalize/ecell-internationalize-app/pom.xml b/ecell-internationalize/ecell-internationalize-app/pom.xml index c396648..1468896 100644 --- a/ecell-internationalize/ecell-internationalize-app/pom.xml +++ b/ecell-internationalize/ecell-internationalize-app/pom.xml @@ -46,6 +46,7 @@ mysql mysql-connector-java + 8.0.29 com.ecell.internationalize.common.issue diff --git a/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/controller/AuthController.java b/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/controller/AuthController.java index 701ba1e..1ac5a62 100644 --- a/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/controller/AuthController.java +++ b/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/controller/AuthController.java @@ -67,4 +67,5 @@ public class AuthController { public UserLogin test(String userName) { return sysUserFeignClient.queryByUser(userName); } + } diff --git a/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/service/impl/SysUserLoginServiceImpl.java b/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/service/impl/SysUserLoginServiceImpl.java index 7606134..5a1216e 100644 --- a/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/service/impl/SysUserLoginServiceImpl.java +++ b/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/service/impl/SysUserLoginServiceImpl.java @@ -46,7 +46,7 @@ public class SysUserLoginServiceImpl implements SysUserLoginService { } //账号被停用 if (UserStatus.DISABLE.getCode().equals(userInfo.getStatus())) { - return R.fail(LocaleUtil.getMessage("messages.account.delete")); + return R.fail(LocaleUtil.getMessage("messages.account.stop")); } System.out.println("userInfo:"+userInfo.getStatus()); System.out.println("校验通过"); diff --git a/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/config/MybatisPlusPageConfig.java b/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/config/MybatisPlusPageConfig.java index 3eb27f5..e567581 100644 --- a/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/config/MybatisPlusPageConfig.java +++ b/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/config/MybatisPlusPageConfig.java @@ -1,13 +1,43 @@ package com.ecell.internationalize.system.security.config; +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.ecell.internationalize.common.core.utils.StringUtils; +import com.ecell.internationalize.common.security.utils.SecurityUtils; +import com.ecell.internationalize.common.system.constant.FieldConstant; +import org.apache.ibatis.reflection.MetaObject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import java.util.Date; + @Configuration -public class MybatisPlusPageConfig { +public class MybatisPlusPageConfig implements MetaObjectHandler { @Bean public PaginationInterceptor paginationInterceptor() { return new PaginationInterceptor(); } + + /** + * 分页插件，交给Spring管理 + * + * @return 分页插件的实例 + */ + @Override + public void insertFill(MetaObject metaObject) { + setFieldValByName(FieldConstant.CREATE_TIME, new Date(), metaObject); + if (StringUtils.isNotEmpty(SecurityUtils.getUsername())) { + setFieldValByName(FieldConstant.CREATE_USER, SecurityUtils.getUsername(), metaObject); + } + + } + + @Override + public void updateFill(MetaObject metaObject) { + setFieldValByName(FieldConstant.UPDATE_TIME, new Date(), metaObject); + if (StringUtils.isNotEmpty(SecurityUtils.getUsername())) { + setFieldValByName(FieldConstant.UPDATE_USER, SecurityUtils.getUsername(), metaObject); + } + + } } diff --git a/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/controller/SysUserController.java b/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/controller/SysUserController.java index f5e4f83..2ddade9 100644 --- a/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/controller/SysUserController.java +++ b/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/controller/SysUserController.java @@ -2,6 +2,7 @@ package com.ecell.internationalize.system.security.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ecell.internationalize.common.core.constant.Constants; import com.ecell.internationalize.common.core.domain.UserLogin; import com.ecell.internationalize.common.core.utils.ServletUtils; import com.ecell.internationalize.common.core.utils.StringUtils; @@ -80,6 +81,8 @@ public class SysUserController { public UserLogin queryByUserName(@ApiParam(name="userName",value="用户账号",required=true) String userName) { LambdaQueryWrapper sysUserLambdaQueryWrapper=new LambdaQueryWrapper<>(); sysUserLambdaQueryWrapper.eq(SysUser::getAccount,userName); + sysUserLambdaQueryWrapper.eq(SysUser::getStatus, Constants.LOGIN_SUCCESS_STATUS); + sysUserLambdaQueryWrapper.eq(SysUser::getDelFlag, Constants.LOGIN_FAIL_STATUS); UserLogin sysUserVo = new UserLogin(); SysUser sysUser = sysUserService.getBaseMapper().selectOne(sysUserLambdaQueryWrapper); if (null == sysUser){ diff --git a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/config/MybatisPlusPageConfig.java b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/config/MybatisPlusPageConfig.java index 34e58b7..e4625a0 100644 --- a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/config/MybatisPlusPageConfig.java +++ b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/config/MybatisPlusPageConfig.java @@ -1,17 +1,43 @@ package com.ecell.internationalize.system.config; +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.ecell.internationalize.common.core.utils.StringUtils; +import com.ecell.internationalize.common.security.utils.SecurityUtils; +import com.ecell.internationalize.common.system.constant.FieldConstant; +import org.apache.ibatis.reflection.MetaObject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import java.util.Date; + @Configuration -public class MybatisPlusPageConfig { - /** +public class MybatisPlusPageConfig implements MetaObjectHandler { + /** * 分页插件，交给Spring管理 + * * @return 分页插件的实例 */ @Bean public PaginationInterceptor paginationInterceptor() { return new PaginationInterceptor(); } + + @Override + public void insertFill(MetaObject metaObject) { + setFieldValByName(FieldConstant.CREATE_TIME, new Date(), metaObject); + if (StringUtils.isNotEmpty(SecurityUtils.getUsername())) { + setFieldValByName(FieldConstant.CREATE_USER, SecurityUtils.getUsername(), metaObject); + } + + } + + @Override + public void updateFill(MetaObject metaObject) { + setFieldValByName(FieldConstant.UPDATE_TIME, new Date(), metaObject); + if (StringUtils.isNotEmpty(SecurityUtils.getUsername())) { + setFieldValByName(FieldConstant.UPDATE_USER, SecurityUtils.getUsername(), metaObject); + } + + } } diff --git a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/constant/DeviceModelEnum.java b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/constant/DeviceModelEnum.java index b172de7..0cecadd 100644 --- a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/constant/DeviceModelEnum.java +++ b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/constant/DeviceModelEnum.java @@ -2,7 +2,7 @@ package com.ecell.internationalize.system.constant; public enum DeviceModelEnum { - LOCATION_FUN_ONE("1","基站"), LOCATION_FUN_TWO("2","基站+wiff"), LOCATION_FUN_THREE("3","基站+GPS"), LOCATION_FUN_FOUR("4","基站+wiff+GPS"), + LOCATION_FUN_ONE("1","基站"), LOCATION_FUN_TWO("2","基站+wifi"), LOCATION_FUN_THREE("3","基站+GPS"), LOCATION_FUN_FOUR("4","基站+wiff+GPS"), DEVICE_TYPE_ZERO("0","默认"),DEVICE_TYPE_ONE("1","手表"),DEVICE_TYPE_TWO("2","学生卡"),DEVICE_TYPE_THREE("3","老人机"); private String code; private String type; diff --git a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/entity/vo/RemoteControlVO.java b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/entity/vo/RemoteControlVO.java index f1485b1..1187260 100644 --- a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/entity/vo/RemoteControlVO.java +++ b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/entity/vo/RemoteControlVO.java @@ -10,4 +10,5 @@ public class RemoteControlVO { private String imei; private String code; private String addr; + private String firmName; } diff --git a/ecell-internationalize/ecell-internationalize-system/src/main/resources/com/ecell/internationalize/system/mapper/DeviceInfoMapper.xml b/ecell-internationalize/ecell-internationalize-system/src/main/resources/com/ecell/internationalize/system/mapper/DeviceInfoMapper.xml index 6aa4b17..88347ac 100644 --- a/ecell-internationalize/ecell-internationalize-system/src/main/resources/com/ecell/internationalize/system/mapper/DeviceInfoMapper.xml +++ b/ecell-internationalize/ecell-internationalize-system/src/main/resources/com/ecell/internationalize/system/mapper/DeviceInfoMapper.xml @@ -309,7 +309,7 @@