Merge remote-tracking branch 'origin/master'

无关风月

14 小时以前 02bb94e413f6950b9786c5ee86c0937bc20f8ae8

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

@@ -5,14 +5,20 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.hutool.json.JSON;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.LocationDTO;
import com.ruoyi.system.importExcel.TLocationImportExcel;
import com.ruoyi.system.model.*;
@@ -72,6 +78,8 @@
    private TDeptService deptService;
    @Resource
    private ISysUserService sysUserService;
    @Resource
    private TokenService tokenService;

    @ApiOperation(value = "点位管理分页列表")
    @PostMapping(value = "/pageList")
@@ -130,10 +138,23 @@
                .eq(query.getStatus() != null, TTask::getStatus, query.getStatus())
                .in(query.getPatrolInspectorIds() != null && query.getPatrolInspectorIds().isEmpty(), TTask::getPatrolInspector, query.getPatrolInspectorIds())
                .in(query.getTaskIds() != null && query.getTaskIds().isEmpty(), TTask::getId, query.getTaskIds()).list();
        List<String> collect = list.stream().map(TTask::getId).collect(Collectors.toList());

        list = list.stream().skip((long) (query.getPageNum() - 1) * query.getPageSize()).limit(query.getPageSize()).collect(Collectors.toList());
        pageInfo.setTotal(list.size());
        List<LocationListTaskVO> res = new ArrayList<>();
        List<TTaskDetail> taskDetails = tTaskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class)
                        .in(TTaskDetail::getTaskId,collect)
                .eq(TTaskDetail::getClearStatus, 2)
                .eq(TTaskDetail::getHandleType,1)
                .orderByDesc(TTaskDetail::getCreateTime));
        taskDetails = new ArrayList<>(taskDetails.stream()
                .collect(Collectors.groupingBy(
                        TTaskDetail::getTaskId,
                        Collectors.collectingAndThen(
                                Collectors.toList(),
                                listAll -> listAll.get(0)
                        )
                ))
                .values());
        for (TTask tTask : list) {
            LocationListTaskVO temp = new LocationListTaskVO();
            TLocation tLocation = locationList.stream().filter(e -> e.getId().equals(tTask.getLocationId())).findFirst().orElse(null);
@@ -161,21 +182,32 @@
                            }
                        }
                });
                locationTypeList.stream().filter(e -> e.getId().equals(tLocation.getLocationType())).findFirst()
                        .ifPresent(tLocationType -> temp.setLocationTypeName(tLocationType.getLocationName()));

            }
            TTaskDetail one = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, tTask.getId())
                    .orderByDesc(TTaskDetail::getCreateTime).last("limit 1").one();
            if (one!=null){
                temp.setClearStatus(one.getClearStatus());
                temp.setPicture(one.getPicture());
            TTaskDetail tTaskDetail = taskDetails.stream().filter(e -> e.getTaskId().equals(tTask.getId())).findFirst().orElse(null);
            if (tTaskDetail!=null){
                temp.setPicture(tTaskDetail.getPicture());
                temp.setClearStatus(tTaskDetail.getClearStatus());
                if (query.getClearStatus()!=null){
                    if (query.getClearStatus().equals(tTaskDetail.getClearStatus())){
                        res.add(temp);
                    }
                }else{
                    res.add(temp);
                }
            }
            temp.setTaskType(tTask.getTaskType());
            temp.setStatus(tTask.getStatus());
            temp.setTaskId(tTask.getId());
            temp.setImplementTime(tTask.getImplementTime());
            res.add(temp);

        }
        res = res.stream().skip((long) (query.getPageNum() - 1) * query.getPageSize()).limit(query.getPageSize()).collect(Collectors.toList());
        pageInfo.setTotal(res.size());
        pageInfo.setRecords(res);
        return R.ok();
        return R.ok(pageInfo);
    }
    @ApiOperation(value = "根据片区id查询保洁员列表 不分页")
    @GetMapping(value = "/listCleaner")
@@ -187,6 +219,7 @@
    public R<List<TLocation>> listLocation(@RequestParam String id) {
        return R.ok(locationService.lambdaQuery().eq(TLocation::getLocationCleaner,id).list());
    }

    @ApiOperation(value = "查询部门 项目部列表 不分页")
    @GetMapping(value = "/listDepts")
    public R<List<DeptNoLimitVO>> listDepts() {
@@ -236,7 +269,15 @@
    @ApiOperation(value = "根据部门/项目部id查询巡检员列表 不分页")
    @GetMapping(value = "/listUsers")
    public R<List<SysUser>> listUsers(@RequestParam String id) {
            List<SysUser> res = sysUserService.selectUserByDeptId(id);
        List<String> strings = new ArrayList<>();
        strings.add(id);
        TProjectDept projectDept = projectDeptService.getById(id);
        if (projectDept.getParentId().equals("0")){
            List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, projectDept.getId())
                    .list().stream().map(TProjectDept::getId).collect(Collectors.toList());
            strings.addAll(collect);
        }
        List<SysUser> res = sysUserService.selectUserByDeptId(strings);
        return R.ok(res);
    }
    @Log(title = "新增点位", businessType = BusinessType.INSERT)
@@ -271,6 +312,8 @@
    @GetMapping("/import-template")
    public void importTemplate() {
        List<TLocationImportExcel> locationImportExcels = new ArrayList<>();
        TLocationImportExcel tLocationImportExcel = new TLocationImportExcel();
        locationImportExcels.add(tLocationImportExcel);
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TLocationImportExcel.class, locationImportExcels);
        HttpServletResponse response = WebUtils.response();
        ServletOutputStream outputStream = null;
@@ -298,12 +341,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.setTitleRows(1); // 标题行数
        params.setHeadRows(1); //表头行数
        InputStream inputStream = null;
        List<CustomerImportFailedData> failedData = new ArrayList<>();
//        List<CustomerImportFailedData> failedData = new ArrayList<>();
        List<TLocationImportExcel> locationExcelList;
        try {
            inputStream = file.getInputStream();
@@ -323,12 +366,67 @@
        if (CollectionUtils.isEmpty(locationExcelList)) {
            throw new ServiceException("点位数据为空!");
        }

//        List<TLocation> saveOrUpdateList = new ArrayList<>();
        // 查询所有类型点位
        List<TLocationType> locationTypes = locationTypeService.list();
        // 查询所有用户
        List<SysUser> users = sysUserService.selectAllList();
        // 查询所有部门
        List<TProjectDept> deptList = projectDeptService.list();
        // 查询所有保洁员
        List<TCleaner> cleaners = cleanerService.list();

        JSONObject result = new JSONObject();

        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]);
            TProjectDept projectDept = deptList.stream().filter(dept -> dept.getCode().equals(locationExcel.getDeptCode())).findFirst().orElse(null);
            if(Objects.nonNull(projectDept)){
                location.setProjectId(projectDept.getId());
            }else {
                result.append("路段名：[", locationExcel.getLocationName()+"]未查询到部门");
                continue;
            }
            SysUser sysUser = users.stream().filter(user -> user.getNickName().equals(locationExcel.getNickName())).findFirst().orElse(null);
            if(Objects.nonNull(sysUser)){
                location.setLocationLeader(String.valueOf(sysUser.getUserId()));
            }else {
                result.append("路段名：[", locationExcel.getLocationName()+"]未查询到点位负责人");
                continue;
            }
            TCleaner tCleaner = cleaners.stream().filter(cleaner -> cleaner.getCleanerCode().equals(locationExcel.getCleanerCodeClear())
                    && cleaner.getDeptCode().equals(locationExcel.getDeptCodeClear())
                    && cleaner.getProjectCode().equals(locationExcel.getProjectCodeClear())
                    && cleaner.getCleanerName().equals(locationExcel.getCleanerName())).findFirst().orElse(null);
            if(Objects.nonNull(tCleaner)){
                location.setLocationCleaner(tCleaner.getId());
            }else {
                result.append("路段名：[", locationExcel.getLocationName()+"]未查询到保洁员");
                continue;
            }
            locationService.save(location);
        }
//        locationService.saveOrUpdateBatch(saveOrUpdateList);

        return R.ok(failedData);
        if(!result.isEmpty()){
            return R.ok(result.toString());
        }
        return R.ok();
    }

}