diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectlisdata/InspectLisDataController.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectlisdata/InspectLisDataController.java index f09ce23..f235d9d 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectlisdata/InspectLisDataController.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectlisdata/InspectLisDataController.java @@ -42,14 +42,12 @@ public class InspectLisDataController { @PostMapping("/create") @Operation(summary = "创建lis抓取数据") - @PreAuthorize("@ss.hasPermission('inspect:lis-data:create')") public CommonResult createLisData(@Valid @RequestBody InspectLisDataSaveReqVO createReqVO) { return success(lisDataService.createLisData(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新lis抓取数据") - @PreAuthorize("@ss.hasPermission('inspect:lis-data:update')") public CommonResult updateLisData(@Valid @RequestBody InspectLisDataSaveReqVO updateReqVO) { lisDataService.updateLisData(updateReqVO); return success(true); @@ -58,7 +56,6 @@ public class InspectLisDataController { @DeleteMapping("/delete") @Operation(summary = "删除lis抓取数据") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('inspect:lis-data:delete')") public CommonResult deleteLisData(@RequestParam("id") Integer id) { lisDataService.deleteLisData(id); return success(true); @@ -67,15 +64,20 @@ public class InspectLisDataController { @GetMapping("/get") @Operation(summary = "获得lis抓取数据") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('inspect:lis-data:query')") public CommonResult getLisData(@RequestParam("id") Integer id) { InspectLisDataDO lisData = lisDataService.getLisData(id); return success(BeanUtils.toBean(lisData, InspectLisDataRespVO.class)); } + @GetMapping("/getList") + @Operation(summary = "根据体检编号获得lis抓取数据") + public CommonResult> GetLisData(String code) { + List list = lisDataService.GetLisData(code); + return success(BeanUtils.toBean(list, InspectLisDataRespVO.class)); + } + @GetMapping("/page") @Operation(summary = "获得lis抓取数据分页") - @PreAuthorize("@ss.hasPermission('inspect:lis-data:query')") public CommonResult> getLisDataPage(@Valid InspectLisDataPageReqVO pageReqVO) { PageResult pageResult = lisDataService.getLisDataPage(pageReqVO); return success(BeanUtils.toBean(pageResult, InspectLisDataRespVO.class)); @@ -83,7 +85,6 @@ public class InspectLisDataController { @GetMapping("/export-excel") @Operation(summary = "导出lis抓取数据 Excel") - @PreAuthorize("@ss.hasPermission('inspect:lis-data:export')") @ApiAccessLog(operateType = EXPORT) public void exportLisDataExcel(@Valid InspectLisDataPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpacsdata/InspectPacsDataController.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpacsdata/InspectPacsDataController.java index 84e4464..12e2a3e 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpacsdata/InspectPacsDataController.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpacsdata/InspectPacsDataController.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.inspect.controller.admin.inspectpacsdata; +import cn.iocoder.yudao.module.inspect.controller.admin.inspectlisdata.vo.InspectLisDataRespVO; +import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectlisdata.InspectLisDataDO; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -42,14 +44,12 @@ public class InspectPacsDataController { @PostMapping("/create") @Operation(summary = "创建pacs抓取数据") - @PreAuthorize("@ss.hasPermission('inspect:pacs-data:create')") public CommonResult createPacsData(@Valid @RequestBody InspectPacsDataSaveReqVO createReqVO) { return success(pacsDataService.createPacsData(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新pacs抓取数据") - @PreAuthorize("@ss.hasPermission('inspect:pacs-data:update')") public CommonResult updatePacsData(@Valid @RequestBody InspectPacsDataSaveReqVO updateReqVO) { pacsDataService.updatePacsData(updateReqVO); return success(true); @@ -58,7 +58,6 @@ public class InspectPacsDataController { @DeleteMapping("/delete") @Operation(summary = "删除pacs抓取数据") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('inspect:pacs-data:delete')") public CommonResult deletePacsData(@RequestParam("id") Integer id) { pacsDataService.deletePacsData(id); return success(true); @@ -67,15 +66,20 @@ public class InspectPacsDataController { @GetMapping("/get") @Operation(summary = "获得pacs抓取数据") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('inspect:pacs-data:query')") public CommonResult getPacsData(@RequestParam("id") Integer id) { InspectPacsDataDO pacsData = pacsDataService.getPacsData(id); return success(BeanUtils.toBean(pacsData, InspectPacsDataRespVO.class)); } + @GetMapping("/getList") + @Operation(summary = "根据体检编号获得pacs抓取数据") + public CommonResult> GetpacsData(String code) { + List list = pacsDataService.GetpacsData(code); + return success(BeanUtils.toBean(list, InspectPacsDataRespVO.class)); + } + @GetMapping("/page") @Operation(summary = "获得pacs抓取数据分页") - @PreAuthorize("@ss.hasPermission('inspect:pacs-data:query')") public CommonResult> getPacsDataPage(@Valid InspectPacsDataPageReqVO pageReqVO) { PageResult pageResult = pacsDataService.getPacsDataPage(pageReqVO); return success(BeanUtils.toBean(pageResult, InspectPacsDataRespVO.class)); @@ -83,7 +87,6 @@ public class InspectPacsDataController { @GetMapping("/export-excel") @Operation(summary = "导出pacs抓取数据 Excel") - @PreAuthorize("@ss.hasPermission('inspect:pacs-data:export')") @ApiAccessLog(operateType = EXPORT) public void exportPacsDataExcel(@Valid InspectPacsDataPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectlisdata/InspectLisDataService.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectlisdata/InspectLisDataService.java index 51fa6ea..5bcd012 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectlisdata/InspectLisDataService.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectlisdata/InspectLisDataService.java @@ -29,6 +29,10 @@ public interface InspectLisDataService { * @param updateReqVO 更新信息 */ void updateLisData(@Valid InspectLisDataSaveReqVO updateReqVO); + /* + * 根据体检编号获取lis数据 + * */ + List GetLisData(String code); /** * 删除lis抓取数据 diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectlisdata/InspectLisDataServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectlisdata/InspectLisDataServiceImpl.java index 6a5ce76..1e4caf5 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectlisdata/InspectLisDataServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectlisdata/InspectLisDataServiceImpl.java @@ -1,15 +1,14 @@ package cn.iocoder.yudao.module.inspect.service.inspectlisdata; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; import java.util.*; import cn.iocoder.yudao.module.inspect.controller.admin. inspectlisdata.vo.*; import cn.iocoder.yudao.module.inspect.dal.dataobject. inspectlisdata.InspectLisDataDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.inspect.dal.mysql. inspectlisdata.InspectLisDataMapper; @@ -48,7 +47,13 @@ public class InspectLisDataServiceImpl implements InspectLisDataService { InspectLisDataDO updateObj = BeanUtils.toBean(updateReqVO, InspectLisDataDO.class); lisDataMapper.updateById(updateObj); } + @Override + public List GetLisData(String code) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("code", code); + return lisDataMapper.selectList(queryWrapper); + } @Override public void deleteLisData(Integer id) { // 校验存在 diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpacsdata/InspectPacsDataService.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpacsdata/InspectPacsDataService.java index 1b9871d..6dca960 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpacsdata/InspectPacsDataService.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpacsdata/InspectPacsDataService.java @@ -44,6 +44,11 @@ public interface InspectPacsDataService { * @return pacs抓取数据 */ InspectPacsDataDO getPacsData(Integer id); + /* + * + * 根据体检编号获取pacs数据 + * */ + List GetpacsData(String code); /** * 获得pacs抓取数据分页 diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpacsdata/InspectPacsDataServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpacsdata/InspectPacsDataServiceImpl.java index 12ddfdf..8dc626a 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpacsdata/InspectPacsDataServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpacsdata/InspectPacsDataServiceImpl.java @@ -1,14 +1,13 @@ package cn.iocoder.yudao.module.inspect.service.inspectpacsdata; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; import java.util.*; import cn.iocoder.yudao.module.inspect.controller.admin.inspectpacsdata.vo.*; import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectpacsdata.InspectPacsDataDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.inspect.dal.mysql.inspectpacsdata.InspectPacsDataMapper; @@ -66,7 +65,13 @@ public class InspectPacsDataServiceImpl implements InspectPacsDataService { public InspectPacsDataDO getPacsData(Integer id) { return pacsDataMapper.selectById(id); } + @Override + public List GetpacsData(String code) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("code", code); + return pacsDataMapper.selectList(queryWrapper); + } @Override public PageResult getPacsDataPage(InspectPacsDataPageReqVO pageReqVO) { return pacsDataMapper.selectPage(pageReqVO);