diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index fa37acb..ae0a5d3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -115,7 +115,6 @@ @PostMapping("/sign/listExport") @ResponseBody public void export(@RequestBody @Valid SignListRequest request) throws IOException { - List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -172,7 +171,6 @@ @PostMapping("/template/listPage") @ResponseBody public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { - Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -180,7 +178,7 @@ @ApiOperation("文件模板管理-文件管理模板详情") @PostMapping("/template/detail") @ResponseBody - public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -191,7 +189,6 @@ @PostMapping("/template/list") @ResponseBody public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { - return ReturnUtil.success(templateService.list(request)); } @@ -213,7 +210,6 @@ @PostMapping("/template/add") @ResponseBody public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { - return templateService.addTemplate(request); } @@ -287,11 +283,11 @@ @ApiOperation("获取业务编号前缀列表") @PostMapping("/prefixcode/list") @ResponseBody - public Object getPreFixCodeList() throws Exception{ + public Object getPreFixCodeList() throws Exception { Class fixCodeEnumClass = PrefixCodeEnum.class; Field[] fixCodeEnumFileds = fixCodeEnumClass.getDeclaredFields(); List fixCodeList = new ArrayList<>(); - for(Field field: fixCodeEnumFileds){ + for (Field field : fixCodeEnumFileds) { fixCodeList.add(field.get(PrefixCodeEnum.class).toString()); } return ReturnUtil.success(fixCodeList); @@ -359,7 +355,7 @@ Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); }); - User oldUser = (User)this.userService.getById(user.getId()); + User oldUser = (User) this.userService.getById(user.getId()); LogObjectHolder.me().set(oldUser); if (ShiroKit.hasRole("administrator")) { this.userService.updateById(UserFactory.editUser(user, oldUser)); @@ -376,7 +372,7 @@ private void assertAuth(Serializable userId) { if (!ShiroKit.isAdmin()) { List deptDataScope = this.authService.getLoginUserDataScope().getDeptIds(); - User user = (User)this.userService.getById(userId); + User user = (User) this.userService.getById(userId); Long deptid = user.getDeptId(); if (!deptDataScope.contains(deptid)) { throw new ServiceException(BizExceptionEnum.NO_PERMISSION); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index fa37acb..ae0a5d3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -115,7 +115,6 @@ @PostMapping("/sign/listExport") @ResponseBody public void export(@RequestBody @Valid SignListRequest request) throws IOException { - List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -172,7 +171,6 @@ @PostMapping("/template/listPage") @ResponseBody public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { - Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -180,7 +178,7 @@ @ApiOperation("文件模板管理-文件管理模板详情") @PostMapping("/template/detail") @ResponseBody - public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -191,7 +189,6 @@ @PostMapping("/template/list") @ResponseBody public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { - return ReturnUtil.success(templateService.list(request)); } @@ -213,7 +210,6 @@ @PostMapping("/template/add") @ResponseBody public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { - return templateService.addTemplate(request); } @@ -287,11 +283,11 @@ @ApiOperation("获取业务编号前缀列表") @PostMapping("/prefixcode/list") @ResponseBody - public Object getPreFixCodeList() throws Exception{ + public Object getPreFixCodeList() throws Exception { Class fixCodeEnumClass = PrefixCodeEnum.class; Field[] fixCodeEnumFileds = fixCodeEnumClass.getDeclaredFields(); List fixCodeList = new ArrayList<>(); - for(Field field: fixCodeEnumFileds){ + for (Field field : fixCodeEnumFileds) { fixCodeList.add(field.get(PrefixCodeEnum.class).toString()); } return ReturnUtil.success(fixCodeList); @@ -359,7 +355,7 @@ Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); }); - User oldUser = (User)this.userService.getById(user.getId()); + User oldUser = (User) this.userService.getById(user.getId()); LogObjectHolder.me().set(oldUser); if (ShiroKit.hasRole("administrator")) { this.userService.updateById(UserFactory.editUser(user, oldUser)); @@ -376,7 +372,7 @@ private void assertAuth(Serializable userId) { if (!ShiroKit.isAdmin()) { List deptDataScope = this.authService.getLoginUserDataScope().getDeptIds(); - User user = (User)this.userService.getById(userId); + User user = (User) this.userService.getById(userId); Long deptid = user.getDeptId(); if (!deptDataScope.contains(deptid)) { throw new ServiceException(BizExceptionEnum.NO_PERMISSION); diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index 9514ca0..0a02f75 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -31,6 +31,9 @@ + + + @@ -47,10 +50,12 @@ + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index fa37acb..ae0a5d3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -115,7 +115,6 @@ @PostMapping("/sign/listExport") @ResponseBody public void export(@RequestBody @Valid SignListRequest request) throws IOException { - List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -172,7 +171,6 @@ @PostMapping("/template/listPage") @ResponseBody public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { - Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -180,7 +178,7 @@ @ApiOperation("文件模板管理-文件管理模板详情") @PostMapping("/template/detail") @ResponseBody - public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -191,7 +189,6 @@ @PostMapping("/template/list") @ResponseBody public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { - return ReturnUtil.success(templateService.list(request)); } @@ -213,7 +210,6 @@ @PostMapping("/template/add") @ResponseBody public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { - return templateService.addTemplate(request); } @@ -287,11 +283,11 @@ @ApiOperation("获取业务编号前缀列表") @PostMapping("/prefixcode/list") @ResponseBody - public Object getPreFixCodeList() throws Exception{ + public Object getPreFixCodeList() throws Exception { Class fixCodeEnumClass = PrefixCodeEnum.class; Field[] fixCodeEnumFileds = fixCodeEnumClass.getDeclaredFields(); List fixCodeList = new ArrayList<>(); - for(Field field: fixCodeEnumFileds){ + for (Field field : fixCodeEnumFileds) { fixCodeList.add(field.get(PrefixCodeEnum.class).toString()); } return ReturnUtil.success(fixCodeList); @@ -359,7 +355,7 @@ Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); }); - User oldUser = (User)this.userService.getById(user.getId()); + User oldUser = (User) this.userService.getById(user.getId()); LogObjectHolder.me().set(oldUser); if (ShiroKit.hasRole("administrator")) { this.userService.updateById(UserFactory.editUser(user, oldUser)); @@ -376,7 +372,7 @@ private void assertAuth(Serializable userId) { if (!ShiroKit.isAdmin()) { List deptDataScope = this.authService.getLoginUserDataScope().getDeptIds(); - User user = (User)this.userService.getById(userId); + User user = (User) this.userService.getById(userId); Long deptid = user.getDeptId(); if (!deptDataScope.contains(deptid)) { throw new ServiceException(BizExceptionEnum.NO_PERMISSION); diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index 9514ca0..0a02f75 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -31,6 +31,9 @@ + + + @@ -47,10 +50,12 @@ + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java index 6316648..28b84d2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java @@ -1,5 +1,6 @@ package com.casic.missiles.dto.system; +import com.baomidou.mybatisplus.annotation.TableField; import com.casic.missiles.dto.BaseSystemRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,6 +42,11 @@ @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true) private String templateType; + + @ApiModelProperty(value = "检定项分类id", dataType = "Long") + @TableField("measure_item_id") + private String measureItemId; + /** * minio存储文件名 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index fa37acb..ae0a5d3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -115,7 +115,6 @@ @PostMapping("/sign/listExport") @ResponseBody public void export(@RequestBody @Valid SignListRequest request) throws IOException { - List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -172,7 +171,6 @@ @PostMapping("/template/listPage") @ResponseBody public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { - Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -180,7 +178,7 @@ @ApiOperation("文件模板管理-文件管理模板详情") @PostMapping("/template/detail") @ResponseBody - public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -191,7 +189,6 @@ @PostMapping("/template/list") @ResponseBody public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { - return ReturnUtil.success(templateService.list(request)); } @@ -213,7 +210,6 @@ @PostMapping("/template/add") @ResponseBody public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { - return templateService.addTemplate(request); } @@ -287,11 +283,11 @@ @ApiOperation("获取业务编号前缀列表") @PostMapping("/prefixcode/list") @ResponseBody - public Object getPreFixCodeList() throws Exception{ + public Object getPreFixCodeList() throws Exception { Class fixCodeEnumClass = PrefixCodeEnum.class; Field[] fixCodeEnumFileds = fixCodeEnumClass.getDeclaredFields(); List fixCodeList = new ArrayList<>(); - for(Field field: fixCodeEnumFileds){ + for (Field field : fixCodeEnumFileds) { fixCodeList.add(field.get(PrefixCodeEnum.class).toString()); } return ReturnUtil.success(fixCodeList); @@ -359,7 +355,7 @@ Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); }); - User oldUser = (User)this.userService.getById(user.getId()); + User oldUser = (User) this.userService.getById(user.getId()); LogObjectHolder.me().set(oldUser); if (ShiroKit.hasRole("administrator")) { this.userService.updateById(UserFactory.editUser(user, oldUser)); @@ -376,7 +372,7 @@ private void assertAuth(Serializable userId) { if (!ShiroKit.isAdmin()) { List deptDataScope = this.authService.getLoginUserDataScope().getDeptIds(); - User user = (User)this.userService.getById(userId); + User user = (User) this.userService.getById(userId); Long deptid = user.getDeptId(); if (!deptDataScope.contains(deptid)) { throw new ServiceException(BizExceptionEnum.NO_PERMISSION); diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index 9514ca0..0a02f75 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -31,6 +31,9 @@ + + + @@ -47,10 +50,12 @@ + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java index 6316648..28b84d2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java @@ -1,5 +1,6 @@ package com.casic.missiles.dto.system; +import com.baomidou.mybatisplus.annotation.TableField; import com.casic.missiles.dto.BaseSystemRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,6 +42,11 @@ @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true) private String templateType; + + @ApiModelProperty(value = "检定项分类id", dataType = "Long") + @TableField("measure_item_id") + private String measureItemId; + /** * minio存储文件名 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java index 769f242..884f11f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java @@ -1,5 +1,8 @@ package com.casic.missiles.dto.system; +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -66,6 +69,25 @@ @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; + + @ApiModelProperty(value = "检定项id", dataType = "Long") + @TableField("measure_item_id") + private String measureItemId; + + @ApiModelProperty(value = "检定项名称", dataType = "String") + @TableField(exist = false) + private String measureItemName; + + @ApiModelProperty(value = "标准装置id(字典值)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + + @ApiModelProperty(value = "标准装置名称", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + /** * 更新时间 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index fa37acb..ae0a5d3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -115,7 +115,6 @@ @PostMapping("/sign/listExport") @ResponseBody public void export(@RequestBody @Valid SignListRequest request) throws IOException { - List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -172,7 +171,6 @@ @PostMapping("/template/listPage") @ResponseBody public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { - Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -180,7 +178,7 @@ @ApiOperation("文件模板管理-文件管理模板详情") @PostMapping("/template/detail") @ResponseBody - public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -191,7 +189,6 @@ @PostMapping("/template/list") @ResponseBody public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { - return ReturnUtil.success(templateService.list(request)); } @@ -213,7 +210,6 @@ @PostMapping("/template/add") @ResponseBody public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { - return templateService.addTemplate(request); } @@ -287,11 +283,11 @@ @ApiOperation("获取业务编号前缀列表") @PostMapping("/prefixcode/list") @ResponseBody - public Object getPreFixCodeList() throws Exception{ + public Object getPreFixCodeList() throws Exception { Class fixCodeEnumClass = PrefixCodeEnum.class; Field[] fixCodeEnumFileds = fixCodeEnumClass.getDeclaredFields(); List fixCodeList = new ArrayList<>(); - for(Field field: fixCodeEnumFileds){ + for (Field field : fixCodeEnumFileds) { fixCodeList.add(field.get(PrefixCodeEnum.class).toString()); } return ReturnUtil.success(fixCodeList); @@ -359,7 +355,7 @@ Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); }); - User oldUser = (User)this.userService.getById(user.getId()); + User oldUser = (User) this.userService.getById(user.getId()); LogObjectHolder.me().set(oldUser); if (ShiroKit.hasRole("administrator")) { this.userService.updateById(UserFactory.editUser(user, oldUser)); @@ -376,7 +372,7 @@ private void assertAuth(Serializable userId) { if (!ShiroKit.isAdmin()) { List deptDataScope = this.authService.getLoginUserDataScope().getDeptIds(); - User user = (User)this.userService.getById(userId); + User user = (User) this.userService.getById(userId); Long deptid = user.getDeptId(); if (!deptDataScope.contains(deptid)) { throw new ServiceException(BizExceptionEnum.NO_PERMISSION); diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index 9514ca0..0a02f75 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -31,6 +31,9 @@ + + + @@ -47,10 +50,12 @@ + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java index 6316648..28b84d2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java @@ -1,5 +1,6 @@ package com.casic.missiles.dto.system; +import com.baomidou.mybatisplus.annotation.TableField; import com.casic.missiles.dto.BaseSystemRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,6 +42,11 @@ @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true) private String templateType; + + @ApiModelProperty(value = "检定项分类id", dataType = "Long") + @TableField("measure_item_id") + private String measureItemId; + /** * minio存储文件名 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java index 769f242..884f11f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java @@ -1,5 +1,8 @@ package com.casic.missiles.dto.system; +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -66,6 +69,25 @@ @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; + + @ApiModelProperty(value = "检定项id", dataType = "Long") + @TableField("measure_item_id") + private String measureItemId; + + @ApiModelProperty(value = "检定项名称", dataType = "String") + @TableField(exist = false) + private String measureItemName; + + @ApiModelProperty(value = "标准装置id(字典值)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + + @ApiModelProperty(value = "标准装置名称", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + /** * 更新时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java index 6d17bbe..6fb63f9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java @@ -47,6 +47,7 @@ */ @ApiModelProperty(value = "创建时间(开始)", dataType = "String") private String createStartTime; + @ApiModelProperty(value = "创建时间(结束)", dataType = "String") private String createEndTime; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index fa37acb..ae0a5d3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -115,7 +115,6 @@ @PostMapping("/sign/listExport") @ResponseBody public void export(@RequestBody @Valid SignListRequest request) throws IOException { - List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -172,7 +171,6 @@ @PostMapping("/template/listPage") @ResponseBody public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { - Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -180,7 +178,7 @@ @ApiOperation("文件模板管理-文件管理模板详情") @PostMapping("/template/detail") @ResponseBody - public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -191,7 +189,6 @@ @PostMapping("/template/list") @ResponseBody public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { - return ReturnUtil.success(templateService.list(request)); } @@ -213,7 +210,6 @@ @PostMapping("/template/add") @ResponseBody public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { - return templateService.addTemplate(request); } @@ -287,11 +283,11 @@ @ApiOperation("获取业务编号前缀列表") @PostMapping("/prefixcode/list") @ResponseBody - public Object getPreFixCodeList() throws Exception{ + public Object getPreFixCodeList() throws Exception { Class fixCodeEnumClass = PrefixCodeEnum.class; Field[] fixCodeEnumFileds = fixCodeEnumClass.getDeclaredFields(); List fixCodeList = new ArrayList<>(); - for(Field field: fixCodeEnumFileds){ + for (Field field : fixCodeEnumFileds) { fixCodeList.add(field.get(PrefixCodeEnum.class).toString()); } return ReturnUtil.success(fixCodeList); @@ -359,7 +355,7 @@ Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); }); - User oldUser = (User)this.userService.getById(user.getId()); + User oldUser = (User) this.userService.getById(user.getId()); LogObjectHolder.me().set(oldUser); if (ShiroKit.hasRole("administrator")) { this.userService.updateById(UserFactory.editUser(user, oldUser)); @@ -376,7 +372,7 @@ private void assertAuth(Serializable userId) { if (!ShiroKit.isAdmin()) { List deptDataScope = this.authService.getLoginUserDataScope().getDeptIds(); - User user = (User)this.userService.getById(userId); + User user = (User) this.userService.getById(userId); Long deptid = user.getDeptId(); if (!deptDataScope.contains(deptid)) { throw new ServiceException(BizExceptionEnum.NO_PERMISSION); diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index 9514ca0..0a02f75 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -31,6 +31,9 @@ + + + @@ -47,10 +50,12 @@ + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java index 6316648..28b84d2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java @@ -1,5 +1,6 @@ package com.casic.missiles.dto.system; +import com.baomidou.mybatisplus.annotation.TableField; import com.casic.missiles.dto.BaseSystemRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,6 +42,11 @@ @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true) private String templateType; + + @ApiModelProperty(value = "检定项分类id", dataType = "Long") + @TableField("measure_item_id") + private String measureItemId; + /** * minio存储文件名 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java index 769f242..884f11f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java @@ -1,5 +1,8 @@ package com.casic.missiles.dto.system; +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -66,6 +69,25 @@ @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; + + @ApiModelProperty(value = "检定项id", dataType = "Long") + @TableField("measure_item_id") + private String measureItemId; + + @ApiModelProperty(value = "检定项名称", dataType = "String") + @TableField(exist = false) + private String measureItemName; + + @ApiModelProperty(value = "标准装置id(字典值)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + + @ApiModelProperty(value = "标准装置名称", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + /** * 更新时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java index 6d17bbe..6fb63f9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java @@ -47,6 +47,7 @@ */ @ApiModelProperty(value = "创建时间(开始)", dataType = "String") private String createStartTime; + @ApiModelProperty(value = "创建时间(结束)", dataType = "String") private String createEndTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java index 1d27ebe..4a4ae24 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -115,6 +115,14 @@ @TableField("update_time") private String updateTime; + /** + * 检定项id + */ + @ApiModelProperty(hidden = true) + @TableField("measure_item_id") + private String measureItemId; + + @ApiModelProperty(hidden = true) // @NotEmpty(message = "可使用人不能为空") @TableField(exist = false) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index fa37acb..ae0a5d3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -115,7 +115,6 @@ @PostMapping("/sign/listExport") @ResponseBody public void export(@RequestBody @Valid SignListRequest request) throws IOException { - List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -172,7 +171,6 @@ @PostMapping("/template/listPage") @ResponseBody public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { - Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -180,7 +178,7 @@ @ApiOperation("文件模板管理-文件管理模板详情") @PostMapping("/template/detail") @ResponseBody - public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -191,7 +189,6 @@ @PostMapping("/template/list") @ResponseBody public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { - return ReturnUtil.success(templateService.list(request)); } @@ -213,7 +210,6 @@ @PostMapping("/template/add") @ResponseBody public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { - return templateService.addTemplate(request); } @@ -287,11 +283,11 @@ @ApiOperation("获取业务编号前缀列表") @PostMapping("/prefixcode/list") @ResponseBody - public Object getPreFixCodeList() throws Exception{ + public Object getPreFixCodeList() throws Exception { Class fixCodeEnumClass = PrefixCodeEnum.class; Field[] fixCodeEnumFileds = fixCodeEnumClass.getDeclaredFields(); List fixCodeList = new ArrayList<>(); - for(Field field: fixCodeEnumFileds){ + for (Field field : fixCodeEnumFileds) { fixCodeList.add(field.get(PrefixCodeEnum.class).toString()); } return ReturnUtil.success(fixCodeList); @@ -359,7 +355,7 @@ Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); }); - User oldUser = (User)this.userService.getById(user.getId()); + User oldUser = (User) this.userService.getById(user.getId()); LogObjectHolder.me().set(oldUser); if (ShiroKit.hasRole("administrator")) { this.userService.updateById(UserFactory.editUser(user, oldUser)); @@ -376,7 +372,7 @@ private void assertAuth(Serializable userId) { if (!ShiroKit.isAdmin()) { List deptDataScope = this.authService.getLoginUserDataScope().getDeptIds(); - User user = (User)this.userService.getById(userId); + User user = (User) this.userService.getById(userId); Long deptid = user.getDeptId(); if (!deptDataScope.contains(deptid)) { throw new ServiceException(BizExceptionEnum.NO_PERMISSION); diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index 9514ca0..0a02f75 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -31,6 +31,9 @@ + + + @@ -47,10 +50,12 @@ + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java index 6316648..28b84d2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java @@ -1,5 +1,6 @@ package com.casic.missiles.dto.system; +import com.baomidou.mybatisplus.annotation.TableField; import com.casic.missiles.dto.BaseSystemRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,6 +42,11 @@ @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true) private String templateType; + + @ApiModelProperty(value = "检定项分类id", dataType = "Long") + @TableField("measure_item_id") + private String measureItemId; + /** * minio存储文件名 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java index 769f242..884f11f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java @@ -1,5 +1,8 @@ package com.casic.missiles.dto.system; +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -66,6 +69,25 @@ @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; + + @ApiModelProperty(value = "检定项id", dataType = "Long") + @TableField("measure_item_id") + private String measureItemId; + + @ApiModelProperty(value = "检定项名称", dataType = "String") + @TableField(exist = false) + private String measureItemName; + + @ApiModelProperty(value = "标准装置id(字典值)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + + @ApiModelProperty(value = "标准装置名称", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + /** * 更新时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java index 6d17bbe..6fb63f9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java @@ -47,6 +47,7 @@ */ @ApiModelProperty(value = "创建时间(开始)", dataType = "String") private String createStartTime; + @ApiModelProperty(value = "创建时间(结束)", dataType = "String") private String createEndTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java index 1d27ebe..4a4ae24 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -115,6 +115,14 @@ @TableField("update_time") private String updateTime; + /** + * 检定项id + */ + @ApiModelProperty(hidden = true) + @TableField("measure_item_id") + private String measureItemId; + + @ApiModelProperty(hidden = true) // @NotEmpty(message = "可使用人不能为空") @TableField(exist = false) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 40b454c..c06ef9b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -18,8 +18,10 @@ import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.record.Record; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -60,8 +62,9 @@ } @Override - public ReturnDTO templateDetail(Long id) { + public ReturnDTO templateDetail(Long id) throws Exception { TemplateDetailResponse templateDetailResponse = templateMapper.selectTemplateDetailById(id); + DictCodeUtils.convertDictCodeToName(templateDetailResponse); return ReturnUtil.success(templateDetailResponse); } @@ -76,11 +79,11 @@ //关联表 //0208原始记录模板和证书报告模板需求更新为都不需要可使用人 boolean saveBatch = true; - if(!CollectionUtils.isEmpty(request.getUserIdList())){ + if (!CollectionUtils.isEmpty(request.getUserIdList())) { List userRelationList = getUserRelations(request.getUserIdList(), systemTemplate.getId()); saveBatch = userRelationService.saveBatch(userRelationList); } - if(insertFlag > 0 && saveBatch){ + if (insertFlag > 0 && saveBatch) { return ReturnUtil.success(); } return ReturnUtil.failed("新建失败"); @@ -93,14 +96,14 @@ //关联表 int deleteFlag = 1; boolean saveBatch = true; - if(!CollectionUtils.isEmpty(systemTemplate.getUserIdList())){ + if (!CollectionUtils.isEmpty(systemTemplate.getUserIdList())) { Map columnMap = new HashMap<>(); columnMap.put("template_id", systemTemplate.getId()); deleteFlag = userRelationMapper.deleteByMap(columnMap); List userRelationList = getUserRelations(systemTemplate.getUserIdList(), systemTemplate.getId()); saveBatch = userRelationService.saveBatch(userRelationList); } - if(updateFlag > 0 && deleteFlag > 0 && saveBatch){ + if (updateFlag > 0 && deleteFlag > 0 && saveBatch) { return ReturnUtil.success(); } return ReturnUtil.failed("更新失败"); @@ -108,7 +111,7 @@ @Override public ReturnDTO deleteTemplate(Long id) { - if(templateMapper.deleteById(id) > 0){ + if (templateMapper.deleteById(id) > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -116,7 +119,7 @@ @Override public ReturnDTO deleteBatchTemplate(List ids) { - if(templateMapper.deleteBatchIds(ids) > 0){ + if (templateMapper.deleteBatchIds(ids) > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -136,14 +139,16 @@ private QueryWrapper getWrapper(TemplateListRequest request) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("system_type", request.getSystemType()); - wrapper.eq(StringUtils.isNotBlank(request.getTemplateType()),"template_type", request.getTemplateType()); + wrapper.eq(StringUtils.isNotBlank(request.getTemplateType()), "template_type", request.getTemplateType()); wrapper.like(StringUtils.isNotBlank(request.getTemplateNo()), "template_no", request.getTemplateNo()); wrapper.like(StringUtils.isNotBlank(request.getTemplateName()), "template_name", request.getTemplateName()); wrapper.like(StringUtils.isNotBlank(request.getTemplateCreator()), "template_creator", request.getTemplateCreator()); - wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); - wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + if (StringUtils.isNotBlank(request.getCreateStartTime())) { + wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); + } + if (StringUtils.isNotBlank(request.getCreateEndTime())) { + wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + } wrapper.orderByDesc("create_time"); return wrapper; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index fa37acb..ae0a5d3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -115,7 +115,6 @@ @PostMapping("/sign/listExport") @ResponseBody public void export(@RequestBody @Valid SignListRequest request) throws IOException { - List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -172,7 +171,6 @@ @PostMapping("/template/listPage") @ResponseBody public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { - Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -180,7 +178,7 @@ @ApiOperation("文件模板管理-文件管理模板详情") @PostMapping("/template/detail") @ResponseBody - public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO templateDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -191,7 +189,6 @@ @PostMapping("/template/list") @ResponseBody public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { - return ReturnUtil.success(templateService.list(request)); } @@ -213,7 +210,6 @@ @PostMapping("/template/add") @ResponseBody public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { - return templateService.addTemplate(request); } @@ -287,11 +283,11 @@ @ApiOperation("获取业务编号前缀列表") @PostMapping("/prefixcode/list") @ResponseBody - public Object getPreFixCodeList() throws Exception{ + public Object getPreFixCodeList() throws Exception { Class fixCodeEnumClass = PrefixCodeEnum.class; Field[] fixCodeEnumFileds = fixCodeEnumClass.getDeclaredFields(); List fixCodeList = new ArrayList<>(); - for(Field field: fixCodeEnumFileds){ + for (Field field : fixCodeEnumFileds) { fixCodeList.add(field.get(PrefixCodeEnum.class).toString()); } return ReturnUtil.success(fixCodeList); @@ -359,7 +355,7 @@ Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); }); - User oldUser = (User)this.userService.getById(user.getId()); + User oldUser = (User) this.userService.getById(user.getId()); LogObjectHolder.me().set(oldUser); if (ShiroKit.hasRole("administrator")) { this.userService.updateById(UserFactory.editUser(user, oldUser)); @@ -376,7 +372,7 @@ private void assertAuth(Serializable userId) { if (!ShiroKit.isAdmin()) { List deptDataScope = this.authService.getLoginUserDataScope().getDeptIds(); - User user = (User)this.userService.getById(userId); + User user = (User) this.userService.getById(userId); Long deptid = user.getDeptId(); if (!deptDataScope.contains(deptid)) { throw new ServiceException(BizExceptionEnum.NO_PERMISSION); diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index 9514ca0..0a02f75 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -31,6 +31,9 @@ + + + @@ -47,10 +50,12 @@ + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java index 6316648..28b84d2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java @@ -1,5 +1,6 @@ package com.casic.missiles.dto.system; +import com.baomidou.mybatisplus.annotation.TableField; import com.casic.missiles.dto.BaseSystemRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,6 +42,11 @@ @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true) private String templateType; + + @ApiModelProperty(value = "检定项分类id", dataType = "Long") + @TableField("measure_item_id") + private String measureItemId; + /** * minio存储文件名 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java index 769f242..884f11f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateDetailResponse.java @@ -1,5 +1,8 @@ package com.casic.missiles.dto.system; +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -66,6 +69,25 @@ @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; + + @ApiModelProperty(value = "检定项id", dataType = "Long") + @TableField("measure_item_id") + private String measureItemId; + + @ApiModelProperty(value = "检定项名称", dataType = "String") + @TableField(exist = false) + private String measureItemName; + + @ApiModelProperty(value = "标准装置id(字典值)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + + @ApiModelProperty(value = "标准装置名称", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + /** * 更新时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java index 6d17bbe..6fb63f9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java @@ -47,6 +47,7 @@ */ @ApiModelProperty(value = "创建时间(开始)", dataType = "String") private String createStartTime; + @ApiModelProperty(value = "创建时间(结束)", dataType = "String") private String createEndTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java index 1d27ebe..4a4ae24 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -115,6 +115,14 @@ @TableField("update_time") private String updateTime; + /** + * 检定项id + */ + @ApiModelProperty(hidden = true) + @TableField("measure_item_id") + private String measureItemId; + + @ApiModelProperty(hidden = true) // @NotEmpty(message = "可使用人不能为空") @TableField(exist = false) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 40b454c..c06ef9b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -18,8 +18,10 @@ import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.record.Record; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -60,8 +62,9 @@ } @Override - public ReturnDTO templateDetail(Long id) { + public ReturnDTO templateDetail(Long id) throws Exception { TemplateDetailResponse templateDetailResponse = templateMapper.selectTemplateDetailById(id); + DictCodeUtils.convertDictCodeToName(templateDetailResponse); return ReturnUtil.success(templateDetailResponse); } @@ -76,11 +79,11 @@ //关联表 //0208原始记录模板和证书报告模板需求更新为都不需要可使用人 boolean saveBatch = true; - if(!CollectionUtils.isEmpty(request.getUserIdList())){ + if (!CollectionUtils.isEmpty(request.getUserIdList())) { List userRelationList = getUserRelations(request.getUserIdList(), systemTemplate.getId()); saveBatch = userRelationService.saveBatch(userRelationList); } - if(insertFlag > 0 && saveBatch){ + if (insertFlag > 0 && saveBatch) { return ReturnUtil.success(); } return ReturnUtil.failed("新建失败"); @@ -93,14 +96,14 @@ //关联表 int deleteFlag = 1; boolean saveBatch = true; - if(!CollectionUtils.isEmpty(systemTemplate.getUserIdList())){ + if (!CollectionUtils.isEmpty(systemTemplate.getUserIdList())) { Map columnMap = new HashMap<>(); columnMap.put("template_id", systemTemplate.getId()); deleteFlag = userRelationMapper.deleteByMap(columnMap); List userRelationList = getUserRelations(systemTemplate.getUserIdList(), systemTemplate.getId()); saveBatch = userRelationService.saveBatch(userRelationList); } - if(updateFlag > 0 && deleteFlag > 0 && saveBatch){ + if (updateFlag > 0 && deleteFlag > 0 && saveBatch) { return ReturnUtil.success(); } return ReturnUtil.failed("更新失败"); @@ -108,7 +111,7 @@ @Override public ReturnDTO deleteTemplate(Long id) { - if(templateMapper.deleteById(id) > 0){ + if (templateMapper.deleteById(id) > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -116,7 +119,7 @@ @Override public ReturnDTO deleteBatchTemplate(List ids) { - if(templateMapper.deleteBatchIds(ids) > 0){ + if (templateMapper.deleteBatchIds(ids) > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -136,14 +139,16 @@ private QueryWrapper getWrapper(TemplateListRequest request) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("system_type", request.getSystemType()); - wrapper.eq(StringUtils.isNotBlank(request.getTemplateType()),"template_type", request.getTemplateType()); + wrapper.eq(StringUtils.isNotBlank(request.getTemplateType()), "template_type", request.getTemplateType()); wrapper.like(StringUtils.isNotBlank(request.getTemplateNo()), "template_no", request.getTemplateNo()); wrapper.like(StringUtils.isNotBlank(request.getTemplateName()), "template_name", request.getTemplateName()); wrapper.like(StringUtils.isNotBlank(request.getTemplateCreator()), "template_creator", request.getTemplateCreator()); - wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); - wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + if (StringUtils.isNotBlank(request.getCreateStartTime())) { + wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); + } + if (StringUtils.isNotBlank(request.getCreateEndTime())) { + wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + } wrapper.orderByDesc("create_time"); return wrapper; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateService.java index 01d93bf..b7500c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateService.java @@ -32,5 +32,5 @@ List list(TemplateListRequest request); - ReturnDTO templateDetail(Long id); + ReturnDTO templateDetail(Long id) throws Exception; }