From d6137fb59cfd89145893732b3b79dad6cbd7ecd6 Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Sat, 11 Oct 2025 15:29:34 +0800 Subject: [PATCH] =?UTF-8?q?202501011=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entrustment/config/ErrorController.java | 71 ------------------- .../controller/EntrustmentController.java | 47 ------------ ...rustMaterialCheckoutResultServiceImpl.java | 12 +++- 3 files changed, 10 insertions(+), 120 deletions(-) delete mode 100644 src/main/java/digital/laboratory/platform/entrustment/config/ErrorController.java diff --git a/src/main/java/digital/laboratory/platform/entrustment/config/ErrorController.java b/src/main/java/digital/laboratory/platform/entrustment/config/ErrorController.java deleted file mode 100644 index 48c7d37..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/config/ErrorController.java +++ /dev/null @@ -1,71 +0,0 @@ -package digital.laboratory.platform.entrustment.config; - -import digital.laboratory.platform.common.core.util.R; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.NoHandlerFoundException; - -import java.util.HashMap; -import java.util.Map; - -/** - * Spring Boot 自定义异常处理 - * 所有的异常都派生自 Exception, 如果我们定义了某个异常的处理 Handler, Spring Boot 会调用用对应的异常 Handler, 否则会调用 Exception Handler. - * 有一个前提是在 application.yml 中定义两个属性, 让 springboot 在没有找到 url 的处理器触发异常; 让 springboot 不要自作多情加 /error 这个 map - * mvc: - * throw-exception-if-no-handler-found: true - * web: - * resources: - * add-mappings: false - * 只有如此, springboot 才会触发异常。 - */ - - -@ControllerAdvice -public class ErrorController { - - @ExceptionHandler(Exception.class) - @ResponseBody - public ResponseEntity error(Exception ex) { - System.out.println("ErrorController.error Exception"); - ex.printStackTrace(); - Map map = new HashMap<>(); - map.put("Exception", ex.getClass().getName()); - map.put("message", ex.getMessage()); - map.put("localizedMessage", ex.getLocalizedMessage()); - map.put("toString", ex.toString()); - - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(R.failed(map, "发生异常 " + ex.getMessage())); - } - - - @ExceptionHandler(value = {NoHandlerFoundException.class}) - @ResponseBody - public ResponseEntity error(NoHandlerFoundException ex) { -//System.out.println("ErrorController.error NoHandlerFoundException"); -//ex.printStackTrace(); -// //ex.getRawStatusCode() - Map map = new HashMap<>(); - map.put("Exception", ex.getClass().getName()); - map.put("message", ex.getMessage()); - map.put("localizedMessage", ex.getLocalizedMessage()); - map.put("requestURL", ex.getRequestURL()); - map.put("httpMethod", ex.getHttpMethod()); -// map.put("cause", ex.getCause().toString()); - map.put("toString", ex.toString()); -// map.put("comments", "单独的 ExceptionHandler, 系统管理捕获的全局异常 NoHandlerFoundException"); -// //return map; -// //ResponseEntity> r = new ResponseEntity>(map, HttpStatus.INTERNAL_SERVER_ERROR); -// //ResponseEntity> r = new ResponseEntity>(map, HttpStatus.NOT_FOUND); -// //return r; -// return ResponseEntity.status(HttpStatus.NOT_FOUND).body(map); - - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(R.failed(map, "没有找到")); - } - - -} - diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java index e9ab3fc..d7ad696 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java @@ -2195,53 +2195,6 @@ public class EntrustmentController { return R.ok(entrustmentService.updateImportData(excuteType)); } - //===================================================================================== - // 测试, 为现有的案件创建一些委托 - @GetMapping("/create100") - public R xxx_TestCreate100() { - List cjs = caseEventService.getCaseVoList(null, null, null, null); - for (CaseEvent cj : cjs) { - int num = RandomUtil.randomInt(1, 4); - for (int i = 0; i < num; i++) { - List ces = entrustmentService.list(Wrappers.query() - .eq("case_id", cj.getId())); - - if (ces.size() >= num) { - break; - } - Entrustment entrustment = new Entrustment(); - - entrustment.setCaseId(cj.getId()); - //entrustment.setEntrustmentNo(entrustmentService.getNewEntrustmentNo(cj.getCaseNo())); - entrustment.setEntrustmentNo(entrustmentService.getNewEntrustmentNo()); - //entrustment.setEntrustmentTime(LocalDateTime.now()); - entrustment.setClientOrgId(""); - //entrustment.setClientOrgName(""); - entrustment.setDeliverer1Name("李宏亮"); - entrustment.setDeliverer1Phone("13985001001"); - entrustment.setDeliverer1Id("522122199504042035"); - entrustment.setDeliverer2Name("西门吹雪"); - entrustment.setDeliverer2Phone("13985001002"); - entrustment.setDeliverer2Id("522122190504042031"); - - //entrustment.setIdentificationOrgName("国家毒品实验室陕西分中心"); // 鉴定机构名称 - entrustment.setIdentificationDomain("毒品检验"); // 鉴定专业 - entrustment.setQualitativeAnalysis(true); // 定性分析 - entrustment.setQuantitativeAnalysis(true); // 定量分析 - entrustment.setOtherIdentificationRequests("无"); // 鉴定要求 - entrustment.setId(IdWorker.get32UUID().toUpperCase()); - - if (entrustmentService.save(entrustment)) { - System.out.println("新增委托成功"); - } else { - System.out.println("新增委托失败"); - } - - } - } - return R.ok("已经为每个案件创建了 一些 委托"); - } - @GetMapping("/get/quantity/for/Inspection") @ApiOperation(value = "送检系统统计当前用户(机构)送检且已受理的所有检材数量", notes = "送检系统统计当前用户(机构)送检且已受理的所有检材数量") public R> getQuantityForInspection(HttpServletRequest httpServletRequest) { diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java index cf13c63..5f2e5ce 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java @@ -204,6 +204,9 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl entrustIds = entrustmentList.stream().map(Entrustment::getId).collect(Collectors.toList()); + if (CollUtil.isEmpty(entrustIds)) { + throw new CheckedException("没有查询到符合条件的委托信息！"); + } // 获取检材信息， 排序的原因是需要数据是有序的 List materialList = entrustmentIdentificationMaterialService.list( Wrappers.lambdaQuery() @@ -851,8 +854,13 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl resultData = this.getResultData(excelDTO);