From b0ea7a77e67412388a9cde0804379f2cc95eea69 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 23 六月 2025 11:51:02 +0800
Subject: [PATCH] 点位导入完成，小程序任务上传
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
index fdb8ee8..998f30c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
@@ -241,12 +241,12 @@
@ApiOperation(value = "点位导入")
@Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
@PostMapping("/importLocation")
- public R<List<CustomerImportFailedData>> importLocation(@RequestPart("file") MultipartFile file) {
+ public R<String> importLocation(@RequestPart("file") MultipartFile file) {
ImportParams params = new ImportParams();
params.setTitleRows(2); // 标题行数
params.setHeadRows(1); //表头行数
InputStream inputStream = null;
- List<CustomerImportFailedData> failedData = new ArrayList<>();
+// List<CustomerImportFailedData> failedData = new ArrayList<>();
List<TLocationImportExcel> locationExcelList;
try {
inputStream = file.getInputStream();
@@ -266,12 +266,50 @@
if (CollectionUtils.isEmpty(locationExcelList)) {
throw new ServiceException("点位数据为空!");
}
+
+// List<TLocation> saveOrUpdateList = new ArrayList<>();
+ // 查询所有类型点位
+ List<TLocationType> locationTypes = locationTypeService.list();
+ // 查询所有用户
+ List<SysUser> users = sysUserService.selectAllList();
+ // 查询所有部门
+ List<TDept> deptList = deptService.list();
+ // 查询所有保洁员
+ List<TCleaner> cleaners = cleanerService.list();
+
for (TLocationImportExcel locationExcel : locationExcelList) {
System.err.println(locationExcel);
+ TLocation location = new TLocation();
+ location.setLocationCode(locationExcel.getLocationCode());
+ location.setLocationName(locationExcel.getLocationName());
+ TLocationType tLocationType = locationTypes.stream().filter(locationType -> locationType.getLocationName().equals(locationExcel.getLocationType())).findFirst().orElse(null);
+ if (Objects.nonNull(tLocationType)){
+ location.setLocationType(tLocationType.getId());
+ }
+ location.setLocationAddress(locationExcel.getLocationAddress());
+ String[] addressLonLat = locationExcel.getLocationAddressLonLat().split("/");
+ location.setLocationLon(addressLonLat[0]);
+ location.setLocationLat(addressLonLat[1]);
+ location.setLocationAddressEnd(locationExcel.getLocationAddressEnd());
+ String[] addressEndLonLat = locationExcel.getLocationAddressEndLonLat().split("/");
+ location.setLocationLonEnd(addressEndLonLat[0]);
+ location.setLocationLatEnd(addressEndLonLat[1]);
+ TDept tDept = deptList.stream().filter(dept -> dept.getCode().equals(locationExcel.getDeptCode())).findFirst().orElse(null);
+ if(Objects.nonNull(tDept)){
+ location.setProjectId(tDept.getId());
+ }
+ SysUser sysUser = users.stream().filter(user -> user.getNickName().equals(locationExcel.getNickName())).findFirst().orElse(null);
+ if(Objects.nonNull(sysUser)){
+ location.setLocationLeader(String.valueOf(sysUser.getUserId()));
+ }
+ cleaners.stream().filter(cleaner -> cleaner.getCleanerCode().equals(locationExcel.getCleanerCodeClear())
+ && cleaner.getDeptCode().equals(locationExcel.getDeptCodeClear())
+ && cleaner.getProjectCode().equals(locationExcel.getProjectCodeClear())).findFirst().orElse(null);
+ location.setLocationCleaner(locationExcel.getProjectCodeClear());
+ locationService.save(location);
}
-// locationService.saveOrUpdateBatch(saveOrUpdateList);
- return R.ok(failedData);
+ return R.ok();
}
}
--
Gitblit v1.7.1