From 951b06c1aaa8cc4c83f9e4b4ba9fae066fd84941 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 七月 2025 21:11:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java | 8 ++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 6 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java | 26 ++++++++++++++++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/vo/system/TLocationStatisticsVO.java | 3 +++
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 1 +
5 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index 33aa8cc..d0cae9a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -1375,6 +1375,12 @@
TLocationStatisticsVO locationStatisticsVO = new TLocationStatisticsVO();
BeanUtils.copyProperties(location, locationStatisticsVO);
+ // 查询点位类型
+ TLocationType locationType = locationTypeService.getById(location.getLocationType());
+ if(Objects.nonNull(locationType)){
+ locationStatisticsVO.setLocationIcon(locationType.getLocationIcon());
+ }
+
List<TTask> list = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
.eq(TTask::getLocationId, query.getLocationId()));
// 总数
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
index d15f91c..6596671 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
@@ -60,6 +60,8 @@
private TTaskCleanService taskCleanService;
@Autowired
private TTemplateCountService templateCountService;
+ @Autowired
+ private TEarlyWarningService earlyWarningService;
// 每一个小时执行一次
@@ -94,6 +96,30 @@
}
}
+ @Scheduled(cron = "0 0 20 * * ?")
+ public void dayOfEarlyWarning() {
+ try {
+ // 查询前一天为执行的所有任务，改成已超时状态
+ List<TTask> taskCleanList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
+ .like(TTask::getImplementTime, LocalDate.now().minusDays(1))
+ .eq(TTask::getStatus, 1));
+ if (!CollectionUtils.isEmpty(taskCleanList)) {
+ List<TEarlyWarning> earlyWarningList = new ArrayList<>();
+ taskCleanList.forEach(task -> {
+ task.setStatus(2);
+ TEarlyWarning earlyWarning = new TEarlyWarning();
+ earlyWarning.setWarningType(1);
+ earlyWarning.setTaskId(task.getId());
+ earlyWarningList.add(earlyWarning);
+ });
+ earlyWarningService.saveBatch(earlyWarningList);
+ taskCleanService.updateBatchById(taskCleanList);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
public void createInspection(TTemplate template) {
// 查询所有的模板详情
List<TTemplateDetail> list = templateDetailService.list(Wrappers.lambdaQuery(TTemplateDetail.class)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java b/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java
index 7c7fe66..67423d5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java
@@ -14,6 +14,10 @@
private String deptCode;
@Excel(name = "项目部名称")
private String deptName;
+ @Excel(name = "基层管理员部门编号")
+ private String deptNumber;
+ @Excel(name = "基层管理员项目部编号")
+ private String projectDeptNumber;
@Excel(name = "基层管理员姓名 巡检员")
private String nickName;
@Excel(name = "保洁员部门编号")
@@ -22,8 +26,12 @@
private String deptCodeClear;
@Excel(name = "保洁员片区编号")
private String cleanerCodeClear;
+ @Excel(name = "保洁员(驾驶员)")
+ private String cleanerName;
@Excel(name = "路段总号")
private String locationCode;
+ @Excel(name = "个人编号")
+ private String cleanerCode;
@Excel(name = "点位类型")
private String locationType;
@Excel(name = "路段名（村名）")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/TLocationStatisticsVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/TLocationStatisticsVO.java
index 1ea00b4..8863203 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/TLocationStatisticsVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/TLocationStatisticsVO.java
@@ -20,5 +20,8 @@
@ApiModelProperty(value = "合格率")
private BigDecimal passRate;
+ @ApiModelProperty(value = "点位类型图标")
+ private String locationIcon;
+
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 99ff29f..6eca4ec 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -21,6 +21,7 @@
<result property="remark" column="remark" />
<result property="removeDays" column="removeDays" />
<result property="postType" column="postType" />
+ <result property="roleType" column="roleType" />
</resultMap>
<sql id="selectRoleVo">
--
Gitblit v1.7.1