点位导入完成，小程序任务上传

xuhy

2025-06-23 b0ea7a77e67412388a9cde0804379f2cc95eea69

点位导入完成，小程序任务上传

 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();
    }

}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java

@@ -32,6 +32,7 @@
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -186,7 +187,7 @@
    @Log(title = "批量审核任务", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "批量审核任务")
    @PostMapping(value = "/auditBatch")
    public R<Boolean> auditBatch(@RequestBody @Valid TTaskAuditBatchDTO dto) {
    public R<Boolean> auditBatch(@RequestBody @Validated TTaskAuditBatchDTO dto) {
        List<TTaskDetail> tTaskDetails = new ArrayList<>();
        for (String s : dto.getTaskIds().split(",")) {
            TTask byId = taskCleanerService.getById(s);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java

@@ -150,6 +150,9 @@
                    .in(TProjectDept::getParentId, proIds));
            // 获取片区id
            List<String> areaIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());
            if(CollectionUtils.isEmpty(areaIds)){
                return;
            }

            // 计算每天需要抽取多少个保洁员
            long count = cleanerService.count(Wrappers.lambdaQuery(TCleaner.class)

 ruoyi-admin/src/main/resources/application-test.yml

@@ -95,9 +95,9 @@
    druid:
      # 主库数据源
      master:
        url: jdbc:mysql://192.168.110.64:3306/cleaning_inspection?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai
        url: jdbc:mysql://192.168.110.34:3306/cleaning_inspection?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai
        username: root
        password: root
        password: 123456
      # 从库数据源
      slave:
        # 从数据源开关/默认关闭

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TTaskDetailController.java

@@ -1,9 +1,30 @@
package com.ruoyi.web.controller.api;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.dto.TTaskAuditBatchDTO;
import com.ruoyi.system.model.TAppeal;
import com.ruoyi.system.model.TTask;
import com.ruoyi.system.model.TTaskDetail;
import com.ruoyi.system.service.TAppealService;
import com.ruoyi.system.service.TTaskCleanService;
import com.ruoyi.system.service.TTaskDetailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
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.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;

/**
 * <p>
@@ -18,5 +39,33 @@
@RequestMapping("/t-task-detail")
public class TTaskDetailController {

    @Autowired
    private TTaskDetailService taskDetailService;
    @Autowired
    private TTaskCleanService taskService;
    @Autowired
    private TAppealService appealService;

    @ApiOperation(value = "上传任务")
    @PostMapping(value = "/uploadTask")
    public R<Boolean> uploadTask(@RequestBody TTaskDetail dto) {
        taskDetailService.save(dto);
        // 修改任务状态
        taskService.update(Wrappers.<TTask>lambdaUpdate().set(TTask::getStatus, 3).eq(TTask::getId, dto.getTaskId()));
        return R.ok();
    }

    @ApiOperation(value = "申诉")
    @PostMapping(value = "/appeal")
    public R<Boolean> appeal(@RequestBody TAppeal dto) {
        appealService.save(dto);
        // 添加任务详情
        TTaskDetail taskDetail = new TTaskDetail();
        taskDetail.setTaskId(dto.getTaskId());
        taskDetail.setHandleType(4);
        taskDetailService.save(taskDetail);
        return R.ok();
    }

}