From 401699ba0024678002f4b699cc66e3c6ed7cf49b Mon Sep 17 00:00:00 2001 From: Chujinwang <17638147107@163.com> Date: Thu, 4 Jul 2024 09:08:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E4=B8=BA?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E9=A2=84=E8=AF=BB=E5=8F=96=E5=92=8C=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=B8=A4=E4=B8=AA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StoreImportController.java | 39 ++++++++----------- .../terminal/service/StoreImportService.java | 5 +++ .../service/impl/StoreImportServiceImpl.java | 22 ++++++++++- 3 files changed, 42 insertions(+), 24 deletions(-) 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 a239d15..5dc21c8 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 @@ -63,29 +63,25 @@ public class StoreImportController { return AjaxResult.success(tbTemplateService.getByAlias(templateAlias, null)); } - // todo 导入商户 read - // todo 导入商户 save + + @SysLog(value = "导入预读取", businessType = BusinessType.IMPORT) + @PostMapping("/read") + @RequiresPermissions("store:import:read") + public AjaxResult importRead(@RequestParam(value = "file") MultipartFile file) + { + + return AjaxResult.success(ExcelUtils.read(file, StoreImportDTO.class)); + } @SysLog(value = "导入", businessType = BusinessType.IMPORT) - @PostMapping("/import") - @RequiresPermissions("store:import:import") - public AjaxResult importStore(@RequestParam(defaultValue = "file") MultipartFile file) + @PostMapping("/save") + @RequiresPermissions("store:import:save") + public AjaxResult importStore(@RequestParam(value = "lists") List lists) { - List read = ExcelUtils.read(file, StoreImportDTO.class); - List storeImportList = assembleEntity(read); - - return AjaxResult.success(storeImportService.saveBatch(storeImportList)); + return AjaxResult.success(storeImportService.saveList(lists)); } - private List assembleEntity(List read){ - List storeImportList = Lists.newArrayList(); - for (StoreImportDTO storeImportDTO: read){ - StoreImport copy = BeanCopyUtils.copy(storeImportDTO, StoreImport.class); - copy.setDeptId(SecurityUtils.getDeptId()); - storeImportList.add(copy); - } - return storeImportList; - } + /** * 列表确认导入查询 @@ -131,10 +127,10 @@ public class StoreImportController { /** * 新增导入数据 */ - @PostMapping(value = "/save") + @PostMapping(value = "/save/one") @SysLog(value = "新增导入数据", businessType = BusinessType.INSERT) @RequiresPermissions("store:import:save") - public AjaxResult save(@RequestBody @Validated(Create.class) StoreImportQuery query) + public AjaxResult saveOne(@RequestBody @Validated(Create.class) StoreImportQuery query) { StoreImport storeImport = BeanCopyUtils.copy(query, StoreImport.class); storeImport.setDeptId(SecurityUtils.getDeptId()); @@ -155,7 +151,4 @@ public class StoreImportController { - - - } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/StoreImportService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/StoreImportService.java index ea6a56d..dbc9b82 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/StoreImportService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/StoreImportService.java @@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.inspection.project.dto.ProjectDTO; +import com.chushang.inspection.terminal.dto.StoreImportDTO; import com.chushang.inspection.terminal.po.StoreImport; import com.chushang.inspection.terminal.query.StoreImportQuery; import com.chushang.inspection.terminal.query.StoreQuery; +import java.util.List; + /** * @auther: zhao * @date: 2024/7/3 9:55 @@ -20,4 +23,6 @@ public interface StoreImportService extends IService { int confimImport(Long[] ids); + int saveList(List dtoList); + } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/StoreImportServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/StoreImportServiceImpl.java index 8ad145f..ef13934 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/StoreImportServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/StoreImportServiceImpl.java @@ -13,6 +13,7 @@ import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.inspection.project.dto.ProjectDTO; import com.chushang.inspection.project.po.WrkProject; +import com.chushang.inspection.terminal.dto.StoreImportDTO; import com.chushang.inspection.terminal.mapper.StoreImportMapper; import com.chushang.inspection.terminal.mapper.StoreMapper; import com.chushang.inspection.terminal.mapper.TerminalInsMapper; @@ -27,7 +28,10 @@ import com.chushang.inspection.terminal.service.StoreImportService; import com.chushang.inspection.terminal.vo.StoreVO; import com.chushang.inspection.terminal.vo.TerminalVO; import com.chushang.inspection.utils.BeanCopyUtils; +import com.chushang.security.utils.SecurityUtils; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -72,7 +76,7 @@ public class StoreImportServiceImpl extends ServiceImpl dtoList) { + for (StoreImportDTO storeImportDTO : dtoList) { + StoreImport copy = BeanCopyUtils.copy(storeImportDTO, StoreImport.class); + copy.setDeptId(SecurityUtils.getDeptId()); + try { + save(copy); + } catch (Exception e) { + e.printStackTrace(); + log.error("商户导入异常：{}", copy.getStoreName()); + } + } + return 1; + } + }