From dac03cbfc47fafc26548990e8de740599627e7a8 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 30 Jul 2025 13:40:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DirectiveBodyTagController.java | 240 +++++++++--------- .../DirectiveEmotionTagController.java | 240 +++++++++--------- .../controller/InstructionTagController.java | 231 +++++++++-------- .../ConfigServiceCategoryController.java | 8 + .../ConfigServiceDirectiveController.java | 28 +- .../ConfigServiceDirectiveServiceImpl.java | 1 - .../ConfigServiceTypeController.java | 12 +- 7 files changed, 398 insertions(+), 362 deletions(-) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java index ace10443..273f574b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java @@ -1,5 +1,7 @@ package com.nu.modules.directivetag.body.controller; +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,6 +12,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; @@ -23,143 +26,148 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; - /** +/** * @Description: 体型标签 * @Author: 张明远 - * @Date: 2025-03-17 + * @Date: 2025-03-17 * @Version: V1.0 */ -@Api(tags="体型标签") +@Api(tags = "体型标签") @RestController @RequestMapping("/services/directiveTag/bodyTag") @Slf4j public class DirectiveBodyTagController extends JeecgController { - @Autowired - private IDirectiveBodyTagService directiveTagService; + @Autowired + private IDirectiveBodyTagService directiveTagService; + @Autowired + private ISysBaseAPI sysBaseAPI; - /** - * 分页列表查询 - * - * @param directiveTag - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "体型标签-分页列表查询") - @ApiOperation(value="体型标签-分页列表查询", notes="体型标签-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(DirectiveBodyTag directiveTag, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + /** + * 分页列表查询 + * + * @param directiveTag + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "体型标签-分页列表查询") + @ApiOperation(value = "体型标签-分页列表查询", notes = "体型标签-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(DirectiveBodyTag directiveTag, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { // 自定义查询规则 Map customeRuleMap = new HashMap<>(); // 自定义多选的查询规则为：LIKE_WITH_OR customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(directiveTag, req.getParameterMap(),customeRuleMap); - Page page = new Page(pageNo, pageSize); - IPage pageList = directiveTagService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param directiveTag - * @return - */ - @AutoLog(value = "体型标签-添加") - @ApiOperation(value="体型标签-添加", notes="体型标签-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody DirectiveBodyTag directiveTag) { - directiveTagService.save(directiveTag); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param directiveTag - * @return - */ - @AutoLog(value = "体型标签-编辑") - @ApiOperation(value="体型标签-编辑", notes="体型标签-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody DirectiveBodyTag directiveTag) { - directiveTagService.updateById(directiveTag); - 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) { - if(directiveTagService.isUsed(id)){ - return Result.error("已被使用，无法删除!"); - } - directiveTagService.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) { - if(directiveTagService.isUsed(ids)){ - return Result.error("已被使用，无法删除!"); - } - this.directiveTagService.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) { - DirectiveBodyTag directiveTag = directiveTagService.getById(id); - if(directiveTag==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(directiveTag); - } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(directiveTag, req.getParameterMap(), customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage pageList = directiveTagService.page(page, queryWrapper); + return Result.OK(pageList); + } /** - * 导出excel - * - * @param request - * @param directiveTag - */ + * 添加 + * + * @param directiveTag + * @return + */ + @AutoLog(value = "体型标签-添加") + @ApiOperation(value = "体型标签-添加", notes = "体型标签-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody DirectiveBodyTag directiveTag) { + JSONObject deptInfo = sysBaseAPI.getDeptInfo(); + directiveTag.setId(deptInfo.getString("code") + IdUtil.simpleUUID()); + directiveTag.setSysOrgCode(deptInfo.getString("code")); + directiveTagService.save(directiveTag); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param directiveTag + * @return + */ + @AutoLog(value = "体型标签-编辑") + @ApiOperation(value = "体型标签-编辑", notes = "体型标签-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody DirectiveBodyTag directiveTag) { + directiveTagService.updateById(directiveTag); + 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) { + if (directiveTagService.isUsed(id)) { + return Result.error("已被使用，无法删除!"); + } + directiveTagService.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) { + if (directiveTagService.isUsed(ids)) { + return Result.error("已被使用，无法删除!"); + } + this.directiveTagService.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) { + DirectiveBodyTag directiveTag = directiveTagService.getById(id); + if (directiveTag == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(directiveTag); + } + + /** + * 导出excel + * + * @param request + * @param directiveTag + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, DirectiveBodyTag directiveTag) { return super.exportXls(request, directiveTag, DirectiveBodyTag.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, DirectiveBodyTag.class); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java index c5acce5c..4a4c4882 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java @@ -1,5 +1,7 @@ package com.nu.modules.directivetag.emotion.controller; +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,6 +12,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; @@ -23,143 +26,148 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; - /** +/** * @Description: 情绪标签 * @Author: 张明远 - * @Date: 2025-03-17 + * @Date: 2025-03-17 * @Version: V1.0 */ -@Api(tags="情绪标签") +@Api(tags = "情绪标签") @RestController @RequestMapping("/services/directiveTag/emotionTag") @Slf4j public class DirectiveEmotionTagController extends JeecgController { - @Autowired - private IDirectiveEmotionTagService directiveTagService; + @Autowired + private IDirectiveEmotionTagService directiveTagService; + @Autowired + private ISysBaseAPI sysBaseAPI; - /** - * 分页列表查询 - * - * @param directiveTag - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "情绪标签-分页列表查询") - @ApiOperation(value="情绪标签-分页列表查询", notes="情绪标签-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(DirectiveEmotionTag directiveTag, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + /** + * 分页列表查询 + * + * @param directiveTag + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "情绪标签-分页列表查询") + @ApiOperation(value = "情绪标签-分页列表查询", notes = "情绪标签-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(DirectiveEmotionTag directiveTag, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { // 自定义查询规则 Map customeRuleMap = new HashMap<>(); // 自定义多选的查询规则为：LIKE_WITH_OR customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(directiveTag, req.getParameterMap(),customeRuleMap); - Page page = new Page(pageNo, pageSize); - IPage pageList = directiveTagService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param directiveTag - * @return - */ - @AutoLog(value = "情绪标签-添加") - @ApiOperation(value="情绪标签-添加", notes="情绪标签-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody DirectiveEmotionTag directiveTag) { - directiveTagService.save(directiveTag); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param directiveTag - * @return - */ - @AutoLog(value = "情绪标签-编辑") - @ApiOperation(value="情绪标签-编辑", notes="情绪标签-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody DirectiveEmotionTag directiveTag) { - directiveTagService.updateById(directiveTag); - 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) { - if(directiveTagService.isUsed(id)){ - return Result.error("已被使用，无法删除!"); - } - directiveTagService.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) { - if(directiveTagService.isUsed(ids)){ - return Result.error("已被使用，无法删除!"); - } - this.directiveTagService.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) { - DirectiveEmotionTag directiveTag = directiveTagService.getById(id); - if(directiveTag==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(directiveTag); - } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(directiveTag, req.getParameterMap(), customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage pageList = directiveTagService.page(page, queryWrapper); + return Result.OK(pageList); + } /** - * 导出excel - * - * @param request - * @param directiveTag - */ + * 添加 + * + * @param directiveTag + * @return + */ + @AutoLog(value = "情绪标签-添加") + @ApiOperation(value = "情绪标签-添加", notes = "情绪标签-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody DirectiveEmotionTag directiveTag) { + JSONObject deptInfo = sysBaseAPI.getDeptInfo(); + directiveTag.setId(deptInfo.getString("code") + IdUtil.simpleUUID()); + directiveTag.setSysOrgCode(deptInfo.getString("code")); + directiveTagService.save(directiveTag); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param directiveTag + * @return + */ + @AutoLog(value = "情绪标签-编辑") + @ApiOperation(value = "情绪标签-编辑", notes = "情绪标签-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody DirectiveEmotionTag directiveTag) { + directiveTagService.updateById(directiveTag); + 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) { + if (directiveTagService.isUsed(id)) { + return Result.error("已被使用，无法删除!"); + } + directiveTagService.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) { + if (directiveTagService.isUsed(ids)) { + return Result.error("已被使用，无法删除!"); + } + this.directiveTagService.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) { + DirectiveEmotionTag directiveTag = directiveTagService.getById(id); + if (directiveTag == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(directiveTag); + } + + /** + * 导出excel + * + * @param request + * @param directiveTag + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, DirectiveEmotionTag directiveTag) { return super.exportXls(request, directiveTag, DirectiveEmotionTag.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, DirectiveEmotionTag.class); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/controller/InstructionTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/controller/InstructionTagController.java index ef15b4a4..f175e14d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/controller/InstructionTagController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/controller/InstructionTagController.java @@ -10,7 +10,11 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSONObject; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.util.oConvertUtils; @@ -39,133 +43,138 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; - /** +/** * @Description: 服务指令-分类标签 * @Author: jeecg-boot - * @Date: 2025-07-10 + * @Date: 2025-07-10 * @Version: V1.0 */ -@Api(tags="服务指令-分类标签") +@Api(tags = "服务指令-分类标签") @RestController @RequestMapping("/services/instructionTag") @Slf4j public class InstructionTagController extends JeecgController { - @Autowired - private IInstructionTagService instructionTagService; - - /** - * 分页列表查询 - * - * @param instructionTag - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "服务指令-分类标签-分页列表查询") - @ApiOperation(value="服务指令-分类标签-分页列表查询", notes="服务指令-分类标签-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(InstructionTag instructionTag, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(instructionTag, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = instructionTagService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param instructionTag - * @return - */ - @AutoLog(value = "服务指令-分类标签-添加") - @ApiOperation(value="服务指令-分类标签-添加", notes="服务指令-分类标签-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody InstructionTag instructionTag) { - instructionTagService.save(instructionTag); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param instructionTag - * @return - */ - @AutoLog(value = "服务指令-分类标签-编辑") - @ApiOperation(value="服务指令-分类标签-编辑", notes="服务指令-分类标签-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody InstructionTag instructionTag) { - instructionTagService.updateById(instructionTag); - 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) { - instructionTagService.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.instructionTagService.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) { - InstructionTag instructionTag = instructionTagService.getById(id); - if(instructionTag==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(instructionTag); - } + @Autowired + private IInstructionTagService instructionTagService; + @Autowired + private ISysBaseAPI sysBaseAPI; /** - * 导出excel - * - * @param request - * @param instructionTag - */ + * 分页列表查询 + * + * @param instructionTag + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "服务指令-分类标签-分页列表查询") + @ApiOperation(value = "服务指令-分类标签-分页列表查询", notes = "服务指令-分类标签-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(InstructionTag instructionTag, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(instructionTag, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = instructionTagService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param instructionTag + * @return + */ + @AutoLog(value = "服务指令-分类标签-添加") + @ApiOperation(value = "服务指令-分类标签-添加", notes = "服务指令-分类标签-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody InstructionTag instructionTag) { + JSONObject deptInfo = sysBaseAPI.getDeptInfo(); + instructionTag.setId(deptInfo.getString("code") + IdUtil.simpleUUID()); + instructionTag.setSysOrgCode(deptInfo.getString("code")); + instructionTagService.save(instructionTag); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param instructionTag + * @return + */ + @AutoLog(value = "服务指令-分类标签-编辑") + @ApiOperation(value = "服务指令-分类标签-编辑", notes = "服务指令-分类标签-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody InstructionTag instructionTag) { + instructionTagService.updateById(instructionTag); + 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) { + instructionTagService.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.instructionTagService.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) { + InstructionTag instructionTag = instructionTagService.getById(id); + if (instructionTag == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(instructionTag); + } + + /** + * 导出excel + * + * @param request + * @param instructionTag + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, InstructionTag instructionTag) { return super.exportXls(request, instructionTag, InstructionTag.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, InstructionTag.class); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java index 2983742b..9f7dab6e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java @@ -1,5 +1,7 @@ package com.nu.modules.servicecategory.controller; +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,6 +12,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; @@ -36,6 +39,8 @@ import java.util.Map; public class ConfigServiceCategoryController extends JeecgController { @Autowired private IConfigServiceCategoryService configServiceCategoryService; + @Autowired + private ISysBaseAPI sysBaseAPI; /** * 分页列表查询 @@ -73,6 +78,9 @@ public class ConfigServiceCategoryController extends JeecgController add(@RequestBody ConfigServiceCategory configServiceCategory) { + JSONObject deptInfo = sysBaseAPI.getDeptInfo(); + configServiceCategory.setId(deptInfo.getString("code") + IdUtil.simpleUUID()); + configServiceCategory.setSysOrgCode(deptInfo.getString("code")); configServiceCategoryService.save(configServiceCategory); return Result.OK("添加成功！"); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java index e17c5f2f..bcb633c7 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java @@ -1,30 +1,25 @@ package com.nu.modules.servicedirective.controller; -import cn.hutool.core.collection.ListUtil; -import com.alibaba.fastjson.JSONArray; +import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONObject; 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.nu.dto.DirectiveAsyncMQDto; import com.nu.modules.servicedirective.entity.ConfigServiceDirective; import com.nu.modules.servicedirective.entity.TreeNode; import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; -import com.nu.modules.sysconfig.ISysConfigApi; import com.nu.utils.RabbitMQUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang.StringUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -128,6 +123,7 @@ public class ConfigServiceDirectiveController extends JeecgController add(@RequestBody ConfigServiceDirective configServiceDirective) { //存储机构编码 JSONObject deptInfo = sysBaseAPI.getDeptInfo(); + configServiceDirective.setId(deptInfo.getString("code") + IdUtil.simpleUUID()); configServiceDirective.setSysOrgCode(deptInfo.getString("code")); //设置为“未授权” configServiceDirective.setStatus("1"); @@ -146,11 +142,11 @@ public class ConfigServiceDirectiveController extends JeecgController { @Autowired private IConfigServiceTypeService configServiceTypeService; + @Autowired + private ISysBaseAPI sysBaseAPI; /** * 分页列表查询 @@ -73,6 +78,9 @@ public class ConfigServiceTypeController extends JeecgController add(@RequestBody ConfigServiceType configServiceType) { + JSONObject deptInfo = sysBaseAPI.getDeptInfo(); + configServiceType.setId(deptInfo.getString("code") + IdUtil.simpleUUID()); + configServiceType.setSysOrgCode(deptInfo.getString("code")); configServiceTypeService.save(configServiceType); return Result.OK("添加成功！"); } @@ -101,7 +109,7 @@ public class ConfigServiceTypeController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { - if(configServiceTypeService.isUsed(id)){ + if (configServiceTypeService.isUsed(id)) { return Result.error("已被使用，无法删除!"); } configServiceTypeService.removeById(id); @@ -118,7 +126,7 @@ public class ConfigServiceTypeController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - if(configServiceTypeService.isUsed(ids)){ + if (configServiceTypeService.isUsed(ids)) { return Result.error("已被使用，无法删除!"); } this.configServiceTypeService.removeByIds(Arrays.asList(ids.split(",")));