From 0a265c8c77cde1a2dd50e2e876b09326d7fc3d26 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 14 七月 2025 17:27:30 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectorController.java | 7 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java | 21 ++++++++++
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java | 21 ++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java | 10 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java | 21 ++++++++++
5 files changed, 80 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
index d0752ab..1619bb2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
@@ -13,6 +13,7 @@
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.InsepectorListQuery;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.utils.TemplateMessageSendUtil;
import com.ruoyi.system.vo.system.AppealDetailVO;
import com.ruoyi.system.vo.system.AppealListVO;
import com.ruoyi.web.controller.tool.EmailUtils;
@@ -26,9 +27,11 @@
import javax.annotation.Resource;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -203,6 +206,8 @@
@Resource
private MsgUtils msgUtils;
@Resource
+ private TemplateMessageSendUtil templateMessageSendUtil;
+ @Resource
private TNoticeSetService noticeSetService;
@Resource
private TDictDataService dictDataService;
@@ -265,6 +270,14 @@
}
break;
case 3:
+ if (StringUtils.hasLength(sysUser.getOpenId())){
+ Date date = new Date();
+
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String format = simpleDateFormat.format(date);
+ templateMessageSendUtil.wxTemplateAppealResultRequest(sysUser.getOpenId(),
+ location.getLocationName(),"通过",format,dto.getAuditRemark());
+ }
break;
}
}
@@ -289,6 +302,14 @@
}
break;
case 3:
+ if (StringUtils.hasLength(sysUser.getOpenId())){
+ Date date = new Date();
+
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String format = simpleDateFormat.format(date);
+ templateMessageSendUtil.wxTemplateAppealResultRequest(sysUser.getOpenId(),
+ location.getLocationName(),"驳回",format,dto.getAuditRemark());
+ }
break;
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectorController.java
index d07a2e9..2fb437b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectorController.java
@@ -17,6 +17,7 @@
import com.ruoyi.system.query.InsepectorListQuery;
import com.ruoyi.system.query.TaskListQuery;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.utils.TemplateMessageSendUtil;
import com.ruoyi.system.vo.system.InspectorListVO;
import com.ruoyi.system.vo.system.TaskListVO;
import com.ruoyi.web.controller.tool.EmailUtils;
@@ -279,6 +280,8 @@
private TDictDataService dictDataService;
@Resource
private MsgUtils msgUtils;
+ @Resource
+ private TemplateMessageSendUtil templateMessageSendUtil;
@Log(title = "审核任务", businessType = BusinessType.UPDATE)
@ApiOperation(value = "审核任务")
@PostMapping(value = "/audit")
@@ -318,6 +321,10 @@
}
break;
case 3:
+ if (StringUtils.hasLength(sysUser.getOpenId())){
+ templateMessageSendUtil.wxTemplateProblemRectificationRequest(sysUser.getOpenId(),
+ location.getLocationName(),dto.getAuditRemark());
+ }
break;
}
}else{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
index 87fa67d..2168cd3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
@@ -30,6 +30,7 @@
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TaskListQuery;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.utils.TemplateMessageSendUtil;
import com.ruoyi.system.vo.system.*;
import com.ruoyi.web.controller.tool.EmailUtils;
import com.ruoyi.web.controller.tool.MsgUtils;
@@ -199,12 +200,15 @@
private TNoticeSetService noticeSetService;
@Resource
private TDictDataService dictDataService;
+ @Resource
+ private TemplateMessageSendUtil templateMessageSendUtil;
@Log(title = "审核任务", businessType = BusinessType.UPDATE)
@ApiOperation(value = "审核任务")
@PostMapping(value = "/audit")
public R<Boolean> audit(@RequestBody TTaskAuditDTO dto) throws Exception {
dto.setAuditTime(LocalDateTime.now());
TTask task = taskCleanerService.getById(dto.getTaskId());
+ SysUser auditPerson = sysUserService.selectUserById(tokenService.getLoginUser().getUserId());
SysUser sysUser = sysUserService.selectUserById(Long.valueOf(task.getPatrolInspector()));
TTaskDetail one = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId())
@@ -258,7 +262,10 @@
// 增加消息
tNotice.setNoticeType(1);
tNotice.setNoticeContent("【" + location.getLocationName() + "】任务不合格,请重新上传!");
+
if (sysUser!=null){
+
+
switch (noticeSet.getNoticeType()) {
case 1:
msgUtils.sendMsg1(sysUser.getPhonenumber(),location.getLocationName(),"驳回");
@@ -269,6 +276,10 @@
}
break;
case 3:
+ if (StringUtils.hasLength(sysUser.getOpenId())){
+ templateMessageSendUtil.wxTemplateTaskResultRequest(sysUser.getOpenId(),
+ location.getLocationName(),"驳回",auditPerson.getNickName());
+ }
break;
}
@@ -333,6 +344,10 @@
}
break;
case 3:
+ if (StringUtils.hasLength(sysUser.getOpenId())){
+ templateMessageSendUtil.wxTemplateTaskResultRequest(sysUser.getOpenId(),
+ location.getLocationName(),"驳回",auditPerson.getNickName());
+ }
break;
}
}
@@ -357,6 +372,8 @@
List<TTaskDetail> tTaskDetails = new ArrayList<>();
List<TLocation> locations = locationService.list();
List<SysUser> sysUsers = sysUserService.selectAllList();
+ SysUser auditPerson = sysUserService.selectUserById(tokenService.getLoginUser().getUserId());
+
List<TTaskDetail> taskDetails = taskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class)
.in(TTaskDetail::getTaskId, Arrays.asList(dto.getTaskIds().split(",")))
.eq(TTaskDetail::getHandleType,1)
@@ -527,6 +544,10 @@
}
break;
case 3:
+ if (StringUtils.hasLength(sysUser.getOpenId())){
+ templateMessageSendUtil.wxTemplateTaskResultRequest(sysUser.getOpenId(),
+ location.getLocationName(),"驳回",auditPerson.getNickName());
+ }
break;
}
}
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 7e0d83c..a23a7a8 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
@@ -10,6 +10,7 @@
import com.ruoyi.system.mapper.TCleanerMapper;
import com.ruoyi.system.model.*;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.utils.TemplateMessageSendUtil;
import com.ruoyi.web.controller.tool.EmailUtils;
import com.ruoyi.web.controller.tool.MsgUtils;
import javafx.concurrent.Task;
@@ -97,6 +98,8 @@
@Resource
private MsgUtils msgUtils;
@Resource
+ private TemplateMessageSendUtil templateMessageSendUtil;
+ @Resource
private TDictDataService dictDataService;
@Scheduled(cron = "0 0 20 * * ?")
public void dayOfEarlyWarning() {
@@ -154,6 +157,13 @@
}
break;
case 3:
+ if (StringUtils.hasLength(sysUser.getOpenId())){
+ Date date = new Date();
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String format = simpleDateFormat.format(date);
+ templateMessageSendUtil.wxTemplateDayWorkRequest(sysUser.getOpenId(),
+ count+"",format);
+ }
break;
}
}
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
index 4d364d8..aeda7ff 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
@@ -27,6 +27,7 @@
import com.ruoyi.system.query.KnowledgeListQuery;
import com.ruoyi.system.query.TaskListQuery;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.utils.TemplateMessageSendUtil;
import com.ruoyi.system.utils.wx.body.resp.Code2SessionRespBody;
import com.ruoyi.system.utils.wx.body.resq.Code2SessionResqBody;
import com.ruoyi.system.utils.wx.model.WeixinProperties;
@@ -121,6 +122,8 @@
private RedisService redisService;
@Resource
private MsgUtils msgUtils;
+ @Resource
+ private TemplateMessageSendUtil templateMessageSendUtil;
@ApiOperation(value = "通过code获得openid,获取用户信息",tags = {"微信小程序登录"})
@GetMapping("/openIdByJsCode")
public R<String> openIdByJsCode(@RequestParam String code) {
@@ -808,6 +811,17 @@
}
break;
case 3:
+ if (StringUtils.hasLength(sysUser.getOpenId())){
+ Date date1 = new Date();
+ SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String format1 = simpleDateFormat1.format(date1);
+ String startTime = simpleDateFormat2.format(leaveDTO.getStartTime());
+ String endTime = simpleDateFormat2.format(leaveDTO.getStartTime());
+ templateMessageSendUtil.wxTemplatePendApprovalRequest(sysUser.getOpenId(),
+ user.getNickName(),format1,"员工请假",
+ startTime,endTime);
+ }
break;
}
@@ -965,6 +979,13 @@
}
break;
case 3:
+ if (StringUtils.hasLength(sysUser.getOpenId())){
+ Date date = new Date();
+ SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String startTime1 = simpleDateFormat2.format(date);
+ templateMessageSendUtil.wxTemplateMakeCopyRequest(sysUser1.getOpenId(),
+ sysUser1.getNickName(),startTime1,"请假审批");
+ }
break;
}
}
--
Gitblit v1.7.1