From 581a4811fb62fcfef4e6a19cc67e095a167f139d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 18:21:59 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java | 606 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 530 insertions(+), 76 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java
index b4fc93a..402ceaf 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java
@@ -6,6 +6,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
@@ -13,7 +14,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.applet.dto.*;
@@ -27,8 +30,10 @@
import com.sun.org.apache.bcel.internal.generic.NEW;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -40,6 +45,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -98,6 +104,7 @@
@Resource
private TSystemBulletinService systemBulletinService;
+
@ApiOperation(value = "首页-系统公告")
@PostMapping(value = "/systemBulletin")
public R<TSystemBulletin> systemBulletin() {
@@ -105,21 +112,33 @@
return R.ok(systemBulletin);
}
+
@ApiOperation(value = "首页-数据概览-更多")
@PostMapping(value = "/dataReport")
public R<DataReportVO> dataReport(@RequestBody DataReportDTO dto) {
DataReportQuery dataReportQuery = new DataReportQuery();
- dataReportQuery.setStartTime(dto.getStartTime());
- dataReportQuery.setEndTime(dto.getEndTime());
+ dataReportQuery.setStartTime(dto.getStartTime()+" 00:00:00");
+ dataReportQuery.setEndTime(dto.getEndTime()+" 23:59:59");
+ dataReportQuery.setPageNum(dto.getPageNum());
+ dataReportQuery.setPageSize(dto.getPageSize());
DataReportVO res = new DataReportVO();
List<TDictData> dataList = dictDataService.list();
List<TProjectDept> projectDepts = projectDeptService.list();
List<TTaskDetail> taskDetails = taskDetailService.lambdaQuery()
.isNotNull(TTaskDetail::getClearStatus)
+ .eq(TTaskDetail::getHandleType,1)
.eq(TTaskDetail::getAuditStatus,1)
- .groupBy(TTaskDetail::getTaskId)
.orderByDesc(BaseModel::getCreateTime)
.list();
+ taskDetails = new ArrayList<>(taskDetails.stream()
+ .collect(Collectors.groupingBy(
+ TTaskDetail::getTaskId,
+ Collectors.collectingAndThen(
+ Collectors.toList(),
+ listAll -> listAll.get(0)
+ )
+ ))
+ .values());
List<String> userDeptIds = new ArrayList<>();
LambdaQueryWrapper<TTask> tTaskLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.hasLength(dto.getProjectId())) {
@@ -141,7 +160,7 @@
}
} else {
// 根据当前登录人查询部门
- Long userId = tokenService.getLoginUser().getUserId();
+ Long userId = tokenService.getLoginUserApplet().getUserId();
SysUser sysUser = sysUserService.selectUserById(userId);
if (sysUser.getDeptType() == 1) {
TProjectDept projectDept = projectDeptService.getById(sysUser.getDeptId());
@@ -150,8 +169,8 @@
tTaskLambdaQueryWrapper.eq(TTask::getProjectId, projectDept.getId());
userDeptIds.add(projectDept.getId());
} else {
- TProjectDept parent = projectDeptService.getById(projectDept.getParentId());
- List<TProjectDept> list = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, parent.getId()).list();
+ userDeptIds.add(projectDept.getId());
+ List<TProjectDept> list = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, projectDept.getId()).list();
List<String> deptIds = list.stream().map(TProjectDept::getId).collect(Collectors.toList());
if (!deptIds.isEmpty()) {
tTaskLambdaQueryWrapper.in(TTask::getProjectId, deptIds);
@@ -167,21 +186,34 @@
dataReportQuery.setProjectIds(userDeptIds);
if (StringUtils.hasLength(dto.getStartTime())) {
- tTaskLambdaQueryWrapper.ge(TTask::getImplementTime, dto.getStartTime());
- tTaskLambdaQueryWrapper.le(TTask::getImplementTime, dto.getEndTime());
+ tTaskLambdaQueryWrapper.ge(TTask::getImplementTime, dto.getStartTime()+" 00:00:00");
+ tTaskLambdaQueryWrapper.le(TTask::getImplementTime, dto.getEndTime()+" 23:59:59");
} else {
// 获取今天凌晨00:00:00 和今天23:59:59 类型为LocalDateTime
LocalDateTime startOfToday = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
LocalDateTime endOfToday = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
- tTaskLambdaQueryWrapper.ge(TTask::getImplementTime, startOfToday);
- tTaskLambdaQueryWrapper.le(TTask::getImplementTime, endOfToday);
+ String startOfTodayStr = startOfToday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ String endOfTodayStr = endOfToday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ tTaskLambdaQueryWrapper.ge(TTask::getImplementTime, startOfTodayStr);
+ tTaskLambdaQueryWrapper.le(TTask::getImplementTime, endOfTodayStr);
}
- tTaskLambdaQueryWrapper.ne(TTask::getStatus, 1);
+// tTaskLambdaQueryWrapper.ne(TTask::getStatus, 1);
List<TTask> tasks = taskCleanerService.list(tTaskLambdaQueryWrapper);
HashMap<String, Integer> taskMap = new HashMap<>();
HashMap<String, Integer> statusMap = new HashMap<>();
+ statusMap.put("未执行", 0);
+ statusMap.put("超时", 0);
+ statusMap.put("待确认", 0);
+ statusMap.put("已驳回", 0);
+ statusMap.put("已完成", 0);
HashMap<String, Integer> clearMap = new HashMap<>();
+ clearMap.put("合格", 0);
+ clearMap.put("不合格", 0);
HashMap<String, Integer> unqualifiedMap = new HashMap<>();
+ List<TDictData> dictData = dataList.stream().filter(e -> e.getDataType() == 2).collect(Collectors.toList());
+ for (TDictData dictDatum : dictData) {
+ unqualifiedMap.put(dictDatum.getDataContent(), 0);
+ }
for (TTask task : tasks) {
TProjectDept tProjectDept = projectDepts.stream().filter(e -> e.getId().equals(task.getProjectId())).findFirst().orElse(null);
if (tProjectDept == null) continue;
@@ -202,13 +234,12 @@
break;
case 5:
temp.append("已完成");
-
break;
case 6:
temp.append("已完成");
break;
}
- statusMap.put(temp.toString(), statusMap.getOrDefault(task.getStatus()+"", 0) + 1);
+ statusMap.put(temp.toString(), statusMap.getOrDefault(temp.toString(), 0) + 1);
TTaskDetail tTaskDetail = taskDetails.stream().filter(e -> e.getTaskId().equals(task.getId())).findFirst().orElse(null);
StringBuilder temp1 = new StringBuilder();
if (tTaskDetail!=null){
@@ -220,7 +251,7 @@
temp1.append("不合格");
TDictData tDictData = dataList.stream().filter(e -> e.getId().equals(tTaskDetail.getUnqualified())).findFirst().orElse(null);
if (tDictData != null){
- unqualifiedMap.put(tTaskDetail.getUnqualifiedName(), unqualifiedMap.getOrDefault(tDictData.getDataContent(), 0) + 1);
+ unqualifiedMap.put(tDictData.getDataContent(), unqualifiedMap.getOrDefault(tDictData.getDataContent(), 0) + 1);
}
break;
}
@@ -233,6 +264,10 @@
int pass=0;
int unPass=0;
List<TTask> userTaskList = tasks.stream().filter(e -> e.getPatrolInspector().equals(record.getUserId() + "")).collect(Collectors.toList());
+ List<TTask> userTaskListPass = tasks.stream().filter(e ->
+ (e.getStatus()==5||e.getStatus()==6)
+ &&
+ e.getPatrolInspector().equals(record.getUserId() + "")).collect(Collectors.toList());
for (TTask tTask : userTaskList) {
TTaskDetail tTaskDetail = taskDetails.stream().filter(e -> e.getTaskId().equals(tTask.getId())).findFirst().orElse(null);
if (tTaskDetail!=null){
@@ -249,9 +284,7 @@
}
record.setTotal(userTaskList.size());
record.setRate(pass+unPass!=0?new BigDecimal(pass).divide(new BigDecimal(pass+unPass),2,RoundingMode.HALF_DOWN).multiply(new BigDecimal(100)):BigDecimal.ZERO);
- List<TTask> status1 = userTaskList.stream().filter(e -> e.getStatus() == 5 || e.getStatus() == 6).collect(Collectors.toList());
- List<TTask> status2 = userTaskList.stream().filter(e -> e.getStatus() != 5 && e.getStatus() != 6).collect(Collectors.toList());
- record.setFinish(!status1.isEmpty()?new BigDecimal(status1.size()).divide(new BigDecimal(status1.size()+status2.size()),2,RoundingMode.HALF_DOWN).multiply(new BigDecimal(100)):BigDecimal.ZERO);
+ record.setFinish(!userTaskList.isEmpty()?new BigDecimal(userTaskListPass.size()).divide(new BigDecimal(userTaskList.size()),2,RoundingMode.HALF_DOWN).multiply(new BigDecimal(100)):BigDecimal.ZERO);
}
// PageInfo<TaskFinishListVO> taskFinishListVOPageInfo = new PageInfo<>();
@@ -289,23 +322,32 @@
}
return R.ok(projectDeptListNoLimitVOS);
}
-
+@Resource
+private TNoticeService noticeService;
@ApiOperation(value = "首页")
@PostMapping(value = "/index")
public R<IndexVO> index(@RequestBody IndexDTO dto) throws IOException {
- if (!StringUtils.hasLength(dto.getLon()) || !StringUtils.hasLength(dto.getLat())) {
- return R.fail("请上传经纬度");
- }
IndexVO res = new IndexVO();
- Long userId = tokenService.getLoginUser().getUserId();
+ res.setIsNotice(0);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ Long count = noticeService.lambdaQuery().eq(TNotice::getUserId, userId).eq(TNotice::getStatus, 1).count();
+ if (count>0){
+ res.setIsNotice(1);
+ }
+ List<TProjectDept> projectListAll = projectDeptService.list();
+
List<TLocation> locationList = locationService.list();
List<TLocationType> locationTypeList = locationTypeService.list();
- List<TTask> taskAll = taskCleanerService.lambdaQuery().eq(TTask::getPatrolInspector, userId).list();
+ dto.setUserId(userId);
+ List<TTask> taskAll = taskCleanerService.indexTask(dto);
+// List<TTask> taskAll = taskCleanerService.lambdaQuery().eq(TTask::getPatrolInspector, userId).list();
// 获取今天凌晨00:00:00 和今天23:59:59 类型为LocalDateTime
LocalDateTime startOfToday = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
LocalDateTime endOfToday = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
+ String startOfTodayStr = startOfToday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ String endOfTodayStr = endOfToday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
List<TTask> taskToday = taskCleanerService.lambdaQuery()
- .between(TTask::getImplementTime, startOfToday, endOfToday)
+ .between(TTask::getImplementTime, startOfTodayStr, endOfTodayStr)
.eq(TTask::getPatrolInspector, userId).list();
List<SysUser> sysUsers = sysUserService.selectAllList();
SysUser sysUser = sysUserService.selectUserById(userId);
@@ -318,10 +360,11 @@
TProjectDept projectDept = projectDeptService.getById(sysUser.getDeptId());
if (projectDept != null) {
- if (!"0".equals(projectDept.getParentId())) {
+ if ("0".equals(projectDept.getParentId())) {
+ List<String> collect = projectListAll.stream().filter(e -> e.getParentId().equals(projectDept.getId())).map(TProjectDept::getId).collect(Collectors.toList());
+ collect.add(projectDept.getId());
// 查询片区下的所有人员
- users = sysUsers.stream().filter(e -> e.getDeptId()
- .equals(projectDept.getId())
+ users = sysUsers.stream().filter(e ->collect.contains(e.getDeptId())
&& e.getStatus().equals("0")
&& e.getDeptType() == 1).collect(Collectors.toList());
} else {
@@ -345,21 +388,19 @@
} else {
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept != null) {
- if (!dept.getDeptName().equals("公司")) {
- users = sysUsers.stream().filter(e -> e.getDeptId()
- .equals(sysUser.getDeptId())
- && e.getStatus().equals("0")
- && e.getDeptType() == 1).collect(Collectors.toList());
+ if (!dept.getDeptName().contains("公司")) {
+ users = sysUsers.stream().filter(e -> e.getDeptType() == 1).collect(Collectors.toList());
}
}
}
}
- List<TaskTodayVO> pendingTask = new ArrayList<>();
+ List<TaskPendingVO> pendingTask = new ArrayList<>();
res.setTotalUserCount(users.size());
if (!users.isEmpty()) {
- List<TTask> tasks = taskCleanerService.lambdaQuery().in(TTask::getPatrolInspector, users).list();
+ List<Long> userIds = users.stream().map(SysUser::getUserId).collect(Collectors.toList());
+ List<TTask> tasks = taskCleanerService.lambdaQuery().in(TTask::getPatrolInspector, userIds).list();
List<String> taskIds = tasks.stream().map(TTask::getId).collect(Collectors.toList());
if (!tasks.isEmpty()) {
List<TTask> status1 = tasks.stream().filter(e -> e.getStatus() == 5 || e.getStatus() == 6).collect(Collectors.toList());
@@ -369,17 +410,26 @@
.multiply(new BigDecimal(100))
: new BigDecimal(0));
List<TTaskDetail> taskDetails = taskDetailService.lambdaQuery()
- .eq(TTaskDetail::getAuditStatus, 1).in(TTaskDetail::getTaskId, taskIds)
+ .eq(TTaskDetail::getAuditStatus, 1)
+ .in(TTaskDetail::getTaskId, taskIds)
.isNotNull(TTaskDetail::getClearStatus)
- .groupBy(TTaskDetail::getTaskId)
+ .eq(TTaskDetail::getHandleType,1)
.orderByDesc(TTaskDetail::getCreateTime).list();
-
+ taskDetails = new ArrayList<>(taskDetails.stream()
+ .collect(Collectors.groupingBy(
+ TTaskDetail::getTaskId,
+ Collectors.collectingAndThen(
+ Collectors.toList(),
+ listAll -> listAll.get(0)
+ )
+ ))
+ .values());
List<TTaskDetail> status3 = taskDetails.stream().filter(e -> e.getClearStatus() == 1).collect(Collectors.toList());
List<TTaskDetail> status4 = taskDetails.stream().filter(e -> e.getClearStatus() == 2).collect(Collectors.toList());
- if (status3.size() + status4.size() != 0) {
- BigDecimal divide = new BigDecimal(status3.size() + status4.size())
- .divide(new BigDecimal(status3.size()), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
+ if (!status3.isEmpty()) {
+ BigDecimal divide = new BigDecimal(status3.size() )
+ .divide(new BigDecimal(status3.size()+ status4.size()), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
res.setRate(divide);
} else {
res.setRate(new BigDecimal(0));
@@ -410,16 +460,16 @@
leaveUserListVO.setCreateTime1(tLeave.getCreateTime());
leaveUserListVO.setStartTime1(tLeave.getStartTime());
leaveUserListVO.setEndTime1(tLeave.getEndTime());
+ leaveList.add(leaveUserListVO);
}
List<TTask> taskList = taskAll.stream().filter(e -> e.getPatrolInspector().equals(userId + "") && e.getStatus() == 4).collect(Collectors.toList());
- List<String> taskIds = taskList.stream().map(TTask::getId).collect(Collectors.toList());
+
for (TTask tTask : taskList) {
- List<TTaskDetail> taskDetailsStatus1 = taskDetailService.lambdaQuery()
- .eq(TTaskDetail::getAuditStatus, 1).in(TTaskDetail::getTaskId, taskIds)
- .eq(TTaskDetail::getClearStatus, 2)
- .groupBy(TTaskDetail::getTaskId)
- .orderByDesc(TTaskDetail::getCreateTime).list();
- TaskTodayVO taskTodayVO = new TaskTodayVO();
+ TTaskDetail taskDetailsStatus1 = taskDetailService.lambdaQuery()
+ .eq(TTaskDetail::getTaskId, tTask.getId())
+ .in(TTaskDetail::getHandleType, Arrays.asList(3,6))
+ .orderByDesc(TTaskDetail::getCreateTime).last("limit 1").one();
+ TaskPendingVO taskTodayVO = new TaskPendingVO();
BeanUtils.copyProperties(tTask, taskTodayVO);
TLocation tLocation = locationList.stream().filter(e -> e.getId().equals(tTask.getLocationId())).findFirst().orElse(null);
if (tLocation != null) {
@@ -427,11 +477,9 @@
taskTodayVO.setLocationLon(tLocation.getLocationLon());
taskTodayVO.setLocationLat(tLocation.getLocationLat());
taskTodayVO.setLocationName(tLocation.getLocationName());
- // todo
- Map<String, String> distance = amapApiClient.getDistance(dto.getLon() + "," + dto.getLat(), tLocation.getLocationLon() + "," + tLocation.getLocationLat(), 1);
- if (distance != null) {
- taskTodayVO.setDistance(new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_EVEN));
- } else {
+ if(StringUtils.hasLength(dto.getLon())){
+ taskTodayVO.setDistance(tTask.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_DOWN));
+ }else {
taskTodayVO.setDistance(new BigDecimal("0"));
}
TLocationType tLocationType = locationTypeList.stream().filter(e -> e.getId().equals(tLocation.getLocationType())).findFirst().orElse(null);
@@ -440,26 +488,58 @@
taskTodayVO.setLocationTypeIcon(tLocationType.getLocationIcon());
}
}
- TTaskDetail tTaskDetail = taskDetailsStatus1.stream().filter(e -> e.getTaskId().equals(tTask.getId())).findFirst().orElse(null);
- if (tTaskDetail != null) {
- String unqualified = tTaskDetail.getUnqualified();
- TDictData dictData = dictDataService.lambdaQuery().eq(TDictData::getId, unqualified).one();
- if (dictData != null) {
- taskTodayVO.setRemark(dictData.getDataContent());
+ if (taskDetailsStatus1!=null){
+ taskTodayVO.setRemark(taskDetailsStatus1.getAuditRemark());
+ }
+ // 任务记录ids
+ List<String> collect = taskAll.stream().map(TTask::getId).collect(Collectors.toList());
+ if (!collect.isEmpty()){
+ List<TInspector> list1 = inspectorService.lambdaQuery()
+
+ .in(TInspector::getTaskId, collect).eq(TInspector::getStatus, 2).list();
+ for (TInspector tInspector : list1) {
+ TaskPendingVO taskTodayVOOne = new TaskPendingVO();
+ BeanUtils.copyProperties(tTask, taskTodayVOOne);
+ taskTodayVOOne.setId(tInspector.getId());
+ TLocation tLocationOne = locationList.stream().filter(e -> e.getId().equals(tTask.getLocationId())).findFirst().orElse(null);
+ if (tLocationOne != null) {
+ taskTodayVOOne.setLocationAddress(tLocationOne.getLocationAddress());
+ taskTodayVOOne.setLocationLon(tLocationOne.getLocationLon());
+ taskTodayVOOne.setLocationLat(tLocationOne.getLocationLat());
+ taskTodayVOOne.setLocationName(tLocationOne.getLocationName());
+ if(StringUtils.hasLength(dto.getLon())){
+ taskTodayVO.setDistance(tTask.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_DOWN));
+ }else {
+ taskTodayVO.setDistance(new BigDecimal("0"));
+ }
+ TLocationType tLocationType = locationTypeList.stream().filter(e -> e.getId().equals(tLocationOne.getLocationType())).findFirst().orElse(null);
+ if (tLocationType != null) {
+ taskTodayVOOne.setLocationTypeName(tLocationType.getLocationName());
+ taskTodayVOOne.setLocationTypeIcon(tLocationType.getLocationIcon());
+ }
+ }
+ taskTodayVOOne.setStatus(4);
+ taskTodayVOOne.setRemark(tInspector.getAuditRemark());
+ pendingTask.add(taskTodayVOOne);
}
}
pendingTask.add(taskTodayVO);
}
+ // 将pendingTask按照距离 从小到大排序
+ pendingTask.sort(Comparator.comparing(TaskPendingVO::getDistance));
res.setPendingTask(pendingTask);
res.setLeaveList(leaveList);
List<TaskTodayVO> todayTask = new ArrayList<>();
+ List<String> collect = taskAll.stream().map(TTask::getId).collect(Collectors.toList());
for (TTask tTask : taskToday) {
TaskTodayVO taskTodayVO = new TaskTodayVO();
- List<TTaskDetail> taskDetailsStatus1 = taskDetailService.lambdaQuery()
- .eq(TTaskDetail::getAuditStatus, 1).in(TTaskDetail::getTaskId, taskIds)
- .eq(TTaskDetail::getClearStatus, 2)
- .groupBy(TTaskDetail::getTaskId)
- .orderByDesc(TTaskDetail::getCreateTime).list();
+ if(CollectionUtils.isEmpty(collect)){
+ break;
+ }
+ TTaskDetail taskDetailsStatus1 = taskDetailService.lambdaQuery()
+ .eq(TTaskDetail::getTaskId, tTask.getId())
+ .in(TTaskDetail::getHandleType, Arrays.asList(3,6))
+ .orderByDesc(TTaskDetail::getCreateTime).last("limit 1").one();
BeanUtils.copyProperties(tTask, taskTodayVO);
TLocation tLocation = locationList.stream().filter(e -> e.getId().equals(tTask.getLocationId())).findFirst().orElse(null);
if (tLocation != null) {
@@ -467,10 +547,14 @@
taskTodayVO.setLocationLon(tLocation.getLocationLon());
taskTodayVO.setLocationLat(tLocation.getLocationLat());
taskTodayVO.setLocationName(tLocation.getLocationName());
- Map<String, String> distance = amapApiClient.getDistance(dto.getLon() + "," + dto.getLat(), tLocation.getLocationLon() + "," + tLocation.getLocationLat(), 1);
- if (distance != null) {
- taskTodayVO.setDistance(new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_EVEN));
- } else {
+ if(StringUtils.hasLength(dto.getLon())){
+ Map<String, String> distance = amapApiClient.getDistance(dto.getLon() + "," + dto.getLat(), tLocation.getLocationLon() + "," + tLocation.getLocationLat(), 1);
+ if (distance != null) {
+ taskTodayVO.setDistance(new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ } else {
+ taskTodayVO.setDistance(new BigDecimal("0"));
+ }
+ }else {
taskTodayVO.setDistance(new BigDecimal("0"));
}
TLocationType tLocationType = locationTypeList.stream().filter(e -> e.getId().equals(tLocation.getLocationType())).findFirst().orElse(null);
@@ -479,21 +563,391 @@
taskTodayVO.setLocationTypeIcon(tLocationType.getLocationIcon());
}
}
- TTaskDetail tTaskDetail = taskDetailsStatus1.stream().filter(e -> e.getTaskId().equals(tTask.getId())).findFirst().orElse(null);
- if (tTaskDetail != null) {
- String unqualified = tTaskDetail.getUnqualified();
- TDictData dictData = dictDataService.lambdaQuery().eq(TDictData::getId, unqualified).one();
- if (dictData != null) {
- taskTodayVO.setRemark(dictData.getDataContent());
- }
+ if (taskDetailsStatus1!=null){
+ taskTodayVO.setRemark(taskDetailsStatus1.getAuditRemark());
}
todayTask.add(taskTodayVO);
+
}
+ // 将todayTask进行排序 优先根据status状态排序，优先展示未执行、超时、待整改、待确认、整改完成、已完成，然后状态一样再根据距离排序
+ sortTodayTasks(todayTask);
res.setTodayTask(todayTask);
- List<TaskTodayVO> tomorrowTask = new ArrayList<>(todayTask);
+ List<TaskTomorrowVO> tomorrowTask = new ArrayList<>();
+
+ for (TaskTodayVO taskTodayVO : todayTask) {
+ TaskTomorrowVO taskTomorrowVO = new TaskTomorrowVO();
+ BeanUtils.copyProperties(taskTodayVO, taskTomorrowVO);
+ tomorrowTask.add(taskTomorrowVO);
+ }
Collections.shuffle(tomorrowTask);
- res.setTomorrowTask(tomorrowTask);
+ List<TTemplate> templates = templateService.list();
+ TTemplate tTemplate = templates.stream().filter(e -> e.getId().equals(sysUser.getTemplateId())).findFirst()
+ .orElse(null);
+ if (tTemplate!=null){
+ List<TTask> inspection = createInspection(tTemplate, userId);
+ List<String> collect1 = inspection.stream().map(TTask::getId).collect(Collectors.toList());
+ if (collect1.isEmpty()){
+ collect1.add("0");
+ }
+ List<TTask> temp =new ArrayList<>();
+ if (!StringUtils.hasLength(dto.getLon())){
+ temp = inspection;
+ }else{
+ temp = taskCleanerService.getTaskByIds(collect1,dto.getLon(),dto.getLat());
+ }
+ List<TaskTomorrowVO> taskTomorrowVOS = new ArrayList<>();
+ for (TTask tTask : temp) {
+ TaskTomorrowVO taskTomorrowVO = new TaskTomorrowVO();
+ BeanUtils.copyProperties(tTask, taskTomorrowVO);
+
+ TLocation tLocation = locationList.stream().filter(e -> e.getId().equals(tTask.getLocationId())).findFirst().orElse(null);
+ if (tLocation!=null){
+ TLocationType tLocationType = locationTypeList.stream().filter(e -> e.getId().equals(tLocation.getLocationType())).findFirst().orElse(null);
+ if (tLocationType!=null){
+ taskTomorrowVO.setLocationId(tLocation.getId());
+ taskTomorrowVO.setLocationName(tLocation.getLocationName());
+ taskTomorrowVO.setLocationTypeName(tLocationType.getLocationName());
+ taskTomorrowVO.setLocationTypeIcon(tLocationType.getLocationIcon());
+ taskTomorrowVO.setLocationAddress(tLocation.getLocationAddress());
+ taskTomorrowVO.setLocationLon(tLocation.getLocationLon());
+ taskTomorrowVO.setLocationLat(tLocation.getLocationLat());
+ if (StringUtils.hasLength(dto.getLon())){
+ taskTomorrowVO.setDistance(tTask.getDistance().divide(new BigDecimal("1000"),2, RoundingMode.HALF_DOWN));
+ }else {
+ taskTomorrowVO.setDistance(new BigDecimal("0"));
+ }
+ }
+ }
+ taskTomorrowVOS.add(taskTomorrowVO);
+ }
+ res.setTomorrowTask(taskTomorrowVOS);
+ }else{
+ res.setTomorrowTask(new ArrayList<>());
+ }
+
+
+ res.setIsLeave(0);
+ // 查询请假状态
+ List<TLeave> list2 = leaveService.lambdaQuery().eq(TLeave::getLeavePerson, userId)
+ .eq(TLeave::getAuditStatus, 2)
+ .list();
+ for (TLeave tLeave : list2) {
+ LocalDate now = LocalDate.now();
+ LocalDate startDate = tLeave.getStartTime().toLocalDate();
+ LocalDate endDate = tLeave.getStartTime().toLocalDate();
+ if (now.isAfter(startDate) && now.isBefore(endDate)) {
+ res.setIsLeave(1);
+ } else if (now.isEqual(startDate) || now.isEqual(endDate)) {
+ res.setIsLeave(1);
+ }
+ }
return R.ok(res);
}
+ @Resource
+ private TTemplateService templateService;
+ // 项目部权重标识
+ private static final String PROJECT_DEPT_WEIGHT = ":PROJECT_DEPT_WEIGHT";
+ // 保洁员权重标识
+ private static final String CLEANER_WEIGHT = ":CLEANER_WEIGHT";
+ // 重复点位标识
+ private static final String REPEAT_LOCATION = ":REPEAT_LOCATION";
+
+ @Autowired
+ private RedisCache redisCache;
+ @Autowired
+ private TTemplateDetailService templateDetailService;
+
+ public List<TTask> createInspection(TTemplate template,Long userId) {
+ // 查询所有的模板详情
+ List<TTemplateDetail> list = templateDetailService.list(Wrappers.lambdaQuery(TTemplateDetail.class)
+ .eq(TTemplateDetail::getTemplateId, template.getId()));
+ if (CollectionUtils.isEmpty(list)) {
+ return new ArrayList<>();
+ }
+ List<TTask> taskAll = new ArrayList<>();
+ // 通过模板id查询员工巡检员
+ List<SysUser> sysUsers = sysUserService.selectUserByTempLateId(template.getId());
+ sysUsers = sysUsers.stream().filter(e->e.getUserId().equals(userId)).collect(Collectors.toList());
+ // 创建任务
+ for (TTemplateDetail detail : list) {
+ // 计算周期
+ int cycle = detail.getCycle();
+ switch (detail.getCycleType()){
+ case 2:
+ cycle = cycle * 7;
+ break;
+ case 3:
+ cycle = cycle * 30;
+ break;
+ case 4:
+ cycle = cycle * 90;
+ break;
+ case 5:
+ cycle = cycle * 365;
+ break;
+ }
+
+ // 拿到保洁抽查次数
+ int num1 = detail.getNum1();
+ // 拿到项目部数
+ int num2 = detail.getNum2();
+ // 拿到每日重复点位
+ int num3 = detail.getNum3();
+ // 获取点位类型的占比
+ String num4 = detail.getNum4();
+
+ // 未绑定员工
+ if(CollectionUtils.isEmpty(sysUsers)){
+ continue;
+ }
+
+ int taskCount = 0;
+ for (SysUser sysUser : sysUsers) {
+
+ if("1".equals(sysUser.getStatus())){
+ continue;
+ }
+
+ List<TProjectDept> projectDeptLists = new ArrayList<>();
+ if(sysUser.getDeptType() == 1){
+ TProjectDept projectDept = projectDeptService.getById(sysUser.getDeptId());
+ if(projectDept.getStatus() == 1){
+ if("0".equals(projectDept.getParentId())){
+ projectDeptLists = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+ .eq(TProjectDept::getParentId, projectDept.getId())
+ .eq(TProjectDept::getStatus, 1));
+ }else {
+ projectDeptLists.add(projectDept);
+ }
+ }
+ }else {
+ projectDeptLists = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+ .ne(TProjectDept::getParentId,0)
+ .eq(TProjectDept::getStatus, 1));
+ }
+ if(CollectionUtils.isEmpty(projectDeptLists)){
+ continue;
+ }
+ List<String> proDeptIds = projectDeptLists.stream().map(TProjectDept::getId).collect(Collectors.toList());
+
+ // 获取项目部在该模板详情中的权重
+ List<String> projectDeptIds = redisCache.getCacheList(detail.getId() + PROJECT_DEPT_WEIGHT);
+ // 获取项目部列表
+ List<TProjectDept> projectDeptList;
+ if(CollectionUtils.isEmpty(projectDeptIds)){
+ projectDeptList = projectDeptLists;
+ }else {
+ projectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+ .ne(TProjectDept::getParentId,0)
+ .in(TProjectDept::getId, proDeptIds)
+ .notIn(TProjectDept::getId, projectDeptIds));
+ // 所过所有的项目部都被抽取了，则重新抽取，并且清空项目部权重
+ if(CollectionUtils.isEmpty(projectDeptList)){
+ projectDeptList = projectDeptLists;
+ }
+ }
+ // 如果可抽取的项目部数不足，先抽取余下项目部后，再清空权重，重新抽取
+ List<TProjectDept> projectDepts = randomSelection(projectDeptList, num2);
+ if(projectDepts.size() < num2){
+ List<String> proIds = projectDepts.stream().map(TProjectDept::getId).collect(Collectors.toList());
+ List<TProjectDept> projectDeptList1 = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+ .notIn(TProjectDept::getId, proIds)
+ .ne(TProjectDept::getParentId,0));
+ List<TProjectDept> projectDepts1 = randomSelection(projectDeptList1, num2 - projectDepts.size());
+ List<String> proIds1 = projectDepts1.stream().map(TProjectDept::getId).collect(Collectors.toList());
+ // 将已抽取的项目部id保存到redis中
+ projectDepts.addAll(projectDepts1);
+ }else {
+ List<String> proIds = projectDepts.stream().map(TProjectDept::getId).collect(Collectors.toList());
+ // 将已抽取的项目部id保存到redis中
+ }
+ List<String> proIds = projectDepts.stream().map(TProjectDept::getId).collect(Collectors.toList());
+
+ // 拿到抽取的项目部下的所有保洁员
+// List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+// .in(TProjectDept::getId, proIds));
+ // 获取片区id
+ List<String> areaIds = projectDepts.stream().map(TProjectDept::getId).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(areaIds)){
+ return new ArrayList<>();
+ }
+
+ // 计算每天需要抽取多少个保洁员
+ long count = cleanerService.count(Wrappers.lambdaQuery(TCleaner.class)
+ .in(TCleaner::getProjectId, areaIds));
+ int cleanerSums = num1 * Integer.parseInt(count + "");
+ // 获取每天需要抽取的保洁员数,向上取整
+ if (cleanerSums < cycle){
+ cleanerSums = cycle;
+ }
+ int dayCleanerCount = cleanerSums / cycle;
+
+ if((cycle == detail.getCurrentValue()) && cleanerSums % cycle != 0){
+ dayCleanerCount++;
+ }
+
+ // 获取保洁员权重
+ List<String> cleanerIds = redisCache.getCacheList(detail.getId() + CLEANER_WEIGHT);
+ // 获取保洁员列表
+ List<TCleaner> cleaners;
+ if(CollectionUtils.isEmpty(cleanerIds)){
+ cleaners = cleanerService.list(Wrappers.lambdaQuery(TCleaner.class)
+ .in(TCleaner::getProjectId, areaIds));
+ }else {
+ cleaners = cleanerService.list(Wrappers.lambdaQuery(TCleaner.class)
+ .in(TCleaner::getProjectId, areaIds)
+ .notIn(TCleaner::getId, cleanerIds));
+ if(CollectionUtils.isEmpty(cleaners)){
+ cleaners = cleanerService.list(Wrappers.lambdaQuery(TCleaner.class)
+ .in(TCleaner::getProjectId, areaIds));
+ }
+ }
+
+ // 抽取保洁员
+ List<TCleaner> tCleaners = randomSelection(cleaners, dayCleanerCount);
+ if(CollectionUtils.isEmpty(tCleaners)){
+ continue;
+ }
+ if(tCleaners.size() < dayCleanerCount){
+ List<String> cleanIds = tCleaners.stream().map(TCleaner::getId).collect(Collectors.toList());
+ List<TCleaner> cleaners1 = cleanerService.list(Wrappers.lambdaQuery(TCleaner.class)
+ .in(TCleaner::getProjectId, areaIds)
+ .notIn(TCleaner::getId, cleanIds));
+ List<TCleaner> tCleaners1 = randomSelection(cleaners1, dayCleanerCount - tCleaners.size());
+ List<String> cleanIds1 = tCleaners1.stream().map(TCleaner::getId).collect(Collectors.toList());
+ // 将已抽取的保洁员id保存到redis中
+ cleanIds1.addAll(cleanIds);
+ tCleaners.addAll(tCleaners1);
+ }else {
+ List<String> cleanIds = tCleaners.stream().map(TCleaner::getId).collect(Collectors.toList());
+ }
+
+ // 通过保洁员id查询点位
+ List<String> cleanersIds = tCleaners.stream().map(TCleaner::getId).collect(Collectors.toList());
+ List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
+ .in(TLocation::getLocationCleaner, cleanersIds));
+ // 查询点位类型
+ JSONArray jsonArray = JSONObject.parseArray(num4);
+ List<TLocation> tLocationList = new ArrayList<>();
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = JSONObject.parseObject(o.toString());
+ String id = jsonObject.getString("id");
+ BigDecimal value = jsonObject.getBigDecimal("value");
+ List<TLocation> locations = locationList.stream().filter(tLocation -> tLocation.getLocationType().equals(id)).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(locations)){
+ BigDecimal bigDecimal = new BigDecimal(locations.size()).multiply(value.divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN)).setScale(0, BigDecimal.ROUND_UP);
+ int locationCount = bigDecimal.intValue();
+ if(locationCount > 0){
+ List<TLocation> tLocations = randomSelection(locations, locationCount);
+ tLocationList.addAll(tLocations);
+ }
+ }
+ }
+ tLocationList = tLocationList.stream().distinct().collect(Collectors.toList());
+ // 抽取重复点位
+ Integer currentValue = detail.getCurrentValue();
+ if(currentValue != cycle){
+ // 周期天数加一
+ detail.setCurrentValue(currentValue + 1);
+ // 获取重复点位
+ Set<TLocation> repeatLocation = redisCache.getCacheSet(detail.getId() + ":" + sysUser.getUserId() + REPEAT_LOCATION);
+ if(!CollectionUtils.isEmpty(repeatLocation)){
+ List<TLocation> locations = randomSelection(new ArrayList<>(tLocationList), num3);
+ tLocationList.addAll(locations);
+ }
+ Set<TLocation> locationSet = new HashSet<>(tLocationList);
+
+ }else {
+ // 设置当前周期为0
+ detail.setCurrentValue(0);
+
+ }
+
+
+ // 查询请假记录
+ TLeave leave = leaveService.getOne(Wrappers.lambdaQuery(TLeave.class)
+ .eq(TLeave::getLeavePerson, sysUser.getUserId())
+ .eq(TLeave::getAuditStatus, 2)
+ .orderByDesc(TLeave::getCreateTime)
+ .last("LIMIT 1"));
+
+ // 创建任务
+ List<TTask> tasks = new ArrayList<>();
+ for (TLocation tLocation : tLocationList) {
+ TTask task = new TTask();
+ // 获取保洁员
+ tCleaners.stream().filter(tCleaner -> tCleaner.getId().equals(tLocation.getLocationCleaner())).findFirst().ifPresent(tCleaner -> {
+ task.setProjectId(tCleaner.getProjectId());
+ task.setCleanerId(tCleaner.getId());
+ });
+ // 获取巡检员
+ task.setPatrolInspector(sysUser.getUserId().toString());
+ task.setPatrolInspectorDept(sysUser.getDeptId());
+ task.setUserId(sysUser.getUserId());
+ task.setStatus(1);
+ task.setLocationId(tLocation.getId());
+
+ // 判断今天是否在请假时间内
+ if(Objects.nonNull(leave) && ((leave.getStartTime().toLocalDate().isBefore(LocalDate.now().plusDays(1)) && leave.getEndTime().toLocalDate().isAfter(LocalDate.now().plusDays(1)))
+ || (leave.getStartTime().toLocalDate().isEqual(LocalDate.now().plusDays(1)) || leave.getEndTime().toLocalDate().isEqual(LocalDate.now().plusDays(1))))){
+ task.setImplementTime(leave.getEndTime().plusDays(1));
+ }else {
+ task.setImplementTime(LocalDateTime.now().plusDays(1));
+ }
+ task.setTaskType(1);
+ task.setTemplateId(detail.getTemplateId());
+ String nameAndCode = CodeGenerateUtils.generateVolumeSn();
+ task.setTaskName(nameAndCode);
+ task.setTaskCode(nameAndCode);
+ task.setDisabled(true);
+ tasks.add(task);
+ }
+
+ // 添加应生成任务数量
+ TTemplateCount templateCount = new TTemplateCount();
+ templateCount.setTemplateId(detail.getTemplateId());
+ // 查询所有的保洁员下面的点位
+ List<String> cleanIds = cleaners.stream().map(TCleaner::getId).collect(Collectors.toList());
+ List<TLocation> tLocations = locationService.list(Wrappers.lambdaQuery(TLocation.class)
+ .in(TLocation::getLocationCleaner, cleanIds));
+ templateCount.setTaskCount(tLocations.size());
+ templateCount.setUserId(sysUser.getUserId());
+// templateCountService.save(templateCount);
+ taskAll.addAll(tasks);
+ taskCleanerService.saveBatch(tasks);
+ taskCount = taskCount + tasks.size();
+ }
+ template.setTaskCount(taskCount);
+// templateService.updateById(template);
+// templateDetailService.updateById(detail);
+ }
+ return taskAll;
+ }
+ @Autowired
+ private TTemplateCountService templateCountService;
+ @Autowired
+ private TCleanerService cleanerService;
+ public static void sortTodayTasks(List<TaskTodayVO> taskList) {
+ Map<Integer, Integer> statusOrder = new HashMap<>();
+ statusOrder.put(1, 0);
+ statusOrder.put(2, 1);
+ statusOrder.put(4, 2);
+ statusOrder.put(3, 3);
+ statusOrder.put(5, 4);
+ statusOrder.put(6, 5);
+
+ taskList.sort(Comparator.comparingInt((TaskTodayVO o) -> statusOrder.getOrDefault(o.getStatus(), Integer.MAX_VALUE)).thenComparing(TaskTodayVO::getDistance));
+ }
+ private static <T> List<T> randomSelection(List<T> list, int size) {
+ List<T> selected = new ArrayList<>();
+ int length = list.size();
+ for (int i = 0; i < size; i++) {
+ Collections.shuffle(list);
+ // 如果需求的大小超过了集合的长度，则只能取到集合的全部元素
+ int subListSize = Math.min(size - selected.size(), length);
+ selected.addAll(list.subList(0, subListSize));
+ }
+ return selected;
+ }
}
--
Gitblit v1.7.1