From e5a85d904ce028a35229ab6245ab894afbca6531 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 26 七月 2025 17:07:30 +0800
Subject: [PATCH] 维修工单
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java | 68 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
index 72462d1..8cd02b7 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
@@ -2,11 +2,17 @@
import java.util.Arrays;
import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.Lists;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.constant.WebsocketConst;
@@ -14,9 +20,10 @@
import org.jeecg.common.util.SqlInjectionUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.message.websocket.WebSocket;
-import org.jeecg.modules.system.entity.SysAnnouncementSend;
+import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.model.AnnouncementSendModel;
-import org.jeecg.modules.system.service.ISysAnnouncementSendService;
+import org.jeecg.modules.system.service.*;
+import org.jeecg.modules.system.vo.OptionsVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -51,7 +58,16 @@
private ISysAnnouncementSendService sysAnnouncementSendService;
@Autowired
private WebSocket webSocket;
-
+ @Autowired
+ private ISysRoleService sysRoleService;
+ @Autowired
+ private ISysDictService sysDictService;
+ @Autowired
+ private ISysDictItemService sysDictItemService;
+ @Autowired
+ private ISysUserRoleService sysUserRoleService;
+ @Autowired
+ private ISysUserService sysUserService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
* @param sysAnnouncementSend
@@ -92,7 +108,7 @@
result.setResult(pageList);
return result;
}
-
+
/**
* 娣诲姞
* @param sysAnnouncementSend
@@ -110,7 +126,7 @@
}
return result;
}
-
+
/**
* 缂栬緫
* @param sysAnnouncementSend
@@ -129,10 +145,10 @@
result.success("鎿嶄綔鎴愬姛!");
}
}
-
+
return result;
}
-
+
/**
* 閫氳繃id鍒犻櫎
* @param id
@@ -150,10 +166,10 @@
result.success("鍒犻櫎鎴愬姛!");
}
}
-
+
return result;
}
-
+
/**
* 鎵归噺鍒犻櫎
* @param ids
@@ -170,7 +186,7 @@
}
return result;
}
-
+
/**
* 閫氳繃id鏌ヨ
* @param id
@@ -188,7 +204,7 @@
}
return result;
}
-
+
/**
* @鍔熻兘锛氭洿鏂扮敤鎴风郴缁熸秷鎭槄璇荤姸鎬�
* @param json
@@ -209,7 +225,7 @@
result.setSuccess(true);
return result;
}
-
+
/**
* @鍔熻兘锛氳幏鍙栨垜鐨勬秷鎭�
* @return
@@ -229,6 +245,18 @@
result.setResult(pageList);
result.setSuccess(true);
return result;
+ }
+
+ /**
+ * @鍔熻兘锛氳幏鍙栨秷鎭被鍨嬩笅鎷�
+ * @return
+ */
+ @AutoLog(value = "鑾峰彇娑堟伅绫诲瀷涓嬫媺")
+ @ApiOperation(value = "鑾峰彇娑堟伅绫诲瀷涓嬫媺", notes = "鑾峰彇娑堟伅绫诲瀷涓嬫媺")
+ @GetMapping(value = "/getMessageType")
+ public Result<List<OptionsVo>> getMessageType() {
+ List<OptionsVo> result = sysAnnouncementSendService.getMessageType();
+ return Result.OK(result);
}
/**
@@ -265,4 +293,20 @@
AnnouncementSendModel model = sysAnnouncementSendService.getOne(sendId);
return Result.ok(model);
}
+ @GetMapping("getPrimaryInfo")
+ public Result<?> getPrimaryInfo(@RequestParam(name="userId",required=true) String userId){
+ SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false);
+ List<SysDictItem> sysDictItemList = sysDictItemService.list(new QueryWrapper<SysDictItem>().eq("dict_id",sysDict.getId()));
+// List<String> rollCodeList = sysDictItemList.stream().map(SysDictItem::getItemValue).collect(Collectors.toList());
+// List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("user_id",userId));
+// List<String> roleIds = sysUserRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
+// List<SysRole> sysRoles = sysRoleService.list(new QueryWrapper<SysRole>().in("role_code",rollCodeList).in("id",roleIds));
+ List<String> msgCategoryList = sysDictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList());
+ List<SysAnnouncementSend> list = sysAnnouncementSendService.getPrimaryInfo(userId,msgCategoryList);
+ for(SysAnnouncementSend sysAnnouncementSend:list){
+ sysAnnouncementSend.setReadFlag("1");
+ sysAnnouncementSendService.updateById(sysAnnouncementSend);
+ }
+ return Result.OK(list);
+ }
}
--
Gitblit v1.9.3