admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据同步接口

Browse Source
This commit is contained in:
pengjie 2023-09-19 14:18:39 +08:00
parent 2681b21961
commit 67f4b30c85
19 changed files with 225 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserOpController.java Normal file
View File

@ -0,0 +1,178 @@
package com.zhgd.xmgl.modules.basicdata.controller.admin;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.handler.exception.CustomException;
import com.zhgd.xmgl.modules.basicdata.dto.SystemUserDto;
import com.zhgd.xmgl.modules.basicdata.entity.Government;
import com.zhgd.xmgl.modules.basicdata.entity.SystemRole;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUserRole;
import com.zhgd.xmgl.modules.basicdata.service.IGovernmentService;
import com.zhgd.xmgl.modules.basicdata.service.ISystemRoleService;
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserRoleService;
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
import com.zhgd.xmgl.modules.basicdata.vo.SystemUserOpVo;
import com.zhgd.xmgl.modules.basicdata.vo.SystemUserVo;
import com.zhgd.xmgl.security.JwtTokenProvider;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @Title: Controller
* @Description: 系统用户表
* @author： pds
* @date： 2023-02-08
* @version： V1.0
*/
@RestController
@RequestMapping("/xmgl/user")
@Slf4j
@Api(tags = "用户管理")
public class SystemUserOpController {
@Autowired
private ISystemUserService systemUserService;
@Autowired
private ISystemUserRoleService systemUserRoleService;
@Autowired
private IGovernmentService governmentService;
@Autowired
private ISystemRoleService systemRoleService;
@Autowired
private JwtTokenProvider jwtTokenProvider;
@OperLog(operModul = "用户管理", operType = "新增", operDesc = "用户注册")
@ApiOperation(value = " 用户注册", notes = "用户注册", httpMethod = "POST")
@PostMapping(value = "/register")
public Result<SystemUser> register(@RequestBody SystemUserOpVo systemUserOpVo) {
Result<SystemUser> result = new Result<SystemUser>();
SystemUser systemUser1 = systemUserService.getOne(Wrappers.<SystemUser>lambdaQuery().eq(SystemUser::getAccount, systemUserOpVo.getName()));
if (systemUser1 != null) {
throw new CustomException("该用户账号已存在!请重新输入");
}
Government government = governmentService.list().get(0);
SystemUser systemUser = new SystemUser();
systemUser.setUserId(systemUserOpVo.getId());
systemUser.setAccount(systemUserOpVo.getName());
systemUser.setPassword(systemUserOpVo.getPwd());
systemUser.setShowPassword(systemUserOpVo.getPwd());
systemUser.setCreateTime(new Date());
systemUser.setSn(government.getGovernmentSn());
systemUser.setShowPassword(systemUser.getPassword());
systemUser.setIsManager(false);
systemUser.setAccountType(2);
systemUser.setUserTel(systemUserOpVo.getNumPhone());
systemUserService.save(systemUser);
//新增用户角色
SystemUserRole systemUserRole = new SystemUserRole();
systemUserRole.setRoleId(systemUserOpVo.getRole());
systemUserRole.setUserId(systemUser.getUserId());
systemUserRoleService.save(systemUserRole);
result.success("添加成功！");
return result;
}
@OperLog(operModul = "用户管理", operType = "删除", operDesc = "删除系统用户表信息")
@ApiOperation(value = "删除系统用户表信息", notes = "删除系统用户表信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "用户ID", paramType = "body", required = true, dataType = "Integer")
@PostMapping(value = "/delete")
public Result<SystemUser> delete(@ApiIgnore @RequestBody Map<String, Object> map) {
Result<SystemUser> result = new Result<SystemUser>();
SystemUser systemUserEntity = systemUserService.getById(MapUtils.getString(map, "id"));
if (systemUserEntity == null) {
result.error500("未找到对应实体");
} else {
boolean ok = systemUserService.removeInfo(systemUserEntity.getUserId());
if (ok) {
result.success("删除成功!");
}
}
return result;
}
@OperLog(operModul = "用户管理", operType = "修改", operDesc = "编辑系统用户表信息")
@ApiOperation(value = "编辑系统用户表信息", notes = "编辑系统用户表信息", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<SystemUser> edit(@RequestBody SystemUserOpVo systemUserOpVo) {
Result<SystemUser> result = new Result<SystemUser>();
SystemUser systemUserEntity = systemUserService.getById(systemUserOpVo.getId());
if (systemUserEntity == null) {
result.error500("未找到对应实体");
} else {
SystemUserVo systemUserVo = new SystemUserVo();
systemUserVo.setUserId(systemUserOpVo.getId());
systemUserVo.setAccount(systemUserOpVo.getName());
systemUserVo.setPassword(systemUserOpVo.getPwd());
systemUserVo.setShowPassword(systemUserOpVo.getPwd());
systemUserVo.setRoleId(systemUserOpVo.getRole());
systemUserVo.setState(systemUserOpVo.getEnable());
systemUserVo.setUserTel(systemUserOpVo.getNumPhone());
systemUserService.updateInfo(systemUserVo);
result.success("修改成功!");
}
return result;
}
@OperLog(operModul = "用户管理", operType = "查询", operDesc = "通过id查询系统用户表信息")
@ApiOperation(value = "通过id查询系统用户表信息", notes = "通过id查询系统用户表信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "系统用户表ID", paramType = "body", required = true, dataType = "Integer")
@PostMapping(value = "/queryById")
public Result<SystemUserDto> queryById(@ApiIgnore @RequestBody Map<String, Object> map) {
Result<SystemUserDto> result = new Result<SystemUserDto>();
SystemUser systemUser = systemUserService.getById(MapUtils.getString(map, "id"));
if (systemUser == null) {
result.error500("未找到对应实体");
} else {
SystemUserDto systemUserDto = new SystemUserDto();
BeanUtils.copyProperties(systemUser, systemUserDto);
SystemUserRole sys = systemUserRoleService.getOne(Wrappers.<SystemUserRole>lambdaQuery().eq(SystemUserRole::getUserId, systemUser.getUserId()));
systemUserDto.setRoleId(sys.getRoleId());
result.setResult(systemUserDto);
result.setSuccess(true);
}
return result;
}
@OperLog(operModul = "角色管理", operType = "列表查询", operDesc = "列表查询系统角色信息")
@ApiOperation(value = " 列表查询系统角色信息", notes = "列表查询系统角色信息", httpMethod="GET")
@GetMapping(value = "/roleList")
public Result<List<SystemRole>> roleList() {
Government government = governmentService.list().get(0);
List<SystemRole> list = systemRoleService.list(Wrappers.<SystemRole>lambdaQuery().eq(SystemRole::getSn, government.getGovernmentSn())
.gt(SystemRole::getPriority, 3));
return Result.success(list);
}
@OperLog(operModul = "角色管理", operType = "退出登录", operDesc = "退出登录")
@ApiOperation(value = " 退出登录", notes = "退出登录", httpMethod="POST")
@PostMapping(value = "/logout")
public Result<Object> logout(@RequestBody Map<String, Object> map) {
Result<Object> result = new Result<Object>();
String name = MapUtils.getString(map, "name");
jwtTokenProvider.removeToken(name);
result.setSuccess(true);
return result;
}
}

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemUserController.java
View File

@ -141,7 +141,7 @@ public class EntSystemUserController {
if(systemUser==null) {
result.error500("未找到对应实体");
}else {
boolean ok = systemUserService.removeInfo(MapUtils.getLong(map,"userId"));
boolean ok = systemUserService.removeInfo(MapUtils.getString(map,"userId"));
if(ok) {
result.success("删除成功!");
}

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovSystemUserController.java
View File

@ -140,7 +140,7 @@ public class GovSystemUserController {
if(systemUser==null) {
result.error500("未找到对应实体");
}else {
boolean ok = systemUserService.removeInfo(MapUtils.getLong(map,"userId"));
boolean ok = systemUserService.removeInfo(MapUtils.getString(map,"userId"));
if(ok) {
result.success("删除成功!");
}

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/SystemUserController.java
View File

@ -137,11 +137,11 @@ public class SystemUserController {
@PostMapping(value = "/delete")
public Result<SystemUser> delete(@ApiIgnore @RequestBody Map<String,Object> map) {
Result<SystemUser> result = new Result<SystemUser>();
SystemUser systemUser = systemUserService.getById(MapUtils.getLong(map,"userId"));
SystemUser systemUser = systemUserService.getById(MapUtils.getString(map,"userId"));
if(systemUser==null) {
result.error500("未找到对应实体");
}else {
boolean ok = systemUserService.removeInfo(MapUtils.getLong(map,"userId"));
boolean ok = systemUserService.removeInfo(MapUtils.getString(map,"userId"));
if(ok) {
result.success("删除成功!");
}

2
src/main/java/com/zhgd/xmgl/modules/basicdata/dto/SystemUserDto.java
View File

@ -17,5 +17,5 @@ public class SystemUserDto extends SystemUser {
private String roleName;
@ApiModelProperty(value = "角色ID")
private Long roleId;
private String roleId;
}

2
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemRole.java
View File

@ -31,7 +31,7 @@ public class SystemRole implements Serializable {
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "角色id(主键ID)")
private Long roleId;
private String roleId;
/**
* 角色名称
*/

4
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java
View File

@ -3,8 +3,6 @@ package com.zhgd.xmgl.modules.basicdata.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zhgd.xmgl.sensitive.Sensitive;
import com.zhgd.xmgl.sensitive.SensitiveTypeEnum;
import com.zhgd.xmgl.valid.AddGroup;
import com.zhgd.xmgl.valid.EditGroup;
import io.swagger.annotations.ApiModel;
@ -76,7 +74,7 @@ public class SystemUser implements Serializable {
/**
* 人员电话
*/
@Sensitive(type = SensitiveTypeEnum.MOBILE_PHONE)
// @Sensitive(type = SensitiveTypeEnum.MOBILE_PHONE)
@NotBlank(message = "手机号码不能为空", groups = {AddGroup.class, EditGroup.class})
@Excel(name = "人员电话", width = 15)
@ApiModelProperty(value = "人员电话")

2
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUserRole.java
View File

@ -39,5 +39,5 @@ public class SystemUserRole implements Serializable {
*/
@Excel(name = "角色id", width = 15)
@ApiModelProperty(value = "角色id")
private Long roleId;
private String roleId;
}

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseActionMapper.java
View File

@ -29,7 +29,7 @@ public interface BaseActionMapper extends BaseMapper<BaseAction> {
List<BaseAction> getActionCodes(@Param("accountType") Integer accountType);
List<BaseAction> getActionCodeByRole(@Param("roleId") Long roleId);
List<BaseAction> getActionCodeByRole(@Param("roleId") String roleId);
Set<String> getMenuCode(@Param("menuId") String menuId);

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseMenuMapper.java
View File

@ -29,5 +29,5 @@ public interface BaseMenuMapper extends BaseMapper<BaseMenu> {
List<EntityMap> selectComapnyUserMenuList(Map<String, Object> param);
List<BaseMenu> getMenuIdByFilter(Long roleId, Long moduleId);
List<BaseMenu> getMenuIdByFilter(String roleId, Long moduleId);
}

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseModuleMapper.java
View File

@ -17,5 +17,5 @@ public interface BaseModuleMapper extends BaseMapper<BaseModule> {
List<String> getTitles();
List<Long> getByRoleId(Long roleId);
List<Long> getByRoleId(String roleId);
}

2
src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java
View File

@ -25,7 +25,7 @@ public interface ISystemUserService extends IService<SystemUser> {
int updateInfo(SystemUserVo systemUserVo);
boolean removeInfo(Long userId);
boolean removeInfo(String userId);
boolean updatePassword(String userId, String password);

2
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseActionServiceImpl.java
View File

@ -63,7 +63,7 @@ public class BaseActionServiceImpl extends ServiceImpl<BaseActionMapper, BaseAct
} else {
SystemUserRole systemUserRole = systemUserRoleMapper.selectOne(Wrappers.<SystemUserRole>lambdaQuery().eq(SystemUserRole::getUserId, user.getUserId()));
if (systemUserRole != null) {
Long roleId = systemUserRole.getRoleId();
String roleId = systemUserRole.getRoleId();
actionCodes = baseActionMapper.getActionCodeByRole(roleId).stream().filter(a -> a.getMenuId().equals(menuId))
.map(a -> a.getActionCode()).collect(Collectors.toSet());
}

4
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java
View File

@ -109,7 +109,7 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
baseMenus = baseMenuMapper.selectList(Wrappers.<BaseMenu>lambdaQuery().in(BaseMenu::getModuleId, moduleId)
.eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority));
} else {
Long roleId = systemUserRoleService.getOne(Wrappers.<SystemUserRole>lambdaQuery()
String roleId = systemUserRoleService.getOne(Wrappers.<SystemUserRole>lambdaQuery()
.eq(SystemUserRole::getUserId, user.getUserId())).getRoleId();
if (roleId != null) {
baseMenus = baseMenuMapper.getMenuIdByFilter(roleId, moduleId);
@ -172,7 +172,7 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
baseMenus = baseMenuMapper.selectList(Wrappers.<BaseMenu>lambdaQuery().in(BaseMenu::getModuleId, moduleId)
.eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority));
} else {
Long roleId = systemUserRoleService.getOne(Wrappers.<SystemUserRole>lambdaQuery()
String roleId = systemUserRoleService.getOne(Wrappers.<SystemUserRole>lambdaQuery()
.eq(SystemUserRole::getUserId, systemUser.getUserId())).getRoleId();
if (roleId != null) {
baseMenus = baseMenuMapper.getMenuIdByFilter(roleId, moduleId);

3
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -112,7 +112,6 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
}
SystemUser systemUser = new SystemUser();
BeanUtils.copyProperties(systemUserVo, systemUser);
systemUser.setCreateTime(new Date());
this.updateById(systemUser);
//新增用户角色
systemUserRoleMapper.delete(Wrappers.<SystemUserRole>lambdaQuery()
@ -124,7 +123,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
}
@Override
public boolean removeInfo(Long userId) {
public boolean removeInfo(String userId) {
systemUserRoleMapper.delete(Wrappers.<SystemUserRole>lambdaQuery()
.eq(SystemUserRole::getUserId, userId));
return this.removeById(userId);

28
src/main/java/com/zhgd/xmgl/modules/basicdata/vo/SystemUserOpVo.java Normal file
View File

@ -0,0 +1,28 @@
package com.zhgd.xmgl.modules.basicdata.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "系统用户详细信息(VO)", description = "SystemUserOpVo")
public class SystemUserOpVo {
@ApiModelProperty(value = "用户ID")
private String id;
@ApiModelProperty(value = "登录账号")
private String name;
@ApiModelProperty(value = "登录密码")
private String pwd;
@ApiModelProperty(value = "角色")
private String role;
@ApiModelProperty(value = "1：开启，0：禁用")
private Integer enable;
@ApiModelProperty(value = "手机号")
private String numPhone;
}

2
src/main/java/com/zhgd/xmgl/modules/basicdata/vo/SystemUserVo.java
View File

@ -15,6 +15,6 @@ public class SystemUserVo extends SystemUser {
@NotNull(message = "用户角色不能为空", groups = {AddGroup.class, EditGroup.class})
@ApiModelProperty(value="角色ID")
private Long roleId;
private String roleId;
}

2
src/main/java/com/zhgd/xmgl/security/MyUserDetailsImpl.java
View File

@ -53,7 +53,7 @@ public class MyUserDetailsImpl implements UserDetailsService {
} else {
SystemUserRole systemUserRole = systemUserRoleMapper.selectOne(Wrappers.<SystemUserRole>lambdaQuery().eq(SystemUserRole::getUserId, user.getUserId()));
if (systemUserRole != null) {
Long roleId = systemUserRole.getRoleId();
String roleId = systemUserRole.getRoleId();
actionCodes = baseActionMapper.getActionCodeByRole(roleId).stream().map(a -> a.getActionCode()).collect(Collectors.toSet());
}
}

1
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -86,6 +86,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/filetransfer/preview").permitAll()
.antMatchers("/xmgl/baseMenu/getAll").permitAll()
.antMatchers("/xmgl/systemUser/analysis").permitAll()
.antMatchers("/xmgl/user/**").permitAll()
.antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
.anyRequest().authenticated() // 剩下所有的验证都需要验证
.and()