chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhaowenyuan 2024-07-04 10:36:06 +08:00
parent 321132766b 401699ba00
commit e919621d2e
3 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreImportController.java
View File

@ -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<StoreImportDTO> lists)
{
List<StoreImportDTO> read = ExcelUtils.read(file, StoreImportDTO.class);
List<StoreImport> storeImportList = assembleEntity(read);
return AjaxResult.success(storeImportService.saveBatch(storeImportList));
return AjaxResult.success(storeImportService.saveList(lists));
}
private List<StoreImport> assembleEntity(List<StoreImportDTO> read){
List<StoreImport> 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 {
}

5
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/StoreImportService.java
View File

@ -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<StoreImport> {
int confimImport(Long[] ids);
int saveList(List<StoreImportDTO> dtoList);
}

22
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/StoreImportServiceImpl.java
View File

@ -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<StoreImportMapper, Store
for (Long id : ids) {
i++;
StoreImport storeImport = getById(id);
if(ObjectUtil.isEmpty(storeImport)){
if (ObjectUtil.isEmpty(storeImport)) {
throw new RuntimeException("导入失败");
}
Store store = BeanCopyUtils.copy(storeImport, Store.class);
@ -90,5 +94,21 @@ public class StoreImportServiceImpl extends ServiceImpl<StoreImportMapper, Store
return i;
}
@Override
@Async
public int saveList(List<StoreImportDTO> 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;
}
}