From 25807350b5126265e70203889bc2093bae3ddfab Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 25 五月 2023 17:45:14 +0800
Subject: [PATCH] 代码提交
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EquipmentinfoServiceImpl.java | 44 ++++++++++++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/IEquipmentinfoService.java | 5 ++
ruoyi-system/pom.xml | 8 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/EquipmentinfoController.java | 31 ---------------
4 files changed, 58 insertions(+), 30 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/EquipmentinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/EquipmentinfoController.java
index 960482a..e9294f7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/EquipmentinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/EquipmentinfoController.java
@@ -38,8 +38,6 @@
public class EquipmentinfoController extends BaseController {
@Autowired
private IEquipmentinfoService equipmentinfoService;
- @Autowired
- private DingTalkService dingTalkService;
/**
@@ -108,39 +106,12 @@
/**
* 闂涓婃姤
*/
-
@RequestMapping("/reportContent")
public AjaxResult reportContent(@RequestBody ReportReqVo reportReqVo) {
if (StringUtils.isEmpty(reportReqVo.getDealDept()) && StringUtils.isEmpty(reportReqVo.getDealPersionNO())) {
return error("澶勭悊浜哄拰澶勭悊閮ㄩ棬涓嶈兘鍚屾椂涓虹┖锛�");
}
- Boolean aBoolean = false;
- //1.鍒ゆ柇澶勭悊浜虹殑宸ュ彿鏄惁涓虹┖锛屽鏋滀笉涓虹┖锛岃幏鍙栫敤鎴风殑鐨勮仈绯绘柟寮�
- if (StringUtils.isNotEmpty(reportReqVo.getDealPersionNO())) {
-
- //2.濡備綍澶勭悊浜轰笉涓虹┖锛屾牴鎹�氱煡鏂瑰紡锛岃皟鐢ㄥ搴旂殑鎺ュ彛锛屽皢涓婃姤闂鍙戝嚭
- if (reportReqVo.getNoticeWay() == "閽夐拤") {
- //璋冪敤閽夐拤鎺ュ彛锛岃繘琛屾秷鎭彂閫�
- } else if (reportReqVo.getNoticeWay() == "寰俊") {
- //闇�瑕佷紒涓氬井淇★紝鍚庢湡鍐嶅仛
- } else if (reportReqVo.getNoticeWay() == "鐢佃瘽") {
- //璋冪敤鐢佃瘽鐨勬帴鍙�
- }
- }
-
- //3.鑾峰彇澶勭悊閮ㄩ棬锛岃皟鐢ㄩ拤閽夋帴鍙ｏ紝灏嗕笂鎶ラ棶棰樺彂鍑�
- if (StringUtils.isNotEmpty(reportReqVo.getDealDept())) {
- DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
- //璁剧疆鍙戦�佸唴瀹�
- dingTalkReqVo.setContents(null);
- dingTalkReqVo.setDeptId(reportReqVo.getDealDeptID());
- dingTalkReqVo.setUserId(reportReqVo.getDealPersionDingNO());
- aBoolean = dingTalkService.sendNotification(dingTalkReqVo);
- }
-
- // 灏嗗伐浣滄祦鎺ㄨ嚦涓嬩竴鑺傜偣
-
- //杩斿洖缁撴灉
+ Boolean aBoolean = equipmentinfoService.reportContent(reportReqVo);
return toAjax(aBoolean);
}
}
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index aa268bd..07e02ea 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -22,6 +22,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>smartor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>smartor</artifactId>
+ </dependency>
</dependencies>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IEquipmentinfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IEquipmentinfoService.java
index aaa8e4d..a74615d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IEquipmentinfoService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IEquipmentinfoService.java
@@ -4,6 +4,8 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.domain.Equipmentinfo;
+import com.ruoyi.system.domain.ReportReqVo;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice鎺ュ彛
@@ -61,4 +63,7 @@
public int deleteEquipmentinfoById(Long id);
+ public Boolean reportContent(ReportReqVo reportReqVo);
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EquipmentinfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EquipmentinfoServiceImpl.java
index 755cce0..d64c1ed 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EquipmentinfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EquipmentinfoServiceImpl.java
@@ -2,6 +2,10 @@
import java.util.List;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.ReportReqVo;
+import com.smartor.domain.DingTalkReqVo;
+import com.smartor.service.DingTalkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.EquipmentinfoMapper;
@@ -18,6 +22,10 @@
public class EquipmentinfoServiceImpl implements IEquipmentinfoService {
@Autowired
private EquipmentinfoMapper equipmentinfoMapper;
+
+ @Autowired
+ private DingTalkService dingTalkService;
+
/**
* 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆�
@@ -84,4 +92,40 @@
public int deleteEquipmentinfoById(Long id) {
return equipmentinfoMapper.deleteEquipmentinfoById(id);
}
+
+ @Override
+ public Boolean reportContent(ReportReqVo reportReqVo) {
+ Boolean aBoolean = false;
+ //1. 灏嗕笂鎶ョ殑闂瀛樺簱
+
+
+ //2.鍒ゆ柇澶勭悊浜虹殑宸ュ彿鏄惁涓虹┖锛屽鏋滀笉涓虹┖锛岃幏鍙栫敤鎴风殑鐨勮仈绯绘柟寮�
+ if (StringUtils.isNotEmpty(reportReqVo.getDealPersionNO())) {
+
+ //3.濡備綍澶勭悊浜轰笉涓虹┖锛屾牴鎹�氱煡鏂瑰紡锛岃皟鐢ㄥ搴旂殑鎺ュ彛锛屽皢涓婃姤闂鍙戝嚭
+ if (reportReqVo.getNoticeWay() == "閽夐拤") {
+ //璋冪敤閽夐拤鎺ュ彛锛岃繘琛屾秷鎭彂閫�
+ } else if (reportReqVo.getNoticeWay() == "寰俊") {
+ //闇�瑕佷紒涓氬井淇★紝鍚庢湡鍐嶅仛
+ } else if (reportReqVo.getNoticeWay() == "鐢佃瘽") {
+ //璋冪敤鐢佃瘽鐨勬帴鍙�
+ }
+ }
+
+ //4.鑾峰彇澶勭悊閮ㄩ棬锛岃皟鐢ㄩ拤閽夋帴鍙ｏ紝灏嗕笂鎶ラ棶棰樺彂鍑�
+ if (StringUtils.isNotEmpty(reportReqVo.getDealDept())) {
+ DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
+ //璁剧疆鍙戦�佸唴瀹�
+ dingTalkReqVo.setContents(null);
+ dingTalkReqVo.setDeptId(reportReqVo.getDealDeptID());
+ dingTalkReqVo.setUserId(reportReqVo.getDealPersionDingNO());
+ aBoolean = dingTalkService.sendNotification(dingTalkReqVo);
+ }
+
+
+ // 5灏嗗伐浣滄祦鎺ㄨ嚦涓嬩竴鑺傜偣
+
+ //杩斿洖缁撴灉
+ return aBoolean;
+ }
}
--
Gitblit v1.9.3