洪城义警-正式版后台
钟日健
2022-02-22 09b75a9d425aca0c78be341b3a8ac5ef522250e9
新增保安员信息修改,离职,注销数据同步
2 files modified
1 files added
131 ■■■■■ changed files
src/main/java/org/springblade/modules/system/controller/UserController.java 82 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/dto/UserDTO.java 48 ●●●●● patch | view | raw | blame | history
src/main/resources/application.yml 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -45,6 +45,7 @@
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.system.dto.UserDTO;
import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.excel.UserExcel;
@@ -66,10 +67,7 @@
import javax.validation.Valid;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
@@ -555,5 +553,81 @@
        //返回
        return R.status(status);
    }
    /**
     * 保安员新增(数据同步调用)
     */
    @PostMapping("/updateBySecurtiy")
    @Transactional(rollbackFor = Exception.class)
    public R updateBySecurtiy(@RequestBody User user) {
        User user1 = new User();
        user1.setIsDeleted(0);
        user1.setStatus(1);
        user1.setCardid(user.getCardid());
        User one = userService.getOne(Condition.getQueryWrapper(user1));
        boolean status = false;
        if (null!=one){
            one.setRealName(user.getRealName());
            one.setAvatar(user.getAvatar());
            one.setPhone(user.getPhone());
            one.setExamination_type(user.getExamination_type());
            one.setStatus(user.getStatus());
            one.setUpdateTime(new Date());
            //修改
            status = userService.updateById(one);
        }
        //返回
        return R.status(status);
    }
    /**
     * 保安员信息修改(账号,身份证,密码 修改)
     */
    @PostMapping("/updateUserByAccount")
    @Transactional(rollbackFor = Exception.class)
    public R updateUserByAccount(@RequestBody UserDTO user) {
        User user1 = new User();
        user1.setIsDeleted(0);
        user1.setStatus(1);
        user1.setCardid(user.getOldCardid());
        User one = userService.getOne(Condition.getQueryWrapper(user1));
        boolean status = false;
        if (null!=one){
            //修改
            one.setAccount(user.getCardid());
            one.setCardid(user.getCardid());
            one.setPassword(user.getPassword());
            one.setAvatar(user.getAvatar());
            one.setPhone(user.getPhone());
            one.setRealName(user.getRealName());
            one.setUpdateTime(new Date());
            //用户修改
            status = userService.updateById(one);
        }
        //返回
        return R.status(status);
    }
    /**
     * 同步删除
     */
    @PostMapping("/removeSecurity")
    @Transactional(rollbackFor = Exception.class)
    public R removeSecurity(@RequestBody User user) {
        User user1 = new User();
        user1.setIsDeleted(0);
        user1.setStatus(1);
        user1.setCardid(user.getCardid());
        User one = userService.getOne(Condition.getQueryWrapper(user1));
        boolean status = false;
        if (null!=one){
            //修改
            one.setIsDeleted(1);
            //用户修改
            status = userService.removeById(one.getId());
        }
        //返回
        return R.status(status);
    }
};
src/main/java/org/springblade/modules/system/dto/UserDTO.java
New file
@@ -0,0 +1,48 @@
package org.springblade.modules.system.dto;
import lombok.Data;
import java.io.Serializable;
/**
 * 用户数据推送 DTO
 * @author zhongrj
 * @since 2022-02-22
 */
@Data
public class UserDTO implements Serializable {
    private Long id;
    private String account;
    /**
     * 密码
     */
    private String password;
    private String realName;
    private String avatar;
    private String email;
    private String phone;
    private Integer sex;
    private String roleId;
    private Integer status;
    private Integer isDeleted;
    private String examination_type;
    private String examination_mx;
    private String jurisdiction;
    private String cardid;
    private String oldCardid;
}
src/main/resources/application.yml
@@ -194,6 +194,7 @@
    #接口放行
    skip-url:
      - /blade-test/**
      - /blade-user/import-users
    #授权认证配置
    auth:
      - method: ALL