diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 1679bf6..4a40513 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,9 @@ * 导出标准装置 */ @ApiOperation("导出excel") -// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { -// public void exportExcel() throws Exception { -// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); if (!CollectionUtils.isEmpty(list)) { @@ -106,4 +103,28 @@ } } + + @ApiOperation("到期提醒列表（分页）") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + DictCodeUtils.validDictCode(request); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); + } + + @ApiOperation("到期提醒-删除") + @PostMapping("/deleteRemind") + @ResponseBody + public ReturnDTO deleteRemind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.deleteRemind(idDTO.getId()); + } + + @ApiOperation("到期提醒-提醒") + @PostMapping("/remind") + @ResponseBody + public ReturnDTO remind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.remind(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 1679bf6..4a40513 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,9 @@ * 导出标准装置 */ @ApiOperation("导出excel") -// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { -// public void exportExcel() throws Exception { -// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); if (!CollectionUtils.isEmpty(list)) { @@ -106,4 +103,28 @@ } } + + @ApiOperation("到期提醒列表（分页）") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + DictCodeUtils.validDictCode(request); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); + } + + @ApiOperation("到期提醒-删除") + @PostMapping("/deleteRemind") + @ResponseBody + public ReturnDTO deleteRemind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.deleteRemind(idDTO.getId()); + } + + @ApiOperation("到期提醒-提醒") + @PostMapping("/remind") + @ResponseBody + public ReturnDTO remind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.remind(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 c9ed538..12beee9 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,6 +29,10 @@ #图片下载本地地址 file: uploadPath: D:\tmp\ + meter: + standardEquipment: #标准装置 + remindDay: 30 #到期提醒，提前天数 + delayDay: 30 #到期提醒-删除，提醒推迟天数 logging: level.root: info diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 1679bf6..4a40513 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,9 @@ * 导出标准装置 */ @ApiOperation("导出excel") -// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { -// public void exportExcel() throws Exception { -// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); if (!CollectionUtils.isEmpty(list)) { @@ -106,4 +103,28 @@ } } + + @ApiOperation("到期提醒列表（分页）") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + DictCodeUtils.validDictCode(request); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); + } + + @ApiOperation("到期提醒-删除") + @PostMapping("/deleteRemind") + @ResponseBody + public ReturnDTO deleteRemind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.deleteRemind(idDTO.getId()); + } + + @ApiOperation("到期提醒-提醒") + @PostMapping("/remind") + @ResponseBody + public ReturnDTO remind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.remind(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 c9ed538..12beee9 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,6 +29,10 @@ #图片下载本地地址 file: uploadPath: D:\tmp\ + meter: + standardEquipment: #标准装置 + remindDay: 30 #到期提醒，提前天数 + delayDay: 30 #到期提醒-删除，提醒推迟天数 logging: level.root: info diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java index 7559c40..abe6450 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java @@ -19,4 +19,8 @@ Long selectMaxNo(); Page listPage(Page page, @Param("request") StandardEquipmentRequest request); + + Page remindListPage(Page page, @Param("request") StandardEquipmentRequest request); + } + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 1679bf6..4a40513 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,9 @@ * 导出标准装置 */ @ApiOperation("导出excel") -// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { -// public void exportExcel() throws Exception { -// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); if (!CollectionUtils.isEmpty(list)) { @@ -106,4 +103,28 @@ } } + + @ApiOperation("到期提醒列表（分页）") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + DictCodeUtils.validDictCode(request); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); + } + + @ApiOperation("到期提醒-删除") + @PostMapping("/deleteRemind") + @ResponseBody + public ReturnDTO deleteRemind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.deleteRemind(idDTO.getId()); + } + + @ApiOperation("到期提醒-提醒") + @PostMapping("/remind") + @ResponseBody + public ReturnDTO remind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.remind(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 c9ed538..12beee9 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,6 +29,10 @@ #图片下载本地地址 file: uploadPath: D:\tmp\ + meter: + standardEquipment: #标准装置 + remindDay: 30 #到期提醒，提前天数 + delayDay: 30 #到期提醒-删除，提醒推迟天数 logging: level.root: info diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java index 7559c40..abe6450 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java @@ -19,4 +19,8 @@ Long selectMaxNo(); Page listPage(Page page, @Param("request") StandardEquipmentRequest request); + + Page remindListPage(Page page, @Param("request") StandardEquipmentRequest request); + } + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml index 2c67dbf..015eff9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml @@ -7,17 +7,7 @@ mse.* - - - + SELECT IFNULL(max(RIGHT(standard_no, 12)), 0) from meter_standard_equipment + + + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 1679bf6..4a40513 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,9 @@ * 导出标准装置 */ @ApiOperation("导出excel") -// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { -// public void exportExcel() throws Exception { -// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); if (!CollectionUtils.isEmpty(list)) { @@ -106,4 +103,28 @@ } } + + @ApiOperation("到期提醒列表（分页）") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + DictCodeUtils.validDictCode(request); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); + } + + @ApiOperation("到期提醒-删除") + @PostMapping("/deleteRemind") + @ResponseBody + public ReturnDTO deleteRemind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.deleteRemind(idDTO.getId()); + } + + @ApiOperation("到期提醒-提醒") + @PostMapping("/remind") + @ResponseBody + public ReturnDTO remind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.remind(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 c9ed538..12beee9 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,6 +29,10 @@ #图片下载本地地址 file: uploadPath: D:\tmp\ + meter: + standardEquipment: #标准装置 + remindDay: 30 #到期提醒，提前天数 + delayDay: 30 #到期提醒-删除，提醒推迟天数 logging: level.root: info diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java index 7559c40..abe6450 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java @@ -19,4 +19,8 @@ Long selectMaxNo(); Page listPage(Page page, @Param("request") StandardEquipmentRequest request); + + Page remindListPage(Page page, @Param("request") StandardEquipmentRequest request); + } + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml index 2c67dbf..015eff9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml @@ -7,17 +7,7 @@ mse.* - - - + SELECT IFNULL(max(RIGHT(standard_no, 12)), 0) from meter_standard_equipment + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java index dd92764..04012e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java @@ -54,4 +54,11 @@ */ @ApiModelProperty(value = "筹建日期", dataType = "String") private String preparationDate; + + /** + * 到期日期 + */ + @ApiModelProperty(value = "到期日期（即有效日期，到期提醒列表）", dataType = "String") + private String validTime; + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 1679bf6..4a40513 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,9 @@ * 导出标准装置 */ @ApiOperation("导出excel") -// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { -// public void exportExcel() throws Exception { -// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); if (!CollectionUtils.isEmpty(list)) { @@ -106,4 +103,28 @@ } } + + @ApiOperation("到期提醒列表（分页）") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + DictCodeUtils.validDictCode(request); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); + } + + @ApiOperation("到期提醒-删除") + @PostMapping("/deleteRemind") + @ResponseBody + public ReturnDTO deleteRemind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.deleteRemind(idDTO.getId()); + } + + @ApiOperation("到期提醒-提醒") + @PostMapping("/remind") + @ResponseBody + public ReturnDTO remind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.remind(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 c9ed538..12beee9 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,6 +29,10 @@ #图片下载本地地址 file: uploadPath: D:\tmp\ + meter: + standardEquipment: #标准装置 + remindDay: 30 #到期提醒，提前天数 + delayDay: 30 #到期提醒-删除，提醒推迟天数 logging: level.root: info diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java index 7559c40..abe6450 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java @@ -19,4 +19,8 @@ Long selectMaxNo(); Page listPage(Page page, @Param("request") StandardEquipmentRequest request); + + Page remindListPage(Page page, @Param("request") StandardEquipmentRequest request); + } + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml index 2c67dbf..015eff9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml @@ -7,17 +7,7 @@ mse.* - - - + SELECT IFNULL(max(RIGHT(standard_no, 12)), 0) from meter_standard_equipment + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java index dd92764..04012e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java @@ -54,4 +54,11 @@ */ @ApiModelProperty(value = "筹建日期", dataType = "String") private String preparationDate; + + /** + * 到期日期 + */ + @ApiModelProperty(value = "到期日期（即有效日期，到期提醒列表）", dataType = "String") + private String validTime; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java index ebb1d0c..0cb0975 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java @@ -350,6 +350,20 @@ @ApiModelProperty(value = "更新时间", dataType = "String") private String updateTime; + /** + * 提醒时间 + */ + @TableField("remind_time") + @ApiModelProperty(value = "提醒时间", dataType = "String") + private String remindTime; + + /** + * 有效时间 + */ + @TableField(exist = false) + @ApiModelProperty(value = "有效时间", dataType = "String") + private String validTime; + /** * 文件列表 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 1679bf6..4a40513 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,9 @@ * 导出标准装置 */ @ApiOperation("导出excel") -// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { -// public void exportExcel() throws Exception { -// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); if (!CollectionUtils.isEmpty(list)) { @@ -106,4 +103,28 @@ } } + + @ApiOperation("到期提醒列表（分页）") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + DictCodeUtils.validDictCode(request); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); + } + + @ApiOperation("到期提醒-删除") + @PostMapping("/deleteRemind") + @ResponseBody + public ReturnDTO deleteRemind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.deleteRemind(idDTO.getId()); + } + + @ApiOperation("到期提醒-提醒") + @PostMapping("/remind") + @ResponseBody + public ReturnDTO remind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.remind(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 c9ed538..12beee9 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,6 +29,10 @@ #图片下载本地地址 file: uploadPath: D:\tmp\ + meter: + standardEquipment: #标准装置 + remindDay: 30 #到期提醒，提前天数 + delayDay: 30 #到期提醒-删除，提醒推迟天数 logging: level.root: info diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java index 7559c40..abe6450 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java @@ -19,4 +19,8 @@ Long selectMaxNo(); Page listPage(Page page, @Param("request") StandardEquipmentRequest request); + + Page remindListPage(Page page, @Param("request") StandardEquipmentRequest request); + } + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml index 2c67dbf..015eff9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml @@ -7,17 +7,7 @@ mse.* - - - + SELECT IFNULL(max(RIGHT(standard_no, 12)), 0) from meter_standard_equipment + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java index dd92764..04012e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java @@ -54,4 +54,11 @@ */ @ApiModelProperty(value = "筹建日期", dataType = "String") private String preparationDate; + + /** + * 到期日期 + */ + @ApiModelProperty(value = "到期日期（即有效日期，到期提醒列表）", dataType = "String") + private String validTime; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java index ebb1d0c..0cb0975 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java @@ -350,6 +350,20 @@ @ApiModelProperty(value = "更新时间", dataType = "String") private String updateTime; + /** + * 提醒时间 + */ + @TableField("remind_time") + @ApiModelProperty(value = "提醒时间", dataType = "String") + private String remindTime; + + /** + * 有效时间 + */ + @TableField(exist = false) + @ApiModelProperty(value = "有效时间", dataType = "String") + private String validTime; + /** * 文件列表 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentServiceImpl.java index c5e7430..5df13b3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentServiceImpl.java @@ -1,6 +1,8 @@ package com.casic.missiles.service.Impl.meter; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.page.PageFactory; @@ -9,6 +11,7 @@ import com.casic.missiles.dto.meter.StandardEquipmentRequest; import com.casic.missiles.mapper.meter.MeterStandardEquipmentFileMapper; import com.casic.missiles.mapper.meter.MeterStandardEquipmentMapper; +import com.casic.missiles.model.MeterCertificateExpireMessage; import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardEquipmentFile; import com.casic.missiles.model.page.PageQuery; @@ -16,12 +19,16 @@ import com.casic.missiles.service.meter.IMeterStandardEquipmentService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import javax.validation.ConstraintViolation; import javax.validation.Validation; +import java.util.Calendar; +import java.util.Date; import java.util.List; import java.util.Set; @@ -45,6 +52,9 @@ @Autowired private IMeterStandardEquipmentFileService meterStandardEquipmentFileService; + @Value("${casic.meter.standardEquipment.delayDay:30}") + private Integer delayDay; + @Override public Page listPage(Page page, StandardEquipmentRequest request) throws Exception { Page resultPage = meterStandardEquipmentMapper.listPage(page, request); @@ -159,4 +169,50 @@ meterStandardEquipmentFileService.saveBatch(meterStandardEquipment.getFileList()); } } + + @Override + public Page remindListPage(Page page, StandardEquipmentRequest request) throws Exception { + Page resultPage = meterStandardEquipmentMapper.remindListPage(page, request); + for (MeterStandardEquipment item:resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(item); + } + return resultPage; + } + + /** + * 删除：提醒时间=当前时间+30[配置值：推迟时间]天 + * todo： 新增、更新标准装置时，设置默认提醒时间（有效时间+30[配置值：提醒时间]天） + * @param id 标准装置id + * @return 更新结果 + */ + @Override + public ReturnDTO deleteRemind(Long id) { + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DATE,delayDay); + calendar.set(Calendar.HOUR_OF_DAY,0); + calendar.set(Calendar.MINUTE,0); + calendar.set(Calendar.SECOND,0); + return updateRemindTime(id, calendar.getTime()); + } + + /** + * 提醒：提醒时间=当前时间 + * @param id 标准装置id + * @return 更新结果 + */ + @Override + public ReturnDTO remind(Long id) { + return updateRemindTime(id,new Date()); + } + + @NotNull + private ReturnDTO updateRemindTime(Long id, Date remind_time) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id).set("remind_time", remind_time); + if(meterStandardEquipmentMapper.update(null, updateWrapper)>0){ + return ReturnUtil.success(); + } + return ReturnUtil.failed("操作失败"); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 1679bf6..4a40513 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,9 @@ * 导出标准装置 */ @ApiOperation("导出excel") -// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { -// public void exportExcel() throws Exception { -// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); if (!CollectionUtils.isEmpty(list)) { @@ -106,4 +103,28 @@ } } + + @ApiOperation("到期提醒列表（分页）") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + DictCodeUtils.validDictCode(request); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); + } + + @ApiOperation("到期提醒-删除") + @PostMapping("/deleteRemind") + @ResponseBody + public ReturnDTO deleteRemind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.deleteRemind(idDTO.getId()); + } + + @ApiOperation("到期提醒-提醒") + @PostMapping("/remind") + @ResponseBody + public ReturnDTO remind(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentService.remind(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 c9ed538..12beee9 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,6 +29,10 @@ #图片下载本地地址 file: uploadPath: D:\tmp\ + meter: + standardEquipment: #标准装置 + remindDay: 30 #到期提醒，提前天数 + delayDay: 30 #到期提醒-删除，提醒推迟天数 logging: level.root: info diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java index 7559c40..abe6450 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentMapper.java @@ -19,4 +19,8 @@ Long selectMaxNo(); Page listPage(Page page, @Param("request") StandardEquipmentRequest request); + + Page remindListPage(Page page, @Param("request") StandardEquipmentRequest request); + } + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml index 2c67dbf..015eff9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml @@ -7,17 +7,7 @@ mse.* - - - + SELECT IFNULL(max(RIGHT(standard_no, 12)), 0) from meter_standard_equipment + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java index dd92764..04012e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java @@ -54,4 +54,11 @@ */ @ApiModelProperty(value = "筹建日期", dataType = "String") private String preparationDate; + + /** + * 到期日期 + */ + @ApiModelProperty(value = "到期日期（即有效日期，到期提醒列表）", dataType = "String") + private String validTime; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java index ebb1d0c..0cb0975 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java @@ -350,6 +350,20 @@ @ApiModelProperty(value = "更新时间", dataType = "String") private String updateTime; + /** + * 提醒时间 + */ + @TableField("remind_time") + @ApiModelProperty(value = "提醒时间", dataType = "String") + private String remindTime; + + /** + * 有效时间 + */ + @TableField(exist = false) + @ApiModelProperty(value = "有效时间", dataType = "String") + private String validTime; + /** * 文件列表 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentServiceImpl.java index c5e7430..5df13b3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentServiceImpl.java @@ -1,6 +1,8 @@ package com.casic.missiles.service.Impl.meter; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.page.PageFactory; @@ -9,6 +11,7 @@ import com.casic.missiles.dto.meter.StandardEquipmentRequest; import com.casic.missiles.mapper.meter.MeterStandardEquipmentFileMapper; import com.casic.missiles.mapper.meter.MeterStandardEquipmentMapper; +import com.casic.missiles.model.MeterCertificateExpireMessage; import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardEquipmentFile; import com.casic.missiles.model.page.PageQuery; @@ -16,12 +19,16 @@ import com.casic.missiles.service.meter.IMeterStandardEquipmentService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import javax.validation.ConstraintViolation; import javax.validation.Validation; +import java.util.Calendar; +import java.util.Date; import java.util.List; import java.util.Set; @@ -45,6 +52,9 @@ @Autowired private IMeterStandardEquipmentFileService meterStandardEquipmentFileService; + @Value("${casic.meter.standardEquipment.delayDay:30}") + private Integer delayDay; + @Override public Page listPage(Page page, StandardEquipmentRequest request) throws Exception { Page resultPage = meterStandardEquipmentMapper.listPage(page, request); @@ -159,4 +169,50 @@ meterStandardEquipmentFileService.saveBatch(meterStandardEquipment.getFileList()); } } + + @Override + public Page remindListPage(Page page, StandardEquipmentRequest request) throws Exception { + Page resultPage = meterStandardEquipmentMapper.remindListPage(page, request); + for (MeterStandardEquipment item:resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(item); + } + return resultPage; + } + + /** + * 删除：提醒时间=当前时间+30[配置值：推迟时间]天 + * todo： 新增、更新标准装置时，设置默认提醒时间（有效时间+30[配置值：提醒时间]天） + * @param id 标准装置id + * @return 更新结果 + */ + @Override + public ReturnDTO deleteRemind(Long id) { + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DATE,delayDay); + calendar.set(Calendar.HOUR_OF_DAY,0); + calendar.set(Calendar.MINUTE,0); + calendar.set(Calendar.SECOND,0); + return updateRemindTime(id, calendar.getTime()); + } + + /** + * 提醒：提醒时间=当前时间 + * @param id 标准装置id + * @return 更新结果 + */ + @Override + public ReturnDTO remind(Long id) { + return updateRemindTime(id,new Date()); + } + + @NotNull + private ReturnDTO updateRemindTime(Long id, Date remind_time) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id).set("remind_time", remind_time); + if(meterStandardEquipmentMapper.update(null, updateWrapper)>0){ + return ReturnUtil.success(); + } + return ReturnUtil.failed("操作失败"); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterStandardEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterStandardEquipmentService.java index 2546317..74238a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterStandardEquipmentService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterStandardEquipmentService.java @@ -30,4 +30,10 @@ ReturnDTO addList(List meterStandardEquipmentList) throws Exception; MeterStandardEquipment getById(Long id) throws Exception; + + Page remindListPage(Page page, StandardEquipmentRequest request) throws Exception; + + ReturnDTO deleteRemind(Long id); + + ReturnDTO remind(Long id); }