添加修改用户状态

ad-platform-pojo/src/main/java/com/baiye/model/enums/ResponseCode.java

@@ -52,6 +52,11 @@ public enum ResponseCode {
      */
     USER_INFORMATION_ERROR("1002", "用户信息错误"),
 
+    /**
+     * 账户已被禁用
+     */
+    ACCOUNT_DISABLED("1025", "账户已被禁用"),
+
     /**
      * 支付宝支付失败
      */

manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/FormUser.java

@@ -44,6 +44,11 @@ public class FormUser extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "最后登录时间")
     private Date lastLoginTime;
 
+
+    @Column(name = "status")
+    @ApiModelProperty(value = "账户状态")
+    private Integer status;
+
     @Column(name = "optimistic_version")
     @ApiModelProperty(value = "版本号")
     private Long optimisticVersion;

manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/FormUserRepository.java

@@ -4,6 +4,8 @@ package com.baiye.modules.system.repository;
 import com.baiye.modules.system.domain.FormUser;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
 /**
  * @author Enzo
@@ -18,4 +20,14 @@ public interface FormUserRepository extends JpaRepository<FormUser, Long>, JpaSp
      * @return
      */
     FormUser findByPhone(String phoneNumber);
+
+
+    /**
+     * 修改用户状态
+     * @param status
+     * @param userId
+     */
+    @Modifying
+    @Query(value = "update FormUser set status = ?1 where id = ?2")
+    void updateStatusById(Integer status, Long userId);
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/FormUserController.java

@@ -10,10 +10,12 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -48,6 +50,14 @@ public class FormUserController {
         return formUserService.getUserDetail(userToken);
     }
 
+    @ApiOperation("修改公司状态")
+    @GetMapping("/updateUserStatus")
+    public ResponseEntity<Object> create(@RequestParam("status") Integer status,
+                                         @RequestParam("id") Long id) {
+        formUserService.updateFormUserStatus(status, id);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
     @ApiOperation("查询人员列表(分页)")
     @GetMapping("/queryAll")
     public ResponseEntity<Object> queryAll(FormUserQueryCriteria formUserQueryCriteria, Pageable pageable) {

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/FormUserService.java

@@ -49,4 +49,11 @@ public interface FormUserService {
      * @return
      */
     Map<String, Object> queryAll(FormUserQueryCriteria formUserQueryCriteria, Pageable pageable);
+
+    /**
+     * 修改用户状态
+     * @param status
+     * @param id
+     */
+    void updateFormUserStatus(Integer status, Long id);
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/FormUserServiceImpl.java

@@ -1,14 +1,11 @@
 package com.baiye.modules.system.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baiye.constant.DefaultNumberConstants;
-import com.baiye.constant.SqlConstant;
 import com.baiye.http.CommonResponse;
 import com.baiye.manager.UserTokenManager;
 import com.baiye.model.enums.ResponseCode;
@@ -17,7 +14,10 @@ import com.baiye.modules.system.domain.FormUser;
 import com.baiye.modules.system.repository.DebtFormRepository;
 import com.baiye.modules.system.repository.FormUserRepository;
 import com.baiye.modules.system.service.FormUserService;
-import com.baiye.modules.system.service.dto.*;
+import com.baiye.modules.system.service.dto.FormUserDto;
+import com.baiye.modules.system.service.dto.FormUserQueryCriteria;
+import com.baiye.modules.system.service.dto.QueryResultDTO;
+import com.baiye.modules.system.service.dto.UserLoginDTO;
 import com.baiye.modules.system.service.mapstruct.FormUserMapper;
 import com.baiye.util.*;
 import com.google.common.collect.Lists;
@@ -25,8 +25,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
-import org.hibernate.query.internal.NativeQueryImpl;
-import org.hibernate.transform.Transformers;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -34,12 +32,8 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.math.BigInteger;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -101,6 +95,9 @@ public class FormUserServiceImpl implements FormUserService {
         FormUser formUser = formUserRepository.findByPhone(phone);
         // 已存在用户
         if (ObjectUtil.isNotNull(formUser)) {
+            if (formUser.getStatus() != DefaultNumberConstants.ONE_NUMBER){
+                return CommonResponse.createByErrorMessage(ResponseCode.ACCOUNT_DISABLED.getDesc());
+            }
             formUser.setLastLoginTime(DateUtil.date());
             // token
             String userToken =
@@ -112,6 +109,7 @@ public class FormUserServiceImpl implements FormUserService {
         Long formUserId = IdUtil.getSnowflake(workerId, datacenterId).nextId();
         formUser.setId(formUserId);
         formUser.setPhone(phone);
+        formUser.setStatus(DefaultNumberConstants.ONE_NUMBER);
         formUser.setOptimisticVersion((long) DefaultNumberConstants.ZERO_NUMBER);
 
         // token
@@ -144,7 +142,7 @@ public class FormUserServiceImpl implements FormUserService {
         Date beginOfDay = DateUtil.beginOfDay(DateUtil.offsetWeek
                 (now, DefaultNumberConstants.MINUS_ONE_NUMBER));
         List<Object[]> dtoList = Lists.newArrayList(debtFormRepository.findByDate(beginOfDay, now, userId));
-        TreeMap<String, String> treeMap = new TreeMap<>(Comparator.comparing(DateUtil::parseDate));
+        Map<String, String> treeMap = new TreeMap<>(Comparator.comparing(DateUtil::parseDate));
 
         // 转换map
         if (CollUtil.isNotEmpty(dtoList)) {
@@ -192,5 +190,11 @@ public class FormUserServiceImpl implements FormUserService {
         return PageUtil.toPage(map);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateFormUserStatus(Integer status, Long id) {
+        formUserRepository.updateStatusById(status, id);
+    }
+
 
 }