diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 3e4f307..83b9856 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 3e4f307..83b9856 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index b507dde..5253767 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -30,8 +30,7 @@ String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; - //标准装置-状态 - String STANDARD_MANAGER_STATE = "standardManagerState"; - //测量设备-状态 - String MANAGER_STATE = "managerState"; + //房间号 + String DOOR_NUMBER = "doorCode"; + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 3e4f307..83b9856 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index b507dde..5253767 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -30,8 +30,7 @@ String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; - //标准装置-状态 - String STANDARD_MANAGER_STATE = "standardManagerState"; - //测量设备-状态 - String MANAGER_STATE = "managerState"; + //房间号 + String DOOR_NUMBER = "doorCode"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java new file mode 100644 index 0000000..5057d08 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -0,0 +1,14 @@ +package com.casic.missiles.enums; + +/** + * @Description: 生成编号前缀枚举 + * @Author: zt + * @Date: 2023/2/13 15:41 + */ +public interface PrefixCodeEnum { + + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 3e4f307..83b9856 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index b507dde..5253767 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -30,8 +30,7 @@ String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; - //标准装置-状态 - String STANDARD_MANAGER_STATE = "standardManagerState"; - //测量设备-状态 - String MANAGER_STATE = "managerState"; + //房间号 + String DOOR_NUMBER = "doorCode"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java new file mode 100644 index 0000000..5057d08 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -0,0 +1,14 @@ +package com.casic.missiles.enums; + +/** + * @Description: 生成编号前缀枚举 + * @Author: zt + * @Date: 2023/2/13 15:41 + */ +public interface PrefixCodeEnum { + + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java deleted file mode 100644 index fa11713..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.business.BusinessEnvironmentRecord; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -public interface BusinessEnviromentRecordMapper extends BaseMapper { - @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") - Long selectMaxCode(); -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 3e4f307..83b9856 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index b507dde..5253767 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -30,8 +30,7 @@ String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; - //标准装置-状态 - String STANDARD_MANAGER_STATE = "standardManagerState"; - //测量设备-状态 - String MANAGER_STATE = "managerState"; + //房间号 + String DOOR_NUMBER = "doorCode"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java new file mode 100644 index 0000000..5057d08 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -0,0 +1,14 @@ +package com.casic.missiles.enums; + +/** + * @Description: 生成编号前缀枚举 + * @Author: zt + * @Date: 2023/2/13 15:41 + */ +public interface PrefixCodeEnum { + + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java deleted file mode 100644 index fa11713..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.business.BusinessEnvironmentRecord; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -public interface BusinessEnviromentRecordMapper extends BaseMapper { - @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") - Long selectMaxCode(); -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java new file mode 100644 index 0000000..a651c40 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnvironmentRecord; +import org.apache.ibatis.annotations.Select; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnvironmentRecordMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from business_environment_record") + Long selectMaxCode(); + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 3e4f307..83b9856 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index b507dde..5253767 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -30,8 +30,7 @@ String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; - //标准装置-状态 - String STANDARD_MANAGER_STATE = "standardManagerState"; - //测量设备-状态 - String MANAGER_STATE = "managerState"; + //房间号 + String DOOR_NUMBER = "doorCode"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java new file mode 100644 index 0000000..5057d08 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -0,0 +1,14 @@ +package com.casic.missiles.enums; + +/** + * @Description: 生成编号前缀枚举 + * @Author: zt + * @Date: 2023/2/13 15:41 + */ +public interface PrefixCodeEnum { + + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java deleted file mode 100644 index fa11713..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.business.BusinessEnvironmentRecord; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -public interface BusinessEnviromentRecordMapper extends BaseMapper { - @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") - Long selectMaxCode(); -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java new file mode 100644 index 0000000..a651c40 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnvironmentRecord; +import org.apache.ibatis.annotations.Select; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnvironmentRecordMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from business_environment_record") + Long selectMaxCode(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java index 94db1cc..7f16692 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -1,7 +1,10 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} + + +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 3e4f307..83b9856 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index b507dde..5253767 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -30,8 +30,7 @@ String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; - //标准装置-状态 - String STANDARD_MANAGER_STATE = "standardManagerState"; - //测量设备-状态 - String MANAGER_STATE = "managerState"; + //房间号 + String DOOR_NUMBER = "doorCode"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java new file mode 100644 index 0000000..5057d08 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -0,0 +1,14 @@ +package com.casic.missiles.enums; + +/** + * @Description: 生成编号前缀枚举 + * @Author: zt + * @Date: 2023/2/13 15:41 + */ +public interface PrefixCodeEnum { + + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java deleted file mode 100644 index fa11713..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.business.BusinessEnvironmentRecord; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -public interface BusinessEnviromentRecordMapper extends BaseMapper { - @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") - Long selectMaxCode(); -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java new file mode 100644 index 0000000..a651c40 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnvironmentRecord; +import org.apache.ibatis.annotations.Select; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnvironmentRecordMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from business_environment_record") + Long selectMaxCode(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java index 94db1cc..7f16692 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -1,7 +1,10 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} + + +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} + diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java new file mode 100644 index 0000000..884b482 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java @@ -0,0 +1,17 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zt + * @since 2023-02-02 + */ +public interface EnvironmentListResponseMapper extends BaseMapper { + + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 3e4f307..83b9856 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index b507dde..5253767 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -30,8 +30,7 @@ String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; - //标准装置-状态 - String STANDARD_MANAGER_STATE = "standardManagerState"; - //测量设备-状态 - String MANAGER_STATE = "managerState"; + //房间号 + String DOOR_NUMBER = "doorCode"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java new file mode 100644 index 0000000..5057d08 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -0,0 +1,14 @@ +package com.casic.missiles.enums; + +/** + * @Description: 生成编号前缀枚举 + * @Author: zt + * @Date: 2023/2/13 15:41 + */ +public interface PrefixCodeEnum { + + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java deleted file mode 100644 index fa11713..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.business.BusinessEnvironmentRecord; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -public interface BusinessEnviromentRecordMapper extends BaseMapper { - @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") - Long selectMaxCode(); -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java new file mode 100644 index 0000000..a651c40 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnvironmentRecord; +import org.apache.ibatis.annotations.Select; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnvironmentRecordMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from business_environment_record") + Long selectMaxCode(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java index 94db1cc..7f16692 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -1,7 +1,10 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} + + +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} + diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java new file mode 100644 index 0000000..884b482 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java @@ -0,0 +1,17 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zt + * @since 2023-02-02 + */ +public interface EnvironmentListResponseMapper extends BaseMapper { + + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml index e80a3ad..14eeb73 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -1,6 +1,6 @@ - + @@ -20,6 +20,7 @@ + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 3e4f307..83b9856 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index b507dde..5253767 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -30,8 +30,7 @@ String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; - //标准装置-状态 - String STANDARD_MANAGER_STATE = "standardManagerState"; - //测量设备-状态 - String MANAGER_STATE = "managerState"; + //房间号 + String DOOR_NUMBER = "doorCode"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java new file mode 100644 index 0000000..5057d08 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -0,0 +1,14 @@ +package com.casic.missiles.enums; + +/** + * @Description: 生成编号前缀枚举 + * @Author: zt + * @Date: 2023/2/13 15:41 + */ +public interface PrefixCodeEnum { + + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java deleted file mode 100644 index fa11713..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.business.BusinessEnvironmentRecord; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -public interface BusinessEnviromentRecordMapper extends BaseMapper { - @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") - Long selectMaxCode(); -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java new file mode 100644 index 0000000..a651c40 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnvironmentRecord; +import org.apache.ibatis.annotations.Select; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnvironmentRecordMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from business_environment_record") + Long selectMaxCode(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java index 94db1cc..7f16692 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -1,7 +1,10 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} + + +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} + diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java new file mode 100644 index 0000000..884b482 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java @@ -0,0 +1,17 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zt + * @since 2023-02-02 + */ +public interface EnvironmentListResponseMapper extends BaseMapper { + + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml index e80a3ad..14eeb73 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -1,6 +1,6 @@ - + @@ -20,6 +20,7 @@ + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java new file mode 100644 index 0000000..6b7ddc9 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.business.environment; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class EnvironmentListRequest { + + @ApiModelProperty(value = "记录单编号", dataType = "String") + private String environmentCode; + + @ApiModelProperty(value = "房间号", dataType = "String") + private String roomNumber; + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 3e4f307..83b9856 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index b507dde..5253767 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -30,8 +30,7 @@ String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; - //标准装置-状态 - String STANDARD_MANAGER_STATE = "standardManagerState"; - //测量设备-状态 - String MANAGER_STATE = "managerState"; + //房间号 + String DOOR_NUMBER = "doorCode"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java new file mode 100644 index 0000000..5057d08 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -0,0 +1,14 @@ +package com.casic.missiles.enums; + +/** + * @Description: 生成编号前缀枚举 + * @Author: zt + * @Date: 2023/2/13 15:41 + */ +public interface PrefixCodeEnum { + + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java deleted file mode 100644 index fa11713..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.business.BusinessEnvironmentRecord; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -public interface BusinessEnviromentRecordMapper extends BaseMapper { - @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") - Long selectMaxCode(); -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java new file mode 100644 index 0000000..a651c40 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnvironmentRecord; +import org.apache.ibatis.annotations.Select; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnvironmentRecordMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from business_environment_record") + Long selectMaxCode(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java index 94db1cc..7f16692 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -1,7 +1,10 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} + + +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} + diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java new file mode 100644 index 0000000..884b482 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java @@ -0,0 +1,17 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zt + * @since 2023-02-02 + */ +public interface EnvironmentListResponseMapper extends BaseMapper { + + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml index e80a3ad..14eeb73 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -1,6 +1,6 @@ - + @@ -20,6 +20,7 @@ + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java new file mode 100644 index 0000000..6b7ddc9 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.business.environment; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class EnvironmentListRequest { + + @ApiModelProperty(value = "记录单编号", dataType = "String") + private String environmentCode; + + @ApiModelProperty(value = "房间号", dataType = "String") + private String roomNumber; + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java new file mode 100644 index 0000000..d858b3a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java @@ -0,0 +1,69 @@ +package com.casic.missiles.dto.business.environment; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +@TableName("business_environment_record") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class EnvironmentListResponse { + + @ApiModelProperty(value = "环境记录单id", dataType = "Long") + private Long id; + @ApiModelProperty(value = "记录单编号", dataType = "String") + @ExcelProperty(value = "记录单编号",order = 0) + private String environmentCode; + + @ApiModelProperty(value = "房间号", dataType = "String") + @ExcelProperty(value = "房间号",order = 1) + private String roomNumber; + + @ApiModelProperty(value = "温度", dataType = "String") + @ExcelProperty(value = "温度",order = 2) + private String temperature; + + @ApiModelProperty(value = "湿度", dataType = "String") + @ExcelProperty(value = "湿度",order = 3) + private String humidity; + + @ApiModelProperty(value = "输出电压", dataType = "String") + @ExcelProperty(value = "输出电压",order = 4) + private String outputVoltage; + + @ApiModelProperty(value = "零地电压", dataType = "String") + @ExcelProperty(value = "零地电压",order = 5) + private String zeroGroundVoltage; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "记录人", dataType = "String") + @ExcelProperty(value = "记录人",order = 6) + private String recorder; + + @ApiModelProperty(value = "创建人", dataType = "String") + private String createUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "记录时间", dataType = "String") + @ExcelProperty(value = "记录时间",order = 7) + private String recordTime; + + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 3e4f307..83b9856 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index b507dde..5253767 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -30,8 +30,7 @@ String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; - //标准装置-状态 - String STANDARD_MANAGER_STATE = "standardManagerState"; - //测量设备-状态 - String MANAGER_STATE = "managerState"; + //房间号 + String DOOR_NUMBER = "doorCode"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java new file mode 100644 index 0000000..5057d08 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -0,0 +1,14 @@ +package com.casic.missiles.enums; + +/** + * @Description: 生成编号前缀枚举 + * @Author: zt + * @Date: 2023/2/13 15:41 + */ +public interface PrefixCodeEnum { + + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java deleted file mode 100644 index fa11713..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.business.BusinessEnvironmentRecord; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -public interface BusinessEnviromentRecordMapper extends BaseMapper { - @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") - Long selectMaxCode(); -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java new file mode 100644 index 0000000..a651c40 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnvironmentRecord; +import org.apache.ibatis.annotations.Select; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnvironmentRecordMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from business_environment_record") + Long selectMaxCode(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java index 94db1cc..7f16692 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -1,7 +1,10 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} + + +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} + diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java new file mode 100644 index 0000000..884b482 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java @@ -0,0 +1,17 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zt + * @since 2023-02-02 + */ +public interface EnvironmentListResponseMapper extends BaseMapper { + + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml index e80a3ad..14eeb73 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -1,6 +1,6 @@ - + @@ -20,6 +20,7 @@ + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java new file mode 100644 index 0000000..6b7ddc9 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.business.environment; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class EnvironmentListRequest { + + @ApiModelProperty(value = "记录单编号", dataType = "String") + private String environmentCode; + + @ApiModelProperty(value = "房间号", dataType = "String") + private String roomNumber; + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java new file mode 100644 index 0000000..d858b3a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java @@ -0,0 +1,69 @@ +package com.casic.missiles.dto.business.environment; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +@TableName("business_environment_record") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class EnvironmentListResponse { + + @ApiModelProperty(value = "环境记录单id", dataType = "Long") + private Long id; + @ApiModelProperty(value = "记录单编号", dataType = "String") + @ExcelProperty(value = "记录单编号",order = 0) + private String environmentCode; + + @ApiModelProperty(value = "房间号", dataType = "String") + @ExcelProperty(value = "房间号",order = 1) + private String roomNumber; + + @ApiModelProperty(value = "温度", dataType = "String") + @ExcelProperty(value = "温度",order = 2) + private String temperature; + + @ApiModelProperty(value = "湿度", dataType = "String") + @ExcelProperty(value = "湿度",order = 3) + private String humidity; + + @ApiModelProperty(value = "输出电压", dataType = "String") + @ExcelProperty(value = "输出电压",order = 4) + private String outputVoltage; + + @ApiModelProperty(value = "零地电压", dataType = "String") + @ExcelProperty(value = "零地电压",order = 5) + private String zeroGroundVoltage; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "记录人", dataType = "String") + @ExcelProperty(value = "记录人",order = 6) + private String recorder; + + @ApiModelProperty(value = "创建人", dataType = "String") + private String createUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "记录时间", dataType = "String") + @ExcelProperty(value = "记录时间",order = 7) + private String recordTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java index 12f60ea..8eddeb7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java @@ -17,7 +17,7 @@ * @since 2023-02-02 */ @Data -@TableName("business_enviroment_record") +@TableName("business_environment_record") public class BusinessEnvironmentRecord implements Serializable { private static final long serialVersionUID = 1L; @@ -46,7 +46,7 @@ @TableField("temperature") private String temperature; - @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String") + @ApiModelProperty(value = "湿度", dataType = "String") @TableField("humidity") private String humidity; @@ -74,5 +74,4 @@ @TableField("update_time") private String updateTime; - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 3e4f307..83b9856 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index b507dde..5253767 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -30,8 +30,7 @@ String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; - //标准装置-状态 - String STANDARD_MANAGER_STATE = "standardManagerState"; - //测量设备-状态 - String MANAGER_STATE = "managerState"; + //房间号 + String DOOR_NUMBER = "doorCode"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java new file mode 100644 index 0000000..5057d08 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -0,0 +1,14 @@ +package com.casic.missiles.enums; + +/** + * @Description: 生成编号前缀枚举 + * @Author: zt + * @Date: 2023/2/13 15:41 + */ +public interface PrefixCodeEnum { + + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java deleted file mode 100644 index fa11713..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.business.BusinessEnvironmentRecord; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -public interface BusinessEnviromentRecordMapper extends BaseMapper { - @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") - Long selectMaxCode(); -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java new file mode 100644 index 0000000..a651c40 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnvironmentRecord; +import org.apache.ibatis.annotations.Select; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnvironmentRecordMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from business_environment_record") + Long selectMaxCode(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java index 94db1cc..7f16692 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -1,7 +1,10 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} + + +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} + diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java new file mode 100644 index 0000000..884b482 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java @@ -0,0 +1,17 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zt + * @since 2023-02-02 + */ +public interface EnvironmentListResponseMapper extends BaseMapper { + + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml index e80a3ad..14eeb73 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -1,6 +1,6 @@ - + @@ -20,6 +20,7 @@ + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java new file mode 100644 index 0000000..6b7ddc9 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.business.environment; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class EnvironmentListRequest { + + @ApiModelProperty(value = "记录单编号", dataType = "String") + private String environmentCode; + + @ApiModelProperty(value = "房间号", dataType = "String") + private String roomNumber; + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java new file mode 100644 index 0000000..d858b3a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java @@ -0,0 +1,69 @@ +package com.casic.missiles.dto.business.environment; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +@TableName("business_environment_record") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class EnvironmentListResponse { + + @ApiModelProperty(value = "环境记录单id", dataType = "Long") + private Long id; + @ApiModelProperty(value = "记录单编号", dataType = "String") + @ExcelProperty(value = "记录单编号",order = 0) + private String environmentCode; + + @ApiModelProperty(value = "房间号", dataType = "String") + @ExcelProperty(value = "房间号",order = 1) + private String roomNumber; + + @ApiModelProperty(value = "温度", dataType = "String") + @ExcelProperty(value = "温度",order = 2) + private String temperature; + + @ApiModelProperty(value = "湿度", dataType = "String") + @ExcelProperty(value = "湿度",order = 3) + private String humidity; + + @ApiModelProperty(value = "输出电压", dataType = "String") + @ExcelProperty(value = "输出电压",order = 4) + private String outputVoltage; + + @ApiModelProperty(value = "零地电压", dataType = "String") + @ExcelProperty(value = "零地电压",order = 5) + private String zeroGroundVoltage; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "记录人", dataType = "String") + @ExcelProperty(value = "记录人",order = 6) + private String recorder; + + @ApiModelProperty(value = "创建人", dataType = "String") + private String createUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "记录时间", dataType = "String") + @ExcelProperty(value = "记录时间",order = 7) + private String recordTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java index 12f60ea..8eddeb7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java @@ -17,7 +17,7 @@ * @since 2023-02-02 */ @Data -@TableName("business_enviroment_record") +@TableName("business_environment_record") public class BusinessEnvironmentRecord implements Serializable { private static final long serialVersionUID = 1L; @@ -46,7 +46,7 @@ @TableField("temperature") private String temperature; - @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String") + @ApiModelProperty(value = "湿度", dataType = "String") @TableField("humidity") private String humidity; @@ -74,5 +74,4 @@ @TableField("update_time") private String updateTime; - } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java index 8d77f67..b7ff5dd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java @@ -3,26 +3,32 @@ 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.core.base.service.IBaseExportService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper; +import com.casic.missiles.mapper.business.EnvironmentListResponseMapper; import com.casic.missiles.model.business.BusinessEnvironmentRecord; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.business.BusinessOrderSampleRelation; -import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.service.business.IBusinessEnvironmentRecordService; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; +import java.io.IOException; import java.util.List; /** @@ -34,12 +40,26 @@ * @since 2023-02-02 */ @Service -public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl implements IBusinessEnvironmentRecordService { +public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl implements IBusinessEnvironmentRecordService { + @Resource + private EnvironmentListResponseMapper environmentListResponseMapper; + @Resource + private IBaseExportService iBaseExportService; + @Override - public Page orderListPage(Page page, OrderListRequest request) throws Exception { - return null; + public Page environmentListPage(Page page, EnvironmentListRequest request) throws Exception { + + // 获取列表 + QueryWrapper wrapper = listParamWrapper(request); + Page environmentListResponsePage = this.environmentListResponseMapper.selectPage(page, wrapper); + if (!CollectionUtils.isEmpty(environmentListResponsePage.getRecords())) { + for (EnvironmentListResponse record : environmentListResponsePage.getRecords()) { + DictCodeUtils.convertDictCodeToName(record); + } + } + return environmentListResponsePage; } @Override @@ -70,15 +90,39 @@ } @Override - public void environmentExport(OrderListRequest request, HttpServletResponse response) { + public void environmentExport(EnvironmentListRequest request, HttpServletResponse response) { + QueryWrapper wrapper = listParamWrapper(request); + List environmentListResponseList = this.environmentListResponseMapper.selectList(wrapper); + try { + iBaseExportService.exportExcel(response, EnvironmentListResponse.class, environmentListResponseList, ExportEnum.ENVIRONMENT_DATA.getSheetName()); + } catch (IOException e) { + log.error("环境记录单导出出现异常,异常信息为{}", e); + } } private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) { Long maxNo = this.baseMapper.selectMaxCode(); - String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo); + String environmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.ENVIRONMENT_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessEnvironmentRecord.setCreateUser(authUser.getId()); + businessEnvironmentRecord.setRecorder(StringUtils. + isNotBlank(businessEnvironmentRecord.getRecorder()) ? + businessEnvironmentRecord.getRecorder() : authUser.getName()); businessEnvironmentRecord.setEnvironmentCode(environmentNo); } + + + private QueryWrapper listParamWrapper(EnvironmentListRequest request) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.like(StringUtils.isNotBlank(request.getEnvironmentCode()), "environment_code", request.getEnvironmentCode()); + wrapper.like(StringUtils.isNotBlank(request.getRoomNumber()), "room_number", request.getRoomNumber()); + wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),//apply方法传入参数名不能为空 + "{0} <= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getStartTime()); + wrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} >= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getEndTime()); + return wrapper; + } + + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java index 53c9774..99e3b8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -1,13 +1,18 @@ package com.casic.missiles.controller.business; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; 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.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessEnvironmentRecord; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -28,7 +34,7 @@ * 前端控制器 *

* - * @author wangpeng + * @author zt * @since 2023-02-02 */ @RestController @@ -37,19 +43,23 @@ @Resource private IBusinessEnvironmentRecordService businessEnvironmentRecordService; -// @ApiOperation("环境检测单查询") -// @PostMapping("/listPage") -// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { -// if (bindingResult.hasErrors()) { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// } -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); -// } -// + @Resource + private AbstractDictService dictService; + + @ApiOperation("环境检测单查询") + @PostMapping("/listPage") + public ReturnDTO> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request))); + } + + @ApiOperation("环境检测单详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO environmentDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -58,7 +68,7 @@ @ApiOperation("环境检测单更新") @PostMapping("/update") - public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){ + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -83,14 +93,18 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); + return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId())); } -// -// //*******************************************************************************************************************// -// @ApiOperation("环境检测单导出") -// @PostMapping("/export") -// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { -// businessOrderService.orderExport(request, response); -// } + @ApiOperation("环境检测单导出") + @PostMapping("/export") + public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) { + businessEnvironmentRecordService.environmentExport(request, response); + } + @ApiOperation("获取房间号")//业务表 + @PostMapping("/getDoors") + public ReturnDTO getDoors() { + return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER)); + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 3e4f307..83b9856 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index b507dde..5253767 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -30,8 +30,7 @@ String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; - //标准装置-状态 - String STANDARD_MANAGER_STATE = "standardManagerState"; - //测量设备-状态 - String MANAGER_STATE = "managerState"; + //房间号 + String DOOR_NUMBER = "doorCode"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java new file mode 100644 index 0000000..5057d08 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -0,0 +1,14 @@ +package com.casic.missiles.enums; + +/** + * @Description: 生成编号前缀枚举 + * @Author: zt + * @Date: 2023/2/13 15:41 + */ +public interface PrefixCodeEnum { + + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java deleted file mode 100644 index fa11713..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.business.BusinessEnvironmentRecord; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -public interface BusinessEnviromentRecordMapper extends BaseMapper { - @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") - Long selectMaxCode(); -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java new file mode 100644 index 0000000..a651c40 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnvironmentRecord; +import org.apache.ibatis.annotations.Select; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnvironmentRecordMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from business_environment_record") + Long selectMaxCode(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java index 94db1cc..7f16692 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -1,7 +1,10 @@ -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} + + +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} + diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java new file mode 100644 index 0000000..884b482 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java @@ -0,0 +1,17 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zt + * @since 2023-02-02 + */ +public interface EnvironmentListResponseMapper extends BaseMapper { + + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml index e80a3ad..14eeb73 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -1,6 +1,6 @@ - + @@ -20,6 +20,7 @@ + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java new file mode 100644 index 0000000..6b7ddc9 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.business.environment; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class EnvironmentListRequest { + + @ApiModelProperty(value = "记录单编号", dataType = "String") + private String environmentCode; + + @ApiModelProperty(value = "房间号", dataType = "String") + private String roomNumber; + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java new file mode 100644 index 0000000..d858b3a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java @@ -0,0 +1,69 @@ +package com.casic.missiles.dto.business.environment; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +@TableName("business_environment_record") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class EnvironmentListResponse { + + @ApiModelProperty(value = "环境记录单id", dataType = "Long") + private Long id; + @ApiModelProperty(value = "记录单编号", dataType = "String") + @ExcelProperty(value = "记录单编号",order = 0) + private String environmentCode; + + @ApiModelProperty(value = "房间号", dataType = "String") + @ExcelProperty(value = "房间号",order = 1) + private String roomNumber; + + @ApiModelProperty(value = "温度", dataType = "String") + @ExcelProperty(value = "温度",order = 2) + private String temperature; + + @ApiModelProperty(value = "湿度", dataType = "String") + @ExcelProperty(value = "湿度",order = 3) + private String humidity; + + @ApiModelProperty(value = "输出电压", dataType = "String") + @ExcelProperty(value = "输出电压",order = 4) + private String outputVoltage; + + @ApiModelProperty(value = "零地电压", dataType = "String") + @ExcelProperty(value = "零地电压",order = 5) + private String zeroGroundVoltage; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "记录人", dataType = "String") + @ExcelProperty(value = "记录人",order = 6) + private String recorder; + + @ApiModelProperty(value = "创建人", dataType = "String") + private String createUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "记录时间", dataType = "String") + @ExcelProperty(value = "记录时间",order = 7) + private String recordTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java index 12f60ea..8eddeb7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java @@ -17,7 +17,7 @@ * @since 2023-02-02 */ @Data -@TableName("business_enviroment_record") +@TableName("business_environment_record") public class BusinessEnvironmentRecord implements Serializable { private static final long serialVersionUID = 1L; @@ -46,7 +46,7 @@ @TableField("temperature") private String temperature; - @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String") + @ApiModelProperty(value = "湿度", dataType = "String") @TableField("humidity") private String humidity; @@ -74,5 +74,4 @@ @TableField("update_time") private String updateTime; - } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java index 8d77f67..b7ff5dd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java @@ -3,26 +3,32 @@ 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.core.base.service.IBaseExportService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper; +import com.casic.missiles.mapper.business.EnvironmentListResponseMapper; import com.casic.missiles.model.business.BusinessEnvironmentRecord; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.business.BusinessOrderSampleRelation; -import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.service.business.IBusinessEnvironmentRecordService; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; +import java.io.IOException; import java.util.List; /** @@ -34,12 +40,26 @@ * @since 2023-02-02 */ @Service -public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl implements IBusinessEnvironmentRecordService { +public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl implements IBusinessEnvironmentRecordService { + @Resource + private EnvironmentListResponseMapper environmentListResponseMapper; + @Resource + private IBaseExportService iBaseExportService; + @Override - public Page orderListPage(Page page, OrderListRequest request) throws Exception { - return null; + public Page environmentListPage(Page page, EnvironmentListRequest request) throws Exception { + + // 获取列表 + QueryWrapper wrapper = listParamWrapper(request); + Page environmentListResponsePage = this.environmentListResponseMapper.selectPage(page, wrapper); + if (!CollectionUtils.isEmpty(environmentListResponsePage.getRecords())) { + for (EnvironmentListResponse record : environmentListResponsePage.getRecords()) { + DictCodeUtils.convertDictCodeToName(record); + } + } + return environmentListResponsePage; } @Override @@ -70,15 +90,39 @@ } @Override - public void environmentExport(OrderListRequest request, HttpServletResponse response) { + public void environmentExport(EnvironmentListRequest request, HttpServletResponse response) { + QueryWrapper wrapper = listParamWrapper(request); + List environmentListResponseList = this.environmentListResponseMapper.selectList(wrapper); + try { + iBaseExportService.exportExcel(response, EnvironmentListResponse.class, environmentListResponseList, ExportEnum.ENVIRONMENT_DATA.getSheetName()); + } catch (IOException e) { + log.error("环境记录单导出出现异常,异常信息为{}", e); + } } private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) { Long maxNo = this.baseMapper.selectMaxCode(); - String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo); + String environmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.ENVIRONMENT_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessEnvironmentRecord.setCreateUser(authUser.getId()); + businessEnvironmentRecord.setRecorder(StringUtils. + isNotBlank(businessEnvironmentRecord.getRecorder()) ? + businessEnvironmentRecord.getRecorder() : authUser.getName()); businessEnvironmentRecord.setEnvironmentCode(environmentNo); } + + + private QueryWrapper listParamWrapper(EnvironmentListRequest request) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.like(StringUtils.isNotBlank(request.getEnvironmentCode()), "environment_code", request.getEnvironmentCode()); + wrapper.like(StringUtils.isNotBlank(request.getRoomNumber()), "room_number", request.getRoomNumber()); + wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),//apply方法传入参数名不能为空 + "{0} <= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getStartTime()); + wrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} >= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getEndTime()); + return wrapper; + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java index 5bc1307..de26f89 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.environment.EnvironmentListRequest; +import com.casic.missiles.dto.business.environment.EnvironmentListResponse; import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.model.business.BusinessEnvironmentRecord; @@ -18,7 +20,8 @@ * @since 2023-02-02 */ public interface IBusinessEnvironmentRecordService extends IService { - Page orderListPage(Page page, OrderListRequest request) throws Exception; + + Page environmentListPage(Page page, EnvironmentListRequest request) throws Exception; BusinessEnvironmentRecord environmentDetail(Long id); @@ -28,6 +31,8 @@ ReturnDTO addEnvironment(BusinessEnvironmentRecord businessEnvironmentRecord); - void environmentExport(OrderListRequest request, HttpServletResponse response); + void environmentExport(EnvironmentListRequest request, HttpServletResponse response); + } +