diff --git a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue index 561330d..277dc62 100644 --- a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue +++ b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue @@ -176,11 +176,12 @@ export default { // align: "center", // dataIndex: 'pmDescribe' // }, - // { - // title:'责任人', - // align:"center", - // dataIndex: 'managerUsers' - // }, + { + title:'责任人', + align:"center", + // dataIndex: 'managerUsers' + dataIndex: 'managerUsers_dictText' + }, { title: '任务等级', align: "center", @@ -230,11 +231,11 @@ export default { // align:"center", // dataIndex: 'userRole' // }, - { - title: '关联实体', - align: "center", - dataIndex: 'relatedBean_dictText' - }, + // { + // title: '关联实体', + // align: "center", + // dataIndex: 'relatedBean_dictText' + // }, // { // title:'原型图', // align:"center", diff --git a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue index e726eb5..c4a4df1 100644 --- a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue +++ b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue @@ -89,12 +89,12 @@ - - - - - + + + + + + diff --git a/ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue b/ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue index 1cec1ae..aeac38d 100644 --- a/ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue +++ b/ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue @@ -7,7 +7,7 @@ - + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/controller/ModulexController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/controller/ModulexController.java index 51af5c1..b9d15a2 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/controller/ModulexController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/controller/ModulexController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.modulex.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,166 +13,207 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.modulex.entity.Modulex; +import org.jeecg.modules.modulex.mapper.ModulexMapper; import org.jeecg.modules.modulex.service.IModulexService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; +import java.util.*; +import java.util.stream.Collectors; - /** +/** * @Description: 模块管理 * @Author: jeecg-boot - * @Date: 2023-04-10 + * @Date: 2023-04-10 * @Version: V1.0 */ -@Api(tags="模块管理") +@Api(tags = "模块管理") @RestController @RequestMapping("/modulex/modulex") @Slf4j public class ModulexController extends JeecgController { - @Autowired - private IModulexService modulexService; - - /** - * 分页列表查询 - * - * @param modulex - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "模块管理-分页列表查询") - @ApiOperation(value="模块管理-分页列表查询", notes="模块管理-分页列表查询") - @GetMapping(value = "/list") - public Result queryPageList(Modulex modulex, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(modulex, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = modulexService.page(page, queryWrapper); - return Result.OK(pageList); - } - - @GetMapping(value = "/fabu") - public Result fabu(@RequestParam(name="id") String id) { - return modulexService.fabu(id); - } - @GetMapping(value = "/kaishi") - public Result kaishi(@RequestParam(name="id") String id) { - return modulexService.kaishi(id); - } - @GetMapping(value = "/tijiao") - public Result tijiao(@RequestParam(name="id") String id) { - return modulexService.tijiao(id); - } - @GetMapping(value = "/cehui") - public Result cehui(@RequestParam(name="id") String id) { - return modulexService.cehui(id); - } - @GetMapping(value = "/shenhe") - public Result shenhe(@RequestParam(name="id") String id) { - return modulexService.shenhe(id); - } - - /** - * 添加 - * - * @param modulex - * @return - */ - @AutoLog(value = "模块管理-添加") - @ApiOperation(value="模块管理-添加", notes="模块管理-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody Modulex modulex) { - //版本号 顺序累加；初始值1 - Integer newVersion = modulexService.getMaxVersion(modulex.getVerison()); - modulex.setVerison(newVersion+1); - modulexService.save(modulex); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param modulex - * @return - */ - @AutoLog(value = "模块管理-编辑") - @ApiOperation(value="模块管理-编辑", notes="模块管理-编辑") - @PutMapping(value = "/edit") - public Result edit(@RequestBody Modulex modulex) { - modulexService.updateById(modulex); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "模块管理-通过id删除") - @ApiOperation(value="模块管理-通过id删除", notes="模块管理-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - modulexService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "模块管理-批量删除") - @ApiOperation(value="模块管理-批量删除", notes="模块管理-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.modulexService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "模块管理-通过id查询") - @ApiOperation(value="模块管理-通过id查询", notes="模块管理-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - Modulex modulex = modulexService.getById(id); - if(modulex==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(modulex); - } + @Autowired + private IModulexService modulexService; + @Resource + private ModulexMapper modulexMapper; /** - * 导出excel - * - * @param request - * @param modulex - */ + * 分页列表查询 + * + * @param modulex + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "模块管理-分页列表查询") + @ApiOperation(value = "模块管理-分页列表查询", notes = "模块管理-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(Modulex modulex, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(modulex, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = modulexService.page(page, queryWrapper); + List modulexList = pageList.getRecords(); + for (Modulex modu :modulexList) { + if (!StringUtils.hasText(modu.getManagerUsers())){ + break; + }else { + String[] split = modu.getManagerUsers().split(","); + List stringList = Arrays.asList(split); + List strings = new ArrayList<>(); + stringList.forEach(manager -> { + String realName = modulexMapper.getRealName(manager); + if (StringUtils.hasText(realName)) { + strings.add(realName); + } else { + strings.add(manager); + } + }); + String toString = strings.toString(); + String substring = toString.substring(1, toString.length() - 1); + modu.setManagerUsers_dictText(substring); + } + } + return Result.OK(pageList); + } + + @GetMapping(value = "/fabu") + public Result fabu(@RequestParam(name = "id") String id) { + return modulexService.fabu(id); + } + + @GetMapping(value = "/kaishi") + public Result kaishi(@RequestParam(name = "id") String id) { + return modulexService.kaishi(id); + } + + @GetMapping(value = "/tijiao") + public Result tijiao(@RequestParam(name = "id") String id) { + return modulexService.tijiao(id); + } + + @GetMapping(value = "/cehui") + public Result cehui(@RequestParam(name = "id") String id) { + return modulexService.chehui(id); + } + + @GetMapping(value = "/shenhe") + public Result shenhe(@RequestParam(name = "id") String id) { + return modulexService.shenhe(id); + } + + /** + * 添加 + * moduleName 中文名称 + * 相同上级的模块不能重名 + */ + @AutoLog(value = "模块管理-添加") + @ApiOperation(value = "模块管理-添加", notes = "模块管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody Modulex modulex) { + //版本号 顺序累加；初始值1 + if (StringUtils.hasText(modulex.getPid())) { + List collect = modulexService.list( + new LambdaQueryWrapper() + .eq(StringUtils.hasText(modulex.getPid()), Modulex::getPid, modulex.getPid())) + .stream().map(Modulex::getModuleName).collect(Collectors.toList()); + collect.add(modulex.getModuleName()); + HashSet setList = new HashSet<>(collect); + if (collect.size() != setList.size()){ + return Result.error("相同上级的模块不能重名"); + } + } + Integer newVersion = modulexService.getMaxVersion(modulex.getVerison()); + modulex.setVerison(newVersion + 1); + modulexService.save(modulex); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param modulex + * @return + */ + @AutoLog(value = "模块管理-编辑") + @ApiOperation(value = "模块管理-编辑", notes = "模块管理-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody Modulex modulex) { + modulexService.updateById(modulex); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "模块管理-通过id删除") + @ApiOperation(value = "模块管理-通过id删除", notes = "模块管理-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + modulexService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "模块管理-批量删除") + @ApiOperation(value = "模块管理-批量删除", notes = "模块管理-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.modulexService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "模块管理-通过id查询") + @ApiOperation(value = "模块管理-通过id查询", notes = "模块管理-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Modulex modulex = modulexService.getById(id); + if (modulex == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(modulex); + } + + /** + * 导出excel + * + * @param request + * @param modulex + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, Modulex modulex) { return super.exportXls(request, modulex, Modulex.class, "模块管理"); } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, Modulex.class); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/entity/Modulex.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/entity/Modulex.java index b64cb8a..c725616 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/entity/Modulex.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/entity/Modulex.java @@ -2,6 +2,7 @@ package org.jeecg.modules.modulex.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -96,6 +97,13 @@ public class Modulex implements Serializable { @Excel(name = "责任人", width = 15) @ApiModelProperty(value = "责任人") private String managerUsers; + + /** + * 上面的字段 本身的数据字典无法翻译 也不能直接把原来的字段替换掉 + * 故 用这个字段代表 翻译后的值 不改变原先的 + */ + @TableField(exist = false) + private String managerUsers_dictText; /** * 任务等级 * 值：1、2、3、4、5，默认2 diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/ModulexMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/ModulexMapper.java index 970e97b..b353e6c 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/ModulexMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/ModulexMapper.java @@ -2,7 +2,7 @@ package org.jeecg.modules.modulex.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.modulex.entity.Modulex; /** @@ -13,6 +13,8 @@ import org.jeecg.modules.modulex.entity.Modulex; */ public interface ModulexMapper extends BaseMapper { + @Select("SELECT realname FROM sys_user WHERE id = #{id}") + String getRealName(String id); @Update("update modulex set related_bean=#{tablex} where id = #{moduleId}") void setmodule(String tablex, String moduleId); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/IModulexService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/IModulexService.java index 5d21224..ea96986 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/IModulexService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/IModulexService.java @@ -24,7 +24,7 @@ public interface IModulexService extends IService { Result tijiao(String id); - Result cehui(String id); + Result chehui(String id); Result shenhe(String id); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java index a66405e..b086793 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java @@ -106,7 +106,7 @@ public class ModulexServiceImpl extends ServiceImpl impl * @param id modulex表的主键id */ @Override - public Result cehui(String id) { + public Result chehui(String id) { Modulex byId = this.getById(id); if (byId.getWorkStatus() == 2) { return Result.error("正处于开发中");