From 6a58a5a148c27c9ff66901bfbae6e52c1a56b5d2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 04 七月 2024 17:17:53 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/EquipmentinfoController.java | 41 ++++++-----------------------------------
1 files changed, 6 insertions(+), 35 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..dfefed3 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,16 +38,14 @@
public class EquipmentinfoController extends BaseController {
@Autowired
private IEquipmentinfoService equipmentinfoService;
- @Autowired
- private DingTalkService dingTalkService;
/**
* 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:equipmentinfo:list')")
- @GetMapping("/list")
- public TableDataInfo list(Equipmentinfo equipmentinfo) {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody Equipmentinfo equipmentinfo) {
startPage();
List<Equipmentinfo> list = equipmentinfoService.selectEquipmentinfoList(equipmentinfo);
return getDataTable(list);
@@ -79,7 +77,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:equipmentinfo:add')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody Equipmentinfo equipmentinfo) {
return toAjax(equipmentinfoService.insertEquipmentinfo(equipmentinfo));
}
@@ -89,7 +87,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:equipmentinfo:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody Equipmentinfo equipmentinfo) {
return toAjax(equipmentinfoService.updateEquipmentinfo(equipmentinfo));
}
@@ -99,7 +97,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:equipmentinfo:remove')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(equipmentinfoService.deleteEquipmentinfoByIds(ids));
}
@@ -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);
}
}
--
Gitblit v1.9.3