diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java index d5a0230..f7a7e6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.List; +import java.util.concurrent.ExecutionException; /** * @Description: 业务看板 @@ -35,7 +36,7 @@ @ApiOperation("实时工作统计") @GetMapping("/workStatistics") - public ReturnDTO> workStatistics() { + public ReturnDTO> workStatistics() throws ExecutionException, InterruptedException { return ReturnUtil.success(boardService.workStatistics()); } @@ -48,8 +49,8 @@ */ @ApiOperation("部门产值分析") @PostMapping("/deptOutput") - public ReturnDTO> deptOutput(@RequestBody BoardBaseRequest request) { - return ReturnUtil.success(boardService.deptOutput(request)); + public ReturnDTO deptOutput(@RequestBody BoardBaseRequest request) { + return ReturnUtil.success(boardService.deptOutputList(request)); } /** @@ -72,7 +73,7 @@ @ApiOperation("实时工作统计导出") @GetMapping("/workStatistics/export") - public void workStatisticsExport() throws IOException { + public void workStatisticsExport() throws IOException, ExecutionException, InterruptedException { List list = boardService.workStatistics(); super.exportExcel(BoardWorkStatisticsResponse.class, list, ExportEnum.WORK_STATISTICS_EXPORT.getSheetName()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java index d5a0230..f7a7e6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.List; +import java.util.concurrent.ExecutionException; /** * @Description: 业务看板 @@ -35,7 +36,7 @@ @ApiOperation("实时工作统计") @GetMapping("/workStatistics") - public ReturnDTO> workStatistics() { + public ReturnDTO> workStatistics() throws ExecutionException, InterruptedException { return ReturnUtil.success(boardService.workStatistics()); } @@ -48,8 +49,8 @@ */ @ApiOperation("部门产值分析") @PostMapping("/deptOutput") - public ReturnDTO> deptOutput(@RequestBody BoardBaseRequest request) { - return ReturnUtil.success(boardService.deptOutput(request)); + public ReturnDTO deptOutput(@RequestBody BoardBaseRequest request) { + return ReturnUtil.success(boardService.deptOutputList(request)); } /** @@ -72,7 +73,7 @@ @ApiOperation("实时工作统计导出") @GetMapping("/workStatistics/export") - public void workStatisticsExport() throws IOException { + public void workStatisticsExport() throws IOException, ExecutionException, InterruptedException { List list = boardService.workStatistics(); super.exportExcel(BoardWorkStatisticsResponse.class, list, ExportEnum.WORK_STATISTICS_EXPORT.getSheetName()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 0a85d34..46d6dea 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -2,6 +2,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.dispatch.ReadSampleDTO; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.business.IBusinessReadWriterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,6 +14,7 @@ import java.util.List; import java.util.Set; +import java.util.concurrent.ExecutionException; /** * @Description: 读写器 @@ -41,7 +43,7 @@ /** * 大读写器 - * TCP连接 + * TCP连接，需配置和192.168.1.168一个段 * 读取读写器获取标签TID列表，用于标签绑定，前端从结果中选取一个标签传入标签绑定接口 */ @ApiOperation("获取大读写器识别的标签TID列表") @@ -63,7 +65,7 @@ /** * 有线扫码枪（二维码）（徐州、西昌均使用） - * USB串口连接（模拟COM口），USB模拟串行通讯模式 + * USB串口连接（模拟COM口），USB模拟串行通讯模式，连接后在设备管理器-端口(COM和LPT)可查看连接设备 * 目前设置：扫码一次读取一个，扫码结果无回车 * 二维码由样品编号/设备编号生成 * 扫描收入、扫描检完等，以及大读写器的补充（包括新建委托书和待收入中使用） @@ -75,9 +77,31 @@ } /** - * todo：以下3个结合接口需开发 - * 测量设备中标签识别按钮，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 - * 扫描收入、扫描检完、新建委托书、待收入等获取样品列表，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为样品列表，点击某一个再查详情 - * 标签绑定功能，需要实现大读写器和小读写器识别结合的结果TID列表 + * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 + * 已实现有线扫码枪（二维码）和大读写器结合扫描 */ + @ApiOperation("测量设备标签识别按钮接口") + @GetMapping("/equipment/label/readList") + public ReturnDTO> equipmentLabelReadList() throws ExecutionException, InterruptedException { + return readWriterService.equipmentLabelReadList(); + } + + /** + * 扫描收入、扫描检完、新建委托书、待收入等获取样品列表，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为样品列表，点击某一个再查详情 + * 已实现有线扫码枪（二维码）和大读写器结合扫描 + */ + @ApiOperation("扫描收入、扫描检完、新建委托书、待收入等标签识别获取样品列表") + @GetMapping("/sample/label/readList") + public ReturnDTO> sampleLabelReadList() throws ExecutionException, InterruptedException { + return readWriterService.sampleLabelReadList(); + } + + /** + * 标签绑定功能，实现大读写器和小读写器识别结合的结果TID列表 + */ + @ApiOperation("大读写器和小读写器识别结合标签绑定功能") + @GetMapping("/all/tId/readList") + public ReturnDTO> allTidReadList() throws ExecutionException, InterruptedException { + return readWriterService.allTidReadList(); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java index d5a0230..f7a7e6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.List; +import java.util.concurrent.ExecutionException; /** * @Description: 业务看板 @@ -35,7 +36,7 @@ @ApiOperation("实时工作统计") @GetMapping("/workStatistics") - public ReturnDTO> workStatistics() { + public ReturnDTO> workStatistics() throws ExecutionException, InterruptedException { return ReturnUtil.success(boardService.workStatistics()); } @@ -48,8 +49,8 @@ */ @ApiOperation("部门产值分析") @PostMapping("/deptOutput") - public ReturnDTO> deptOutput(@RequestBody BoardBaseRequest request) { - return ReturnUtil.success(boardService.deptOutput(request)); + public ReturnDTO deptOutput(@RequestBody BoardBaseRequest request) { + return ReturnUtil.success(boardService.deptOutputList(request)); } /** @@ -72,7 +73,7 @@ @ApiOperation("实时工作统计导出") @GetMapping("/workStatistics/export") - public void workStatisticsExport() throws IOException { + public void workStatisticsExport() throws IOException, ExecutionException, InterruptedException { List list = boardService.workStatistics(); super.exportExcel(BoardWorkStatisticsResponse.class, list, ExportEnum.WORK_STATISTICS_EXPORT.getSheetName()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 0a85d34..46d6dea 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -2,6 +2,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.dispatch.ReadSampleDTO; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.business.IBusinessReadWriterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,6 +14,7 @@ import java.util.List; import java.util.Set; +import java.util.concurrent.ExecutionException; /** * @Description: 读写器 @@ -41,7 +43,7 @@ /** * 大读写器 - * TCP连接 + * TCP连接，需配置和192.168.1.168一个段 * 读取读写器获取标签TID列表，用于标签绑定，前端从结果中选取一个标签传入标签绑定接口 */ @ApiOperation("获取大读写器识别的标签TID列表") @@ -63,7 +65,7 @@ /** * 有线扫码枪（二维码）（徐州、西昌均使用） - * USB串口连接（模拟COM口），USB模拟串行通讯模式 + * USB串口连接（模拟COM口），USB模拟串行通讯模式，连接后在设备管理器-端口(COM和LPT)可查看连接设备 * 目前设置：扫码一次读取一个，扫码结果无回车 * 二维码由样品编号/设备编号生成 * 扫描收入、扫描检完等，以及大读写器的补充（包括新建委托书和待收入中使用） @@ -75,9 +77,31 @@ } /** - * todo：以下3个结合接口需开发 - * 测量设备中标签识别按钮，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 - * 扫描收入、扫描检完、新建委托书、待收入等获取样品列表，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为样品列表，点击某一个再查详情 - * 标签绑定功能，需要实现大读写器和小读写器识别结合的结果TID列表 + * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 + * 已实现有线扫码枪（二维码）和大读写器结合扫描 */ + @ApiOperation("测量设备标签识别按钮接口") + @GetMapping("/equipment/label/readList") + public ReturnDTO> equipmentLabelReadList() throws ExecutionException, InterruptedException { + return readWriterService.equipmentLabelReadList(); + } + + /** + * 扫描收入、扫描检完、新建委托书、待收入等获取样品列表，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为样品列表，点击某一个再查详情 + * 已实现有线扫码枪（二维码）和大读写器结合扫描 + */ + @ApiOperation("扫描收入、扫描检完、新建委托书、待收入等标签识别获取样品列表") + @GetMapping("/sample/label/readList") + public ReturnDTO> sampleLabelReadList() throws ExecutionException, InterruptedException { + return readWriterService.sampleLabelReadList(); + } + + /** + * 标签绑定功能，实现大读写器和小读写器识别结合的结果TID列表 + */ + @ApiOperation("大读写器和小读写器识别结合标签绑定功能") + @GetMapping("/all/tId/readList") + public ReturnDTO> allTidReadList() throws ExecutionException, InterruptedException { + return readWriterService.allTidReadList(); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2fd1d05..2ec7bfc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -109,7 +109,7 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -137,7 +137,7 @@ @ApiOperation("状态管理列表导出") @PostMapping("/exportStateManageList") @ResponseBody - public void exportStateManageList(@RequestBody StateManageRequest request, HttpServletResponse response) throws Exception{ + public void exportStateManageList(@RequestBody StateManageRequest request, HttpServletResponse response) { try { stateManageService.exportStateManageList(request,response); }catch (Exception e){ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java index d5a0230..f7a7e6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.List; +import java.util.concurrent.ExecutionException; /** * @Description: 业务看板 @@ -35,7 +36,7 @@ @ApiOperation("实时工作统计") @GetMapping("/workStatistics") - public ReturnDTO> workStatistics() { + public ReturnDTO> workStatistics() throws ExecutionException, InterruptedException { return ReturnUtil.success(boardService.workStatistics()); } @@ -48,8 +49,8 @@ */ @ApiOperation("部门产值分析") @PostMapping("/deptOutput") - public ReturnDTO> deptOutput(@RequestBody BoardBaseRequest request) { - return ReturnUtil.success(boardService.deptOutput(request)); + public ReturnDTO deptOutput(@RequestBody BoardBaseRequest request) { + return ReturnUtil.success(boardService.deptOutputList(request)); } /** @@ -72,7 +73,7 @@ @ApiOperation("实时工作统计导出") @GetMapping("/workStatistics/export") - public void workStatisticsExport() throws IOException { + public void workStatisticsExport() throws IOException, ExecutionException, InterruptedException { List list = boardService.workStatistics(); super.exportExcel(BoardWorkStatisticsResponse.class, list, ExportEnum.WORK_STATISTICS_EXPORT.getSheetName()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 0a85d34..46d6dea 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -2,6 +2,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.dispatch.ReadSampleDTO; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.business.IBusinessReadWriterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,6 +14,7 @@ import java.util.List; import java.util.Set; +import java.util.concurrent.ExecutionException; /** * @Description: 读写器 @@ -41,7 +43,7 @@ /** * 大读写器 - * TCP连接 + * TCP连接，需配置和192.168.1.168一个段 * 读取读写器获取标签TID列表，用于标签绑定，前端从结果中选取一个标签传入标签绑定接口 */ @ApiOperation("获取大读写器识别的标签TID列表") @@ -63,7 +65,7 @@ /** * 有线扫码枪（二维码）（徐州、西昌均使用） - * USB串口连接（模拟COM口），USB模拟串行通讯模式 + * USB串口连接（模拟COM口），USB模拟串行通讯模式，连接后在设备管理器-端口(COM和LPT)可查看连接设备 * 目前设置：扫码一次读取一个，扫码结果无回车 * 二维码由样品编号/设备编号生成 * 扫描收入、扫描检完等，以及大读写器的补充（包括新建委托书和待收入中使用） @@ -75,9 +77,31 @@ } /** - * todo：以下3个结合接口需开发 - * 测量设备中标签识别按钮，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 - * 扫描收入、扫描检完、新建委托书、待收入等获取样品列表，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为样品列表，点击某一个再查详情 - * 标签绑定功能，需要实现大读写器和小读写器识别结合的结果TID列表 + * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 + * 已实现有线扫码枪（二维码）和大读写器结合扫描 */ + @ApiOperation("测量设备标签识别按钮接口") + @GetMapping("/equipment/label/readList") + public ReturnDTO> equipmentLabelReadList() throws ExecutionException, InterruptedException { + return readWriterService.equipmentLabelReadList(); + } + + /** + * 扫描收入、扫描检完、新建委托书、待收入等获取样品列表，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为样品列表，点击某一个再查详情 + * 已实现有线扫码枪（二维码）和大读写器结合扫描 + */ + @ApiOperation("扫描收入、扫描检完、新建委托书、待收入等标签识别获取样品列表") + @GetMapping("/sample/label/readList") + public ReturnDTO> sampleLabelReadList() throws ExecutionException, InterruptedException { + return readWriterService.sampleLabelReadList(); + } + + /** + * 标签绑定功能，实现大读写器和小读写器识别结合的结果TID列表 + */ + @ApiOperation("大读写器和小读写器识别结合标签绑定功能") + @GetMapping("/all/tId/readList") + public ReturnDTO> allTidReadList() throws ExecutionException, InterruptedException { + return readWriterService.allTidReadList(); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2fd1d05..2ec7bfc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -109,7 +109,7 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -137,7 +137,7 @@ @ApiOperation("状态管理列表导出") @PostMapping("/exportStateManageList") @ResponseBody - public void exportStateManageList(@RequestBody StateManageRequest request, HttpServletResponse response) throws Exception{ + public void exportStateManageList(@RequestBody StateManageRequest request, HttpServletResponse response) { try { stateManageService.exportStateManageList(request,response); }catch (Exception e){ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index a25eb00..8221b54 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -216,10 +216,6 @@ return meterFileService.failUpdate(meterFile); } - - /** - * 用于选择下拉检查设备查询 - */ @ApiOperation("用于选择下拉所依据的技术文件查询") @PostMapping("/querySelectList") @ResponseBody diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java index d5a0230..f7a7e6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.List; +import java.util.concurrent.ExecutionException; /** * @Description: 业务看板 @@ -35,7 +36,7 @@ @ApiOperation("实时工作统计") @GetMapping("/workStatistics") - public ReturnDTO> workStatistics() { + public ReturnDTO> workStatistics() throws ExecutionException, InterruptedException { return ReturnUtil.success(boardService.workStatistics()); } @@ -48,8 +49,8 @@ */ @ApiOperation("部门产值分析") @PostMapping("/deptOutput") - public ReturnDTO> deptOutput(@RequestBody BoardBaseRequest request) { - return ReturnUtil.success(boardService.deptOutput(request)); + public ReturnDTO deptOutput(@RequestBody BoardBaseRequest request) { + return ReturnUtil.success(boardService.deptOutputList(request)); } /** @@ -72,7 +73,7 @@ @ApiOperation("实时工作统计导出") @GetMapping("/workStatistics/export") - public void workStatisticsExport() throws IOException { + public void workStatisticsExport() throws IOException, ExecutionException, InterruptedException { List list = boardService.workStatistics(); super.exportExcel(BoardWorkStatisticsResponse.class, list, ExportEnum.WORK_STATISTICS_EXPORT.getSheetName()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 0a85d34..46d6dea 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -2,6 +2,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.dispatch.ReadSampleDTO; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.business.IBusinessReadWriterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,6 +14,7 @@ import java.util.List; import java.util.Set; +import java.util.concurrent.ExecutionException; /** * @Description: 读写器 @@ -41,7 +43,7 @@ /** * 大读写器 - * TCP连接 + * TCP连接，需配置和192.168.1.168一个段 * 读取读写器获取标签TID列表，用于标签绑定，前端从结果中选取一个标签传入标签绑定接口 */ @ApiOperation("获取大读写器识别的标签TID列表") @@ -63,7 +65,7 @@ /** * 有线扫码枪（二维码）（徐州、西昌均使用） - * USB串口连接（模拟COM口），USB模拟串行通讯模式 + * USB串口连接（模拟COM口），USB模拟串行通讯模式，连接后在设备管理器-端口(COM和LPT)可查看连接设备 * 目前设置：扫码一次读取一个，扫码结果无回车 * 二维码由样品编号/设备编号生成 * 扫描收入、扫描检完等，以及大读写器的补充（包括新建委托书和待收入中使用） @@ -75,9 +77,31 @@ } /** - * todo：以下3个结合接口需开发 - * 测量设备中标签识别按钮，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 - * 扫描收入、扫描检完、新建委托书、待收入等获取样品列表，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为样品列表，点击某一个再查详情 - * 标签绑定功能，需要实现大读写器和小读写器识别结合的结果TID列表 + * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 + * 已实现有线扫码枪（二维码）和大读写器结合扫描 */ + @ApiOperation("测量设备标签识别按钮接口") + @GetMapping("/equipment/label/readList") + public ReturnDTO> equipmentLabelReadList() throws ExecutionException, InterruptedException { + return readWriterService.equipmentLabelReadList(); + } + + /** + * 扫描收入、扫描检完、新建委托书、待收入等获取样品列表，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为样品列表，点击某一个再查详情 + * 已实现有线扫码枪（二维码）和大读写器结合扫描 + */ + @ApiOperation("扫描收入、扫描检完、新建委托书、待收入等标签识别获取样品列表") + @GetMapping("/sample/label/readList") + public ReturnDTO> sampleLabelReadList() throws ExecutionException, InterruptedException { + return readWriterService.sampleLabelReadList(); + } + + /** + * 标签绑定功能，实现大读写器和小读写器识别结合的结果TID列表 + */ + @ApiOperation("大读写器和小读写器识别结合标签绑定功能") + @GetMapping("/all/tId/readList") + public ReturnDTO> allTidReadList() throws ExecutionException, InterruptedException { + return readWriterService.allTidReadList(); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2fd1d05..2ec7bfc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -109,7 +109,7 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -137,7 +137,7 @@ @ApiOperation("状态管理列表导出") @PostMapping("/exportStateManageList") @ResponseBody - public void exportStateManageList(@RequestBody StateManageRequest request, HttpServletResponse response) throws Exception{ + public void exportStateManageList(@RequestBody StateManageRequest request, HttpServletResponse response) { try { stateManageService.exportStateManageList(request,response); }catch (Exception e){ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index a25eb00..8221b54 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -216,10 +216,6 @@ return meterFileService.failUpdate(meterFile); } - - /** - * 用于选择下拉检查设备查询 - */ @ApiOperation("用于选择下拉所依据的技术文件查询") @PostMapping("/querySelectList") @ResponseBody diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index a132505..9c31e9c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -52,6 +52,7 @@ FILE_SUBMIT_FAILED(2407, "文件提交处理失败"), FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), + NO_PROPERLY_CONNECTED(500, "请正确连接扫码设备"), QRCODE_FAILED(2409, "二维码生成失败"), RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"), @@ -63,7 +64,7 @@ SITE_EXECUTIVE__SUBMIT_FAILED(3402, "现场检测审核提交处理失败"), FAIL_READ_EPC_TID(2416, "标签信息读取失败，请重新操作"), - READ_WRITER_NOT_CONNECTED(2417, "标签信息读取失败，请连接读写器"), + READ_WRITER_NOT_CONNECTED(2417, "标签信息读取失败，请正确连接读写器"), READ_WRITER_NOT_CONNECTED_OR_NO_TID(2418, "连接读写器失败或无可识别标签"), OUTSOURCER_SAVE_FAILED(2419, "分包方保存至草稿箱失败"), diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java index d5a0230..f7a7e6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.List; +import java.util.concurrent.ExecutionException; /** * @Description: 业务看板 @@ -35,7 +36,7 @@ @ApiOperation("实时工作统计") @GetMapping("/workStatistics") - public ReturnDTO> workStatistics() { + public ReturnDTO> workStatistics() throws ExecutionException, InterruptedException { return ReturnUtil.success(boardService.workStatistics()); } @@ -48,8 +49,8 @@ */ @ApiOperation("部门产值分析") @PostMapping("/deptOutput") - public ReturnDTO> deptOutput(@RequestBody BoardBaseRequest request) { - return ReturnUtil.success(boardService.deptOutput(request)); + public ReturnDTO deptOutput(@RequestBody BoardBaseRequest request) { + return ReturnUtil.success(boardService.deptOutputList(request)); } /** @@ -72,7 +73,7 @@ @ApiOperation("实时工作统计导出") @GetMapping("/workStatistics/export") - public void workStatisticsExport() throws IOException { + public void workStatisticsExport() throws IOException, ExecutionException, InterruptedException { List list = boardService.workStatistics(); super.exportExcel(BoardWorkStatisticsResponse.class, list, ExportEnum.WORK_STATISTICS_EXPORT.getSheetName()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 0a85d34..46d6dea 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -2,6 +2,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.dispatch.ReadSampleDTO; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.business.IBusinessReadWriterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,6 +14,7 @@ import java.util.List; import java.util.Set; +import java.util.concurrent.ExecutionException; /** * @Description: 读写器 @@ -41,7 +43,7 @@ /** * 大读写器 - * TCP连接 + * TCP连接，需配置和192.168.1.168一个段 * 读取读写器获取标签TID列表，用于标签绑定，前端从结果中选取一个标签传入标签绑定接口 */ @ApiOperation("获取大读写器识别的标签TID列表") @@ -63,7 +65,7 @@ /** * 有线扫码枪（二维码）（徐州、西昌均使用） - * USB串口连接（模拟COM口），USB模拟串行通讯模式 + * USB串口连接（模拟COM口），USB模拟串行通讯模式，连接后在设备管理器-端口(COM和LPT)可查看连接设备 * 目前设置：扫码一次读取一个，扫码结果无回车 * 二维码由样品编号/设备编号生成 * 扫描收入、扫描检完等，以及大读写器的补充（包括新建委托书和待收入中使用） @@ -75,9 +77,31 @@ } /** - * todo：以下3个结合接口需开发 - * 测量设备中标签识别按钮，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 - * 扫描收入、扫描检完、新建委托书、待收入等获取样品列表，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为样品列表，点击某一个再查详情 - * 标签绑定功能，需要实现大读写器和小读写器识别结合的结果TID列表 + * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 + * 已实现有线扫码枪（二维码）和大读写器结合扫描 */ + @ApiOperation("测量设备标签识别按钮接口") + @GetMapping("/equipment/label/readList") + public ReturnDTO> equipmentLabelReadList() throws ExecutionException, InterruptedException { + return readWriterService.equipmentLabelReadList(); + } + + /** + * 扫描收入、扫描检完、新建委托书、待收入等获取样品列表，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为样品列表，点击某一个再查详情 + * 已实现有线扫码枪（二维码）和大读写器结合扫描 + */ + @ApiOperation("扫描收入、扫描检完、新建委托书、待收入等标签识别获取样品列表") + @GetMapping("/sample/label/readList") + public ReturnDTO> sampleLabelReadList() throws ExecutionException, InterruptedException { + return readWriterService.sampleLabelReadList(); + } + + /** + * 标签绑定功能，实现大读写器和小读写器识别结合的结果TID列表 + */ + @ApiOperation("大读写器和小读写器识别结合标签绑定功能") + @GetMapping("/all/tId/readList") + public ReturnDTO> allTidReadList() throws ExecutionException, InterruptedException { + return readWriterService.allTidReadList(); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2fd1d05..2ec7bfc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -109,7 +109,7 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -137,7 +137,7 @@ @ApiOperation("状态管理列表导出") @PostMapping("/exportStateManageList") @ResponseBody - public void exportStateManageList(@RequestBody StateManageRequest request, HttpServletResponse response) throws Exception{ + public void exportStateManageList(@RequestBody StateManageRequest request, HttpServletResponse response) { try { stateManageService.exportStateManageList(request,response); }catch (Exception e){ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index a25eb00..8221b54 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -216,10 +216,6 @@ return meterFileService.failUpdate(meterFile); } - - /** - * 用于选择下拉检查设备查询 - */ @ApiOperation("用于选择下拉所依据的技术文件查询") @PostMapping("/querySelectList") @ResponseBody diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index a132505..9c31e9c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -52,6 +52,7 @@ FILE_SUBMIT_FAILED(2407, "文件提交处理失败"), FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), + NO_PROPERLY_CONNECTED(500, "请正确连接扫码设备"), QRCODE_FAILED(2409, "二维码生成失败"), RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"), @@ -63,7 +64,7 @@ SITE_EXECUTIVE__SUBMIT_FAILED(3402, "现场检测审核提交处理失败"), FAIL_READ_EPC_TID(2416, "标签信息读取失败，请重新操作"), - READ_WRITER_NOT_CONNECTED(2417, "标签信息读取失败，请连接读写器"), + READ_WRITER_NOT_CONNECTED(2417, "标签信息读取失败，请正确连接读写器"), READ_WRITER_NOT_CONNECTED_OR_NO_TID(2418, "连接读写器失败或无可识别标签"), OUTSOURCER_SAVE_FAILED(2419, "分包方保存至草稿箱失败"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java index e883a12..321b0f1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java @@ -10,11 +10,13 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Map; +import java.util.concurrent.ForkJoinPool; import java.util.function.Function; /** @@ -96,4 +98,9 @@ }); } + @Bean + public ForkJoinPool forkJoinPool() { + return new ForkJoinPool(100); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java index d5a0230..f7a7e6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.List; +import java.util.concurrent.ExecutionException; /** * @Description: 业务看板 @@ -35,7 +36,7 @@ @ApiOperation("实时工作统计") @GetMapping("/workStatistics") - public ReturnDTO> workStatistics() { + public ReturnDTO> workStatistics() throws ExecutionException, InterruptedException { return ReturnUtil.success(boardService.workStatistics()); } @@ -48,8 +49,8 @@ */ @ApiOperation("部门产值分析") @PostMapping("/deptOutput") - public ReturnDTO> deptOutput(@RequestBody BoardBaseRequest request) { - return ReturnUtil.success(boardService.deptOutput(request)); + public ReturnDTO deptOutput(@RequestBody BoardBaseRequest request) { + return ReturnUtil.success(boardService.deptOutputList(request)); } /** @@ -72,7 +73,7 @@ @ApiOperation("实时工作统计导出") @GetMapping("/workStatistics/export") - public void workStatisticsExport() throws IOException { + public void workStatisticsExport() throws IOException, ExecutionException, InterruptedException { List list = boardService.workStatistics(); super.exportExcel(BoardWorkStatisticsResponse.class, list, ExportEnum.WORK_STATISTICS_EXPORT.getSheetName()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 0a85d34..46d6dea 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -2,6 +2,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.dispatch.ReadSampleDTO; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.business.IBusinessReadWriterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,6 +14,7 @@ import java.util.List; import java.util.Set; +import java.util.concurrent.ExecutionException; /** * @Description: 读写器 @@ -41,7 +43,7 @@ /** * 大读写器 - * TCP连接 + * TCP连接，需配置和192.168.1.168一个段 * 读取读写器获取标签TID列表，用于标签绑定，前端从结果中选取一个标签传入标签绑定接口 */ @ApiOperation("获取大读写器识别的标签TID列表") @@ -63,7 +65,7 @@ /** * 有线扫码枪（二维码）（徐州、西昌均使用） - * USB串口连接（模拟COM口），USB模拟串行通讯模式 + * USB串口连接（模拟COM口），USB模拟串行通讯模式，连接后在设备管理器-端口(COM和LPT)可查看连接设备 * 目前设置：扫码一次读取一个，扫码结果无回车 * 二维码由样品编号/设备编号生成 * 扫描收入、扫描检完等，以及大读写器的补充（包括新建委托书和待收入中使用） @@ -75,9 +77,31 @@ } /** - * todo：以下3个结合接口需开发 - * 测量设备中标签识别按钮，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 - * 扫描收入、扫描检完、新建委托书、待收入等获取样品列表，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为样品列表，点击某一个再查详情 - * 标签绑定功能，需要实现大读写器和小读写器识别结合的结果TID列表 + * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 + * 已实现有线扫码枪（二维码）和大读写器结合扫描 */ + @ApiOperation("测量设备标签识别按钮接口") + @GetMapping("/equipment/label/readList") + public ReturnDTO> equipmentLabelReadList() throws ExecutionException, InterruptedException { + return readWriterService.equipmentLabelReadList(); + } + + /** + * 扫描收入、扫描检完、新建委托书、待收入等获取样品列表，需要实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为样品列表，点击某一个再查详情 + * 已实现有线扫码枪（二维码）和大读写器结合扫描 + */ + @ApiOperation("扫描收入、扫描检完、新建委托书、待收入等标签识别获取样品列表") + @GetMapping("/sample/label/readList") + public ReturnDTO> sampleLabelReadList() throws ExecutionException, InterruptedException { + return readWriterService.sampleLabelReadList(); + } + + /** + * 标签绑定功能，实现大读写器和小读写器识别结合的结果TID列表 + */ + @ApiOperation("大读写器和小读写器识别结合标签绑定功能") + @GetMapping("/all/tId/readList") + public ReturnDTO> allTidReadList() throws ExecutionException, InterruptedException { + return readWriterService.allTidReadList(); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2fd1d05..2ec7bfc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -109,7 +109,7 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -137,7 +137,7 @@ @ApiOperation("状态管理列表导出") @PostMapping("/exportStateManageList") @ResponseBody - public void exportStateManageList(@RequestBody StateManageRequest request, HttpServletResponse response) throws Exception{ + public void exportStateManageList(@RequestBody StateManageRequest request, HttpServletResponse response) { try { stateManageService.exportStateManageList(request,response); }catch (Exception e){ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index a25eb00..8221b54 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -216,10 +216,6 @@ return meterFileService.failUpdate(meterFile); } - - /** - * 用于选择下拉检查设备查询 - */ @ApiOperation("用于选择下拉所依据的技术文件查询") @PostMapping("/querySelectList") @ResponseBody diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index a132505..9c31e9c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -52,6 +52,7 @@ FILE_SUBMIT_FAILED(2407, "文件提交处理失败"), FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), + NO_PROPERLY_CONNECTED(500, "请正确连接扫码设备"), QRCODE_FAILED(2409, "二维码生成失败"), RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"), @@ -63,7 +64,7 @@ SITE_EXECUTIVE__SUBMIT_FAILED(3402, "现场检测审核提交处理失败"), FAIL_READ_EPC_TID(2416, "标签信息读取失败，请重新操作"), - READ_WRITER_NOT_CONNECTED(2417, "标签信息读取失败，请连接读写器"), + READ_WRITER_NOT_CONNECTED(2417, "标签信息读取失败，请正确连接读写器"), READ_WRITER_NOT_CONNECTED_OR_NO_TID(2418, "连接读写器失败或无可识别标签"), OUTSOURCER_SAVE_FAILED(2419, "分包方保存至草稿箱失败"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java index e883a12..321b0f1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java @@ -10,11 +10,13 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Map; +import java.util.concurrent.ForkJoinPool; import java.util.function.Function; /** @@ -96,4 +98,9 @@ }); } + @Bean + public ForkJoinPool forkJoinPool() { + return new ForkJoinPool(100); + } + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index 05a42c5..0d0c60d 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -207,7 +207,7 @@ #{item} - ORDER BY bosr.update_time DESC + ORDER BY bosr.create_time DESC