From 7a015634c61b4891cbb29ab53b61f4065fe91007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?= <11918452+yang-haihang@user.noreply.gitee.com> Date: Tue, 29 Sep 2026 15:46:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=AF=92=E5=93=81=E8=AE=A1=E7=AE=97Excel=E4=BC=9A=E5=9B=A0?= =?UTF-8?q?=E4=B8=BA=E9=87=8D=E5=90=8D=E6=8A=A5=E9=94=99=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/controller/CommDrugController.java | 133 ++++++++++-------- 1 file changed, 74 insertions(+), 59 deletions(-) diff --git a/src/main/java/digital/laboratory/platform/sys/controller/CommDrugController.java b/src/main/java/digital/laboratory/platform/sys/controller/CommDrugController.java index 1436481..bc5a80c 100644 --- a/src/main/java/digital/laboratory/platform/sys/controller/CommDrugController.java +++ b/src/main/java/digital/laboratory/platform/sys/controller/CommDrugController.java @@ -44,7 +44,7 @@ import java.util.stream.Collectors; * @describe 毒品清单 前端控制器 */ @RestController -@RequestMapping("/comm/drug" ) +@RequestMapping("/comm/drug") @Api(value = "drug", tags = "毒品清单管理") public class CommDrugController { @@ -53,46 +53,50 @@ public class CommDrugController { @Resource private DrugTypeService drugTypeService; - /** - * 通过id查询毒品清单 - * @param id id - * @return R - */ - @ApiOperation(value = "通过id查询", notes = "通过id查询") - @GetMapping("/{id}" ) + + /** + * 通过id查询毒品清单 + * + * @param id id + * @return R + */ + @ApiOperation(value = "通过id查询", notes = "通过id查询") + @GetMapping("/{id}") // @PreAuthorize("@pms.hasPermission('common_drug_get')" ) - public R getById(@PathVariable("id" ) String id) { - return R.ok(drugService.getById(id)); - } + public R getById(@PathVariable("id") String id) { + return R.ok(drugService.getById(id)); + } /** * 提供给内部服务通过id查询 + * * @param id id * @return R */ @ApiOperation(value = "提供给内部服务通过id查询", notes = "提供给内部服务通过id查询") - @GetMapping("/inner/{id}" ) + @GetMapping("/inner/{id}") @Inner(value = false) - public R innerGetById(@PathVariable("id" ) String id) { + public R innerGetById(@PathVariable("id") String id) { return R.ok(drugService.getById(id)); } @ApiOperation("获取所有顶层毒品类型的数据，以map的列表返回") @GetMapping("/drugMapList") - public R< List> drugMapList(String drugType, String name, String englishName, String casCode) { + public R> drugMapList(String drugType, String name, String englishName, String casCode) { return R.ok(drugService.drugMapList(drugType, name, englishName, casCode)); } /** * 通过毒品名称查询毒品清单 + * * @param name name * @return R */ @ApiOperation(value = "通过名称查询", notes = "通过名称查询") - @GetMapping("/name/{name}" ) + @GetMapping("/name/{name}") // @PreAuthorize("@pms.hasPermission('common_drug_get')" ) - public R getByName(@PathVariable("name" ) String name) { + public R getByName(@PathVariable("name") String name) { if (StrUtil.isBlank(name)) { throw new RuntimeException("名称不能为空"); } @@ -108,68 +112,75 @@ public class CommDrugController { return R.ok(drugLite); } - /** - * 查询毒品列表 - * @param drug 查询条件(name, alias => like) - * @return - */ - @ApiOperation(value = "常用毒品查询列表", notes = "常用毒品查询列表") - @GetMapping("/list" ) + /** + * 查询毒品列表 + * + * @param drug 查询条件(name, alias => like) + * @return + */ + @ApiOperation(value = "常用毒品查询列表", notes = "常用毒品查询列表") + @GetMapping("/list") // @PreAuthorize("@pms.hasPermission('common_drug_get')" ) - public R getDrugPage(Drug drug) { - List drugTypeList=drugTypeService.list(Wrappers.lambdaQuery() - .eq(DrugType::getName,"常规毒品")); - Assert.notEmpty(drugTypeList,"系统中并没有找到 常规毒品 分类"); + public R getDrugPage(Drug drug) { + List drugTypeList = drugTypeService.list(Wrappers.lambdaQuery() + .eq(DrugType::getName, "常规毒品")); + Assert.notEmpty(drugTypeList, "系统中并没有找到 常规毒品 分类"); List r = drugService.list(Wrappers.query() - .like(StrUtil.isNotBlank(drug.getName()), "name", drug.getName()) - .like(StrUtil.isNotBlank(drug.getAlias()), "english_name", drug.getEnglishName()) + .like(StrUtil.isNotBlank(drug.getName()), "name", drug.getName()) + .like(StrUtil.isNotBlank(drug.getAlias()), "english_name", drug.getEnglishName()) .like(StrUtil.isNotBlank(drug.getCasCode()), "cas_code", drug.getCasCode()) .eq("drug_type", drugTypeList.get(0).getId())//只查询NPS的毒品列表 - ); - return R.ok(r); - } + .orderByAsc("order_index") + ); + return R.ok(r); + } + //NPS 毒品清单 - @ApiOperation(value = "查询NPS的毒品列表",notes = "查询NPS的毒品列表") + @ApiOperation(value = "查询NPS的毒品列表", notes = "查询NPS的毒品列表") @GetMapping("/getNPSDrugList") - public R getNPSDrugList(Drug drug){ - List drugTypeList=drugTypeService.list(Wrappers.lambdaQuery() - .eq(DrugType::getName,"常规毒品")); - Assert.notEmpty(drugTypeList,"系统中并没有找到 NPS毒品 分类"); + public R getNPSDrugList(Drug drug) { + List drugTypeList = drugTypeService.list(Wrappers.lambdaQuery() + .eq(DrugType::getName, "常规毒品")); + Assert.notEmpty(drugTypeList, "系统中并没有找到 NPS毒品 分类"); //根据这个ID查询出下面的子类ID List r = drugService.list(Wrappers.query() .like(StrUtil.isNotBlank(drug.getName()), "name", drug.getName()) .like(StrUtil.isNotBlank(drug.getEnglishName()), "english_name", drug.getEnglishName()) .like(StrUtil.isNotBlank(drug.getCasCode()), "cas_code", drug.getCasCode()) .like(StrUtil.isNotBlank(drug.getCode()), "code", drug.getCode()) - .eq(drug.getPublishTime()!=null, "publish_time", drug.getPublishTime()) - .eq(drug.getImplementTime()!=null, "implement_time", drug.getImplementTime()) + .eq(drug.getPublishTime() != null, "publish_time", drug.getPublishTime()) + .eq(drug.getImplementTime() != null, "implement_time", drug.getImplementTime()) + .orderByAsc("order_index") .ne("drug_type", drugTypeList.get(0).getId())//只查询NPS的毒品列表 ); return R.ok(r); } - /** + + /** * 分页查询 + * * @param page 分页对象 * @param drug 毒品清单 * @return */ @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/page" ) + @GetMapping("/page") // @PreAuthorize("@pms.hasPermission('common_drug_get')" ) public R> getDrugPage(Page page, Drug drug) { - return R.ok(drugService.getDrugPage(page,drug)); + return R.ok(drugService.getDrugPage(page, drug)); } /** * 新增毒品清单 + * * @param drug 毒品清单 * @return R */ @ApiOperation(value = "新增毒品清单", notes = "新增毒品清单") - @SysLog("新增毒品清单" ) + @SysLog("新增毒品清单") @PostMapping // @PreAuthorize("@pms.hasPermission('common_drug_add')" ) public R postAddObject(@RequestBody Drug drug) { @@ -178,53 +189,57 @@ public class CommDrugController { /** * 修改毒品清单 + * * @param drug 毒品清单 * @return R */ @ApiOperation(value = "修改毒品清单", notes = "修改毒品清单") - @SysLog("修改毒品清单" ) + @SysLog("修改毒品清单") @PutMapping // @PreAuthorize("@pms.hasPermission('common_drug_edit')" ) public R putUpdateById(@RequestBody Drug drug) { return R.ok(drugService.updateById(drug)); } + /** * 通过id删除毒品清单 + * * @param id id * @return R */ @ApiOperation(value = "通过id删除毒品清单", notes = "通过id删除毒品清单") - @SysLog("通过id删除毒品清单" ) - @DeleteMapping("/{id}" ) + @SysLog("通过id删除毒品清单") + @DeleteMapping("/{id}") // @PreAuthorize("@pms.hasPermission('common_drug_del')" ) public R deleteById(@PathVariable String id) { return R.ok(drugService.removeById(id)); } + //导入NPS毒品筛查列表 @PostMapping("/importNPSExcelData") public R importNPSExcelData() throws ParseException { - File file= FileUtil.file("D:\\禁毒大数据平台\\整理之后的数据.xlsx"); - ExcelReader excelReader=ExcelUtil.getReader(file); - List> excelDataList=excelReader.read(); - List drugList=new ArrayList<>(); + File file = FileUtil.file("D:\\禁毒大数据平台\\整理之后的数据.xlsx"); + ExcelReader excelReader = ExcelUtil.getReader(file); + List> excelDataList = excelReader.read(); + List drugList = new ArrayList<>(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - for(int i=0;i1){ + for (int i = 0; i < excelDataList.size(); i++) { + if (i > 1) { //0=编号 1=名称 2=英文名称 3=cas编号 4=发布日期 //5=实施日期 6=来源，7=备注 - Drug drug=new Drug(); + Drug drug = new Drug(); drug.setId(IdWorker.get32UUID()); drug.setCode(excelDataList.get(i).get(0).toString().trim()); drug.setName(excelDataList.get(i).get(1).toString().trim()); drug.setEnglishName(excelDataList.get(i).get(2).toString().trim()); - drug.setCasCode(excelDataList.get(i).get(3)!=null?excelDataList.get(i).get(3).toString().trim():""); - drug.setPublishTime(LocalDateTime.parse(excelDataList.get(i).get(4).toString().trim()+" 00:00:00",formatter)); - drug.setImplementTime(LocalDateTime.parse(excelDataList.get(i).get(5).toString().trim()+" 00:00:00",formatter)); + drug.setCasCode(excelDataList.get(i).get(3) != null ? excelDataList.get(i).get(3).toString().trim() : ""); + drug.setPublishTime(LocalDateTime.parse(excelDataList.get(i).get(4).toString().trim() + " 00:00:00", formatter)); + drug.setImplementTime(LocalDateTime.parse(excelDataList.get(i).get(5).toString().trim() + " 00:00:00", formatter)); drug.setSource(excelDataList.get(i).get(6).toString().trim()); - drug.setComments(excelDataList.get(i).get(7)!=null?excelDataList.get(i).get(7).toString().trim():""); + drug.setComments(excelDataList.get(i).get(7) != null ? excelDataList.get(i).get(7).toString().trim() : ""); drug.setOrderIndex(Integer.parseInt(excelDataList.get(i).get(0).toString().trim())); drug.setDrugType("1"); - System.out.println("添加完了一条，编号是：--------------------------------------"+drug.getCode()); + System.out.println("添加完了一条，编号是：--------------------------------------" + drug.getCode()); drugList.add(drug); } } @@ -250,7 +265,7 @@ public class CommDrugController { // 处理委托中两社人员导入时，没有匹配的毒品信息，则调用该接口保存 @PostMapping("/innerSaveDrug") @Inner(value = false) - public R innerSaveDrug(@RequestBody DrugLite drugLite){ + public R innerSaveDrug(@RequestBody DrugLite drugLite) { Drug drug = new Drug(); drug.setId(drugLite.getId()); drug.setDrugType("f73ea1ef4394c2fdd9013b997aa60b6e"); // 默认分配给新型毒品类型