diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index f5470943..ec2c0769 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -105,7 +105,7 @@ public class WebMvcConfig implements WebMvcConfigurer { // //测试接口使用 -// addInterceptor.excludePathPatterns("/api/**"); + addInterceptor.excludePathPatterns("/api/**"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java index 88f3227f..ba18cc02 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java @@ -1,10 +1,17 @@ package com.adc.da.slrs.customWorkGroup.controller; -import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; +import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiModelProperty; +import org.apache.ibatis.annotations.Delete; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; /** @@ -17,7 +24,48 @@ import com.adc.da.base.web.BaseController; */ @RestController @Api(description = "|WorkGroup|") -@RequestMapping("/workGroup/work-group") +@RequestMapping("/${restPath}/workGroup/work-group") public class WorkGroupController extends BaseController { + + @Autowired + IWorkGroupService iWorkGroupService; + + @ApiModelProperty("新增工作组") + @PostMapping + public ResponseMessage addWorkGroup(WorkGroup workGroup) { + boolean add = iWorkGroupService.add(workGroup); + + return Result.success(add); + } + + + + @ApiModelProperty("删除工作组") + @DeleteMapping + public ResponseMessage deleteWorkGroup(String id){ + boolean delete = iWorkGroupService.delete(id); + + return Result.success(delete); + } + + @ApiModelProperty("根据组长民或者组名查询工作组") + @GetMapping + public ResponseMessage> getWorkGroupLists(WorkGroupQueryPage queryPage){ + IPage workGroup = iWorkGroupService.getWorkGroup(queryPage); + + return Result.success(workGroup); + } + + + @ApiModelProperty("修改工作组") + @PutMapping + public ResponseMessage updateWorkGroup(WorkGroup workGroup){ + boolean update = iWorkGroupService.update(workGroup); + + return Result.success(update); + } + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java index a60c6553..233fdb42 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java @@ -1,7 +1,14 @@ package com.adc.da.slrs.customWorkGroup.dao; import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +20,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface WorkGroupDao extends BaseMapper { + + public IPage getWorkGroup( @Param("page")IPage page, + @Param(Constants.WRAPPER) Wrapper queryWrapper, + @Param("queryCondition")WorkGroupQueryPage queryCondition); + + + public List getUserName(String userId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java index fd9ac7d9..b01d4622 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java @@ -22,7 +22,8 @@ public class WorkGroup extends BaseEntity { private static final long serialVersionUID = 1L; - private String workGroupName; + + private String workGroup; private String workLeader; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroupQueryPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroupQueryPage.java new file mode 100644 index 00000000..5b09a2e5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroupQueryPage.java @@ -0,0 +1,32 @@ +package com.adc.da.slrs.customWorkGroup.entity; + +import lombok.Data; + +import java.util.Optional; + +/** + * @author 22501 + */ +@Data +public class WorkGroupQueryPage { + + private Integer page; + + private Integer pageSize; + + private String leaderName; + + private String workGroupName; + + + public int getPage() { + return Optional.ofNullable(this.page) + .orElse(1); + + } + + public int getPageSize() { + return Optional.ofNullable(this.pageSize) + .orElse(20); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java index e35e2042..214fdbc8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java @@ -1,6 +1,8 @@ package com.adc.da.slrs.customWorkGroup.service; import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -13,4 +15,35 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IWorkGroupService extends IService { + /** + * 新增 + * @param workGroup + * @return + */ + public boolean add(WorkGroup workGroup); + + + /** + * 删除 + * @param workGroupId + * @return + */ + public boolean delete(String workGroupId); + + /** + * 修改 + * @param queryPage + * @return + */ + public IPage getWorkGroup(WorkGroupQueryPage queryPage); + + + /** + * 更新 + * @param workGroup + * @return + */ + public boolean update(WorkGroup workGroup); + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java index 86e5d080..d0c55149 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java @@ -2,8 +2,13 @@ package com.adc.da.slrs.customWorkGroup.service.impl; import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; import com.adc.da.slrs.customWorkGroup.dao.WorkGroupDao; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -17,4 +22,47 @@ import org.springframework.stereotype.Service; @Service public class WorkGroupServiceImpl extends ServiceImpl implements IWorkGroupService { + @Autowired + WorkGroupDao workGroupDao; + + + + @Override + public boolean add(WorkGroup workGroup) { + return this.save(workGroup); + } + + @Override + public boolean delete(String workGroupId) { + return this.removeById(workGroupId); + } + + @Override + public IPage getWorkGroup(WorkGroupQueryPage queryPage) { + + + QueryWrapper wrapper = new QueryWrapper<>(); + if (queryPage.getWorkGroupName()!=null && !"".equals(queryPage.getWorkGroupName())){ + wrapper.eq("work_group_name",queryPage.getWorkGroupName()); + } + //可以通过组长名称模糊查询 + IPage workGroupList = workGroupDao.getWorkGroup(new Page<>(queryPage.getPage(), queryPage.getPageSize()), wrapper,queryPage); + //需要把组长的id和组员的id转换为其名称 + for (WorkGroup record : workGroupList.getRecords()) { + + record.setWorkLeader( String.join(",",workGroupDao.getUserName(record.getWorkLeaderId())) ); + record.setWorkPeople( String.join(",",workGroupDao.getUserName(record.getWorkPeopleId()))); + } + + return workGroupList; + + } + + + + + @Override + public boolean update(WorkGroup workGroup) { + return this.updateById(workGroup); + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml index 7ac3bc1d..e21fb1e3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml @@ -2,4 +2,45 @@ + + + + + + +