APP修改

ecell-internationalize/ecell-internationalize-app/pom.xml

@@ -46,6 +46,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.29</version>
         </dependency>
         <dependency>
             <groupId>com.ecell.internationalize.common.issue</groupId>

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);
     }
+
 }

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("校验通过");

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);
+        }
+
+    }
 }

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<SysUser> 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){

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);
+        }
+
+    }
 }

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;

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;
 }

ecell-internationalize/ecell-internationalize-system/src/main/resources/com/ecell/internationalize/system/mapper/DeviceInfoMapper.xml

@@ -309,7 +309,7 @@
     </select>
 
     <select id="queryRemoteControl" resultType="com.ecell.internationalize.system.entity.vo.RemoteControlVO">
-        select d.imei,l.addr,f.firm_code as code  from
+        select d.imei,l.addr,f.firm_code as code,f.firm_name  from
         (
         select imei,firm_id,agent_id,device_model_id,create_time from device_info where audit_status='2' and del_flag
         ='1'