diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java index f5cc657..de9f78f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java @@ -1,7 +1,19 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.MeterStandardVerifyRegulation; +import com.casic.missiles.service.meter.IMeterStandardVerifyRegulationService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; /** *

@@ -12,7 +24,40 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-verify-regulation") -public class MeterStandardVerifyRegulationController { +@RequestMapping("/meter/standard/regulation") +public class MeterStandardVerifyRegulationController extends ExportController { + @Autowired + private IMeterStandardVerifyRegulationService meterStandardVerifyRegulationService; + /** + * 标准装置-检定规程列表 + */ + @ApiOperation("标准装置-检定规程列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardVerifyRegulationService.listPage(page, request))); + } + + /** + * 添加检定规程 + */ + @ApiOperation("添加检定规程") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardVerifyRegulation meterStandardVerifyRegulation) throws Exception { + return meterStandardVerifyRegulationService.add(meterStandardVerifyRegulation); + } + + + /** + * 删除检定规程 + */ + @ApiOperation("删除检定规程") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardVerifyRegulationService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java index f5cc657..de9f78f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java @@ -1,7 +1,19 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.MeterStandardVerifyRegulation; +import com.casic.missiles.service.meter.IMeterStandardVerifyRegulationService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; /** *

@@ -12,7 +24,40 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-verify-regulation") -public class MeterStandardVerifyRegulationController { +@RequestMapping("/meter/standard/regulation") +public class MeterStandardVerifyRegulationController extends ExportController { + @Autowired + private IMeterStandardVerifyRegulationService meterStandardVerifyRegulationService; + /** + * 标准装置-检定规程列表 + */ + @ApiOperation("标准装置-检定规程列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardVerifyRegulationService.listPage(page, request))); + } + + /** + * 添加检定规程 + */ + @ApiOperation("添加检定规程") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardVerifyRegulation meterStandardVerifyRegulation) throws Exception { + return meterStandardVerifyRegulationService.add(meterStandardVerifyRegulation); + } + + + /** + * 删除检定规程 + */ + @ApiOperation("删除检定规程") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardVerifyRegulationService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 894fd10..d963877 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5910 + port: 5909 ################### spring配置 ################### spring: datasource: diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java index f5cc657..de9f78f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java @@ -1,7 +1,19 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.MeterStandardVerifyRegulation; +import com.casic.missiles.service.meter.IMeterStandardVerifyRegulationService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; /** *

@@ -12,7 +24,40 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-verify-regulation") -public class MeterStandardVerifyRegulationController { +@RequestMapping("/meter/standard/regulation") +public class MeterStandardVerifyRegulationController extends ExportController { + @Autowired + private IMeterStandardVerifyRegulationService meterStandardVerifyRegulationService; + /** + * 标准装置-检定规程列表 + */ + @ApiOperation("标准装置-检定规程列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardVerifyRegulationService.listPage(page, request))); + } + + /** + * 添加检定规程 + */ + @ApiOperation("添加检定规程") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardVerifyRegulation meterStandardVerifyRegulation) throws Exception { + return meterStandardVerifyRegulationService.add(meterStandardVerifyRegulation); + } + + + /** + * 删除检定规程 + */ + @ApiOperation("删除检定规程") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardVerifyRegulationService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 894fd10..d963877 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5910 + port: 5909 ################### spring配置 ################### spring: datasource: 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 855c959..9b78048 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 @@ -39,6 +39,7 @@ LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"), STANDARD_EQUIPMENT_ID_EXIST(2402, "标准装置不存在"), STANDARD_EQUIPMENT_USER_ID_EXIST(2402, "标准装置-计量人员不存在"), + STANDARD_VERIFY_REGULATION_ID_EXIST(2402, "标准装置-检定规程不存在"), STANDARD_SUPPORT_EQUIPMENT_ID_EXIST(2402, "标准装置-标准配套装置不存在"); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java index f5cc657..de9f78f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java @@ -1,7 +1,19 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.MeterStandardVerifyRegulation; +import com.casic.missiles.service.meter.IMeterStandardVerifyRegulationService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; /** *

@@ -12,7 +24,40 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-verify-regulation") -public class MeterStandardVerifyRegulationController { +@RequestMapping("/meter/standard/regulation") +public class MeterStandardVerifyRegulationController extends ExportController { + @Autowired + private IMeterStandardVerifyRegulationService meterStandardVerifyRegulationService; + /** + * 标准装置-检定规程列表 + */ + @ApiOperation("标准装置-检定规程列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardVerifyRegulationService.listPage(page, request))); + } + + /** + * 添加检定规程 + */ + @ApiOperation("添加检定规程") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardVerifyRegulation meterStandardVerifyRegulation) throws Exception { + return meterStandardVerifyRegulationService.add(meterStandardVerifyRegulation); + } + + + /** + * 删除检定规程 + */ + @ApiOperation("删除检定规程") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardVerifyRegulationService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 894fd10..d963877 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5910 + port: 5909 ################### spring配置 ################### spring: datasource: 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 855c959..9b78048 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 @@ -39,6 +39,7 @@ LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"), STANDARD_EQUIPMENT_ID_EXIST(2402, "标准装置不存在"), STANDARD_EQUIPMENT_USER_ID_EXIST(2402, "标准装置-计量人员不存在"), + STANDARD_VERIFY_REGULATION_ID_EXIST(2402, "标准装置-检定规程不存在"), STANDARD_SUPPORT_EQUIPMENT_ID_EXIST(2402, "标准装置-标准配套装置不存在"); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardVerifyRegulation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardVerifyRegulation.java index be25293..50275c0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardVerifyRegulation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardVerifyRegulation.java @@ -3,10 +3,14 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import java.io.Serializable; + /** *

* 标准装置-检定规程表 @@ -25,22 +29,65 @@ /** * 主键 */ - @TableId("id") + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") private Long id; /** * 标准装置ID */ @TableField("standard_equipment_id") + @ApiModelProperty(value = "标准装置ID", dataType = "Long") private Long standardEquipmentId; /** * 检定规程ID */ @TableField("verify_regulation_id") + @ApiModelProperty(value = "检定规程ID", dataType = "Long") private Long verifyRegulationId; /** + * 文件编号-系统生成 + */ + @TableField(exist = false) + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField(exist = false) + private String fileName; + + /** + * 文件号 + */ + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @TableField(exist = false) + private String fileCode; + + /** + * 实施时间 + */ + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField(exist = false) + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField(exist = false) + @DictCodeField(message = "实施状态不合法", cacheName = MeterDictCode.EFFECTIVE_STATUS) + private String effectiveStatus; + + @ApiModelProperty(value = "实施状态字典value(列表接口返回参数)", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** * 备注 */ @TableField("remark") @@ -50,7 +97,7 @@ * 删除标记 */ @TableField("is_del") - private Boolean isDel; + private Integer isDel; /** * 创建人 @@ -62,13 +109,13 @@ * 创建时间 */ @TableField("create_time") - private Long createTime; + private String createTime; /** * 更新时间 */ @TableField("update_time") - private Long updateTime; + private String updateTime; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java index f5cc657..de9f78f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java @@ -1,7 +1,19 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.MeterStandardVerifyRegulation; +import com.casic.missiles.service.meter.IMeterStandardVerifyRegulationService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; /** *

@@ -12,7 +24,40 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-verify-regulation") -public class MeterStandardVerifyRegulationController { +@RequestMapping("/meter/standard/regulation") +public class MeterStandardVerifyRegulationController extends ExportController { + @Autowired + private IMeterStandardVerifyRegulationService meterStandardVerifyRegulationService; + /** + * 标准装置-检定规程列表 + */ + @ApiOperation("标准装置-检定规程列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardVerifyRegulationService.listPage(page, request))); + } + + /** + * 添加检定规程 + */ + @ApiOperation("添加检定规程") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardVerifyRegulation meterStandardVerifyRegulation) throws Exception { + return meterStandardVerifyRegulationService.add(meterStandardVerifyRegulation); + } + + + /** + * 删除检定规程 + */ + @ApiOperation("删除检定规程") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardVerifyRegulationService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 894fd10..d963877 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5910 + port: 5909 ################### spring配置 ################### spring: datasource: 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 855c959..9b78048 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 @@ -39,6 +39,7 @@ LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"), STANDARD_EQUIPMENT_ID_EXIST(2402, "标准装置不存在"), STANDARD_EQUIPMENT_USER_ID_EXIST(2402, "标准装置-计量人员不存在"), + STANDARD_VERIFY_REGULATION_ID_EXIST(2402, "标准装置-检定规程不存在"), STANDARD_SUPPORT_EQUIPMENT_ID_EXIST(2402, "标准装置-标准配套装置不存在"); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardVerifyRegulation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardVerifyRegulation.java index be25293..50275c0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardVerifyRegulation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardVerifyRegulation.java @@ -3,10 +3,14 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import java.io.Serializable; + /** *

* 标准装置-检定规程表 @@ -25,22 +29,65 @@ /** * 主键 */ - @TableId("id") + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") private Long id; /** * 标准装置ID */ @TableField("standard_equipment_id") + @ApiModelProperty(value = "标准装置ID", dataType = "Long") private Long standardEquipmentId; /** * 检定规程ID */ @TableField("verify_regulation_id") + @ApiModelProperty(value = "检定规程ID", dataType = "Long") private Long verifyRegulationId; /** + * 文件编号-系统生成 + */ + @TableField(exist = false) + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField(exist = false) + private String fileName; + + /** + * 文件号 + */ + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @TableField(exist = false) + private String fileCode; + + /** + * 实施时间 + */ + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField(exist = false) + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField(exist = false) + @DictCodeField(message = "实施状态不合法", cacheName = MeterDictCode.EFFECTIVE_STATUS) + private String effectiveStatus; + + @ApiModelProperty(value = "实施状态字典value(列表接口返回参数)", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** * 备注 */ @TableField("remark") @@ -50,7 +97,7 @@ * 删除标记 */ @TableField("is_del") - private Boolean isDel; + private Integer isDel; /** * 创建人 @@ -62,13 +109,13 @@ * 创建时间 */ @TableField("create_time") - private Long createTime; + private String createTime; /** * 更新时间 */ @TableField("update_time") - private Long updateTime; + private String updateTime; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardVerifyRegulationServiceImpl.java index 490cb5a..6122a4b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardVerifyRegulationServiceImpl.java @@ -1,10 +1,24 @@ package com.casic.missiles.service.Impl.meter; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.meter.MeterStandardVerifyRegulationMapper; +import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardVerifyRegulation; +import com.casic.missiles.service.meter.IMeterStandardEquipmentService; import com.casic.missiles.service.meter.IMeterStandardVerifyRegulationService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; /** *

@@ -17,4 +31,64 @@ @Service public class MeterStandardVerifyRegulationServiceImpl extends ServiceImpl implements IMeterStandardVerifyRegulationService { + @Autowired + private MeterStandardVerifyRegulationMapper meterStandardVerifyRegulationMapper; + + @Autowired + private MeterFileMapper meterFileMapper; + + @Autowired + private IMeterStandardEquipmentService meterStandardEquipmentService; + + @Override + public Page listPage(Page page, IdDTO request) throws Exception { + // 获取列表 + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("standard_equipment_id", request.getId()); + Page meterStandardVerifyRegulationPage = meterStandardVerifyRegulationMapper.selectPage(page, wrapper); + if (!CollectionUtils.isEmpty(meterStandardVerifyRegulationPage.getRecords())) { + for (MeterStandardVerifyRegulation record : meterStandardVerifyRegulationPage.getRecords()) { + MeterFile meterFile = meterFileMapper.selectById(record.getVerifyRegulationId().toString()); + BeanUtils.copyProperties(meterFile, record); + } + } + return meterStandardVerifyRegulationPage; + } + + @Override + public ReturnDTO add(MeterStandardVerifyRegulation meterStandardVerifyRegulation) throws Exception { + // 校验 + valid(meterStandardVerifyRegulation); + // 首先判断是否存在,不存在再插入 + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("standard_equipment_id", meterStandardVerifyRegulation.getStandardEquipmentId()); + wrapper.eq("verify_regulation_id", meterStandardVerifyRegulation.getVerifyRegulationId()); + MeterStandardVerifyRegulation existRegu = meterStandardVerifyRegulationMapper.selectOne(wrapper); + if (existRegu == null) { + meterStandardVerifyRegulationMapper.insert(meterStandardVerifyRegulation); + } + return ReturnUtil.success(); + } + + @Override + public ReturnDTO deleteById(Long id) { + super.removeById(id); + return ReturnUtil.success(); + } + + + private boolean valid(MeterStandardVerifyRegulation meterStandardVerifyRegulation) throws Exception { + // 判断标准装置是否存在 + MeterStandardEquipment meterStandardEquipment = meterStandardEquipmentService.getById(meterStandardVerifyRegulation.getStandardEquipmentId()); + if (meterStandardEquipment == null) { + throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_ID_EXIST); + } + // 判断文件是否存在 + MeterFile meterFile = meterFileMapper.selectById(meterStandardVerifyRegulation.getVerifyRegulationId().toString()); + if (meterFile == null) { + throw new BusinessException(BusinessExceptionEnum.STANDARD_VERIFY_REGULATION_ID_EXIST); + } + return true; + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java index f5cc657..de9f78f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardVerifyRegulationController.java @@ -1,7 +1,19 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.MeterStandardVerifyRegulation; +import com.casic.missiles.service.meter.IMeterStandardVerifyRegulationService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; /** *

@@ -12,7 +24,40 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-verify-regulation") -public class MeterStandardVerifyRegulationController { +@RequestMapping("/meter/standard/regulation") +public class MeterStandardVerifyRegulationController extends ExportController { + @Autowired + private IMeterStandardVerifyRegulationService meterStandardVerifyRegulationService; + /** + * 标准装置-检定规程列表 + */ + @ApiOperation("标准装置-检定规程列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardVerifyRegulationService.listPage(page, request))); + } + + /** + * 添加检定规程 + */ + @ApiOperation("添加检定规程") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardVerifyRegulation meterStandardVerifyRegulation) throws Exception { + return meterStandardVerifyRegulationService.add(meterStandardVerifyRegulation); + } + + + /** + * 删除检定规程 + */ + @ApiOperation("删除检定规程") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardVerifyRegulationService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 894fd10..d963877 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5910 + port: 5909 ################### spring配置 ################### spring: datasource: 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 855c959..9b78048 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 @@ -39,6 +39,7 @@ LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"), STANDARD_EQUIPMENT_ID_EXIST(2402, "标准装置不存在"), STANDARD_EQUIPMENT_USER_ID_EXIST(2402, "标准装置-计量人员不存在"), + STANDARD_VERIFY_REGULATION_ID_EXIST(2402, "标准装置-检定规程不存在"), STANDARD_SUPPORT_EQUIPMENT_ID_EXIST(2402, "标准装置-标准配套装置不存在"); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardVerifyRegulation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardVerifyRegulation.java index be25293..50275c0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardVerifyRegulation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardVerifyRegulation.java @@ -3,10 +3,14 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import java.io.Serializable; + /** *

* 标准装置-检定规程表 @@ -25,22 +29,65 @@ /** * 主键 */ - @TableId("id") + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") private Long id; /** * 标准装置ID */ @TableField("standard_equipment_id") + @ApiModelProperty(value = "标准装置ID", dataType = "Long") private Long standardEquipmentId; /** * 检定规程ID */ @TableField("verify_regulation_id") + @ApiModelProperty(value = "检定规程ID", dataType = "Long") private Long verifyRegulationId; /** + * 文件编号-系统生成 + */ + @TableField(exist = false) + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField(exist = false) + private String fileName; + + /** + * 文件号 + */ + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @TableField(exist = false) + private String fileCode; + + /** + * 实施时间 + */ + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField(exist = false) + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField(exist = false) + @DictCodeField(message = "实施状态不合法", cacheName = MeterDictCode.EFFECTIVE_STATUS) + private String effectiveStatus; + + @ApiModelProperty(value = "实施状态字典value(列表接口返回参数)", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** * 备注 */ @TableField("remark") @@ -50,7 +97,7 @@ * 删除标记 */ @TableField("is_del") - private Boolean isDel; + private Integer isDel; /** * 创建人 @@ -62,13 +109,13 @@ * 创建时间 */ @TableField("create_time") - private Long createTime; + private String createTime; /** * 更新时间 */ @TableField("update_time") - private Long updateTime; + private String updateTime; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardVerifyRegulationServiceImpl.java index 490cb5a..6122a4b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardVerifyRegulationServiceImpl.java @@ -1,10 +1,24 @@ package com.casic.missiles.service.Impl.meter; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.meter.MeterStandardVerifyRegulationMapper; +import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardVerifyRegulation; +import com.casic.missiles.service.meter.IMeterStandardEquipmentService; import com.casic.missiles.service.meter.IMeterStandardVerifyRegulationService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; /** *

@@ -17,4 +31,64 @@ @Service public class MeterStandardVerifyRegulationServiceImpl extends ServiceImpl implements IMeterStandardVerifyRegulationService { + @Autowired + private MeterStandardVerifyRegulationMapper meterStandardVerifyRegulationMapper; + + @Autowired + private MeterFileMapper meterFileMapper; + + @Autowired + private IMeterStandardEquipmentService meterStandardEquipmentService; + + @Override + public Page listPage(Page page, IdDTO request) throws Exception { + // 获取列表 + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("standard_equipment_id", request.getId()); + Page meterStandardVerifyRegulationPage = meterStandardVerifyRegulationMapper.selectPage(page, wrapper); + if (!CollectionUtils.isEmpty(meterStandardVerifyRegulationPage.getRecords())) { + for (MeterStandardVerifyRegulation record : meterStandardVerifyRegulationPage.getRecords()) { + MeterFile meterFile = meterFileMapper.selectById(record.getVerifyRegulationId().toString()); + BeanUtils.copyProperties(meterFile, record); + } + } + return meterStandardVerifyRegulationPage; + } + + @Override + public ReturnDTO add(MeterStandardVerifyRegulation meterStandardVerifyRegulation) throws Exception { + // 校验 + valid(meterStandardVerifyRegulation); + // 首先判断是否存在,不存在再插入 + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("standard_equipment_id", meterStandardVerifyRegulation.getStandardEquipmentId()); + wrapper.eq("verify_regulation_id", meterStandardVerifyRegulation.getVerifyRegulationId()); + MeterStandardVerifyRegulation existRegu = meterStandardVerifyRegulationMapper.selectOne(wrapper); + if (existRegu == null) { + meterStandardVerifyRegulationMapper.insert(meterStandardVerifyRegulation); + } + return ReturnUtil.success(); + } + + @Override + public ReturnDTO deleteById(Long id) { + super.removeById(id); + return ReturnUtil.success(); + } + + + private boolean valid(MeterStandardVerifyRegulation meterStandardVerifyRegulation) throws Exception { + // 判断标准装置是否存在 + MeterStandardEquipment meterStandardEquipment = meterStandardEquipmentService.getById(meterStandardVerifyRegulation.getStandardEquipmentId()); + if (meterStandardEquipment == null) { + throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_ID_EXIST); + } + // 判断文件是否存在 + MeterFile meterFile = meterFileMapper.selectById(meterStandardVerifyRegulation.getVerifyRegulationId().toString()); + if (meterFile == null) { + throw new BusinessException(BusinessExceptionEnum.STANDARD_VERIFY_REGULATION_ID_EXIST); + } + return true; + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterStandardVerifyRegulationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterStandardVerifyRegulationService.java index cb7d3f4..c84aff2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterStandardVerifyRegulationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterStandardVerifyRegulationService.java @@ -1,7 +1,10 @@ package com.casic.missiles.service.meter; -import com.casic.missiles.model.MeterStandardVerifyRegulation; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.model.MeterStandardVerifyRegulation; /** *

@@ -13,4 +16,9 @@ */ public interface IMeterStandardVerifyRegulationService extends IService { + Page listPage(Page page, IdDTO request) throws Exception; + + ReturnDTO add(MeterStandardVerifyRegulation meterStandardVerifyRegulation) throws Exception; + + ReturnDTO deleteById(Long id); }