diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index e19971cc..55365f9b 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -5,7 +5,7 @@ spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver spring.datasource.url = jdbc:mysql://192.168.10.47:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root -spring.datasource.password = roots +spring.datasource.password = root diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java index e3987b47..e4536ea8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java @@ -91,4 +91,11 @@ public interface TsRoleDao extends BaseMapper { * @return List */ List getResourceIdsByRoleIds(List roleIds); + + /** + * 获取该角色的第一级权限 + * @param roleIds：角色ID + * @return List + */ + List getRootMenuIdsByRoleIds(List roleIds); } 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 1091a832..4f009999 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 @@ -78,4 +78,11 @@ public interface ITsRoleService extends IService { List getResource(String roleId); List getResourceIdsByRoleIds(List roleIds); + + /** + * 获取该角色的第一级权限 + * @param roleIds：角色ID + * @return List + */ + List getRootMenuIdsByRoleIds(List roleIds); } 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 fc4d2e8d..d8ed1875 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 @@ -256,7 +256,18 @@ public class TsRoleServiceImpl extends ServiceImpl implements return null; } - + /** + * 获取该角色的第一级权限 + * @param roleIds：角色ID + * @return List + */ + @Override + public List getRootMenuIdsByRoleIds(List roleIds) { + if(roleIds!=null&&roleIds.size()>0){ + return tsRoleDao.getRootMenuIdsByRoleIds(roleIds); + } + return null; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java new file mode 100644 index 00000000..af718943 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java @@ -0,0 +1,113 @@ +package com.adc.da.slrs.sarUrl.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarUrl.entity.TsUrl; +import com.adc.da.slrs.sarUrl.service.ITsUrlService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + +/** + * @Description: 第三方链接 + * @Author: jeecg-boot + * @Date: 2021-07-07 + * @Version: V1.0 + */ +@Api(tags="第三方链接") +@RestController +@RequestMapping("/api/sarUrl/tsUrl") +@Slf4j +public class TsUrlController{ + @Autowired + private ITsUrlService tsUrlService; + + @ApiOperation("查询") + @GetMapping + public ResponseMessage> getUrls(){ + QueryWrapper tsUrlQueryWrapper=new QueryWrapper<>(); + tsUrlQueryWrapper.orderByAsc("order_by"); + List tsUrls=tsUrlService.list(tsUrlQueryWrapper); + return Result.success(tsUrls); + } + /** + * 添加 + * + * @param tsUrl + * @return + */ + @ApiOperation(value="第三方链接-添加", notes="第三方链接-添加") + @PostMapping(value = "/add") + public ResponseMessage add(@RequestBody TsUrl tsUrl) { + tsUrlService.save(tsUrl); + return Result.success(); + } + + /** + * 编辑 + * + * @param tsUrl + * @return + */ + @ApiOperation(value="第三方链接-编辑", notes="第三方链接-编辑") + @PutMapping(value = "/edit") + public ResponseMessage edit(@RequestBody TsUrl tsUrl) { + tsUrl.setOrderBy(null); + tsUrlService.updateById(tsUrl); + return Result.success(); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value="第三方链接-通过id删除", notes="第三方链接-通过id删除") + @DeleteMapping(value = "/delete") + public ResponseMessage delete(@RequestParam(name="id",required=true) String id) { + tsUrlService.removeById(id); + return Result.success(); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @ApiOperation(value="第三方链接-批量删除", notes="第三方链接-批量删除") + @DeleteMapping(value = "/deleteBatch") + public ResponseMessage deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.tsUrlService.removeByIds(Arrays.asList(ids.split(","))); + return Result.success(); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value="第三方链接-通过id查询", notes="第三方链接-通过id查询") + @GetMapping(value = "/queryById") + public ResponseMessage queryById(@RequestParam(name="id",required=true) String id) { + TsUrl tsUrl = tsUrlService.getById(id); + if(tsUrl==null) { + return Result.error("未找到对应数据"); + } + return Result.success(tsUrl); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java new file mode 100644 index 00000000..7c28a9ce --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.sarUrl.dao; + + +import com.adc.da.slrs.sarUrl.entity.TsUrl; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 第三方链接 + * @Author: jeecg-boot + * @Date: 2021-07-07 + * @Version: V1.0 + */ +public interface TsUrlDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/TsUrl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/TsUrl.java new file mode 100644 index 00000000..6798937c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/TsUrl.java @@ -0,0 +1,64 @@ +package com.adc.da.slrs.sarUrl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +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 java.io.Serializable; +import java.util.Date; + +/** + * @Description: 第三方链接 + * @Author: jeecg-boot + * @Date: 2021-07-07 + * @Version: V1.0 + */ +@Data +@TableName("ts_url") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ts_url对象", description="第三方链接") +public class TsUrl implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.UUID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createById; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateById; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String createDeptId; + /**链接名称*/ + @ApiModelProperty(value = "链接名称") + private String name; + /**链接地址*/ + @ApiModelProperty(value = "链接地址") + private String url; + /**排序*/ + @ApiModelProperty(value = "排序") + private Integer orderBy; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java new file mode 100644 index 00000000..3a5c0ff8 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.sarUrl.service; + + +import com.adc.da.slrs.sarUrl.entity.TsUrl; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 第三方链接 + * @Author: jeecg-boot + * @Date: 2021-07-07 + * @Version: V1.0 + */ +public interface ITsUrlService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java new file mode 100644 index 00000000..b9709a61 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java @@ -0,0 +1,19 @@ +package com.adc.da.slrs.sarUrl.service.impl; + + +import com.adc.da.slrs.sarUrl.dao.TsUrlDao; +import com.adc.da.slrs.sarUrl.entity.TsUrl; +import com.adc.da.slrs.sarUrl.service.ITsUrlService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @Description: 第三方链接 + * @Author: jeecg-boot + * @Date: 2021-07-07 + * @Version: V1.0 + */ +@Service +public class TsUrlServiceImpl extends ServiceImpl implements ITsUrlService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index 9a60f7b4..4555fcff 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -175,7 +175,7 @@ public class TsUserServiceImpl extends ServiceImpl implements public List getMenusByUserId(String userId){ List positionIds=tsUserDao.selectPositionIds(userId); List roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds); - List menuIds=tsRoleService.getMenuIdsByRoleIds(roleIds); + List menuIds=tsRoleService.getRootMenuIdsByRoleIds(roleIds); return sarMenuService.getMenuByIds(menuIds); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml index e4ac1c0e..b3b47d44 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml @@ -1,6 +1,7 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUrl/TsUrlDao.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUrl/TsUrlDao.xml new file mode 100644 index 00000000..a6d3c677 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUrl/TsUrlDao.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file