diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreController.java index 9545ef1..97dc5b4 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreController.java @@ -30,8 +30,7 @@ public class StoreController { @Resource StoreService storeService; - @Resource - TbTemplateService tbTemplateService; + /** * 查询商户 @@ -91,14 +90,5 @@ public class StoreController { return AjaxResult.success(); } - // todo 导入商户 read - @SysLog(value = "导入模板", businessType = BusinessType.DOWNLOAD) - @PostMapping("/down/template") -// @RequiresPermissions("store:down:template") - public AjaxResult downTemplate(@RequestParam(defaultValue = "store_template") String templateAlias, - @RequestParam(defaultValue = "") Long taskId) - { - return AjaxResult.success(tbTemplateService.getByAlias(templateAlias, taskId)); - } - // todo 导入商户 save + } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreImportController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreImportController.java index c7aa2ad..7a55dfe 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreImportController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreImportController.java @@ -1,8 +1,16 @@ package com.chushang.inspection.terminal.controller; +import com.chushang.common.core.web.AjaxResult; +import com.chushang.common.log.annotation.SysLog; +import com.chushang.common.log.enums.BusinessType; +import com.chushang.inspection.project.service.TbTemplateService; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; + /** * @auther: zhao * @date: 2024/7/3 9:56 @@ -10,6 +18,8 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping(value = "/store/import") public class StoreImportController { + @Resource + TbTemplateService tbTemplateService; /** * todo * 需要 以下接口 @@ -21,5 +31,15 @@ public class StoreImportController { * 6. store_import 转 store,template,template_ins 表, 转一条数据之后, 就需要同步清除, 避免数据重复 * 7. 清除当前数据 */ + @SysLog(value = "导入模板", businessType = BusinessType.DOWNLOAD) + @PostMapping("/down/template") +// @RequiresPermissions("store:down:template") + public AjaxResult downTemplate(@RequestParam(defaultValue = "store_template") String templateAlias, + @RequestParam(defaultValue = "") Long taskId) + { + return AjaxResult.success(tbTemplateService.getByAlias(templateAlias, taskId)); + } + // todo 导入商户 read + // todo 导入商户 save }