Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -4,11 +4,13 @@
import com.dg.core.HttpStatus;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.HuaChengSysUser;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.manager.TokenManager;
import com.dg.core.service.IHuaChengSysUserService;
import com.dg.core.util.SmsUtil;
import com.dg.core.util.Snowflake;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,7 +28,7 @@
@Api(tags = {"用户接口"})
@RestController
@RequestMapping("/user")
public class UserController extends BaseController{
public class UserController extends BaseController {
    @Autowired
    com.dg.core.service.ISysUserService IUserService;

@@ -62,12 +64,12 @@
            }

            //本地表查询用户
            user = IUserService.selectData(huaChengSysUser.getUserId()+"");
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
            if (user == null) {
                //本地没有此用户  新用户
                SysUser newSysUser=new SysUser();
                //默认  1系统后台用户
                newSysUser.setUserType("1");
                newSysUser.setUserType("3");
                newSysUser.setPhonenumber(huaChengSysUser.getPhone());
                newSysUser.setUserId(huaChengSysUser.getUserId());
                newSysUser.setUserName(huaChengSysUser.getNickName());
@@ -79,7 +81,7 @@
                IUserService.insertConfig(newSysUser);
            }

            user = IUserService.selectData(huaChengSysUser.getUserId()+"");
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);

            if (user == null) {
                return ResultData.error("用户不存在！请联系管理员");
@@ -100,6 +102,7 @@
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());

            return ResultData.success(map);
        }
@@ -125,6 +128,7 @@
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());

            return ResultData.success(map);
        }
@@ -166,14 +170,15 @@
    @GetMapping("/getlist")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize)
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "keyword",required = false) String keyword)
    {
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"1");
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword);

        int num=IUserService.selectNum("1");
        int num=IUserService.selectNum("3",keyword);
        return getDataTable(list,num);
    }

@@ -187,7 +192,7 @@
    @ApiOperation("新增用户接口")
    @PostMapping("/add")
    @Authorization
    public ResultData insertConfig(@RequestBody SysUser config)
    public ResultData insertConfig(@RequestBody SysUser config, @CurrentUser SysUser sysUser)
    {
        Assert.notNull(config, "parameter can not be empty");

@@ -206,13 +211,21 @@
            return error("昵称不能为空");
        }

        SysUser user = IUserService.getUserByAccount(config.getLoginName());
        if(StringUtils.isEmpty(config.getPhonenumber()))
        {
            return error("手机号不能为空");
        }

        SysUser user = IUserService.selectData("",config.getPhonenumber());
        if (user != null) {
            //提示用户名或密码错误
            return error("该账户已存在！");
        }

        config.setUserType("1");

        config.setCreateBy(sysUser.getUserId()+"");
        config.setUserId(Snowflake.getId());
        config.setUserType("3");

        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());
@@ -229,11 +242,11 @@
    @ApiOperation("修改用户接口")
    @PostMapping("/update")
    @Authorization
    public ResultData updateConfig(@RequestBody SysUser config)
    public ResultData updateConfig(@RequestBody SysUser config,@CurrentUser SysUser sys)
    {
        if(config.getUserId()==null)
        if(config.getId()==null)
        {
            return error("userId不能为空");
            return error("Id不能为空");
        }

        if(StringUtils.isEmpty(config.getLoginName()))
@@ -241,7 +254,9 @@
            return error("账户不能为空");
        }

        config.setUserType("1");
        config.setUserType("3");

        config.setUpdateBy(sys.getUserId()+"");

        return toAjax(IUserService.updateConfig(config));
    }
@@ -280,7 +295,7 @@
            return error("userId不能为空");
        }

        SysUser sysUser=IUserService.selectData(userId);
        SysUser sysUser=IUserService.selectData(userId,null);
        //删除标志（0代表存在 2代表删除）
        sysUser.setDelFlag("2");
        return toAjax(IUserService.updateConfig(sysUser));
@@ -308,7 +323,7 @@
            return error("密码不能为空");
        }

        SysUser sysUser=IUserService.selectData(config.getUserId()+"");
        SysUser sysUser=IUserService.selectData(config.getUserId()+"",null);
        if(sysUser==null)
        {
            return error("用户不存在");