From da0753286f3dafe66dd5d7dda92e5da6e1e23cf6 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Tue, 30 Jul 2024 10:47:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E5=8F=8A?= =?UTF-8?q?=E4=BC=98=E5=8C=96--=E4=B8=8B=E6=8B=89=E9=80=89=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8E=BB=E9=99=A4=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SamplesManageController.java | 6 -- .../TestReportManageController.java | 39 +------------ .../controller/ToolsManageController.java | 1 - .../aqgqj/basis/dao/TestReportManageDao.java | 28 --------- .../service/TestReportManageService.java | 14 ----- .../impl/TestReportManageServiceImpl.java | 58 ------------------- .../mappers/basis/TestReportManageMapper.xml | 50 ---------------- .../resources/static/js/samples/samplesMge.js | 2 +- src/main/resources/static/js/select.js | 2 +- 9 files changed, 4 insertions(+), 196 deletions(-) diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/SamplesManageController.java b/src/main/java/com/bonus/aqgqj/basis/controller/SamplesManageController.java index 3be0370..6f21245 100644 --- a/src/main/java/com/bonus/aqgqj/basis/controller/SamplesManageController.java +++ b/src/main/java/com/bonus/aqgqj/basis/controller/SamplesManageController.java @@ -73,7 +73,6 @@ public class SamplesManageController { @PostMapping(value = "all") @LogAnnotation(operModul = "收样管理", operation = "查询所有工器具", operDesc = "业务级事件",operType="查询") - @PreAuthorize("@pms.hasPermission('sys:samples:query')" ) public ServerResponse getAll() { try { List list = samplesManageService.listTools(); @@ -86,7 +85,6 @@ public class SamplesManageController { @PostMapping(value = "allCustomName") @LogAnnotation(operModul = "收样管理", operation = "查询所有单位", operDesc = "业务级事件",operType="查询") - @PreAuthorize("@pms.hasPermission('sys:samples:query')" ) public ServerResponse getAllCustomName() { try { List list = samplesManageService.getAllCustomName(); @@ -115,7 +113,6 @@ public class SamplesManageController { @PostMapping(value = "getTeamSelected") @LogAnnotation(operModul = "收样管理", operation = "查询所有班组", operDesc = "业务级事件",operType="查询") - @PreAuthorize("@pms.hasPermission('sys:samples:query')" ) public ServerResponse getToolsSelected() { try { List list = samplesManageService.getTeamSelected(); @@ -145,7 +142,6 @@ public class SamplesManageController { @PostMapping(value = "getDeptSelectedById") @DecryptAndVerify(decryptedClass = SamplesManageDto.class) @LogAnnotation(operModul = "收样管理", operation = "根据单位id获取部门", operDesc = "业务级事件",operType="查询") - @PreAuthorize("@pms.hasPermission('sys:tools:query')" ) public ServerResponse getDeptSelectedById(EncryptedReq data) { try { List list = samplesManageService.getDeptSelectedById(data.getData()); @@ -169,6 +165,4 @@ public class SamplesManageController { } return ServerResponse.createErroe("操作失败"); } - - } diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/TestReportManageController.java b/src/main/java/com/bonus/aqgqj/basis/controller/TestReportManageController.java index 2d39585..2e546c2 100644 --- a/src/main/java/com/bonus/aqgqj/basis/controller/TestReportManageController.java +++ b/src/main/java/com/bonus/aqgqj/basis/controller/TestReportManageController.java @@ -60,8 +60,8 @@ public class TestReportManageController { @PostMapping(value = "getDetailsList") @DecryptAndVerify(decryptedClass = TestReportManageDto.class) - @LogAnnotation(operModul = "检测报告管理-收样管理详情", operation = "查询用列表", operDesc = "业务级事件",operType="查询") - @PreAuthorize("@pms.hasPermission('sys:samples:query')" ) + @LogAnnotation(operModul = "检测报告管理-检测报告管理详情", operation = "查询用列表", operDesc = "业务级事件",operType="查询") + @PreAuthorize("@pms.hasPermission('sys:testReport:query')" ) public ServerResponse getDetailsList(EncryptedReq data) { PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); try { @@ -77,7 +77,6 @@ public class TestReportManageController { @PostMapping(value = "all") @LogAnnotation(operModul = "检测报告管理", operation = "查询所有工器具", operDesc = "业务级事件",operType="查询") - @PreAuthorize("@pms.hasPermission('sys:samples:query')" ) public ServerResponse getAll() { try { List list = testReportManageService.listTools(); @@ -90,7 +89,6 @@ public class TestReportManageController { @PostMapping(value = "allCustomName") @LogAnnotation(operModul = "检测报告管理", operation = "查询所有单位", operDesc = "业务级事件",operType="查询") - @PreAuthorize("@pms.hasPermission('sys:samples:query')" ) public ServerResponse getAllCustomName() { try { List list = testReportManageService.getAllCustomName(); @@ -101,25 +99,8 @@ public class TestReportManageController { return ServerResponse.createErroe("操作失败"); } - /** - * @description 新增收样数据 - */ - @PostMapping("addSamples") - @DecryptAndVerify(decryptedClass = TestReportManageDto.class) - @LogAnnotation(operModul = "检测报告管理", operation = "新增收样数据", operDesc = "业务级事件", operType = "新增") - @PreAuthorize("@pms.hasPermission('sys:samples:add')") - public ServerResponse addSamples(EncryptedReq vo) { - try { - return testReportManageService.addSamples(vo.getData()); - }catch (Exception e){ - log.error(e.toString(),e); - return ServerResponse.createErroe("操作失败"); - } - } - @PostMapping(value = "getTeamSelected") @LogAnnotation(operModul = "检测报告管理", operation = "查询所有班组", operDesc = "业务级事件",operType="查询") - @PreAuthorize("@pms.hasPermission('sys:samples:query')" ) public ServerResponse getToolsSelected() { try { List list = testReportManageService.getTeamSelected(); @@ -130,22 +111,6 @@ public class TestReportManageController { return ServerResponse.createErroe("操作失败"); } - /** - * @description 派工 - */ - @PostMapping("dispatchWork") - @DecryptAndVerify(decryptedClass = TestReportManageDto.class) - @LogAnnotation(operModul = "检测报告管理", operation = "派工", operDesc = "业务级事件", operType = "新增") - @PreAuthorize("@pms.hasPermission('sys:samples:dispatch')") - public ServerResponse dispatchWork(EncryptedReq vo) { - try { - return testReportManageService.dispatchWork(vo.getData()); - } catch (Exception e) { - log.error(e.toString(), e); - return ServerResponse.createErroe("操作失败"); - } - } - @PostMapping(value = "viewTestData") @DecryptAndVerify(decryptedClass = TestReportManageDto.class) @LogAnnotation(operModul = "检测报告管理", operation = "试验数据详情", operDesc = "业务级事件", operType = "查询") diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/ToolsManageController.java b/src/main/java/com/bonus/aqgqj/basis/controller/ToolsManageController.java index 5c1383e..6c64c0e 100644 --- a/src/main/java/com/bonus/aqgqj/basis/controller/ToolsManageController.java +++ b/src/main/java/com/bonus/aqgqj/basis/controller/ToolsManageController.java @@ -82,7 +82,6 @@ public class ToolsManageController { @PostMapping(value = "all") @LogAnnotation(operModul = "工器具管理", operation = "查询所有工器具", operDesc = "业务级事件",operType="查询") - @PreAuthorize("@pms.hasPermission('sys:tools:query')" ) public ServerResponse getAll() { try { List list = toolsManageService.listTools(); diff --git a/src/main/java/com/bonus/aqgqj/basis/dao/TestReportManageDao.java b/src/main/java/com/bonus/aqgqj/basis/dao/TestReportManageDao.java index f4cefb5..bb138cb 100644 --- a/src/main/java/com/bonus/aqgqj/basis/dao/TestReportManageDao.java +++ b/src/main/java/com/bonus/aqgqj/basis/dao/TestReportManageDao.java @@ -47,27 +47,6 @@ public interface TestReportManageDao { */ List getAllCustomName(); - /** - * 新增收样数据 tb_samples - * @param TestReportManageDto - * @return - */ - int addSamples(TestReportManageDto TestReportManageDto); - - /** - * 新增设备数据 tb_samples_device - * @param dto - * @return - */ - int addSamplesDevice(TestReportManageDto dto); - - /** - * 设备类型编码 - * @param sampleToolsId - * @return - */ - String getDevTypeCodeById(Integer sampleToolsId); - /** * 获取设备编码 * @param nowDate @@ -81,13 +60,6 @@ public interface TestReportManageDao { */ List getTeamSelected(); - /** - * 修改班组 - * @param dto - * @return - */ - int updateTeamId(TestReportManageDto dto); - /** * 获取当前年月 报告编号 * @param nowDate diff --git a/src/main/java/com/bonus/aqgqj/basis/service/TestReportManageService.java b/src/main/java/com/bonus/aqgqj/basis/service/TestReportManageService.java index bc169d6..0f5b6a7 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/TestReportManageService.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/TestReportManageService.java @@ -41,26 +41,12 @@ public interface TestReportManageService { */ List getAllCustomName(); - /** - * 新增 - * @param data - * @return - */ - ServerResponse addSamples(TestReportManageDto data); - /** * 获取所有班组数据 * @return */ List getTeamSelected(); - /** - * 派工 - * @param data - * @return - */ - ServerResponse dispatchWork(TestReportManageDto data); - /** * 试验数据详情 * @param data diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java index abd5723..da387a5 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java @@ -133,43 +133,6 @@ public class TestReportManageServiceImpl implements TestReportManageService { return testReportManageDao.getAllCustomName(); } - @Override - @Transactional(rollbackFor = Exception.class) - public ServerResponse addSamples(TestReportManageDto data) { - JSONArray jsonArray = JSONObject.parseArray(data.getParamsList()); - List TestReportManageDtos = jsonArray.toJavaList(TestReportManageDto.class); - if (TestReportManageDtos.size() > 0){ - //先增加基础数据表，并返回Id - Integer userId = Integer.parseInt(UserUtil.getLoginUser().getId().toString()); - TestReportManageDtos.get(0).setCreateBy(userId); - int re= testReportManageDao.addSamples(TestReportManageDtos.get(0)); - if (re>0){ - //添加详情数据 - for (TestReportManageDto dto : TestReportManageDtos){ - //查询设备类型编码 - if (dto.getSampleToolsId()!=null){ - String devTypeCode = testReportManageDao.getDevTypeCodeById(dto.getSampleToolsId()); - dto.setDevTypeCode(devTypeCode); - } - //生成设备编码 - String customerCode = customerCodeRule(); - dto.setCustomerCode(customerCode); - dto.setId(TestReportManageDtos.get(0).getId()); - dto.setCreateBy(userId); - int res= testReportManageDao.addSamplesDevice(dto); - if (res<=0){ - throw new RuntimeException("收样设备信息表添加失败"); - } - } - }else { - throw new RuntimeException("收样单位信息表添加失败"); - } - }else { - throw new RuntimeException("未获取到数据"); - } - return ServerResponse.createBySuccessMsg("上传成功"); - } - /** * 查询所有班组 * @return @@ -178,27 +141,6 @@ public class TestReportManageServiceImpl implements TestReportManageService { public List getTeamSelected() { return testReportManageDao.getTeamSelected(); } - - @Override - @Transactional(rollbackFor = Exception.class) - public ServerResponse dispatchWork(TestReportManageDto data) { - if (StringHelper.isNotEmpty(data.getIds())){ - //拆分用逗号分隔的数据 - String[] ids = data.getIds().split(","); - for (String id : ids){ - TestReportManageDto dto = new TestReportManageDto(); - dto.setId(Integer.parseInt(id)); - dto.setTeamId(data.getTeamId()); - //更新班组数据 - int res = testReportManageDao.updateTeamId(dto); - if (res<=0){ - throw new RuntimeException("派工失败"); - } - } - } - return ServerResponse.createBySuccessMsg("派工成功"); - } - @Override public ServerResponse viewTestData(TestReportManageDto dto) { TestReportManageDto testVo = new TestReportManageDto(); diff --git a/src/main/resources/mappers/basis/TestReportManageMapper.xml b/src/main/resources/mappers/basis/TestReportManageMapper.xml index 7cf6a62..248dbd3 100644 --- a/src/main/resources/mappers/basis/TestReportManageMapper.xml +++ b/src/main/resources/mappers/basis/TestReportManageMapper.xml @@ -1,49 +1,6 @@ - - INSERT INTO tb_sample(custom_id, - custom_name, - department, - sample_user, - sample_time, - create_time, - create_user, - sample_date) - VALUES (#{customId}, - #{customName}, - #{sampleDepartment}, - #{sampleUser}, - #{sampleTime}, - NOW(), - #{createBy}, - #{sampleTime}) - - - INSERT INTO tb_sample_device(sample_id, - dev_type_name, - dev_type_code, - dev_module, - dev_code, - customer_code, - sample_time, - create_time, - create_user) - VALUES (#{id}, - #{sampleTools}, - #{devTypeCode}, - #{devModule}, - #{devCode}, - #{customerCode}, - #{sampleTime}, - NOW(), - #{createBy}) - - - UPDATE tb_sample - SET team_id = #{teamId} - WHERE id = #{id} - INSERT INTO tb_certificate (`code`, `exper_id`, `dev_type`, `is_hg`, `department`, `create_time`) @@ -176,13 +133,6 @@ del_flag = 0 and custom_status=0 -