优化

platform-dao/src/main/java/com/platform/dao/dto/upms/SysUserDTO.java

@@ -23,6 +23,7 @@ import java.util.List;
 @Data
 @Accessors(chain = true)
 public class SysUserDTO extends BaseDTO implements Serializable {
+    private Integer flag;
 
     private static final long serialVersionUID = 1L;
 

platform-dao/src/main/java/com/platform/dao/entity/upms/SysUser.java

@@ -21,6 +21,10 @@ import java.time.LocalDateTime;
 @Table(name = "t_sys_user")
 @Accessors(chain = true)
 public class SysUser implements Serializable {
+    /**
+     * 判断被冻结类型1：输错密码
+     */
+    private Integer flag;
 
     private static final long serialVersionUID = 1L;
 

platform-dao/src/main/java/com/platform/dao/vo/SysUserVO.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Accessors(chain = true)
 public class SysUserVO implements Serializable {
     private static final long serialVersionUID = 1L;
-
+    private Integer flag;
     /**
      * 主键ID
      */

platform-dao/src/main/resources/mapper/upms/SysUserMapper.xml

@@ -40,6 +40,15 @@
                 #{item}
             </foreach>
         </if>
+        <if test="updateTime!=null">
+            and u.update_time<![CDATA[ <= ]]>#{updateTime}
+        </if>
+        <if test="status!=null">
+            and u.status=#{status}
+        </if>
+        <if test="flag!=null">
+            and u.flag=#{flag}
+        </if>
         order by u.update_time desc
     </select>
 

platform-rest/src/main/java/com/platform/rest/config/security/TokenEndpointAspect.java

@@ -213,7 +213,7 @@ public class TokenEndpointAspect {
         if (errorTimes >= 5) {
             // 冻结用户
             try {
-                sysUserService.updateStatus(userId, CommonConstants.USER_STATUS_FROZE);
+                sysUserService.updateStatus(userId, CommonConstants.USER_STATUS_FROZE,1);
                 // 删除用户缓存
                 Cache cache = cacheManager.getCache("user_details");
                 if (cache != null) {

platform-rest/src/main/java/com/platform/rest/controller/upms/SysUserController.java

@@ -329,7 +329,7 @@ public class SysUserController {
     @PutMapping("/{userId}/status/{status}")
 //    @PreAuthorize("@pms.hasPermission('upms-users-status-edit')")
     public R updateStatus(@PathVariable("userId") String userId, @PathVariable("status") Integer status) {
-        return new R<>(sysUserService.updateStatus(userId, status));
+        return new R<>(sysUserService.updateStatus(userId, status,null));
     }
 
     /**

platform-rest/src/main/java/com/platform/rest/task/SysUserTask.java

@@ -0,0 +1,23 @@
+package com.platform.rest.task;
+
+import com.platform.service.check.CheckJobService;
+import com.platform.service.upms.SysUserService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 点巡检任务处理
+ * @Author liuyu
+ * @Date 2020-05-09 16:40:01
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Slf4j
+@Component("sysUserTask")
+@AllArgsConstructor
+public class SysUserTask {
+    private SysUserService sysUserService;
+    public void unsealUser(){sysUserService.unsealUser();}
+
+
+}

platform-service/src/main/java/com/platform/service/upms/SysUserService.java

@@ -20,6 +20,7 @@ import java.util.List;
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface SysUserService extends IBaseService<SysUser, SysUserDTO> {
+    void unsealUser();
 
     /**
      * 通过用户名称查询系统用户
@@ -70,7 +71,7 @@ public interface SysUserService extends IBaseService<SysUser, SysUserDTO> {
      * @param status ：状态
      * @return ：
      */
-    int updateStatus(String userId, Integer status);
+    int updateStatus(String userId, Integer status,Integer flag);
 
     /**
      * 修改头像

platform-service/src/main/java/com/platform/service/upms/impl/SysUserServiceImpl.java

@@ -47,6 +47,7 @@ import org.springframework.util.CollectionUtils;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -160,6 +161,23 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
         mapper.updateByPrimaryKeySelective(entity);
     }
 
+    @Override
+    public void unsealUser() {
+        SysUserDTO user = new SysUserDTO();
+        user.setFlag(1);
+        user.setStatus(2);
+        user.setUpdateTime(LocalDateTime.now().minusMinutes(5));
+        List<SysUserVO> list = mapper.selectByDept(user);
+        for (SysUserVO sysUser:list){
+                sysUser.setStatus(1);
+                sysUser.setFlag(null);
+                sysUser.setUpdateTime(LocalDateTime.now());
+                SysUser user1 = BeanConverterUtil.copyObjectProperties(sysUser,SysUser.class);
+                mapper.updateByPrimaryKeySelective(user1);
+
+        }
+    }
+
     @Override
     public SysUser selectByUsername(String userName) {
         Weekend<SysUser> weekend = new Weekend<>(SysUser.class);
@@ -449,15 +467,19 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
     }
 
     @Override
-    public int updateStatus(String userId, Integer status) {
+    public int updateStatus(String userId, Integer status,Integer flag) {
         SysUser user = validUserExist(userId);
         if (user == null) {
             throw new BusinessException("用户不存在");
         }
+        user.setFlag(flag);
         user.setStatus(status);
+        user.setUpdateTime(LocalDateTime.now());
 //        updateSubUser(userId, status);
         SysUser update = new SysUser();
         update.setUserId(user.getUserId());
+        update.setUpdateTime(LocalDateTime.now());
+        update.setFlag(flag);
         update.setStatus(status);
         updateUser(update);
         return 1;