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 new file mode 100644 index 0000000..89ec9ad --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java @@ -0,0 +1,72 @@ +package com.casic.missiles.controller.system.module; + +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.ModuleTypeRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.system.ModuleTypeConfig; +import com.casic.missiles.service.system.IModuleTypeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.util.Objects; + +/** + * @author cz + */ +@Api(tags = "模块类型关系接口") +@RequestMapping("/module/type") +@RestController +@RequiredArgsConstructor +public class ModuleTypeConfigController extends ExportController { + + private final IModuleTypeService moduleTypeService; + + @ApiOperation("模块类型列表") + @RequestMapping("/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") + public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { + return moduleTypeService.addModuleType(moduleTypeConfig); + } + + @ApiOperation("更新模块类型") + @RequestMapping("/update") + public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { + return moduleTypeService.updateModuleType(moduleTypeConfig); + } + + @ApiOperation("模块类型详情") + @RequestMapping("/detail") + public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(moduleTypeService.moduleTypeDetail(idDTO.getId())); + } + + @ApiOperation("删除模块类型") + @RequestMapping("/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 new file mode 100644 index 0000000..89ec9ad --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java @@ -0,0 +1,72 @@ +package com.casic.missiles.controller.system.module; + +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.ModuleTypeRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.system.ModuleTypeConfig; +import com.casic.missiles.service.system.IModuleTypeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.util.Objects; + +/** + * @author cz + */ +@Api(tags = "模块类型关系接口") +@RequestMapping("/module/type") +@RestController +@RequiredArgsConstructor +public class ModuleTypeConfigController extends ExportController { + + private final IModuleTypeService moduleTypeService; + + @ApiOperation("模块类型列表") + @RequestMapping("/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") + public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { + return moduleTypeService.addModuleType(moduleTypeConfig); + } + + @ApiOperation("更新模块类型") + @RequestMapping("/update") + public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { + return moduleTypeService.updateModuleType(moduleTypeConfig); + } + + @ApiOperation("模块类型详情") + @RequestMapping("/detail") + public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(moduleTypeService.moduleTypeDetail(idDTO.getId())); + } + + @ApiOperation("删除模块类型") + @RequestMapping("/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/ModuleTypeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeController.java deleted file mode 100644 index 01c2cd4..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeController.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.controller.system.module; - -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.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.ModuleTypeRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.system.ModuleTypeConfig; -import com.casic.missiles.service.system.IModuleTypeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.Valid; -import java.util.Objects; - -/** - * @author cz - */ -@Api(tags = "模块类型关系接口") -@RequestMapping("/module/type") -@RestController -@RequiredArgsConstructor -public class ModuleTypeController extends BaseController { - - private final IModuleTypeService moduleTypeService; - - @ApiOperation("模块类型列表") - @RequestMapping("/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") - public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { - return moduleTypeService.addModuleType(moduleTypeConfig); - } - - @ApiOperation("更新模块类型") - @RequestMapping("/update") - public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { - return moduleTypeService.updateModuleType(moduleTypeConfig); - } - - @ApiOperation("模块类型详情") - @RequestMapping("/detail") - public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(moduleTypeService.moduleTypeDetail(idDTO.getId())); - } - - @ApiOperation("删除模块类型") - @RequestMapping("/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 new file mode 100644 index 0000000..89ec9ad --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java @@ -0,0 +1,72 @@ +package com.casic.missiles.controller.system.module; + +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.ModuleTypeRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.system.ModuleTypeConfig; +import com.casic.missiles.service.system.IModuleTypeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.util.Objects; + +/** + * @author cz + */ +@Api(tags = "模块类型关系接口") +@RequestMapping("/module/type") +@RestController +@RequiredArgsConstructor +public class ModuleTypeConfigController extends ExportController { + + private final IModuleTypeService moduleTypeService; + + @ApiOperation("模块类型列表") + @RequestMapping("/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") + public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { + return moduleTypeService.addModuleType(moduleTypeConfig); + } + + @ApiOperation("更新模块类型") + @RequestMapping("/update") + public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { + return moduleTypeService.updateModuleType(moduleTypeConfig); + } + + @ApiOperation("模块类型详情") + @RequestMapping("/detail") + public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(moduleTypeService.moduleTypeDetail(idDTO.getId())); + } + + @ApiOperation("删除模块类型") + @RequestMapping("/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/ModuleTypeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeController.java deleted file mode 100644 index 01c2cd4..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeController.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.controller.system.module; - -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.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.ModuleTypeRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.system.ModuleTypeConfig; -import com.casic.missiles.service.system.IModuleTypeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.Valid; -import java.util.Objects; - -/** - * @author cz - */ -@Api(tags = "模块类型关系接口") -@RequestMapping("/module/type") -@RestController -@RequiredArgsConstructor -public class ModuleTypeController extends BaseController { - - private final IModuleTypeService moduleTypeService; - - @ApiOperation("模块类型列表") - @RequestMapping("/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") - public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { - return moduleTypeService.addModuleType(moduleTypeConfig); - } - - @ApiOperation("更新模块类型") - @RequestMapping("/update") - public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { - return moduleTypeService.updateModuleType(moduleTypeConfig); - } - - @ApiOperation("模块类型详情") - @RequestMapping("/detail") - public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(moduleTypeService.moduleTypeDetail(idDTO.getId())); - } - - @ApiOperation("删除模块类型") - @RequestMapping("/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 ba6a90f..7fb0888 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 @@ -3,6 +3,7 @@ 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; @@ -30,10 +31,10 @@ * @author cz */ @Api(tags = "打印文件模块注册接口") -@RequestMapping("/module/type") +@RequestMapping("/module/file") @RestController @RequiredArgsConstructor -public class PrintFileTemplateRegisterController extends BaseController { +public class PrintFileTemplateRegisterController extends ExportController { private final IPrintFileTemplateRegisterService printFileService; @@ -46,13 +47,13 @@ @ApiOperation("新增") @RequestMapping("/add") - public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDto request) { + public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.addFileTemplate(request); } @ApiOperation("更新") @RequestMapping("/update") - public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDto request) { + public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.updateFileTemplate(request); } 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 new file mode 100644 index 0000000..89ec9ad --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java @@ -0,0 +1,72 @@ +package com.casic.missiles.controller.system.module; + +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.ModuleTypeRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.system.ModuleTypeConfig; +import com.casic.missiles.service.system.IModuleTypeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.util.Objects; + +/** + * @author cz + */ +@Api(tags = "模块类型关系接口") +@RequestMapping("/module/type") +@RestController +@RequiredArgsConstructor +public class ModuleTypeConfigController extends ExportController { + + private final IModuleTypeService moduleTypeService; + + @ApiOperation("模块类型列表") + @RequestMapping("/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") + public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { + return moduleTypeService.addModuleType(moduleTypeConfig); + } + + @ApiOperation("更新模块类型") + @RequestMapping("/update") + public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { + return moduleTypeService.updateModuleType(moduleTypeConfig); + } + + @ApiOperation("模块类型详情") + @RequestMapping("/detail") + public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(moduleTypeService.moduleTypeDetail(idDTO.getId())); + } + + @ApiOperation("删除模块类型") + @RequestMapping("/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/ModuleTypeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeController.java deleted file mode 100644 index 01c2cd4..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeController.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.controller.system.module; - -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.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.ModuleTypeRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.system.ModuleTypeConfig; -import com.casic.missiles.service.system.IModuleTypeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.Valid; -import java.util.Objects; - -/** - * @author cz - */ -@Api(tags = "模块类型关系接口") -@RequestMapping("/module/type") -@RestController -@RequiredArgsConstructor -public class ModuleTypeController extends BaseController { - - private final IModuleTypeService moduleTypeService; - - @ApiOperation("模块类型列表") - @RequestMapping("/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") - public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { - return moduleTypeService.addModuleType(moduleTypeConfig); - } - - @ApiOperation("更新模块类型") - @RequestMapping("/update") - public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { - return moduleTypeService.updateModuleType(moduleTypeConfig); - } - - @ApiOperation("模块类型详情") - @RequestMapping("/detail") - public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(moduleTypeService.moduleTypeDetail(idDTO.getId())); - } - - @ApiOperation("删除模块类型") - @RequestMapping("/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 ba6a90f..7fb0888 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 @@ -3,6 +3,7 @@ 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; @@ -30,10 +31,10 @@ * @author cz */ @Api(tags = "打印文件模块注册接口") -@RequestMapping("/module/type") +@RequestMapping("/module/file") @RestController @RequiredArgsConstructor -public class PrintFileTemplateRegisterController extends BaseController { +public class PrintFileTemplateRegisterController extends ExportController { private final IPrintFileTemplateRegisterService printFileService; @@ -46,13 +47,13 @@ @ApiOperation("新增") @RequestMapping("/add") - public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDto request) { + public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.addFileTemplate(request); } @ApiOperation("更新") @RequestMapping("/update") - public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDto request) { + public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.updateFileTemplate(request); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDto.java index 746ab3a..11abe73 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDto.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDto.java @@ -48,6 +48,8 @@ @TableField("update_user") private Long updateUser; + + /** * 创建时间 */ 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 new file mode 100644 index 0000000..89ec9ad --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java @@ -0,0 +1,72 @@ +package com.casic.missiles.controller.system.module; + +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.ModuleTypeRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.system.ModuleTypeConfig; +import com.casic.missiles.service.system.IModuleTypeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.util.Objects; + +/** + * @author cz + */ +@Api(tags = "模块类型关系接口") +@RequestMapping("/module/type") +@RestController +@RequiredArgsConstructor +public class ModuleTypeConfigController extends ExportController { + + private final IModuleTypeService moduleTypeService; + + @ApiOperation("模块类型列表") + @RequestMapping("/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") + public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { + return moduleTypeService.addModuleType(moduleTypeConfig); + } + + @ApiOperation("更新模块类型") + @RequestMapping("/update") + public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { + return moduleTypeService.updateModuleType(moduleTypeConfig); + } + + @ApiOperation("模块类型详情") + @RequestMapping("/detail") + public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(moduleTypeService.moduleTypeDetail(idDTO.getId())); + } + + @ApiOperation("删除模块类型") + @RequestMapping("/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/ModuleTypeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeController.java deleted file mode 100644 index 01c2cd4..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeController.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.controller.system.module; - -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.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.ModuleTypeRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.system.ModuleTypeConfig; -import com.casic.missiles.service.system.IModuleTypeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.Valid; -import java.util.Objects; - -/** - * @author cz - */ -@Api(tags = "模块类型关系接口") -@RequestMapping("/module/type") -@RestController -@RequiredArgsConstructor -public class ModuleTypeController extends BaseController { - - private final IModuleTypeService moduleTypeService; - - @ApiOperation("模块类型列表") - @RequestMapping("/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") - public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { - return moduleTypeService.addModuleType(moduleTypeConfig); - } - - @ApiOperation("更新模块类型") - @RequestMapping("/update") - public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { - return moduleTypeService.updateModuleType(moduleTypeConfig); - } - - @ApiOperation("模块类型详情") - @RequestMapping("/detail") - public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(moduleTypeService.moduleTypeDetail(idDTO.getId())); - } - - @ApiOperation("删除模块类型") - @RequestMapping("/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 ba6a90f..7fb0888 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 @@ -3,6 +3,7 @@ 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; @@ -30,10 +31,10 @@ * @author cz */ @Api(tags = "打印文件模块注册接口") -@RequestMapping("/module/type") +@RequestMapping("/module/file") @RestController @RequiredArgsConstructor -public class PrintFileTemplateRegisterController extends BaseController { +public class PrintFileTemplateRegisterController extends ExportController { private final IPrintFileTemplateRegisterService printFileService; @@ -46,13 +47,13 @@ @ApiOperation("新增") @RequestMapping("/add") - public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDto request) { + public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.addFileTemplate(request); } @ApiOperation("更新") @RequestMapping("/update") - public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDto request) { + public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.updateFileTemplate(request); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDto.java index 746ab3a..11abe73 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDto.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDto.java @@ -48,6 +48,8 @@ @TableField("update_user") private Long updateUser; + + /** * 创建时间 */ 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 3b60599..9879afd 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 @@ -49,7 +49,7 @@ @Override @Transactional - public ReturnDTO addFileTemplate(ModuleTemplatePrintDto request) { + public ReturnDTO addFileTemplate(ModuleTemplatePrintDetail request) { int addFlag = 0; // addFlag = this.baseMapper.insert(id); if (addFlag > 0) { @@ -60,11 +60,19 @@ @Override @Transactional - public ReturnDTO updateFileTemplate(ModuleTemplatePrintDto request) { - int addFlag = 0; -// addFlag = this.baseMapper.insert(id); - if (addFlag > 0) { - return ReturnUtil.success(); + public ReturnDTO updateFileTemplate(ModuleTemplatePrintDetail request) { + boolean addFlag = true; + ModuleTemplatePrintConfig moduleTemplatePrintConfig = ConvertUtils.sourceToTarget(request, ModuleTemplatePrintConfig.class); + List> mo = new ArrayList<>(); + addFlag &= this.baseMapper.insert(moduleTemplatePrintConfig) > 0; + request.getModuleFieldConfigList(); + if (addFlag) { + for (ModuleFieldConfig moduleFieldConfig : request.getModuleFieldConfigList()) { + addFlag &= this.moduleFieldMapper.insert(moduleFieldConfig) > 0; + } + if (addFlag) { + return ReturnUtil.success(); + } } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -83,16 +91,8 @@ public ModuleTemplatePrintDetail fileTemplateDetail(Long id) { ModuleTemplatePrintConfig moduleTemplatePrintConfig = this.baseMapper.selectById(id); ModuleTemplatePrintDetail moduleTemplatePrintDetail = ConvertUtils.sourceToTarget(moduleTemplatePrintConfig, ModuleTemplatePrintDetail.class); - /** - * 取了ids - */ - List signJsonList = JSONArray.parseArray(moduleTemplatePrintDetail.getSignJson(), Map.class); - Map KeyWordMap = new HashMap<>(); List signIds = new ArrayList<>(); - for (Map keywords : signJsonList) { - signIds.add((Long) keywords.get("signId")); - KeyWordMap.put((Long) keywords.get("signId"), (String) keywords.get("keywords")); - } + Map KeyWordMap = jsonToDto(moduleTemplatePrintDetail.getSignJson(), signIds); List bizResourceSealInfo = bizResourceSealInfoMapper.selectBatchIds(signIds); List signImageResponses = ConvertUtils.sourceToTarget(bizResourceSealInfo, SignImageResponse.class); for (SignImageResponse signImageResponse : signImageResponses) { @@ -111,4 +111,30 @@ return moduleTemplatePrintDetail; } + private Map dtoToJson(String signJson, List signIds) { + if (StringUtils.isEmpty(signJson)) { + return null; + } + 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; + } + + private Map jsonToDto(String signJson, List signIds) { + if (StringUtils.isEmpty(signJson)) { + return null; + } + 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; + } + } 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 new file mode 100644 index 0000000..89ec9ad --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeConfigController.java @@ -0,0 +1,72 @@ +package com.casic.missiles.controller.system.module; + +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.ModuleTypeRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.system.ModuleTypeConfig; +import com.casic.missiles.service.system.IModuleTypeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.util.Objects; + +/** + * @author cz + */ +@Api(tags = "模块类型关系接口") +@RequestMapping("/module/type") +@RestController +@RequiredArgsConstructor +public class ModuleTypeConfigController extends ExportController { + + private final IModuleTypeService moduleTypeService; + + @ApiOperation("模块类型列表") + @RequestMapping("/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") + public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { + return moduleTypeService.addModuleType(moduleTypeConfig); + } + + @ApiOperation("更新模块类型") + @RequestMapping("/update") + public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { + return moduleTypeService.updateModuleType(moduleTypeConfig); + } + + @ApiOperation("模块类型详情") + @RequestMapping("/detail") + public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(moduleTypeService.moduleTypeDetail(idDTO.getId())); + } + + @ApiOperation("删除模块类型") + @RequestMapping("/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/ModuleTypeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeController.java deleted file mode 100644 index 01c2cd4..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/module/ModuleTypeController.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.controller.system.module; - -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.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.ModuleTypeRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.system.ModuleTypeConfig; -import com.casic.missiles.service.system.IModuleTypeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.Valid; -import java.util.Objects; - -/** - * @author cz - */ -@Api(tags = "模块类型关系接口") -@RequestMapping("/module/type") -@RestController -@RequiredArgsConstructor -public class ModuleTypeController extends BaseController { - - private final IModuleTypeService moduleTypeService; - - @ApiOperation("模块类型列表") - @RequestMapping("/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") - public ReturnDTO addModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { - return moduleTypeService.addModuleType(moduleTypeConfig); - } - - @ApiOperation("更新模块类型") - @RequestMapping("/update") - public ReturnDTO updateModuleType(@RequestBody @Valid ModuleTypeConfig moduleTypeConfig) { - return moduleTypeService.updateModuleType(moduleTypeConfig); - } - - @ApiOperation("模块类型详情") - @RequestMapping("/detail") - public ReturnDTO addModuleType(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(moduleTypeService.moduleTypeDetail(idDTO.getId())); - } - - @ApiOperation("删除模块类型") - @RequestMapping("/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 ba6a90f..7fb0888 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 @@ -3,6 +3,7 @@ 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; @@ -30,10 +31,10 @@ * @author cz */ @Api(tags = "打印文件模块注册接口") -@RequestMapping("/module/type") +@RequestMapping("/module/file") @RestController @RequiredArgsConstructor -public class PrintFileTemplateRegisterController extends BaseController { +public class PrintFileTemplateRegisterController extends ExportController { private final IPrintFileTemplateRegisterService printFileService; @@ -46,13 +47,13 @@ @ApiOperation("新增") @RequestMapping("/add") - public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDto request) { + public ReturnDTO addFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.addFileTemplate(request); } @ApiOperation("更新") @RequestMapping("/update") - public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDto request) { + public ReturnDTO updateFileTemplate(@RequestBody @Valid ModuleTemplatePrintDetail request) { return printFileService.updateFileTemplate(request); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDto.java index 746ab3a..11abe73 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDto.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDto.java @@ -48,6 +48,8 @@ @TableField("update_user") private Long updateUser; + + /** * 创建时间 */ 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 3b60599..9879afd 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 @@ -49,7 +49,7 @@ @Override @Transactional - public ReturnDTO addFileTemplate(ModuleTemplatePrintDto request) { + public ReturnDTO addFileTemplate(ModuleTemplatePrintDetail request) { int addFlag = 0; // addFlag = this.baseMapper.insert(id); if (addFlag > 0) { @@ -60,11 +60,19 @@ @Override @Transactional - public ReturnDTO updateFileTemplate(ModuleTemplatePrintDto request) { - int addFlag = 0; -// addFlag = this.baseMapper.insert(id); - if (addFlag > 0) { - return ReturnUtil.success(); + public ReturnDTO updateFileTemplate(ModuleTemplatePrintDetail request) { + boolean addFlag = true; + ModuleTemplatePrintConfig moduleTemplatePrintConfig = ConvertUtils.sourceToTarget(request, ModuleTemplatePrintConfig.class); + List> mo = new ArrayList<>(); + addFlag &= this.baseMapper.insert(moduleTemplatePrintConfig) > 0; + request.getModuleFieldConfigList(); + if (addFlag) { + for (ModuleFieldConfig moduleFieldConfig : request.getModuleFieldConfigList()) { + addFlag &= this.moduleFieldMapper.insert(moduleFieldConfig) > 0; + } + if (addFlag) { + return ReturnUtil.success(); + } } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -83,16 +91,8 @@ public ModuleTemplatePrintDetail fileTemplateDetail(Long id) { ModuleTemplatePrintConfig moduleTemplatePrintConfig = this.baseMapper.selectById(id); ModuleTemplatePrintDetail moduleTemplatePrintDetail = ConvertUtils.sourceToTarget(moduleTemplatePrintConfig, ModuleTemplatePrintDetail.class); - /** - * 取了ids - */ - List signJsonList = JSONArray.parseArray(moduleTemplatePrintDetail.getSignJson(), Map.class); - Map KeyWordMap = new HashMap<>(); List signIds = new ArrayList<>(); - for (Map keywords : signJsonList) { - signIds.add((Long) keywords.get("signId")); - KeyWordMap.put((Long) keywords.get("signId"), (String) keywords.get("keywords")); - } + Map KeyWordMap = jsonToDto(moduleTemplatePrintDetail.getSignJson(), signIds); List bizResourceSealInfo = bizResourceSealInfoMapper.selectBatchIds(signIds); List signImageResponses = ConvertUtils.sourceToTarget(bizResourceSealInfo, SignImageResponse.class); for (SignImageResponse signImageResponse : signImageResponses) { @@ -111,4 +111,30 @@ return moduleTemplatePrintDetail; } + private Map dtoToJson(String signJson, List signIds) { + if (StringUtils.isEmpty(signJson)) { + return null; + } + 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; + } + + private Map jsonToDto(String signJson, List signIds) { + if (StringUtils.isEmpty(signJson)) { + return null; + } + 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; + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/IPrintFileTemplateRegisterService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/IPrintFileTemplateRegisterService.java index bd32546..c28492e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/IPrintFileTemplateRegisterService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/IPrintFileTemplateRegisterService.java @@ -12,9 +12,9 @@ Page fileTemplateListPage(Page page, ModuleTypeRequest request); - ReturnDTO addFileTemplate(ModuleTemplatePrintDto request); + ReturnDTO addFileTemplate(ModuleTemplatePrintDetail request); - ReturnDTO updateFileTemplate(ModuleTemplatePrintDto request); + ReturnDTO updateFileTemplate(ModuleTemplatePrintDetail request); ReturnDTO deleteFileTemplate(Long id);