diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java index 89ec9ad..e30dd45 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -36,26 +37,26 @@ private final IModuleTypeService moduleTypeService; @ApiOperation("模块类型列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> moduleTypeListPage(@RequestBody @Valid ModuleTypeRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(moduleTypeService.moduleTypeListPage(page, request))); } @ApiOperation("新增模块类型") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.addModuleType(moduleTypeConfig); } @ApiOperation("更新模块类型") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.updateModuleType(moduleTypeConfig); } @ApiOperation("模块类型详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +65,7 @@ } @ApiOperation("删除模块类型") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteModuleType(@RequestBody @Valid IdDTO idDTO) { return moduleTypeService.deleteModuleType(idDTO.getId()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java index 89ec9ad..e30dd45 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -36,26 +37,26 @@ private final IModuleTypeService moduleTypeService; @ApiOperation("模块类型列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> moduleTypeListPage(@RequestBody @Valid ModuleTypeRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(moduleTypeService.moduleTypeListPage(page, request))); } @ApiOperation("新增模块类型") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.addModuleType(moduleTypeConfig); } @ApiOperation("更新模块类型") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.updateModuleType(moduleTypeConfig); } @ApiOperation("模块类型详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +65,7 @@ } @ApiOperation("删除模块类型") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteModuleType(@RequestBody @Valid IdDTO idDTO) { return moduleTypeService.deleteModuleType(idDTO.getId()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java index 7fb0888..e95c459 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java @@ -2,7 +2,6 @@ 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; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.system.ModuleTemplatePrintDetail; -import com.casic.missiles.dto.system.ModuleTemplatePrintDto; import com.casic.missiles.dto.system.ModuleTemplatePrintReponse; import com.casic.missiles.dto.system.ModuleTypeRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -20,6 +18,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -30,7 +29,7 @@ /** * @author cz */ -@Api(tags = "打印文件模块注册接口") +@Api(tags = "打印文件注册接口") @RequestMapping("/module/file") @RestController @RequiredArgsConstructor @@ -39,26 +38,26 @@ private final IPrintFileTemplateRegisterService printFileService; @ApiOperation("分页列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> fileTemplateListPage(@RequestBody @Valid ModuleTypeRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(printFileService.fileTemplateListPage(page, request))); } @ApiOperation("新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.addFileTemplate(request); } @ApiOperation("更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.updateFileTemplate(request); } @ApiOperation("删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteFileTemplate(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -67,7 +66,7 @@ } @ApiOperation("详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO fileTemplateDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java index 89ec9ad..e30dd45 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -36,26 +37,26 @@ private final IModuleTypeService moduleTypeService; @ApiOperation("模块类型列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> moduleTypeListPage(@RequestBody @Valid ModuleTypeRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(moduleTypeService.moduleTypeListPage(page, request))); } @ApiOperation("新增模块类型") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.addModuleType(moduleTypeConfig); } @ApiOperation("更新模块类型") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.updateModuleType(moduleTypeConfig); } @ApiOperation("模块类型详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +65,7 @@ } @ApiOperation("删除模块类型") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteModuleType(@RequestBody @Valid IdDTO idDTO) { return moduleTypeService.deleteModuleType(idDTO.getId()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java index 7fb0888..e95c459 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java @@ -2,7 +2,6 @@ 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; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.system.ModuleTemplatePrintDetail; -import com.casic.missiles.dto.system.ModuleTemplatePrintDto; import com.casic.missiles.dto.system.ModuleTemplatePrintReponse; import com.casic.missiles.dto.system.ModuleTypeRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -20,6 +18,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -30,7 +29,7 @@ /** * @author cz */ -@Api(tags = "打印文件模块注册接口") +@Api(tags = "打印文件注册接口") @RequestMapping("/module/file") @RestController @RequiredArgsConstructor @@ -39,26 +38,26 @@ private final IPrintFileTemplateRegisterService printFileService; @ApiOperation("分页列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> fileTemplateListPage(@RequestBody @Valid ModuleTypeRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(printFileService.fileTemplateListPage(page, request))); } @ApiOperation("新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.addFileTemplate(request); } @ApiOperation("更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.updateFileTemplate(request); } @ApiOperation("删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteFileTemplate(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -67,7 +66,7 @@ } @ApiOperation("详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO fileTemplateDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java index 4721b62..1e5b0b9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java @@ -52,6 +52,10 @@ basePackage("com.casic.missiles.controller.sys", "com.casic.missiles.controller.system"), PathSelectors.any()), + /** 系统管理模块 */ + PRINTFILE("文件打印配置", + basePackage("com.casic.missiles.controller.system.module"), + PathSelectors.any()), /** 工作台 */ WORKBENCH("工作台", basePackage("com.casic.missiles.controller.workbench"), diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java index 89ec9ad..e30dd45 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -36,26 +37,26 @@ private final IModuleTypeService moduleTypeService; @ApiOperation("模块类型列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> moduleTypeListPage(@RequestBody @Valid ModuleTypeRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(moduleTypeService.moduleTypeListPage(page, request))); } @ApiOperation("新增模块类型") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.addModuleType(moduleTypeConfig); } @ApiOperation("更新模块类型") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.updateModuleType(moduleTypeConfig); } @ApiOperation("模块类型详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +65,7 @@ } @ApiOperation("删除模块类型") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteModuleType(@RequestBody @Valid IdDTO idDTO) { return moduleTypeService.deleteModuleType(idDTO.getId()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java index 7fb0888..e95c459 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java @@ -2,7 +2,6 @@ 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; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.system.ModuleTemplatePrintDetail; -import com.casic.missiles.dto.system.ModuleTemplatePrintDto; import com.casic.missiles.dto.system.ModuleTemplatePrintReponse; import com.casic.missiles.dto.system.ModuleTypeRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -20,6 +18,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -30,7 +29,7 @@ /** * @author cz */ -@Api(tags = "打印文件模块注册接口") +@Api(tags = "打印文件注册接口") @RequestMapping("/module/file") @RestController @RequiredArgsConstructor @@ -39,26 +38,26 @@ private final IPrintFileTemplateRegisterService printFileService; @ApiOperation("分页列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> fileTemplateListPage(@RequestBody @Valid ModuleTypeRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(printFileService.fileTemplateListPage(page, request))); } @ApiOperation("新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.addFileTemplate(request); } @ApiOperation("更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.updateFileTemplate(request); } @ApiOperation("删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteFileTemplate(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -67,7 +66,7 @@ } @ApiOperation("详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO fileTemplateDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java index 4721b62..1e5b0b9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java @@ -52,6 +52,10 @@ basePackage("com.casic.missiles.controller.sys", "com.casic.missiles.controller.system"), PathSelectors.any()), + /** 系统管理模块 */ + PRINTFILE("文件打印配置", + basePackage("com.casic.missiles.controller.system.module"), + PathSelectors.any()), /** 工作台 */ WORKBENCH("工作台", basePackage("com.casic.missiles.controller.workbench"), diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java index 86fe888..a84795a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java @@ -32,8 +32,8 @@ private String descn; @ApiModelProperty("签名Json") - @TableField("sign_json") - private String signJson; + @TableField("signs") + private String signs; @ApiModelProperty("签名列表") @TableField(exist = false) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java index 89ec9ad..e30dd45 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -36,26 +37,26 @@ private final IModuleTypeService moduleTypeService; @ApiOperation("模块类型列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> moduleTypeListPage(@RequestBody @Valid ModuleTypeRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(moduleTypeService.moduleTypeListPage(page, request))); } @ApiOperation("新增模块类型") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.addModuleType(moduleTypeConfig); } @ApiOperation("更新模块类型") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.updateModuleType(moduleTypeConfig); } @ApiOperation("模块类型详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +65,7 @@ } @ApiOperation("删除模块类型") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteModuleType(@RequestBody @Valid IdDTO idDTO) { return moduleTypeService.deleteModuleType(idDTO.getId()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java index 7fb0888..e95c459 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java @@ -2,7 +2,6 @@ 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; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.system.ModuleTemplatePrintDetail; -import com.casic.missiles.dto.system.ModuleTemplatePrintDto; import com.casic.missiles.dto.system.ModuleTemplatePrintReponse; import com.casic.missiles.dto.system.ModuleTypeRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -20,6 +18,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -30,7 +29,7 @@ /** * @author cz */ -@Api(tags = "打印文件模块注册接口") +@Api(tags = "打印文件注册接口") @RequestMapping("/module/file") @RestController @RequiredArgsConstructor @@ -39,26 +38,26 @@ private final IPrintFileTemplateRegisterService printFileService; @ApiOperation("分页列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> fileTemplateListPage(@RequestBody @Valid ModuleTypeRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(printFileService.fileTemplateListPage(page, request))); } @ApiOperation("新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.addFileTemplate(request); } @ApiOperation("更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.updateFileTemplate(request); } @ApiOperation("删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteFileTemplate(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -67,7 +66,7 @@ } @ApiOperation("详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO fileTemplateDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java index 4721b62..1e5b0b9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java @@ -52,6 +52,10 @@ basePackage("com.casic.missiles.controller.sys", "com.casic.missiles.controller.system"), PathSelectors.any()), + /** 系统管理模块 */ + PRINTFILE("文件打印配置", + basePackage("com.casic.missiles.controller.system.module"), + PathSelectors.any()), /** 工作台 */ WORKBENCH("工作台", basePackage("com.casic.missiles.controller.workbench"), diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java index 86fe888..a84795a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java @@ -32,8 +32,8 @@ private String descn; @ApiModelProperty("签名Json") - @TableField("sign_json") - private String signJson; + @TableField("signs") + private String signs; @ApiModelProperty("签名列表") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java index 7515b3b..c7d1169 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java @@ -23,15 +23,15 @@ @TableField("module_type") private String moduleType; - @ApiModelProperty("模板名称") + @ApiModelProperty("模版名称") @TableField("module_name") private String moduleName; - @ApiModelProperty("模板类型") + @ApiModelProperty("描述") @TableField("descn") private String descn; - @ApiModelProperty("模板名称") + @ApiModelProperty("签名id") @TableField("signs") private String signs; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java index 89ec9ad..e30dd45 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -36,26 +37,26 @@ private final IModuleTypeService moduleTypeService; @ApiOperation("模块类型列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> moduleTypeListPage(@RequestBody @Valid ModuleTypeRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(moduleTypeService.moduleTypeListPage(page, request))); } @ApiOperation("新增模块类型") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.addModuleType(moduleTypeConfig); } @ApiOperation("更新模块类型") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.updateModuleType(moduleTypeConfig); } @ApiOperation("模块类型详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +65,7 @@ } @ApiOperation("删除模块类型") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteModuleType(@RequestBody @Valid IdDTO idDTO) { return moduleTypeService.deleteModuleType(idDTO.getId()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java index 7fb0888..e95c459 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java @@ -2,7 +2,6 @@ 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; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.system.ModuleTemplatePrintDetail; -import com.casic.missiles.dto.system.ModuleTemplatePrintDto; import com.casic.missiles.dto.system.ModuleTemplatePrintReponse; import com.casic.missiles.dto.system.ModuleTypeRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -20,6 +18,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -30,7 +29,7 @@ /** * @author cz */ -@Api(tags = "打印文件模块注册接口") +@Api(tags = "打印文件注册接口") @RequestMapping("/module/file") @RestController @RequiredArgsConstructor @@ -39,26 +38,26 @@ private final IPrintFileTemplateRegisterService printFileService; @ApiOperation("分页列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> fileTemplateListPage(@RequestBody @Valid ModuleTypeRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(printFileService.fileTemplateListPage(page, request))); } @ApiOperation("新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.addFileTemplate(request); } @ApiOperation("更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.updateFileTemplate(request); } @ApiOperation("删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteFileTemplate(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -67,7 +66,7 @@ } @ApiOperation("详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO fileTemplateDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java index 4721b62..1e5b0b9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java @@ -52,6 +52,10 @@ basePackage("com.casic.missiles.controller.sys", "com.casic.missiles.controller.system"), PathSelectors.any()), + /** 系统管理模块 */ + PRINTFILE("文件打印配置", + basePackage("com.casic.missiles.controller.system.module"), + PathSelectors.any()), /** 工作台 */ WORKBENCH("工作台", basePackage("com.casic.missiles.controller.workbench"), diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java index 86fe888..a84795a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java @@ -32,8 +32,8 @@ private String descn; @ApiModelProperty("签名Json") - @TableField("sign_json") - private String signJson; + @TableField("signs") + private String signs; @ApiModelProperty("签名列表") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java index 7515b3b..c7d1169 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java @@ -23,15 +23,15 @@ @TableField("module_type") private String moduleType; - @ApiModelProperty("模板名称") + @ApiModelProperty("模版名称") @TableField("module_name") private String moduleName; - @ApiModelProperty("模板类型") + @ApiModelProperty("描述") @TableField("descn") private String descn; - @ApiModelProperty("模板名称") + @ApiModelProperty("签名id") @TableField("signs") private String signs; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/ModuleTypeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/ModuleTypeServiceImpl.java index 73b1c04..6ffeba4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/ModuleTypeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/ModuleTypeServiceImpl.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.system.ModuleTypeRequest; @@ -36,6 +38,8 @@ @Override public ReturnDTO addModuleType(ModuleTypeConfig moduleTypeConfig) { int addFlag = 0; + AuthUser authUser = ShiroKit.getUser(); + moduleTypeConfig.setCreateUserId(authUser.getId()); getBizNumber(moduleTypeConfig); addFlag = this.baseMapper.insert(moduleTypeConfig); if (addFlag > 0) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java index 89ec9ad..e30dd45 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -36,26 +37,26 @@ private final IModuleTypeService moduleTypeService; @ApiOperation("模块类型列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> moduleTypeListPage(@RequestBody @Valid ModuleTypeRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(moduleTypeService.moduleTypeListPage(page, request))); } @ApiOperation("新增模块类型") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.addModuleType(moduleTypeConfig); } @ApiOperation("更新模块类型") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { return moduleTypeService.updateModuleType(moduleTypeConfig); } @ApiOperation("模块类型详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +65,7 @@ } @ApiOperation("删除模块类型") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteModuleType(@RequestBody @Valid IdDTO idDTO) { return moduleTypeService.deleteModuleType(idDTO.getId()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java index 7fb0888..e95c459 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/PrintFileTemplateRegisterController.java @@ -2,7 +2,6 @@ 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; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.system.ModuleTemplatePrintDetail; -import com.casic.missiles.dto.system.ModuleTemplatePrintDto; import com.casic.missiles.dto.system.ModuleTemplatePrintReponse; import com.casic.missiles.dto.system.ModuleTypeRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -20,6 +18,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -30,7 +29,7 @@ /** * @author cz */ -@Api(tags = "打印文件模块注册接口") +@Api(tags = "打印文件注册接口") @RequestMapping("/module/file") @RestController @RequiredArgsConstructor @@ -39,26 +38,26 @@ private final IPrintFileTemplateRegisterService printFileService; @ApiOperation("分页列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> fileTemplateListPage(@RequestBody @Valid ModuleTypeRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(printFileService.fileTemplateListPage(page, request))); } @ApiOperation("新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.addFileTemplate(request); } @ApiOperation("更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.updateFileTemplate(request); } @ApiOperation("删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteFileTemplate(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -67,7 +66,7 @@ } @ApiOperation("详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO fileTemplateDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java index 4721b62..1e5b0b9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java @@ -52,6 +52,10 @@ basePackage("com.casic.missiles.controller.sys", "com.casic.missiles.controller.system"), PathSelectors.any()), + /** 系统管理模块 */ + PRINTFILE("文件打印配置", + basePackage("com.casic.missiles.controller.system.module"), + PathSelectors.any()), /** 工作台 */ WORKBENCH("工作台", basePackage("com.casic.missiles.controller.workbench"), diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java index 86fe888..a84795a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java @@ -32,8 +32,8 @@ private String descn; @ApiModelProperty("签名Json") - @TableField("sign_json") - private String signJson; + @TableField("signs") + private String signs; @ApiModelProperty("签名列表") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java index 7515b3b..c7d1169 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java @@ -23,15 +23,15 @@ @TableField("module_type") private String moduleType; - @ApiModelProperty("模板名称") + @ApiModelProperty("模版名称") @TableField("module_name") private String moduleName; - @ApiModelProperty("模板类型") + @ApiModelProperty("描述") @TableField("descn") private String descn; - @ApiModelProperty("模板名称") + @ApiModelProperty("签名id") @TableField("signs") private String signs; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/ModuleTypeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/ModuleTypeServiceImpl.java index 73b1c04..6ffeba4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/ModuleTypeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/ModuleTypeServiceImpl.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.system.ModuleTypeRequest; @@ -36,6 +38,8 @@ @Override public ReturnDTO addModuleType(ModuleTypeConfig moduleTypeConfig) { int addFlag = 0; + AuthUser authUser = ShiroKit.getUser(); + moduleTypeConfig.setCreateUserId(authUser.getId()); getBizNumber(moduleTypeConfig); addFlag = this.baseMapper.insert(moduleTypeConfig); if (addFlag > 0) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java index 9879afd..a070f3c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java @@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.system.*; @@ -20,6 +22,7 @@ import com.casic.missiles.model.resource.BizResourceSealInfo; import com.casic.missiles.service.system.IPrintFileTemplateRegisterService; import com.casic.missiles.utils.ConvertUtils; +import com.gexin.fastjson.JSON; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -50,20 +53,12 @@ @Override @Transactional public ReturnDTO addFileTemplate(ModuleTemplatePrintDetail request) { - int addFlag = 0; -// addFlag = this.baseMapper.insert(id); - if (addFlag > 0) { - return ReturnUtil.success(); - } - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - - @Override - @Transactional - public ReturnDTO updateFileTemplate(ModuleTemplatePrintDetail request) { boolean addFlag = true; + ModuleTemplatePrintConfig moduleTemplatePrintConfig = ConvertUtils.sourceToTarget(request, ModuleTemplatePrintConfig.class); - List> mo = new ArrayList<>(); + moduleTemplatePrintConfig.setSigns(dtoToJson(request.getSignImageResponseList())); + AuthUser authUser = ShiroKit.getUser(); + moduleTemplatePrintConfig.setUpdateUser(authUser.getId()); addFlag &= this.baseMapper.insert(moduleTemplatePrintConfig) > 0; request.getModuleFieldConfigList(); if (addFlag) { @@ -78,6 +73,28 @@ } @Override + @Transactional + public ReturnDTO updateFileTemplate(ModuleTemplatePrintDetail request) { + boolean updateFlag = true; + ModuleTemplatePrintConfig moduleTemplatePrintConfig = ConvertUtils.sourceToTarget(request, ModuleTemplatePrintConfig.class); + moduleTemplatePrintConfig.setSigns(dtoToJson(request.getSignImageResponseList())); + AuthUser authUser = ShiroKit.getUser(); + moduleTemplatePrintConfig.setUpdateUser(authUser.getId()); + updateFlag &= this.baseMapper.updateById(moduleTemplatePrintConfig) > 0; + request.getModuleFieldConfigList(); + if (updateFlag) { + for (ModuleFieldConfig moduleFieldConfig : request.getModuleFieldConfigList()) { + updateFlag &= ObjectUtils.isNotEmpty(moduleFieldConfig.getId()) ? + this.moduleFieldMapper.updateById(moduleFieldConfig) > 0 : this.moduleFieldMapper.insert(moduleFieldConfig) > 0; + } + if (updateFlag) { + return ReturnUtil.success(); + } + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override public ReturnDTO deleteFileTemplate(Long id) { int deleteFlag = 0; deleteFlag = this.baseMapper.deleteById(id); @@ -91,13 +108,8 @@ public ModuleTemplatePrintDetail fileTemplateDetail(Long id) { ModuleTemplatePrintConfig moduleTemplatePrintConfig = this.baseMapper.selectById(id); ModuleTemplatePrintDetail moduleTemplatePrintDetail = ConvertUtils.sourceToTarget(moduleTemplatePrintConfig, ModuleTemplatePrintDetail.class); - List signIds = new ArrayList<>(); - Map KeyWordMap = jsonToDto(moduleTemplatePrintDetail.getSignJson(), signIds); - List bizResourceSealInfo = bizResourceSealInfoMapper.selectBatchIds(signIds); - List signImageResponses = ConvertUtils.sourceToTarget(bizResourceSealInfo, SignImageResponse.class); - for (SignImageResponse signImageResponse : signImageResponses) { - signImageResponse.setKeyWords(KeyWordMap.get(signImageResponse.getId())); - } + List signImageResponses = jsonToDto(moduleTemplatePrintDetail.getSigns()); + moduleTemplatePrintDetail.setSignImageResponseList(signImageResponses); //添加图片信息,关联表的信息,关联表信息同时json化 List moduleFieldConfigList = new ArrayList<>(); if (ObjectUtils.isNotEmpty(moduleTemplatePrintDetail.getModuleFieldId())) { @@ -111,30 +123,33 @@ return moduleTemplatePrintDetail; } - private Map dtoToJson(String signJson, List signIds) { - if (StringUtils.isEmpty(signJson)) { - return null; + private String dtoToJson(List signImageResponses) { + Map signMap = new HashMap<>(); + for (SignImageResponse signImageResponse : signImageResponses) { + signMap.put("signId", signImageResponse.getId()); + signMap.put("keyWords", signImageResponse.getKeyWords()); } - List signJsonList = JSONArray.parseArray(signJson, Map.class); - Map KeyWordMap = new HashMap<>(); - for (Map keywords : signJsonList) { - signIds.add((Long) keywords.get("signId")); - KeyWordMap.put((Long) keywords.get("signId"), (String) keywords.get("keywords")); - } - return KeyWordMap; + return JSON.toJSONString(signMap); } - private Map jsonToDto(String signJson, List signIds) { + private List jsonToDto(String signJson) { if (StringUtils.isEmpty(signJson)) { return null; } + List signIds = new ArrayList<>(); List signJsonList = JSONArray.parseArray(signJson, Map.class); Map KeyWordMap = new HashMap<>(); for (Map keywords : signJsonList) { signIds.add((Long) keywords.get("signId")); KeyWordMap.put((Long) keywords.get("signId"), (String) keywords.get("keywords")); } - return KeyWordMap; + List bizResourceSealInfo = bizResourceSealInfoMapper.selectBatchIds(signIds); + List signImageResponses = ConvertUtils.sourceToTarget(bizResourceSealInfo, SignImageResponse.class); + for (SignImageResponse signImageResponse : signImageResponses) { + signImageResponse.setKeyWords(KeyWordMap.get(signImageResponse.getId())); + } + return signImageResponses; } + }