From b0751be63a399f67fbbbe88e05e2e3ff7b9db236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E8=82=96=E4=BA=91?= <2816048001@qq.com> Date: Thu, 24 Jun 2021 10:43:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../com/adc/da/main/generate/CodeGen.java | 4 +- .../main/resources/application-dev.properties | 4 +- .../src/main/resources/application.properties | 1 + adc-da-slrs/pom.xml | 5 +- .../controller/TsPositionController.java | 64 +++++++++++++ .../slrs/sarPosition/dao/TsPositionDao.java | 32 +++++++ .../slrs/sarPosition/entity/TsPosition.java | 70 ++++++++++++++ .../sarPosition/entity/TsPositionRoleVO.java | 15 +++ .../service/ITsPositionService.java | 48 ++++++++++ .../service/impl/TsPositionServiceImpl.java | 94 +++++++++++++++++++ .../sarRole/controller/TsRoleController.java | 23 +++-- .../adc/da/slrs/sarRole/entity/TsRole.java | 11 ++- .../slrs/sarRole/service/ITsRoleService.java | 15 +++ .../service/impl/TsRoleServiceImpl.java | 47 +++++++++- .../java/com/adc/da/utils/util/ListUtil.java | 72 ++++++++++++++ .../mapper/sarPosition/TsPositionMapper.xml | 10 ++ pom.xml | 1 + 18 files changed, 501 insertions(+), 16 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPositionRoleVO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/utils/util/ListUtil.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml diff --git a/.gitignore b/.gitignore index 14f81db9..a7ee8a90 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ target *logs/ .metadata +adc-da-main/src/main/resources/application-zxy.properties \ No newline at end of file diff --git a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java index 79244a62..b3120d79 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java +++ b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java @@ -22,11 +22,11 @@ public class CodeGen { // x.x.x.x:3306/xxxx --MYSQL // 192.168.10.140:1521:foton_slrs_test - private static final String DB_IP="192.168.10.47:3306/foton_slrs_test"; + private static final String DB_IP="localhost:3306/foton_slrs_test"; private static final String DB_USER="root"; - private static final String DB_PWD="root"; + private static final String DB_PWD="Zxy20010202"; /** diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 88425a41..afdb5624 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,9 +3,9 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://101.36.227.22:33050/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://localhost:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root -spring.datasource.password = 1q2w3e4r +spring.datasource.password = Zxy20010202 #============================================== # 应用设置 diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index d0fa62ba..503b05d7 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -91,6 +91,7 @@ spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* # ======================================= mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml +mybatis-plus.type-aliases-package=com.adc.da.**.entity # ======================================== # activiti 配置信息 diff --git a/adc-da-slrs/pom.xml b/adc-da-slrs/pom.xml index 7ca6eb4c..b2a17634 100644 --- a/adc-da-slrs/pom.xml +++ b/adc-da-slrs/pom.xml @@ -11,7 +11,10 @@ adc-da-slrs - + + + + com.adc adc-da-base diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java new file mode 100644 index 00000000..d9abac47 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java @@ -0,0 +1,64 @@ +package com.adc.da.slrs.sarPosition.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO; +import com.adc.da.slrs.sarPosition.service.ITsPositionService; +import com.adc.da.slrs.sarRole.entity.TsRole; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.sarPosition.entity.TsPosition; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import javax.validation.Valid; +import java.util.List; + +/** +*

+ * 前端控制器 + *

+* +* @author zyl +* @since 2021-06-23 +*/ +@RestController +@Api(tags = "|岗位管理|") +@RequestMapping("/sarPosition/position") +public class TsPositionController extends BaseController { + @Autowired + private ITsPositionService tsPositionService; + + /** + * 查询岗位（可通过name筛选） + * @param tsPosition：筛选信息 + */ + @ApiOperation("查询岗位") + @GetMapping + public ResponseMessage> getPosition(TsPosition tsPosition){ + List positions=tsPositionService.getPosition(tsPosition); + return Result.success(positions); + } + + @ApiOperation("新增岗位") + @PostMapping + public ResponseMessage addPosition(@Validated(TsPosition.insert.class) TsPosition tsPosition){ + return tsPositionService.addPosition(tsPosition); + } + + @ApiOperation("配置角色") + @PostMapping("/role") + public ResponseMessage setRole(@Valid @RequestBody TsPositionRoleVO tsPositionRoleVO){ + return tsPositionService.setRole(tsPositionRoleVO); + } + + @ApiOperation("查询角色") + @GetMapping("/role") + public ResponseMessage> getRole(@RequestParam String positionId){ + List roles=tsPositionService.getRole(positionId); + return Result.success(roles); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java new file mode 100644 index 00000000..d875b7ad --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java @@ -0,0 +1,32 @@ +package com.adc.da.slrs.sarPosition.dao; + +import com.adc.da.slrs.sarPosition.entity.TsPosition; +import com.adc.da.slrs.sarRole.entity.TsRole; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zyl + * @since 2021-06-23 + */ +public interface TsPositionDao extends BaseMapper { + + @Select("select role_id from ts_position_role where position_id=#{positionId}") + List getRoleId(String positionId); + + @Insert("insert into ts_position_role (position_id,role_id) values (#{positionId},#{roleId})") + void insertRole(String positionId, String roleId); + + @Delete("delete from ts_position_role where position_id=#{positionId} and role_id=#{roleId}") + void deleteRole(String positionId, String roleId); + + List getRole(String positionId); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java new file mode 100644 index 00000000..ca677eef --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java @@ -0,0 +1,70 @@ +package com.adc.da.slrs.sarPosition.entity; + +import com.adc.da.base.entity.BaseEntity; + +import java.sql.Timestamp; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; + +/** + *

+ * + *

+ * + * @author zyl + * @since 2021-06-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="TsPosition对象", description="") +public class TsPosition extends BaseEntity { + public interface insert{ + } + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "操作时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp operateTime; + + @ApiModelProperty(value = "操作人") + private String operator; + + @NotNull(message = "name不能为空",groups = {insert.class}) + @ApiModelProperty(value = "岗位名称") + private String name; + + @ApiModelProperty(value = "创建部门ID") + private String createDeptId; + + @ApiModelProperty(value = "创建人ID") + private String createById; + + @ApiModelProperty(value = "类型(1为导入，2为新建）") + private String type; + + @ApiModelProperty(value = "ID") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp createTime; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPositionRoleVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPositionRoleVO.java new file mode 100644 index 00000000..da7bf94b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPositionRoleVO.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.sarPosition.entity; + +import com.adc.da.slrs.sarRole.entity.TsRole; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +public class TsPositionRoleVO { + @NotNull(message = "positionId不能为空") + private String positionId; + @NotNull(message = "roleIds不能为空") + private List roleIds; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java new file mode 100644 index 00000000..87f44d6b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java @@ -0,0 +1,48 @@ +package com.adc.da.slrs.sarPosition.service; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.sarPosition.entity.TsPosition; +import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO; +import com.adc.da.slrs.sarRole.entity.TsRole; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author zyl + * @since 2021-06-23 + */ +public interface ITsPositionService extends IService { + + /** + * 查询岗位 + * @param tsPosition：查询信息 + * @return List + */ + List getPosition(TsPosition tsPosition); + + /** + * 配置角色 + * @param tsPositionRoleVO：角色ID + * @return ResponseMessage + */ + ResponseMessage setRole(TsPositionRoleVO tsPositionRoleVO); + + /** + * 查询角色 + * @param positionId ：岗位ID + * @return List + */ + List getRole(String positionId); + + /** + * 添加岗位 + * @param tsPosition：岗位信息 + * @return ResponseMessage + */ + ResponseMessage addPosition(TsPosition tsPosition); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java new file mode 100644 index 00000000..44a8e98b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java @@ -0,0 +1,94 @@ +package com.adc.da.slrs.sarPosition.service.impl; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarPosition.entity.TsPosition; +import com.adc.da.slrs.sarPosition.dao.TsPositionDao; +import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO; +import com.adc.da.slrs.sarPosition.service.ITsPositionService; +import com.adc.da.slrs.sarRole.entity.TsRole; +import com.adc.da.utils.util.ListUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 服务实现类 + *

+ * + * @author zyl + * @since 2021-06-23 + */ +@Service +public class TsPositionServiceImpl extends ServiceImpl implements ITsPositionService { + @Autowired + private TsPositionDao tsPositionDao; + + /** + * 查询岗位 + * @param tsPosition：查询信息 + * @return List + */ + @Override + public List getPosition(TsPosition tsPosition) { + QueryWrapper positionQueryWrapper=new QueryWrapper<>(); + if(tsPosition.getName()!=null){ + positionQueryWrapper.like("name","%"+tsPosition.getName()+"%"); + } + return tsPositionDao.selectList(positionQueryWrapper); + } + + /** + * 配置角色 + * @param tsPositionRoleVO：角色ID + * @return ResponseMessage + */ + @Override + @Transactional + public ResponseMessage setRole(TsPositionRoleVO tsPositionRoleVO) { + List oldRoleIds=tsPositionDao.getRoleId(tsPositionRoleVO.getPositionId()); + Map> updateRoleIds= ListUtil.difList(tsPositionRoleVO.getRoleIds(),oldRoleIds); + List insertIds=updateRoleIds.get("insert"); + List deleteIds=updateRoleIds.get("delete"); + for(String id:insertIds){ + tsPositionDao.insertRole(tsPositionRoleVO.getPositionId(),id); + } + for(String id:deleteIds){ + tsPositionDao.deleteRole(tsPositionRoleVO.getPositionId(),id); + } + return Result.success(); + } + + /** + * 查询角色 + * @param positionId ：岗位ID + * @return List + */ + @Override + public List getRole(String positionId) { + return tsPositionDao.getRole(positionId); + } + + /** + * 添加岗位 + * @param tsPosition：岗位信息 + * @return ResponseMessage + */ + @Override + public ResponseMessage addPosition(TsPosition tsPosition) { + QueryWrapper positionQueryWrapper=new QueryWrapper<>(); + positionQueryWrapper.eq("name",tsPosition.getName()); + List tsPositions=tsPositionDao.selectList(positionQueryWrapper); + if(tsPositions!=null&&tsPositions.size()>0){ + return Result.error("该岗位已存在"); + } + tsPositionDao.insert(tsPosition); + return Result.success(); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index 444ca822..df2266d9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -3,16 +3,15 @@ package com.adc.da.slrs.sarRole.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.sarRole.service.ITsRoleService; +import com.adc.da.sys.entity.UserEO; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.sarRole.entity.TsRole; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; @@ -48,7 +47,19 @@ public class TsRoleController extends BaseController { @ApiOperation("新增角色") @PostMapping - public ResponseMessage> addRole(@Validated(TsRole.insert.class) TsRole tsRole){ - return null; + public ResponseMessage addRole(@Validated(TsRole.insert.class) TsRole tsRole){ + //设置操作人 + UserEO userEO=UserUtils.getUser(); + tsRole.setOperator(userEO.getUname()); + return tsRoleService.addRole(tsRole); + } + + @ApiOperation("编辑角色") + @PutMapping + public ResponseMessage updateRole(@Validated(TsRole.update.class) TsRole tsRole){ + //设置操作人 + UserEO userEO=UserUtils.getUser(); + tsRole.setOperator(userEO.getUname()); + return tsRoleService.updateRole(tsRole); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java index c95e91e6..3745aeaa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java @@ -2,6 +2,8 @@ package com.adc.da.slrs.sarRole.entity; import com.adc.da.base.entity.BaseEntity; import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.sql.Timestamp; @@ -35,11 +37,14 @@ import javax.validation.constraints.NotNull; public class TsRole extends BaseEntity { public interface insert{ } + public interface update{ + } private static final long serialVersionUID = 1L; + @NotNull(message = "id不能为空",groups = {update.class}) @ApiModelProperty(value = "主键") - @TableId("ID") + @TableId(value = "ID",type = IdType.UUID) private String id; @NotNull(message = "name不能为空",groups = {insert.class}) @@ -99,8 +104,8 @@ public class TsRole extends BaseEntity { private String parentId; @ApiModelProperty(value = "角色层级") - @TableField("role_level") - private Integer roleLevel; + @TableField("ROLE_HIERARCHY") + private Integer roleHierarchy; @ApiModelProperty(value = "对应部门id") @TableField("DY_ORG_ID") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java index f8405e9a..f70d4a22 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarRole.service; +import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.sarRole.entity.TsRole; import com.baomidou.mybatisplus.extension.service.IService; @@ -27,4 +28,18 @@ public interface ITsRoleService extends IService { * @return List */ List getByName(String name); + + /** + * 添加角色 + * @param tsRole ：角色信息 + * @return ResponseMessage + */ + ResponseMessage addRole(TsRole tsRole); + + /** + * 编辑角色 + * @param tsRole：角色信息 + * @return ResponseMessage + */ + ResponseMessage updateRole(TsRole tsRole); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index ae5c052a..052a70e7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -1,5 +1,7 @@ package com.adc.da.slrs.sarRole.service.impl; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.slrs.sarRole.entity.TsRole; import com.adc.da.slrs.sarRole.dao.TsRoleDao; import com.adc.da.slrs.sarRole.service.ITsRoleService; @@ -30,7 +32,7 @@ public class TsRoleServiceImpl extends ServiceImpl implements @Override public List getAll() { QueryWrapper tsRoleQueryWrapper=new QueryWrapper<>(); - tsRoleQueryWrapper.eq("role_level",1); + tsRoleQueryWrapper.eq("ROLE_HIERARCHY",1); List rootRole=tsRoleDao.selectList(tsRoleQueryWrapper); for(TsRole tsRole:rootRole){ tsRole.setChildren(recursionGetRole(tsRole)); @@ -46,7 +48,7 @@ public class TsRoleServiceImpl extends ServiceImpl implements private List recursionGetRole(TsRole tsRole){ QueryWrapper tsRoleQueryWrapper=new QueryWrapper<>(); tsRoleQueryWrapper.eq("parent_id",tsRole.getId()); - tsRoleQueryWrapper.eq("role_level",tsRole.getRoleLevel()+1); + tsRoleQueryWrapper.eq("ROLE_HIERARCHY",tsRole.getRoleHierarchy()+1); List tsRoles=tsRoleDao.selectList(tsRoleQueryWrapper); for(TsRole tsRoleNode:tsRoles){ tsRoleNode.setChildren(recursionGetRole(tsRoleNode)); @@ -66,5 +68,46 @@ public class TsRoleServiceImpl extends ServiceImpl implements return tsRoleDao.selectList(tsRoleQueryWrapper); } + /** + * 添加角色 + * @param tsRole ：角色信息 + * @return TsRole + */ + @Override + public ResponseMessage addRole(TsRole tsRole) { + //判断是否是顶级角色 + if(tsRole.getParentId()==null){ + tsRole.setRoleHierarchy(1); + }else { + QueryWrapper parentQueryWrapper=new QueryWrapper<>(); + parentQueryWrapper.eq("id",tsRole.getParentId()); + TsRole parentRole=tsRoleDao.selectOne(parentQueryWrapper); + if(parentRole==null){ + return Result.error("父角色不存在"); + } + tsRole.setRoleHierarchy(parentRole.getRoleHierarchy()+1); + } + tsRoleDao.insert(tsRole); + return Result.success(); + } + + /** + * 编辑角色 + * @param tsRole：角色信息 + * @return ResponseMessage + */ + @Override + public ResponseMessage updateRole(TsRole tsRole) { + TsRole oldRole=tsRoleDao.selectById(tsRole.getParentId()); + if(oldRole==null){ + return Result.error("该角色不存在"); + } + //不允许修改父节点 + tsRole.setRoleHierarchy(null); + tsRole.setParentId(null); + tsRoleDao.updateById(tsRole); + return Result.success(); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/ListUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/ListUtil.java new file mode 100644 index 00000000..c60e1130 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/ListUtil.java @@ -0,0 +1,72 @@ +package com.adc.da.utils.util; + +import java.util.*; + +/** + * List操作 + * @author zxy + */ +public class ListUtil { + + /** + * 获得targetList和referList中不同的元素 + * @param targetList:目标List + * @param referList：参照List + */ + public static Map> difList(List targetList, List referList){ + targetList.sort(String::compareTo); + referList.sort(String::compareTo); + //targetList多的节点 + List insertList=new ArrayList<>(); + //referList多的节点 + List deleteList=new ArrayList<>(); + //最后一个相等的节点 + int endEqual=-1; + //referList第一个与当前targetList节点不相等的节点坐标 + int index=0; + for(String node:targetList){ + //判断referList是否已遍历完成 + if(index> result=new HashMap<>(); + result.put("insert",insertList); + result.put("delete",deleteList); + System.out.println(insertList); + System.out.println(deleteList); + return result; + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml new file mode 100644 index 00000000..2c45b160 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/pom.xml b/pom.xml index f3befa7e..3f711899 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,7 @@ adc-da-search adc-da-slrs adc-da-activiti + adc-da-search