From f770f08c09b6e622242a73550b31b273f92e3444 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 六月 2025 16:45:06 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 178 insertions(+), 2 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 1f896f1..6ea909c 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
@@ -1,9 +1,33 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.system.dto.LocationDTO;
+import com.ruoyi.system.dto.LocationTypeDTO;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.LocationListQuery;
+import com.ruoyi.system.query.LocationListTaskQuery;
+import com.ruoyi.system.query.LocationTypeListQuery;
+import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.system.LocationListTaskVO;
+import com.ruoyi.system.vo.system.LocationListVO;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -17,6 +41,158 @@
@RestController
@RequestMapping("/t-location")
public class TLocationController {
+ @Resource
+ private TLocationTypeService locationTypeService;
+ @Resource
+ private TLocationService locationService;
+ @Resource
+ private TProjectDeptService projectDeptService;
+ @Resource
+ private TCleanerService cleanerService;
+ @Resource
+ private TTaskService tTaskService;
+ @Resource
+ private TTaskDetailService tTaskDetailService;
+ @Resource
+ private TDeptService deptService;
+ @Resource
+ private ISysUserService sysUserService;
+ @ApiOperation(value = "点位管理分页列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<LocationListVO>> pageList(@RequestBody LocationListQuery query) {
+ return R.ok(locationService.pageList(query));
+ }
+ @ApiOperation(value = "点位管理-巡检记录分页列表")
+ @PostMapping(value = "/pageListTask")
+ public R<PageInfo<LocationListTaskVO>> pageListTask(@RequestBody LocationListTaskQuery query) {
+ List<SysUser> sysUsers = sysUserService.selectAllList();
+ List<TLocationType> locationTypeList = locationTypeService.list();
+ List<TDept> deptList = deptService.list();
+ List<TProjectDept> projectDeptList = projectDeptService.list();
+ List<TLocation> locationList = locationService.list();
+
+ if (StringUtils.hasLength(query.getDeptName())){
+ List<String> projectIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
+ .stream().map(TProjectDept::getId).collect(Collectors.toList());
+ List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
+ .stream().map(TDept::getId).collect(Collectors.toList());
+ projectIds.addAll(deptIds);
+ if (projectIds.isEmpty()){
+ return R.ok(new PageInfo<>());
+ }
+ if (StringUtils.hasLength(query.getPhonenumber())){
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ sysUser.getPhonenumber().equals(query.getPhonenumber())
+ && projectIds.contains(sysUser.getDeptId())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ if (patrolInspectorIds.isEmpty()){
+ return R.ok(new PageInfo<>());
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ }
+ }else if (StringUtils.hasLength(query.getPhonenumber())){
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ sysUser.getPhonenumber().equals(query.getPhonenumber())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ if (patrolInspectorIds.isEmpty()){
+ return R.ok(new PageInfo<>());
+ }
+ }
+ if (query.getClearStatus()!=null){
+ List<String> collect = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getClearStatus, query.getClearStatus())
+ .list().stream().distinct().map(TTaskDetail::getTaskId).collect(Collectors.toList());
+ query.setTaskIds(collect);
+ if (collect.isEmpty()){
+ return R.ok(new PageInfo<>());
+ }
+ }
+ PageInfo<LocationListTaskVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TTask> list = tTaskService.lambdaQuery()
+ .eq(TTask::getLocationId, query.getId())
+ .between(StringUtils.hasLength(query.getStartTime()), TTask::getImplementTime, query.getStartTime(), query.getEndTime())
+ .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 = list.stream().skip((long) (query.getPageNum() - 1) * query.getPageSize()).limit(query.getPageSize()).collect(Collectors.toList());
+ pageInfo.setTotal(list.size());
+ List<LocationListTaskVO> res = new ArrayList<>();
+ for (TTask tTask : list) {
+ LocationListTaskVO temp = new LocationListTaskVO();
+ TLocation tLocation = locationList.stream().filter(e -> e.getId().equals(tTask.getLocationId())).findFirst().orElse(null);
+ if (tLocation!=null){
+ BeanUtils.copyProperties(tLocation, temp);
+ sysUsers.stream().filter(sysUser -> Objects.equals(sysUser.getUserId(), Long.valueOf(tTask.getPatrolInspector()))).findFirst().ifPresent(sysUser -> {
+ temp.setPatrolInspectorName(sysUser.getUserName());
+ temp.setPhonenumber(sysUser.getPhonenumber());
+ if (1==sysUser.getDeptType()){
+ TProjectDept tProjectDept = projectDeptList.stream().filter(e -> e.getId().equals(sysUser.getDeptId())).findFirst().orElse(null);
+ if (tProjectDept!=null&&!tProjectDept.getParentId().equals("0")){
+ TProjectDept tProjectDept1 = projectDeptList.stream().filter(e -> e.getId().equals(tProjectDept.getParentId())).findFirst().orElse(null);
+ if (tProjectDept1!=null){
+ temp.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
+ }
+ }else{
+ if (tProjectDept!=null){
+ temp.setDeptName(tProjectDept.getProjectName());
+ }
+ }
+ }else{
+ TDept tDept = deptList.stream().filter(e -> e.getId().equals(sysUser.getDeptId())).findFirst().orElse(null);
+ if (tDept!=null){
+ temp.setDeptName(tDept.getDeptName());
+ }
+ }
+ });
+ }
+ 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());
+ }
+ temp.setTaskType(tTask.getTaskType());
+ temp.setStatus(tTask.getStatus());
+ temp.setTaskId(tTask.getId());
+ temp.setImplementTime(tTask.getImplementTime());
+ res.add(temp);
+ }
+ pageInfo.setRecords(res);
+ return R.ok();
+ }
+ @ApiOperation(value = "根据片区id查询保洁员列表 不分页")
+ @GetMapping(value = "/listCleaner")
+ public R<List<TCleaner>> listCleaner(@RequestParam String id) {
+ return R.ok(cleanerService.lambdaQuery().eq(TCleaner::getProjectId,id).list());
+ }
+ @Log(title = "新增点位", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "新增点位")
+ @PostMapping(value = "/add")
+ public R<Boolean> add(@RequestBody LocationDTO dto) {
+ locationService.save(dto);
+ return R.ok();
+ }
+ @Log(title = "编辑点位", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "编辑点位")
+ @PostMapping(value = "/edit")
+ public R<Boolean> edit(@RequestBody LocationDTO dto) {
+ locationService.updateById(dto);
+ return R.ok();
+ }
+ @ApiOperation(value = "详情点位")
+ @GetMapping(value = "/detail")
+ public R<TLocation> detail(@RequestParam String id) {
+ return R.ok(locationService.getById(id));
+ }
+ @Log(title = "批量删除点位", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除点位")
+ @DeleteMapping(value = "/delete")
+ public R<Boolean> edit(@RequestParam String ids) {
+ String[] split = ids.split(",");
+ locationService.removeBatchByIds(Arrays.asList(split));
+ return R.ok();
+ }
}
--
Gitblit v1.7.1