diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 89b7380..003fa11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -128,6 +128,8 @@ String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + String CONFIG_FILE_TYPE = "configFileType"; + /** * 财务产值 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 89b7380..003fa11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -128,6 +128,8 @@ String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + String CONFIG_FILE_TYPE = "configFileType"; + /** * 财务产值 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index a4b3d8d..8baf9b7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -104,6 +104,9 @@ @ApiModelProperty(value = "是否自检", dataType = "boolean") private Boolean isSelfMeasure; + @ApiModelProperty(value = "备注", dataType = "boolean") + private Boolean remark; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 89b7380..003fa11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -128,6 +128,8 @@ String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + String CONFIG_FILE_TYPE = "configFileType"; + /** * 财务产值 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index a4b3d8d..8baf9b7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -104,6 +104,9 @@ @ApiModelProperty(value = "是否自检", dataType = "boolean") private Boolean isSelfMeasure; + @ApiModelProperty(value = "备注", dataType = "boolean") + private Boolean remark; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index dfcff9e..dc5bb04 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -17,7 +17,7 @@ private String customerName; @ApiModelProperty(value = "样品id", dataType = "String") - private Long sampleId; + private Long id; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; @@ -37,6 +37,9 @@ @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; + @ApiModelProperty(value = "电源电压", dataType = "String") + private String powerVoltage; + @ApiModelProperty(value = "检定要求", dataType = "Integer") private String measureContent; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 89b7380..003fa11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -128,6 +128,8 @@ String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + String CONFIG_FILE_TYPE = "configFileType"; + /** * 财务产值 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index a4b3d8d..8baf9b7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -104,6 +104,9 @@ @ApiModelProperty(value = "是否自检", dataType = "boolean") private Boolean isSelfMeasure; + @ApiModelProperty(value = "备注", dataType = "boolean") + private Boolean remark; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index dfcff9e..dc5bb04 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -17,7 +17,7 @@ private String customerName; @ApiModelProperty(value = "样品id", dataType = "String") - private Long sampleId; + private Long id; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; @@ -37,6 +37,9 @@ @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; + @ApiModelProperty(value = "电源电压", dataType = "String") + private String powerVoltage; + @ApiModelProperty(value = "检定要求", dataType = "Integer") private String measureContent; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0e8bbfa..44e879d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -38,7 +38,7 @@ @ApiModelProperty("业务模块名称") @ExcelProperty(value = "业务模块名称", order = 1) - private String metaModuleName; + private String moduleName; @ApiModelProperty("业务类型") @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) @@ -57,6 +57,7 @@ private String fileName; @ApiModelProperty("文件类型") + @DictCodeField(message = "文件类型描述不合法", cacheName = MeterDictCode.CONFIG_FILE_TYPE) private String fileType; @ExcelProperty(value = "文件类型", order = 5) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 89b7380..003fa11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -128,6 +128,8 @@ String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + String CONFIG_FILE_TYPE = "configFileType"; + /** * 财务产值 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index a4b3d8d..8baf9b7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -104,6 +104,9 @@ @ApiModelProperty(value = "是否自检", dataType = "boolean") private Boolean isSelfMeasure; + @ApiModelProperty(value = "备注", dataType = "boolean") + private Boolean remark; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index dfcff9e..dc5bb04 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -17,7 +17,7 @@ private String customerName; @ApiModelProperty(value = "样品id", dataType = "String") - private Long sampleId; + private Long id; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; @@ -37,6 +37,9 @@ @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; + @ApiModelProperty(value = "电源电压", dataType = "String") + private String powerVoltage; + @ApiModelProperty(value = "检定要求", dataType = "Integer") private String measureContent; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0e8bbfa..44e879d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -38,7 +38,7 @@ @ApiModelProperty("业务模块名称") @ExcelProperty(value = "业务模块名称", order = 1) - private String metaModuleName; + private String moduleName; @ApiModelProperty("业务类型") @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) @@ -57,6 +57,7 @@ private String fileName; @ApiModelProperty("文件类型") + @DictCodeField(message = "文件类型描述不合法", cacheName = MeterDictCode.CONFIG_FILE_TYPE) private String fileType; @ExcelProperty(value = "文件类型", order = 5) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index f96a510..798b328 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -36,9 +36,9 @@ @TableField("site_executive_name") private String siteExecutiveName; - @ApiModelProperty(value = "负责人id", dataType = "String") + @ApiModelProperty(value = "负责人id", dataType = "Long") @TableField("director_id") - private String directorId; + private Long directorId; @ApiModelProperty(value = "负责人名字", dataType = "String") @TableField("director_name") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 89b7380..003fa11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -128,6 +128,8 @@ String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + String CONFIG_FILE_TYPE = "configFileType"; + /** * 财务产值 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index a4b3d8d..8baf9b7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -104,6 +104,9 @@ @ApiModelProperty(value = "是否自检", dataType = "boolean") private Boolean isSelfMeasure; + @ApiModelProperty(value = "备注", dataType = "boolean") + private Boolean remark; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index dfcff9e..dc5bb04 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -17,7 +17,7 @@ private String customerName; @ApiModelProperty(value = "样品id", dataType = "String") - private Long sampleId; + private Long id; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; @@ -37,6 +37,9 @@ @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; + @ApiModelProperty(value = "电源电压", dataType = "String") + private String powerVoltage; + @ApiModelProperty(value = "检定要求", dataType = "Integer") private String measureContent; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0e8bbfa..44e879d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -38,7 +38,7 @@ @ApiModelProperty("业务模块名称") @ExcelProperty(value = "业务模块名称", order = 1) - private String metaModuleName; + private String moduleName; @ApiModelProperty("业务类型") @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) @@ -57,6 +57,7 @@ private String fileName; @ApiModelProperty("文件类型") + @DictCodeField(message = "文件类型描述不合法", cacheName = MeterDictCode.CONFIG_FILE_TYPE) private String fileType; @ExcelProperty(value = "文件类型", order = 5) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index f96a510..798b328 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -36,9 +36,9 @@ @TableField("site_executive_name") private String siteExecutiveName; - @ApiModelProperty(value = "负责人id", dataType = "String") + @ApiModelProperty(value = "负责人id", dataType = "Long") @TableField("director_id") - private String directorId; + private Long directorId; @ApiModelProperty(value = "负责人名字", dataType = "String") @TableField("director_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java deleted file mode 100644 index 16445ab..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.casic.missiles.model.system; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.NotNull; - -/** - *

- * - *

- * - * @author cz - * @since 2023-04-03 - */ -@Getter -@Setter -@TableName("system_download_center") -public class DownloadCenter implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @ApiModelProperty("下载编号") - @TableField("download_no") - private String downloadNo; - - @NotNull - @ApiModelProperty("业务模块名称") - @TableField("module_name") - private String moduleName; - - @NotNull - @ApiModelProperty("业务类型(字典)") - @TableField("business_download_type") - private String businessDownloadType; - - @ApiModelProperty("minio存储文件名") - @TableField("minio_file_name") - private String minioFileName; - - @TableField("file_name") - @ApiModelProperty("文件名称") - private String fileName; - - @ApiModelProperty("文件类型") - @TableField("file_type") - private String fileType; - - @ApiModelProperty("描述备注") - @TableField("descn") - private String descn; - - /** - * 创建人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 更新人id - */ - @TableField("update_user") - private Long updateUser; - - /** - * 删除标记 - */ - @TableField("is_del") - private Boolean isDel; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private LocalDateTime updateTime; - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 89b7380..003fa11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -128,6 +128,8 @@ String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + String CONFIG_FILE_TYPE = "configFileType"; + /** * 财务产值 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index a4b3d8d..8baf9b7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -104,6 +104,9 @@ @ApiModelProperty(value = "是否自检", dataType = "boolean") private Boolean isSelfMeasure; + @ApiModelProperty(value = "备注", dataType = "boolean") + private Boolean remark; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index dfcff9e..dc5bb04 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -17,7 +17,7 @@ private String customerName; @ApiModelProperty(value = "样品id", dataType = "String") - private Long sampleId; + private Long id; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; @@ -37,6 +37,9 @@ @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; + @ApiModelProperty(value = "电源电压", dataType = "String") + private String powerVoltage; + @ApiModelProperty(value = "检定要求", dataType = "Integer") private String measureContent; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0e8bbfa..44e879d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -38,7 +38,7 @@ @ApiModelProperty("业务模块名称") @ExcelProperty(value = "业务模块名称", order = 1) - private String metaModuleName; + private String moduleName; @ApiModelProperty("业务类型") @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) @@ -57,6 +57,7 @@ private String fileName; @ApiModelProperty("文件类型") + @DictCodeField(message = "文件类型描述不合法", cacheName = MeterDictCode.CONFIG_FILE_TYPE) private String fileType; @ExcelProperty(value = "文件类型", order = 5) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index f96a510..798b328 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -36,9 +36,9 @@ @TableField("site_executive_name") private String siteExecutiveName; - @ApiModelProperty(value = "负责人id", dataType = "String") + @ApiModelProperty(value = "负责人id", dataType = "Long") @TableField("director_id") - private String directorId; + private Long directorId; @ApiModelProperty(value = "负责人名字", dataType = "String") @TableField("director_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java deleted file mode 100644 index 16445ab..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.casic.missiles.model.system; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.NotNull; - -/** - *

- * - *

- * - * @author cz - * @since 2023-04-03 - */ -@Getter -@Setter -@TableName("system_download_center") -public class DownloadCenter implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @ApiModelProperty("下载编号") - @TableField("download_no") - private String downloadNo; - - @NotNull - @ApiModelProperty("业务模块名称") - @TableField("module_name") - private String moduleName; - - @NotNull - @ApiModelProperty("业务类型(字典)") - @TableField("business_download_type") - private String businessDownloadType; - - @ApiModelProperty("minio存储文件名") - @TableField("minio_file_name") - private String minioFileName; - - @TableField("file_name") - @ApiModelProperty("文件名称") - private String fileName; - - @ApiModelProperty("文件类型") - @TableField("file_type") - private String fileType; - - @ApiModelProperty("描述备注") - @TableField("descn") - private String descn; - - /** - * 创建人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 更新人id - */ - @TableField("update_user") - private Long updateUser; - - /** - * 删除标记 - */ - @TableField("is_del") - private Boolean isDel; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private LocalDateTime updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java new file mode 100644 index 0000000..e73a16f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; + +/** + *

+ * + *

+ * + * @author cz + * @since 2023-04-03 + */ +@Getter +@Setter +@TableName("system_file_config") +public class SystemFileConfig implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @ApiModelProperty("下载编号") + @TableField("download_no") + private String downloadNo; + + @NotNull + @ApiModelProperty("业务模块名称") + @TableField("module_name") + private String moduleName; + + @NotNull + @ApiModelProperty("业务类型(字典)") + @TableField("business_download_type") + private String businessDownloadType; + + @ApiModelProperty("minio存储文件名") + @TableField("minio_file_name") + private String minioFileName; + + @TableField("file_name") + @ApiModelProperty("文件名称") + private String fileName; + + @ApiModelProperty("文件类型") + @TableField("file_type") + private String fileType; + + @ApiModelProperty("描述备注") + @TableField("descn") + private String descn; + + /** + * 创建人id + */ + @TableField("create_user") + private Long createUser; + + /** + * 更新人id + */ + @TableField("update_user") + private Long updateUser; + + /** + * 删除标记 + */ + @TableField("is_del") + private Boolean isDel; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 89b7380..003fa11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -128,6 +128,8 @@ String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + String CONFIG_FILE_TYPE = "configFileType"; + /** * 财务产值 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index a4b3d8d..8baf9b7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -104,6 +104,9 @@ @ApiModelProperty(value = "是否自检", dataType = "boolean") private Boolean isSelfMeasure; + @ApiModelProperty(value = "备注", dataType = "boolean") + private Boolean remark; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index dfcff9e..dc5bb04 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -17,7 +17,7 @@ private String customerName; @ApiModelProperty(value = "样品id", dataType = "String") - private Long sampleId; + private Long id; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; @@ -37,6 +37,9 @@ @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; + @ApiModelProperty(value = "电源电压", dataType = "String") + private String powerVoltage; + @ApiModelProperty(value = "检定要求", dataType = "Integer") private String measureContent; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0e8bbfa..44e879d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -38,7 +38,7 @@ @ApiModelProperty("业务模块名称") @ExcelProperty(value = "业务模块名称", order = 1) - private String metaModuleName; + private String moduleName; @ApiModelProperty("业务类型") @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) @@ -57,6 +57,7 @@ private String fileName; @ApiModelProperty("文件类型") + @DictCodeField(message = "文件类型描述不合法", cacheName = MeterDictCode.CONFIG_FILE_TYPE) private String fileType; @ExcelProperty(value = "文件类型", order = 5) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index f96a510..798b328 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -36,9 +36,9 @@ @TableField("site_executive_name") private String siteExecutiveName; - @ApiModelProperty(value = "负责人id", dataType = "String") + @ApiModelProperty(value = "负责人id", dataType = "Long") @TableField("director_id") - private String directorId; + private Long directorId; @ApiModelProperty(value = "负责人名字", dataType = "String") @TableField("director_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java deleted file mode 100644 index 16445ab..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.casic.missiles.model.system; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.NotNull; - -/** - *

- * - *

- * - * @author cz - * @since 2023-04-03 - */ -@Getter -@Setter -@TableName("system_download_center") -public class DownloadCenter implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @ApiModelProperty("下载编号") - @TableField("download_no") - private String downloadNo; - - @NotNull - @ApiModelProperty("业务模块名称") - @TableField("module_name") - private String moduleName; - - @NotNull - @ApiModelProperty("业务类型(字典)") - @TableField("business_download_type") - private String businessDownloadType; - - @ApiModelProperty("minio存储文件名") - @TableField("minio_file_name") - private String minioFileName; - - @TableField("file_name") - @ApiModelProperty("文件名称") - private String fileName; - - @ApiModelProperty("文件类型") - @TableField("file_type") - private String fileType; - - @ApiModelProperty("描述备注") - @TableField("descn") - private String descn; - - /** - * 创建人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 更新人id - */ - @TableField("update_user") - private Long updateUser; - - /** - * 删除标记 - */ - @TableField("is_del") - private Boolean isDel; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private LocalDateTime updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java new file mode 100644 index 0000000..e73a16f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; + +/** + *

+ * + *

+ * + * @author cz + * @since 2023-04-03 + */ +@Getter +@Setter +@TableName("system_file_config") +public class SystemFileConfig implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @ApiModelProperty("下载编号") + @TableField("download_no") + private String downloadNo; + + @NotNull + @ApiModelProperty("业务模块名称") + @TableField("module_name") + private String moduleName; + + @NotNull + @ApiModelProperty("业务类型(字典)") + @TableField("business_download_type") + private String businessDownloadType; + + @ApiModelProperty("minio存储文件名") + @TableField("minio_file_name") + private String minioFileName; + + @TableField("file_name") + @ApiModelProperty("文件名称") + private String fileName; + + @ApiModelProperty("文件类型") + @TableField("file_type") + private String fileType; + + @ApiModelProperty("描述备注") + @TableField("descn") + private String descn; + + /** + * 创建人id + */ + @TableField("create_user") + private Long createUser; + + /** + * 更新人id + */ + @TableField("update_user") + private Long updateUser; + + /** + * 删除标记 + */ + @TableField("is_del") + private Boolean isDel; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 64e11f7..55151fc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -38,13 +38,15 @@ siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId); siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); - siteExecutiveEquipmentRelation.setEquipmentId(assets.getId()); + siteExecutiveEquipmentRelation.setEquipmentId(assets.getEquipmentId()); siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck()); siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate()); siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId()); + siteExecutiveEquipmentRelation.setBeforeWorkResult(assets.getBeforeWorkResult()); + siteExecutiveEquipmentRelation.setAfterWorkResult(assets.getAfterWorkResult()); list.add(siteExecutiveEquipmentRelation); }); return this.saveBatch(list); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 89b7380..003fa11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -128,6 +128,8 @@ String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + String CONFIG_FILE_TYPE = "configFileType"; + /** * 财务产值 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index a4b3d8d..8baf9b7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -104,6 +104,9 @@ @ApiModelProperty(value = "是否自检", dataType = "boolean") private Boolean isSelfMeasure; + @ApiModelProperty(value = "备注", dataType = "boolean") + private Boolean remark; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index dfcff9e..dc5bb04 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -17,7 +17,7 @@ private String customerName; @ApiModelProperty(value = "样品id", dataType = "String") - private Long sampleId; + private Long id; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; @@ -37,6 +37,9 @@ @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; + @ApiModelProperty(value = "电源电压", dataType = "String") + private String powerVoltage; + @ApiModelProperty(value = "检定要求", dataType = "Integer") private String measureContent; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0e8bbfa..44e879d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -38,7 +38,7 @@ @ApiModelProperty("业务模块名称") @ExcelProperty(value = "业务模块名称", order = 1) - private String metaModuleName; + private String moduleName; @ApiModelProperty("业务类型") @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) @@ -57,6 +57,7 @@ private String fileName; @ApiModelProperty("文件类型") + @DictCodeField(message = "文件类型描述不合法", cacheName = MeterDictCode.CONFIG_FILE_TYPE) private String fileType; @ExcelProperty(value = "文件类型", order = 5) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index f96a510..798b328 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -36,9 +36,9 @@ @TableField("site_executive_name") private String siteExecutiveName; - @ApiModelProperty(value = "负责人id", dataType = "String") + @ApiModelProperty(value = "负责人id", dataType = "Long") @TableField("director_id") - private String directorId; + private Long directorId; @ApiModelProperty(value = "负责人名字", dataType = "String") @TableField("director_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java deleted file mode 100644 index 16445ab..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.casic.missiles.model.system; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.NotNull; - -/** - *

- * - *

- * - * @author cz - * @since 2023-04-03 - */ -@Getter -@Setter -@TableName("system_download_center") -public class DownloadCenter implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @ApiModelProperty("下载编号") - @TableField("download_no") - private String downloadNo; - - @NotNull - @ApiModelProperty("业务模块名称") - @TableField("module_name") - private String moduleName; - - @NotNull - @ApiModelProperty("业务类型(字典)") - @TableField("business_download_type") - private String businessDownloadType; - - @ApiModelProperty("minio存储文件名") - @TableField("minio_file_name") - private String minioFileName; - - @TableField("file_name") - @ApiModelProperty("文件名称") - private String fileName; - - @ApiModelProperty("文件类型") - @TableField("file_type") - private String fileType; - - @ApiModelProperty("描述备注") - @TableField("descn") - private String descn; - - /** - * 创建人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 更新人id - */ - @TableField("update_user") - private Long updateUser; - - /** - * 删除标记 - */ - @TableField("is_del") - private Boolean isDel; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private LocalDateTime updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java new file mode 100644 index 0000000..e73a16f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; + +/** + *

+ * + *

+ * + * @author cz + * @since 2023-04-03 + */ +@Getter +@Setter +@TableName("system_file_config") +public class SystemFileConfig implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @ApiModelProperty("下载编号") + @TableField("download_no") + private String downloadNo; + + @NotNull + @ApiModelProperty("业务模块名称") + @TableField("module_name") + private String moduleName; + + @NotNull + @ApiModelProperty("业务类型(字典)") + @TableField("business_download_type") + private String businessDownloadType; + + @ApiModelProperty("minio存储文件名") + @TableField("minio_file_name") + private String minioFileName; + + @TableField("file_name") + @ApiModelProperty("文件名称") + private String fileName; + + @ApiModelProperty("文件类型") + @TableField("file_type") + private String fileType; + + @ApiModelProperty("描述备注") + @TableField("descn") + private String descn; + + /** + * 创建人id + */ + @TableField("create_user") + private Long createUser; + + /** + * 更新人id + */ + @TableField("update_user") + private Long updateUser; + + /** + * 删除标记 + */ + @TableField("is_del") + private Boolean isDel; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 64e11f7..55151fc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -38,13 +38,15 @@ siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId); siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); - siteExecutiveEquipmentRelation.setEquipmentId(assets.getId()); + siteExecutiveEquipmentRelation.setEquipmentId(assets.getEquipmentId()); siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck()); siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate()); siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId()); + siteExecutiveEquipmentRelation.setBeforeWorkResult(assets.getBeforeWorkResult()); + siteExecutiveEquipmentRelation.setAfterWorkResult(assets.getAfterWorkResult()); list.add(siteExecutiveEquipmentRelation); }); return this.saveBatch(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 48ff287..b4dfc4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -190,6 +190,8 @@ String siteExecutiveNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveInfo.setCreateUser(authUser.getId()); + siteExecutiveInfo.setDirectorId(authUser.getId()); + siteExecutiveInfo.setDirectorName(authUser.getName()); siteExecutiveInfo.setSiteExecutiveNo(siteExecutiveNo); siteExecutiveInfo.setCreateTime(DateUtil.formatDateTime(new Date())); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 89b7380..003fa11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -128,6 +128,8 @@ String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + String CONFIG_FILE_TYPE = "configFileType"; + /** * 财务产值 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index a4b3d8d..8baf9b7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -104,6 +104,9 @@ @ApiModelProperty(value = "是否自检", dataType = "boolean") private Boolean isSelfMeasure; + @ApiModelProperty(value = "备注", dataType = "boolean") + private Boolean remark; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index dfcff9e..dc5bb04 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -17,7 +17,7 @@ private String customerName; @ApiModelProperty(value = "样品id", dataType = "String") - private Long sampleId; + private Long id; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; @@ -37,6 +37,9 @@ @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; + @ApiModelProperty(value = "电源电压", dataType = "String") + private String powerVoltage; + @ApiModelProperty(value = "检定要求", dataType = "Integer") private String measureContent; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0e8bbfa..44e879d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -38,7 +38,7 @@ @ApiModelProperty("业务模块名称") @ExcelProperty(value = "业务模块名称", order = 1) - private String metaModuleName; + private String moduleName; @ApiModelProperty("业务类型") @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) @@ -57,6 +57,7 @@ private String fileName; @ApiModelProperty("文件类型") + @DictCodeField(message = "文件类型描述不合法", cacheName = MeterDictCode.CONFIG_FILE_TYPE) private String fileType; @ExcelProperty(value = "文件类型", order = 5) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index f96a510..798b328 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -36,9 +36,9 @@ @TableField("site_executive_name") private String siteExecutiveName; - @ApiModelProperty(value = "负责人id", dataType = "String") + @ApiModelProperty(value = "负责人id", dataType = "Long") @TableField("director_id") - private String directorId; + private Long directorId; @ApiModelProperty(value = "负责人名字", dataType = "String") @TableField("director_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java deleted file mode 100644 index 16445ab..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.casic.missiles.model.system; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.NotNull; - -/** - *

- * - *

- * - * @author cz - * @since 2023-04-03 - */ -@Getter -@Setter -@TableName("system_download_center") -public class DownloadCenter implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @ApiModelProperty("下载编号") - @TableField("download_no") - private String downloadNo; - - @NotNull - @ApiModelProperty("业务模块名称") - @TableField("module_name") - private String moduleName; - - @NotNull - @ApiModelProperty("业务类型(字典)") - @TableField("business_download_type") - private String businessDownloadType; - - @ApiModelProperty("minio存储文件名") - @TableField("minio_file_name") - private String minioFileName; - - @TableField("file_name") - @ApiModelProperty("文件名称") - private String fileName; - - @ApiModelProperty("文件类型") - @TableField("file_type") - private String fileType; - - @ApiModelProperty("描述备注") - @TableField("descn") - private String descn; - - /** - * 创建人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 更新人id - */ - @TableField("update_user") - private Long updateUser; - - /** - * 删除标记 - */ - @TableField("is_del") - private Boolean isDel; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private LocalDateTime updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java new file mode 100644 index 0000000..e73a16f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; + +/** + *

+ * + *

+ * + * @author cz + * @since 2023-04-03 + */ +@Getter +@Setter +@TableName("system_file_config") +public class SystemFileConfig implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @ApiModelProperty("下载编号") + @TableField("download_no") + private String downloadNo; + + @NotNull + @ApiModelProperty("业务模块名称") + @TableField("module_name") + private String moduleName; + + @NotNull + @ApiModelProperty("业务类型(字典)") + @TableField("business_download_type") + private String businessDownloadType; + + @ApiModelProperty("minio存储文件名") + @TableField("minio_file_name") + private String minioFileName; + + @TableField("file_name") + @ApiModelProperty("文件名称") + private String fileName; + + @ApiModelProperty("文件类型") + @TableField("file_type") + private String fileType; + + @ApiModelProperty("描述备注") + @TableField("descn") + private String descn; + + /** + * 创建人id + */ + @TableField("create_user") + private Long createUser; + + /** + * 更新人id + */ + @TableField("update_user") + private Long updateUser; + + /** + * 删除标记 + */ + @TableField("is_del") + private Boolean isDel; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 64e11f7..55151fc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -38,13 +38,15 @@ siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId); siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); - siteExecutiveEquipmentRelation.setEquipmentId(assets.getId()); + siteExecutiveEquipmentRelation.setEquipmentId(assets.getEquipmentId()); siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck()); siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate()); siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId()); + siteExecutiveEquipmentRelation.setBeforeWorkResult(assets.getBeforeWorkResult()); + siteExecutiveEquipmentRelation.setAfterWorkResult(assets.getAfterWorkResult()); list.add(siteExecutiveEquipmentRelation); }); return this.saveBatch(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 48ff287..b4dfc4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -190,6 +190,8 @@ String siteExecutiveNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveInfo.setCreateUser(authUser.getId()); + siteExecutiveInfo.setDirectorId(authUser.getId()); + siteExecutiveInfo.setDirectorName(authUser.getName()); siteExecutiveInfo.setSiteExecutiveNo(siteExecutiveNo); siteExecutiveInfo.setCreateTime(DateUtil.formatDateTime(new Date())); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index bee53cc..7094117 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -26,6 +27,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.Date; + /** *

* 现场检测记录表 服务实现类 @@ -101,6 +104,8 @@ String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveLog.setCreateUser(authUser.getId()); + siteExecutiveLog.setRecorder(authUser.getId()); + siteExecutiveLog.setRecordTime(DateUtil.formatDateTime(new Date())); siteExecutiveLog.setLogNo(originNo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 89b7380..003fa11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -128,6 +128,8 @@ String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + String CONFIG_FILE_TYPE = "configFileType"; + /** * 财务产值 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index a4b3d8d..8baf9b7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -104,6 +104,9 @@ @ApiModelProperty(value = "是否自检", dataType = "boolean") private Boolean isSelfMeasure; + @ApiModelProperty(value = "备注", dataType = "boolean") + private Boolean remark; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index dfcff9e..dc5bb04 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -17,7 +17,7 @@ private String customerName; @ApiModelProperty(value = "样品id", dataType = "String") - private Long sampleId; + private Long id; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; @@ -37,6 +37,9 @@ @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; + @ApiModelProperty(value = "电源电压", dataType = "String") + private String powerVoltage; + @ApiModelProperty(value = "检定要求", dataType = "Integer") private String measureContent; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0e8bbfa..44e879d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -38,7 +38,7 @@ @ApiModelProperty("业务模块名称") @ExcelProperty(value = "业务模块名称", order = 1) - private String metaModuleName; + private String moduleName; @ApiModelProperty("业务类型") @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) @@ -57,6 +57,7 @@ private String fileName; @ApiModelProperty("文件类型") + @DictCodeField(message = "文件类型描述不合法", cacheName = MeterDictCode.CONFIG_FILE_TYPE) private String fileType; @ExcelProperty(value = "文件类型", order = 5) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index f96a510..798b328 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -36,9 +36,9 @@ @TableField("site_executive_name") private String siteExecutiveName; - @ApiModelProperty(value = "负责人id", dataType = "String") + @ApiModelProperty(value = "负责人id", dataType = "Long") @TableField("director_id") - private String directorId; + private Long directorId; @ApiModelProperty(value = "负责人名字", dataType = "String") @TableField("director_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java deleted file mode 100644 index 16445ab..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.casic.missiles.model.system; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.NotNull; - -/** - *

- * - *

- * - * @author cz - * @since 2023-04-03 - */ -@Getter -@Setter -@TableName("system_download_center") -public class DownloadCenter implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @ApiModelProperty("下载编号") - @TableField("download_no") - private String downloadNo; - - @NotNull - @ApiModelProperty("业务模块名称") - @TableField("module_name") - private String moduleName; - - @NotNull - @ApiModelProperty("业务类型(字典)") - @TableField("business_download_type") - private String businessDownloadType; - - @ApiModelProperty("minio存储文件名") - @TableField("minio_file_name") - private String minioFileName; - - @TableField("file_name") - @ApiModelProperty("文件名称") - private String fileName; - - @ApiModelProperty("文件类型") - @TableField("file_type") - private String fileType; - - @ApiModelProperty("描述备注") - @TableField("descn") - private String descn; - - /** - * 创建人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 更新人id - */ - @TableField("update_user") - private Long updateUser; - - /** - * 删除标记 - */ - @TableField("is_del") - private Boolean isDel; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private LocalDateTime updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java new file mode 100644 index 0000000..e73a16f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; + +/** + *

+ * + *

+ * + * @author cz + * @since 2023-04-03 + */ +@Getter +@Setter +@TableName("system_file_config") +public class SystemFileConfig implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @ApiModelProperty("下载编号") + @TableField("download_no") + private String downloadNo; + + @NotNull + @ApiModelProperty("业务模块名称") + @TableField("module_name") + private String moduleName; + + @NotNull + @ApiModelProperty("业务类型(字典)") + @TableField("business_download_type") + private String businessDownloadType; + + @ApiModelProperty("minio存储文件名") + @TableField("minio_file_name") + private String minioFileName; + + @TableField("file_name") + @ApiModelProperty("文件名称") + private String fileName; + + @ApiModelProperty("文件类型") + @TableField("file_type") + private String fileType; + + @ApiModelProperty("描述备注") + @TableField("descn") + private String descn; + + /** + * 创建人id + */ + @TableField("create_user") + private Long createUser; + + /** + * 更新人id + */ + @TableField("update_user") + private Long updateUser; + + /** + * 删除标记 + */ + @TableField("is_del") + private Boolean isDel; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 64e11f7..55151fc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -38,13 +38,15 @@ siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId); siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); - siteExecutiveEquipmentRelation.setEquipmentId(assets.getId()); + siteExecutiveEquipmentRelation.setEquipmentId(assets.getEquipmentId()); siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck()); siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate()); siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId()); + siteExecutiveEquipmentRelation.setBeforeWorkResult(assets.getBeforeWorkResult()); + siteExecutiveEquipmentRelation.setAfterWorkResult(assets.getAfterWorkResult()); list.add(siteExecutiveEquipmentRelation); }); return this.saveBatch(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 48ff287..b4dfc4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -190,6 +190,8 @@ String siteExecutiveNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveInfo.setCreateUser(authUser.getId()); + siteExecutiveInfo.setDirectorId(authUser.getId()); + siteExecutiveInfo.setDirectorName(authUser.getName()); siteExecutiveInfo.setSiteExecutiveNo(siteExecutiveNo); siteExecutiveInfo.setCreateTime(DateUtil.formatDateTime(new Date())); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index bee53cc..7094117 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -26,6 +27,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.Date; + /** *

* 现场检测记录表 服务实现类 @@ -101,6 +104,8 @@ String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveLog.setCreateUser(authUser.getId()); + siteExecutiveLog.setRecorder(authUser.getId()); + siteExecutiveLog.setRecordTime(DateUtil.formatDateTime(new Date())); siteExecutiveLog.setLogNo(originNo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java index 4ffa5ad..4e6fe4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java @@ -8,24 +8,20 @@ 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.dispatch.DeviceDispatchDTO; -import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse; -import com.casic.missiles.dto.meter.TrainLogListRequest; +import com.casic.missiles.dto.customer.Info.CustomerInfoResponse; import com.casic.missiles.dto.system.DownloadFileRequest; import com.casic.missiles.dto.system.DownloadListRequest; import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.mapper.system.DownloadCenterMapper; -import com.casic.missiles.model.meter.MeterTrainLog; -import com.casic.missiles.model.system.DownloadCenter; +import com.casic.missiles.mapper.system.SystemFileConfigMapper; +import com.casic.missiles.model.system.SystemFileConfig; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.service.system.IDownloadCenterService; import com.casic.missiles.utils.ConvertUtils; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.http.ResponseEntity; @@ -33,7 +29,6 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.List; /** @@ -46,27 +41,30 @@ */ @Service @AllArgsConstructor -public class DownloadCenterServiceImpl extends ServiceImpl implements IDownloadCenterService { +public class DownloadCenterServiceImpl extends ServiceImpl implements IDownloadCenterService { private final MinioUtil minioUtil; private final IBaseExportService iBaseExportService; @Override - public Page listPage(Page page, DownloadListRequest request) { - QueryWrapper queryWrapper = getWrapper(request); + public Page listPage(Page page, DownloadListRequest request)throws Exception { + QueryWrapper queryWrapper = getWrapper(request); Page downloadListResponsePage = PageFactory.defaultPage(); - Page downloadCenterPage = this.baseMapper.selectPage(page, queryWrapper); + Page downloadCenterPage = this.baseMapper.selectPage(page, queryWrapper); downloadListResponsePage.setRecords(ConvertUtils.sourceToTarget(downloadCenterPage.getRecords(), DownloadListResponse.class)); + for (DownloadListResponse customerInfo : downloadListResponsePage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } return downloadListResponsePage; } @Override - public void downloadFileExport(DownloadListRequest request, HttpServletResponse response) throws IOException { - Page page = PageFactory.defaultPage(); + public void downloadFileExport(DownloadListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); Page downloadListResponsePage = PageFactory.defaultPage(); if (!CollectionUtils.isEmpty(request.getIds())) { - List downloadCenterPage = this.baseMapper.selectBatchIds(request.getIds()); + List downloadCenterPage = this.baseMapper.selectBatchIds(request.getIds()); page.setRecords(downloadCenterPage); downloadListResponsePage.setRecords(ConvertUtils.sourceToTarget(page.getRecords(), DownloadListResponse.class)); } else { @@ -81,7 +79,7 @@ @Override - public ReturnDTO addDownloadFile(DownloadCenter downloadCenter) { + public ReturnDTO addDownloadFile(SystemFileConfig downloadCenter) { initDownloadFile(downloadCenter); int addFlag = this.baseMapper.insert(downloadCenter); if (addFlag > 0) { @@ -95,7 +93,7 @@ * 上传新的文件 */ @Override - public ReturnDTO updateDownloadFile(DownloadCenter downloadCenter) { + public ReturnDTO updateDownloadFile(SystemFileConfig downloadCenter) { AuthUser authUser = ShiroKit.getUser(); downloadCenter.setUpdateUser(authUser.getId()); int updateFlag = this.baseMapper.updateById(downloadCenter); @@ -106,8 +104,8 @@ } @Override - public DownloadCenter downloadFileDetail(Long id) { - DownloadCenter downloadCenter = this.baseMapper.selectById(id); + public SystemFileConfig downloadFileDetail(Long id) { + SystemFileConfig downloadCenter = this.baseMapper.selectById(id); return downloadCenter; } @@ -129,8 +127,8 @@ return ReturnUtil.success(download); } - private QueryWrapper getWrapper(DownloadListRequest request) { - QueryWrapper wrapper = new QueryWrapper<>(); + private QueryWrapper getWrapper(DownloadListRequest request) { + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.like(StringUtils.isNotBlank(request.getDownloadNo()), "download_no", request.getDownloadNo()); wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName()); wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName()); @@ -143,7 +141,7 @@ return wrapper; } - private void initDownloadFile(DownloadCenter downloadCenter) { + private void initDownloadFile(SystemFileConfig downloadCenter) { Long maxNo = this.baseMapper.selectMaxCOrderNo(); String downloadNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.DOWNLOAD_NO, maxNo); AuthUser authUser = ShiroKit.getUser(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 89b7380..003fa11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -128,6 +128,8 @@ String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + String CONFIG_FILE_TYPE = "configFileType"; + /** * 财务产值 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index a4b3d8d..8baf9b7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -104,6 +104,9 @@ @ApiModelProperty(value = "是否自检", dataType = "boolean") private Boolean isSelfMeasure; + @ApiModelProperty(value = "备注", dataType = "boolean") + private Boolean remark; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index dfcff9e..dc5bb04 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -17,7 +17,7 @@ private String customerName; @ApiModelProperty(value = "样品id", dataType = "String") - private Long sampleId; + private Long id; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; @@ -37,6 +37,9 @@ @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; + @ApiModelProperty(value = "电源电压", dataType = "String") + private String powerVoltage; + @ApiModelProperty(value = "检定要求", dataType = "Integer") private String measureContent; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0e8bbfa..44e879d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -38,7 +38,7 @@ @ApiModelProperty("业务模块名称") @ExcelProperty(value = "业务模块名称", order = 1) - private String metaModuleName; + private String moduleName; @ApiModelProperty("业务类型") @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) @@ -57,6 +57,7 @@ private String fileName; @ApiModelProperty("文件类型") + @DictCodeField(message = "文件类型描述不合法", cacheName = MeterDictCode.CONFIG_FILE_TYPE) private String fileType; @ExcelProperty(value = "文件类型", order = 5) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index f96a510..798b328 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -36,9 +36,9 @@ @TableField("site_executive_name") private String siteExecutiveName; - @ApiModelProperty(value = "负责人id", dataType = "String") + @ApiModelProperty(value = "负责人id", dataType = "Long") @TableField("director_id") - private String directorId; + private Long directorId; @ApiModelProperty(value = "负责人名字", dataType = "String") @TableField("director_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java deleted file mode 100644 index 16445ab..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.casic.missiles.model.system; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.NotNull; - -/** - *

- * - *

- * - * @author cz - * @since 2023-04-03 - */ -@Getter -@Setter -@TableName("system_download_center") -public class DownloadCenter implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @ApiModelProperty("下载编号") - @TableField("download_no") - private String downloadNo; - - @NotNull - @ApiModelProperty("业务模块名称") - @TableField("module_name") - private String moduleName; - - @NotNull - @ApiModelProperty("业务类型(字典)") - @TableField("business_download_type") - private String businessDownloadType; - - @ApiModelProperty("minio存储文件名") - @TableField("minio_file_name") - private String minioFileName; - - @TableField("file_name") - @ApiModelProperty("文件名称") - private String fileName; - - @ApiModelProperty("文件类型") - @TableField("file_type") - private String fileType; - - @ApiModelProperty("描述备注") - @TableField("descn") - private String descn; - - /** - * 创建人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 更新人id - */ - @TableField("update_user") - private Long updateUser; - - /** - * 删除标记 - */ - @TableField("is_del") - private Boolean isDel; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private LocalDateTime updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java new file mode 100644 index 0000000..e73a16f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; + +/** + *

+ * + *

+ * + * @author cz + * @since 2023-04-03 + */ +@Getter +@Setter +@TableName("system_file_config") +public class SystemFileConfig implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @ApiModelProperty("下载编号") + @TableField("download_no") + private String downloadNo; + + @NotNull + @ApiModelProperty("业务模块名称") + @TableField("module_name") + private String moduleName; + + @NotNull + @ApiModelProperty("业务类型(字典)") + @TableField("business_download_type") + private String businessDownloadType; + + @ApiModelProperty("minio存储文件名") + @TableField("minio_file_name") + private String minioFileName; + + @TableField("file_name") + @ApiModelProperty("文件名称") + private String fileName; + + @ApiModelProperty("文件类型") + @TableField("file_type") + private String fileType; + + @ApiModelProperty("描述备注") + @TableField("descn") + private String descn; + + /** + * 创建人id + */ + @TableField("create_user") + private Long createUser; + + /** + * 更新人id + */ + @TableField("update_user") + private Long updateUser; + + /** + * 删除标记 + */ + @TableField("is_del") + private Boolean isDel; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 64e11f7..55151fc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -38,13 +38,15 @@ siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId); siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); - siteExecutiveEquipmentRelation.setEquipmentId(assets.getId()); + siteExecutiveEquipmentRelation.setEquipmentId(assets.getEquipmentId()); siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck()); siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate()); siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId()); + siteExecutiveEquipmentRelation.setBeforeWorkResult(assets.getBeforeWorkResult()); + siteExecutiveEquipmentRelation.setAfterWorkResult(assets.getAfterWorkResult()); list.add(siteExecutiveEquipmentRelation); }); return this.saveBatch(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 48ff287..b4dfc4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -190,6 +190,8 @@ String siteExecutiveNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveInfo.setCreateUser(authUser.getId()); + siteExecutiveInfo.setDirectorId(authUser.getId()); + siteExecutiveInfo.setDirectorName(authUser.getName()); siteExecutiveInfo.setSiteExecutiveNo(siteExecutiveNo); siteExecutiveInfo.setCreateTime(DateUtil.formatDateTime(new Date())); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index bee53cc..7094117 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -26,6 +27,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.Date; + /** *

* 现场检测记录表 服务实现类 @@ -101,6 +104,8 @@ String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveLog.setCreateUser(authUser.getId()); + siteExecutiveLog.setRecorder(authUser.getId()); + siteExecutiveLog.setRecordTime(DateUtil.formatDateTime(new Date())); siteExecutiveLog.setLogNo(originNo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java index 4ffa5ad..4e6fe4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java @@ -8,24 +8,20 @@ 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.dispatch.DeviceDispatchDTO; -import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse; -import com.casic.missiles.dto.meter.TrainLogListRequest; +import com.casic.missiles.dto.customer.Info.CustomerInfoResponse; import com.casic.missiles.dto.system.DownloadFileRequest; import com.casic.missiles.dto.system.DownloadListRequest; import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.mapper.system.DownloadCenterMapper; -import com.casic.missiles.model.meter.MeterTrainLog; -import com.casic.missiles.model.system.DownloadCenter; +import com.casic.missiles.mapper.system.SystemFileConfigMapper; +import com.casic.missiles.model.system.SystemFileConfig; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.service.system.IDownloadCenterService; import com.casic.missiles.utils.ConvertUtils; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.http.ResponseEntity; @@ -33,7 +29,6 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.List; /** @@ -46,27 +41,30 @@ */ @Service @AllArgsConstructor -public class DownloadCenterServiceImpl extends ServiceImpl implements IDownloadCenterService { +public class DownloadCenterServiceImpl extends ServiceImpl implements IDownloadCenterService { private final MinioUtil minioUtil; private final IBaseExportService iBaseExportService; @Override - public Page listPage(Page page, DownloadListRequest request) { - QueryWrapper queryWrapper = getWrapper(request); + public Page listPage(Page page, DownloadListRequest request)throws Exception { + QueryWrapper queryWrapper = getWrapper(request); Page downloadListResponsePage = PageFactory.defaultPage(); - Page downloadCenterPage = this.baseMapper.selectPage(page, queryWrapper); + Page downloadCenterPage = this.baseMapper.selectPage(page, queryWrapper); downloadListResponsePage.setRecords(ConvertUtils.sourceToTarget(downloadCenterPage.getRecords(), DownloadListResponse.class)); + for (DownloadListResponse customerInfo : downloadListResponsePage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } return downloadListResponsePage; } @Override - public void downloadFileExport(DownloadListRequest request, HttpServletResponse response) throws IOException { - Page page = PageFactory.defaultPage(); + public void downloadFileExport(DownloadListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); Page downloadListResponsePage = PageFactory.defaultPage(); if (!CollectionUtils.isEmpty(request.getIds())) { - List downloadCenterPage = this.baseMapper.selectBatchIds(request.getIds()); + List downloadCenterPage = this.baseMapper.selectBatchIds(request.getIds()); page.setRecords(downloadCenterPage); downloadListResponsePage.setRecords(ConvertUtils.sourceToTarget(page.getRecords(), DownloadListResponse.class)); } else { @@ -81,7 +79,7 @@ @Override - public ReturnDTO addDownloadFile(DownloadCenter downloadCenter) { + public ReturnDTO addDownloadFile(SystemFileConfig downloadCenter) { initDownloadFile(downloadCenter); int addFlag = this.baseMapper.insert(downloadCenter); if (addFlag > 0) { @@ -95,7 +93,7 @@ * 上传新的文件 */ @Override - public ReturnDTO updateDownloadFile(DownloadCenter downloadCenter) { + public ReturnDTO updateDownloadFile(SystemFileConfig downloadCenter) { AuthUser authUser = ShiroKit.getUser(); downloadCenter.setUpdateUser(authUser.getId()); int updateFlag = this.baseMapper.updateById(downloadCenter); @@ -106,8 +104,8 @@ } @Override - public DownloadCenter downloadFileDetail(Long id) { - DownloadCenter downloadCenter = this.baseMapper.selectById(id); + public SystemFileConfig downloadFileDetail(Long id) { + SystemFileConfig downloadCenter = this.baseMapper.selectById(id); return downloadCenter; } @@ -129,8 +127,8 @@ return ReturnUtil.success(download); } - private QueryWrapper getWrapper(DownloadListRequest request) { - QueryWrapper wrapper = new QueryWrapper<>(); + private QueryWrapper getWrapper(DownloadListRequest request) { + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.like(StringUtils.isNotBlank(request.getDownloadNo()), "download_no", request.getDownloadNo()); wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName()); wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName()); @@ -143,7 +141,7 @@ return wrapper; } - private void initDownloadFile(DownloadCenter downloadCenter) { + private void initDownloadFile(SystemFileConfig downloadCenter) { Long maxNo = this.baseMapper.selectMaxCOrderNo(); String downloadNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.DOWNLOAD_NO, maxNo); AuthUser authUser = ShiroKit.getUser(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java new file mode 100644 index 0000000..0302b0f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java @@ -0,0 +1,51 @@ +package com.casic.missiles.service.listeners.processor; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; +import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; +import com.casic.missiles.service.listeners.NotifyEventPostProcessor; +import com.casic.missiles.utils.SpringContextUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.Objects; + +/** + * @author zt + *

+ * 外场检测审批通过状态回填 + */ +@Slf4j +@Service(ActionStatusBeanEnum.SITE_EXECUTIVE_INFO_BEAN_NAME) +public class SiteExecutiveInfoEventPostProcessor implements NotifyEventPostProcessor { + + @Override + public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) { + Long id = Long.valueOf(notifyEventStatusDTO.getId()); + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + BusinessSiteExecutiveInfoMapper certificateReportMapper = SpringContextUtil.getBean(BusinessSiteExecutiveInfoMapper.class); + + BusinessSiteExecutiveInfo siteExecutiveInfo = new BusinessSiteExecutiveInfo(); + siteExecutiveInfo.setId(id); + //设置审批状态为通过 + siteExecutiveInfo.setApprovalStatus(ApprovalStatusEnum.PASSED); + siteExecutiveInfo.setUpdateTime(DateUtil.formatDateTime(new Date())); + certificateReportMapper.updateById(siteExecutiveInfo); + + //审批通过 根据模板生成审批单打印样例 + + + } + + + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java deleted file mode 100644 index 1f7dc2b..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.controller.system.download; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; -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.system.DownloadFileRequest; -import com.casic.missiles.dto.system.DownloadListRequest; -import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.system.DownloadCenter; -import com.casic.missiles.model.system.SystemSign; -import com.casic.missiles.service.system.IDownloadCenterService; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author cz - * @since 2023-04-03 - */ -@RestController -@RequestMapping("/download/center") -@AllArgsConstructor -public class DownloadCenterController extends ExportController { - - private final IDownloadCenterService downloadCenterService; - - @ApiOperation("下载文件分页") - @PostMapping("/listPage") - @ResponseBody - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); - } - - @ResponseBody - @ApiOperation("更新下载文件") - @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.updateDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid DownloadCenter downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.addDownloadFile(downloadCenter); - } - - @ResponseBody - @ApiOperation("下载文件详情") - @PostMapping("/detail") - public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); - } - - @ResponseBody - @ApiOperation("删除下载文件") - @PostMapping("/delete") - public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return downloadCenterService.deleteDownloadFile(idDTO.getId()); - } - - @ResponseBody - @ApiOperation("新增下载文件") - @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - return downloadCenterService.downloadFile(downloadFileRequest); - - } - - - @ApiOperation("文件导出") - @PostMapping("/listExport") - @ResponseBody - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } - downloadCenterService.downloadFileExport(request,response); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java new file mode 100644 index 0000000..929cdde --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -0,0 +1,117 @@ +package com.casic.missiles.controller.system.download; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.dto.system.DownloadListRequest; +import com.casic.missiles.dto.system.DownloadListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.system.SystemFileConfig; +import com.casic.missiles.service.system.IDownloadCenterService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author cz + * @since 2023-04-03 + */ +@RestController +@RequestMapping("/download/center") +@AllArgsConstructor +public class SystemFileConfigController extends ExportController { + + private final IDownloadCenterService downloadCenterService; + + @ApiOperation("下载文件分页") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest 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(downloadCenterService.listPage(page, request))); + } + + @ResponseBody + @ApiOperation("更新下载文件") + @PostMapping("/update") + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.updateDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/add") + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.addDownloadFile(downloadCenter); + } + + @ResponseBody + @ApiOperation("下载文件详情") + @PostMapping("/detail") + public ReturnDTO downloadFileDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(downloadCenterService.downloadFileDetail(idDTO.getId())); + } + + @ResponseBody + @ApiOperation("删除下载文件") + @PostMapping("/delete") + public ReturnDTO deleteDownloadFile(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return downloadCenterService.deleteDownloadFile(idDTO.getId()); + } + + @ResponseBody + @ApiOperation("新增下载文件") + @PostMapping("/downloadFile") + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return downloadCenterService.downloadFile(downloadFileRequest); + + } + + + @ApiOperation("文件导出") + @PostMapping("/listExport") + @ResponseBody + public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + downloadCenterService.downloadFileExport(request,response); + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java deleted file mode 100644 index 4a75170..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/DownloadCenterMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.mapper.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.system.DownloadFileRequest; -import com.casic.missiles.model.system.DownloadCenter; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - *

- * Mapper 接口 - *

- * - * @author cz - * @since 2023-04-03 - */ -public interface DownloadCenterMapper extends BaseMapper { - - Long selectMaxCOrderNo(); - String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); - -} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java new file mode 100644 index 0000000..f2c324c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFileConfigMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.system.DownloadFileRequest; +import com.casic.missiles.model.system.SystemFileConfig; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cz + * @since 2023-04-03 + */ +public interface SystemFileConfigMapper extends BaseMapper { + + Long selectMaxCOrderNo(); + String getFileNameByBusiness(@Param("request") DownloadFileRequest downloadFileRequest); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index d49e80e..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( - SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS - "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS + "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT IFNULL(max(RIGHT (download_no, 12)), 0) - from system_download_center - - - - - diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml new file mode 100644 index 0000000..b15b0bd --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFileConfigMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + , download_no, business_module_name, business_download_type, minio_file_name, file_name, desc, create_user, update_user, is_del, create_time, update_time + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 89b7380..003fa11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -128,6 +128,8 @@ String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + String CONFIG_FILE_TYPE = "configFileType"; + /** * 财务产值 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index a4b3d8d..8baf9b7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -104,6 +104,9 @@ @ApiModelProperty(value = "是否自检", dataType = "boolean") private Boolean isSelfMeasure; + @ApiModelProperty(value = "备注", dataType = "boolean") + private Boolean remark; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index dfcff9e..dc5bb04 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -17,7 +17,7 @@ private String customerName; @ApiModelProperty(value = "样品id", dataType = "String") - private Long sampleId; + private Long id; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; @@ -37,6 +37,9 @@ @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; + @ApiModelProperty(value = "电源电压", dataType = "String") + private String powerVoltage; + @ApiModelProperty(value = "检定要求", dataType = "Integer") private String measureContent; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0e8bbfa..44e879d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -38,7 +38,7 @@ @ApiModelProperty("业务模块名称") @ExcelProperty(value = "业务模块名称", order = 1) - private String metaModuleName; + private String moduleName; @ApiModelProperty("业务类型") @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) @@ -57,6 +57,7 @@ private String fileName; @ApiModelProperty("文件类型") + @DictCodeField(message = "文件类型描述不合法", cacheName = MeterDictCode.CONFIG_FILE_TYPE) private String fileType; @ExcelProperty(value = "文件类型", order = 5) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index f96a510..798b328 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -36,9 +36,9 @@ @TableField("site_executive_name") private String siteExecutiveName; - @ApiModelProperty(value = "负责人id", dataType = "String") + @ApiModelProperty(value = "负责人id", dataType = "Long") @TableField("director_id") - private String directorId; + private Long directorId; @ApiModelProperty(value = "负责人名字", dataType = "String") @TableField("director_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java deleted file mode 100644 index 16445ab..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.casic.missiles.model.system; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.NotNull; - -/** - *

- * - *

- * - * @author cz - * @since 2023-04-03 - */ -@Getter -@Setter -@TableName("system_download_center") -public class DownloadCenter implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @ApiModelProperty("下载编号") - @TableField("download_no") - private String downloadNo; - - @NotNull - @ApiModelProperty("业务模块名称") - @TableField("module_name") - private String moduleName; - - @NotNull - @ApiModelProperty("业务类型(字典)") - @TableField("business_download_type") - private String businessDownloadType; - - @ApiModelProperty("minio存储文件名") - @TableField("minio_file_name") - private String minioFileName; - - @TableField("file_name") - @ApiModelProperty("文件名称") - private String fileName; - - @ApiModelProperty("文件类型") - @TableField("file_type") - private String fileType; - - @ApiModelProperty("描述备注") - @TableField("descn") - private String descn; - - /** - * 创建人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 更新人id - */ - @TableField("update_user") - private Long updateUser; - - /** - * 删除标记 - */ - @TableField("is_del") - private Boolean isDel; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private LocalDateTime updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java new file mode 100644 index 0000000..e73a16f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; + +/** + *

+ * + *

+ * + * @author cz + * @since 2023-04-03 + */ +@Getter +@Setter +@TableName("system_file_config") +public class SystemFileConfig implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @ApiModelProperty("下载编号") + @TableField("download_no") + private String downloadNo; + + @NotNull + @ApiModelProperty("业务模块名称") + @TableField("module_name") + private String moduleName; + + @NotNull + @ApiModelProperty("业务类型(字典)") + @TableField("business_download_type") + private String businessDownloadType; + + @ApiModelProperty("minio存储文件名") + @TableField("minio_file_name") + private String minioFileName; + + @TableField("file_name") + @ApiModelProperty("文件名称") + private String fileName; + + @ApiModelProperty("文件类型") + @TableField("file_type") + private String fileType; + + @ApiModelProperty("描述备注") + @TableField("descn") + private String descn; + + /** + * 创建人id + */ + @TableField("create_user") + private Long createUser; + + /** + * 更新人id + */ + @TableField("update_user") + private Long updateUser; + + /** + * 删除标记 + */ + @TableField("is_del") + private Boolean isDel; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 64e11f7..55151fc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -38,13 +38,15 @@ siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId); siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); - siteExecutiveEquipmentRelation.setEquipmentId(assets.getId()); + siteExecutiveEquipmentRelation.setEquipmentId(assets.getEquipmentId()); siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck()); siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate()); siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId()); + siteExecutiveEquipmentRelation.setBeforeWorkResult(assets.getBeforeWorkResult()); + siteExecutiveEquipmentRelation.setAfterWorkResult(assets.getAfterWorkResult()); list.add(siteExecutiveEquipmentRelation); }); return this.saveBatch(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 48ff287..b4dfc4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -190,6 +190,8 @@ String siteExecutiveNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveInfo.setCreateUser(authUser.getId()); + siteExecutiveInfo.setDirectorId(authUser.getId()); + siteExecutiveInfo.setDirectorName(authUser.getName()); siteExecutiveInfo.setSiteExecutiveNo(siteExecutiveNo); siteExecutiveInfo.setCreateTime(DateUtil.formatDateTime(new Date())); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index bee53cc..7094117 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -26,6 +27,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.Date; + /** *

* 现场检测记录表 服务实现类 @@ -101,6 +104,8 @@ String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveLog.setCreateUser(authUser.getId()); + siteExecutiveLog.setRecorder(authUser.getId()); + siteExecutiveLog.setRecordTime(DateUtil.formatDateTime(new Date())); siteExecutiveLog.setLogNo(originNo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java index 4ffa5ad..4e6fe4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java @@ -8,24 +8,20 @@ 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.dispatch.DeviceDispatchDTO; -import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse; -import com.casic.missiles.dto.meter.TrainLogListRequest; +import com.casic.missiles.dto.customer.Info.CustomerInfoResponse; import com.casic.missiles.dto.system.DownloadFileRequest; import com.casic.missiles.dto.system.DownloadListRequest; import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.mapper.system.DownloadCenterMapper; -import com.casic.missiles.model.meter.MeterTrainLog; -import com.casic.missiles.model.system.DownloadCenter; +import com.casic.missiles.mapper.system.SystemFileConfigMapper; +import com.casic.missiles.model.system.SystemFileConfig; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.service.system.IDownloadCenterService; import com.casic.missiles.utils.ConvertUtils; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.http.ResponseEntity; @@ -33,7 +29,6 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.List; /** @@ -46,27 +41,30 @@ */ @Service @AllArgsConstructor -public class DownloadCenterServiceImpl extends ServiceImpl implements IDownloadCenterService { +public class DownloadCenterServiceImpl extends ServiceImpl implements IDownloadCenterService { private final MinioUtil minioUtil; private final IBaseExportService iBaseExportService; @Override - public Page listPage(Page page, DownloadListRequest request) { - QueryWrapper queryWrapper = getWrapper(request); + public Page listPage(Page page, DownloadListRequest request)throws Exception { + QueryWrapper queryWrapper = getWrapper(request); Page downloadListResponsePage = PageFactory.defaultPage(); - Page downloadCenterPage = this.baseMapper.selectPage(page, queryWrapper); + Page downloadCenterPage = this.baseMapper.selectPage(page, queryWrapper); downloadListResponsePage.setRecords(ConvertUtils.sourceToTarget(downloadCenterPage.getRecords(), DownloadListResponse.class)); + for (DownloadListResponse customerInfo : downloadListResponsePage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } return downloadListResponsePage; } @Override - public void downloadFileExport(DownloadListRequest request, HttpServletResponse response) throws IOException { - Page page = PageFactory.defaultPage(); + public void downloadFileExport(DownloadListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); Page downloadListResponsePage = PageFactory.defaultPage(); if (!CollectionUtils.isEmpty(request.getIds())) { - List downloadCenterPage = this.baseMapper.selectBatchIds(request.getIds()); + List downloadCenterPage = this.baseMapper.selectBatchIds(request.getIds()); page.setRecords(downloadCenterPage); downloadListResponsePage.setRecords(ConvertUtils.sourceToTarget(page.getRecords(), DownloadListResponse.class)); } else { @@ -81,7 +79,7 @@ @Override - public ReturnDTO addDownloadFile(DownloadCenter downloadCenter) { + public ReturnDTO addDownloadFile(SystemFileConfig downloadCenter) { initDownloadFile(downloadCenter); int addFlag = this.baseMapper.insert(downloadCenter); if (addFlag > 0) { @@ -95,7 +93,7 @@ * 上传新的文件 */ @Override - public ReturnDTO updateDownloadFile(DownloadCenter downloadCenter) { + public ReturnDTO updateDownloadFile(SystemFileConfig downloadCenter) { AuthUser authUser = ShiroKit.getUser(); downloadCenter.setUpdateUser(authUser.getId()); int updateFlag = this.baseMapper.updateById(downloadCenter); @@ -106,8 +104,8 @@ } @Override - public DownloadCenter downloadFileDetail(Long id) { - DownloadCenter downloadCenter = this.baseMapper.selectById(id); + public SystemFileConfig downloadFileDetail(Long id) { + SystemFileConfig downloadCenter = this.baseMapper.selectById(id); return downloadCenter; } @@ -129,8 +127,8 @@ return ReturnUtil.success(download); } - private QueryWrapper getWrapper(DownloadListRequest request) { - QueryWrapper wrapper = new QueryWrapper<>(); + private QueryWrapper getWrapper(DownloadListRequest request) { + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.like(StringUtils.isNotBlank(request.getDownloadNo()), "download_no", request.getDownloadNo()); wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName()); wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName()); @@ -143,7 +141,7 @@ return wrapper; } - private void initDownloadFile(DownloadCenter downloadCenter) { + private void initDownloadFile(SystemFileConfig downloadCenter) { Long maxNo = this.baseMapper.selectMaxCOrderNo(); String downloadNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.DOWNLOAD_NO, maxNo); AuthUser authUser = ShiroKit.getUser(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java new file mode 100644 index 0000000..0302b0f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java @@ -0,0 +1,51 @@ +package com.casic.missiles.service.listeners.processor; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; +import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; +import com.casic.missiles.service.listeners.NotifyEventPostProcessor; +import com.casic.missiles.utils.SpringContextUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.Objects; + +/** + * @author zt + *

+ * 外场检测审批通过状态回填 + */ +@Slf4j +@Service(ActionStatusBeanEnum.SITE_EXECUTIVE_INFO_BEAN_NAME) +public class SiteExecutiveInfoEventPostProcessor implements NotifyEventPostProcessor { + + @Override + public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) { + Long id = Long.valueOf(notifyEventStatusDTO.getId()); + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + BusinessSiteExecutiveInfoMapper certificateReportMapper = SpringContextUtil.getBean(BusinessSiteExecutiveInfoMapper.class); + + BusinessSiteExecutiveInfo siteExecutiveInfo = new BusinessSiteExecutiveInfo(); + siteExecutiveInfo.setId(id); + //设置审批状态为通过 + siteExecutiveInfo.setApprovalStatus(ApprovalStatusEnum.PASSED); + siteExecutiveInfo.setUpdateTime(DateUtil.formatDateTime(new Date())); + certificateReportMapper.updateById(siteExecutiveInfo); + + //审批通过 根据模板生成审批单打印样例 + + + } + + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/IDownloadCenterService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/IDownloadCenterService.java index dacc27a..4ddbfb6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/IDownloadCenterService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/IDownloadCenterService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.system.DownloadFileRequest; import com.casic.missiles.dto.system.DownloadListRequest; import com.casic.missiles.dto.system.DownloadListResponse; -import com.casic.missiles.model.system.DownloadCenter; +import com.casic.missiles.model.system.SystemFileConfig; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -19,17 +19,17 @@ * @author cz * @since 2023-04-03 */ -public interface IDownloadCenterService extends IService { +public interface IDownloadCenterService extends IService { - Page listPage(Page page, DownloadListRequest request); + Page listPage(Page page, DownloadListRequest request)throws Exception; - void downloadFileExport(DownloadListRequest request, HttpServletResponse response) throws IOException; + void downloadFileExport(DownloadListRequest request, HttpServletResponse response) throws Exception; - ReturnDTO addDownloadFile(DownloadCenter downloadCenter); + ReturnDTO addDownloadFile(SystemFileConfig downloadCenter); - ReturnDTO updateDownloadFile(DownloadCenter downloadCenter); + ReturnDTO updateDownloadFile(SystemFileConfig downloadCenter); - DownloadCenter downloadFileDetail(Long id); + SystemFileConfig downloadFileDetail(Long id); ReturnDTO deleteDownloadFile(Long id);