From c80135e5c3f7bfab96ba558a910a06f1e587c53c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:14:04 +0800
Subject: [PATCH] 1.新增@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") 2.将新增orgid的拦截器关掉 3.登陆新增campusid
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 65 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 085f086..ae7b580 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;
import com.github.pagehelper.ISelect;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
@@ -129,6 +130,7 @@
* 缁熻闅忚鏁版嵁 -- cache鐗�
*/
@ApiOperation("缁熻闅忚鏁版嵁")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/patItemCount")
public Map<String, Object> patItemCount(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
Map<String, Object> map = new HashMap<>();
@@ -137,22 +139,21 @@
LoginUser loginUser = getLoginUser();
SysUser user = null;
Long userId = null;
- if(ObjectUtils.isNotEmpty(loginUser)){
+ if (ObjectUtils.isNotEmpty(loginUser)) {
user = loginUser.getUser();
- if(ObjectUtils.isNotEmpty(user)){
+ if (ObjectUtils.isNotEmpty(user)) {
userId = user.getUserId();
}
}
- if(ObjectUtils.isNotEmpty(userId)){
+ if (ObjectUtils.isNotEmpty(userId)) {
redisMap = redisCache.getCacheObject(userId + "patItemCount");
//璁板綍鏄惁鏈夊彲鐢ㄧ紦瀛�
Boolean redisFlag = false;
ServiceSubtaskVO oldCondition = null;
- if(MapUtils.isNotEmpty(redisMap)){
- oldCondition = (ServiceSubtaskVO)redisMap.get("searchCondition");
+ if (MapUtils.isNotEmpty(redisMap)) {
+ oldCondition = (ServiceSubtaskVO) redisMap.get("searchCondition");
// 姣旇緝鏌ヨ鏉′欢鏄惁涓�鑷�
- if(ObjectUtils.isNotEmpty(oldCondition) &&
- isSameCondition(oldCondition, serviceSubtaskVO)){
+ if (ObjectUtils.isNotEmpty(oldCondition) && isSameCondition(oldCondition, serviceSubtaskVO)) {
// 鏉′欢涓�鑷达紝浣跨敤缂撳瓨
redisFlag = true;
map = redisMap;
@@ -161,7 +162,7 @@
}
// 濡傛灉娌℃湁缂撳瓨鎴栬�呮潯浠朵笉涓�鑷达紝閲嶆柊鏌ヨ
- if(!redisFlag){
+ if (!redisFlag) {
map = serviceSubtaskService.patItemCount(serviceSubtaskVO);
map.put("searchCondition", serviceSubtaskVO);
redisCache.setCacheObject(userId + "patItemCount", map, 120, TimeUnit.MINUTES);
@@ -178,14 +179,9 @@
*/
private boolean isSameCondition(ServiceSubtaskVO oldCondition, ServiceSubtaskVO newCondition) {
// 浣跨敤ReflectUtils鐨勯�氱敤鏂规硶姣旇緝锛屾帓闄ゅ垎椤靛弬鏁扮瓑鏃犲叧瀛楁
- return ReflectUtils.equalsAllFields(
- oldCondition,
- newCondition,
+ return ReflectUtils.equalsAllFields(oldCondition, newCondition,
// 鎺掗櫎鐨勫瓧娈碉細鍒嗛〉鍙傛暟銆佸簭鍒楀寲ID銆佹椂闂存埑绛�
- "pageNum", "pageSize", "serialVersionUID",
- "createBy", "createTime", "updateBy", "updateTime",
- "searchValue", "params"
- );
+ "pageNum", "pageSize", "serialVersionUID", "createBy", "createTime", "updateBy", "updateTime", "searchValue", "params");
}
@@ -221,6 +217,7 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呴殢璁夸俊鎭�")
//@PreAuthorize("@ss.hasPermi('system:taskcall:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/patItemByCondition")
public TableDataInfo patItemByCondition(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
List<ServiceSubtask> serviceSubtaskList = null;
@@ -270,6 +267,7 @@
* 闅忚鏁版嵁鏌ヨ
*/
@Log(title = "闅忚鏁版嵁鏌ヨ", businessType = BusinessType.EXPORT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/querySubtaskList")
public AjaxResult querySubtaskList(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
@@ -304,6 +302,7 @@
* 鏍规嵁鐤剧梾妯＄硦鏌ヨ
*/
//@PreAuthorize("@ss.hasPermi('system:taskcall:query')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping(value = "/getSubtaskByDiagname")
public Map<String, Object> getSubtaskByDiagname(@RequestBody ServiceSubtask serviceSubtask) {
LoginUser loginUser = getLoginUser();
@@ -329,6 +328,7 @@
* 闅忚鍘嗗彶璁板綍瀵煎嚭
*/
@Log(title = "闅忚鍘嗗彶璁板綍瀵煎嚭", businessType = BusinessType.EXPORT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/getSubtaskByDiagnameExport")
public void getSubtaskByDiagnameExport(HttpServletResponse response, ServiceSubtask serviceSubtask) {
LoginUser loginUser = getLoginUser();
@@ -337,7 +337,8 @@
serviceSubtask.setPageNum(PageUtils.getOffset(serviceSubtask.getPageNum(), serviceSubtask.getPageSize()));
List<ServiceSubtask> subtaskList = serviceSubtaskService.selectServiceSubtaskByDiagname(serviceSubtask);
List<ServiceSubtaskDiagname> serviceSubtaskDiagnameList = new ArrayList<>();
- if (CollectionUtils.isNotEmpty(subtaskList)) serviceSubtaskDiagnameList = serviceSubtaskService.convertToDiagnameList(subtaskList);
+ if (CollectionUtils.isNotEmpty(subtaskList))
+ serviceSubtaskDiagnameList = serviceSubtaskService.convertToDiagnameList(subtaskList);
ExcelUtil<ServiceSubtaskDiagname> util = new ExcelUtil<ServiceSubtaskDiagname>(ServiceSubtaskDiagname.class);
if (active.equals("ls") || active.equals("druid")) {
@@ -353,6 +354,7 @@
@ApiOperation("鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟")
//@PreAuthorize("@ss.hasPermi('system:task:add')")
@Log(title = "鍗曚竴浠诲姟锛堥殢璁匡級", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/insertOrUpdateTask")
public AjaxResult insertOrUpdateHeTask(@RequestBody ServiceTaskVO ivrTaskVO) {
log.info("insertOrUpdateHeTask鐨勫叆鍙備负锛歿}", ivrTaskVO);
@@ -365,6 +367,7 @@
}
@ApiOperation("淇敼瀛愪换鍔�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/update")
public AjaxResult update(@RequestBody ServiceSubtask serviceSubtask) {
serviceSubtask.setUpdateBy(getLoginUser().getUser().getNickName());
@@ -372,6 +375,7 @@
}
@ApiOperation("鏂板瀛愪换鍔�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/addSubTask")
public AjaxResult addSubTask(@RequestBody ServiceSubtask serviceSubtask) {
SysUser user = getLoginUser().getUser();
@@ -380,6 +384,7 @@
}
@ApiOperation("鎮ｈ�呭啀娆￠殢璁�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/addSubTaskAgain")
public AjaxResult addSubTaskAgain(@RequestBody ServiceSubtask serviceSubtask) {
SysUser user = getLoginUser().getUser();
@@ -391,6 +396,7 @@
* 鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅
*/
@ApiOperation("鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/queryTaskByCondition")
public AjaxResult queryTaskByCondition(@RequestBody ServiceSubtaskVO ivrTaskcallVO) {
//鏍规嵁鍏ュ弬鏌ヨ淇℃伅
@@ -464,6 +470,7 @@
* 鑾峰彇姣忎釜鏈堢殑闅忚銆佸璇婇噺
*/
@ApiOperation("鑾峰彇姣忎釜鏈堢殑闅忚銆佸璇婇噺")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/getSfFzInfoEveryMonth")
public TableDataInfo getSfFzInfoEveryMonth(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
return getDataTable(serviceSubtaskService.getSfFzInfoEveryMonth(serviceSubtaskCountReq));
@@ -473,6 +480,7 @@
* 鑾峰彇闅忚缁熻姣斾緥
*/
@ApiOperation("鑾峰彇闅忚缁熻姣斾緥")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/getSfStatistics")
public AjaxResult getSfStatistics(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) {
@@ -485,6 +493,7 @@
* 鑾峰彇闅忚缁熻姣斾緥
*/
@ApiOperation("鑾峰彇闅忚婊℃剰搴︾粺璁�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/getSfStatisticsJoy")
public Map<String, Object> getSfStatisticsJoy(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) {
@@ -519,6 +528,7 @@
* 闅忚缁熻瀵煎嚭
*/
@ApiOperation("鏈嶅姟缁熻鏌ヨ-鎸夋椂闂寸淮搴︾粺璁″嚭闄�/闂ㄨ瘖闅忚鏁版嵁")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/getServiceStatistics")
public AjaxResult getServiceStatistics(@RequestBody ServiceStatisticsRequest serviceStatisticsRequest) {
SysUser user = getLoginUser().getUser();
@@ -532,6 +542,7 @@
* 鑾峰彇闅忚缁熻姣斾緥
*/
@ApiOperation("鑾峰彇闅忚婊℃剰搴︽槑缁�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/getSfStatisticsJoydetails")
public AjaxResult getSfStatisticsJoydetails(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes().size() == 0 && serviceSubtaskCountReq.getDeptcodes().size() == 0) {
@@ -544,6 +555,7 @@
* 鑾峰彇闅忚鍒嗙被缁熻鏄庣粏
*/
@ApiOperation("鑾峰彇闅忚鍒嗙被缁熻鏄庣粏")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/getSfStatisticsCount")
public Map<String, Object> getSfStatisticsCount(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) {
@@ -552,16 +564,16 @@
PageUtils.startPageByPost(serviceSubtaskCountReq.getPageNum(), serviceSubtaskCountReq.getPageSize());
String configKey = serviceSubtaskCountReq.getConfigKey();
- if(StringUtils.isNotEmpty(configKey)){
+ if (StringUtils.isNotEmpty(configKey)) {
String configValue = configService.selectConfigByKey(configKey);
serviceSubtaskCountReq.setConfigValue(configValue);
- if(StringUtils.isEmpty(configValue)){
- String logInfo = "getSfStatisticsCount-鍙傛暟 " + configKey + " 鏈厤缃�, 璇烽厤缃ソ鍚庨噸璇�";
+ if (StringUtils.isEmpty(configValue)) {
+ String logInfo = "getSfStatisticsCount-鍙傛暟 " + configKey + " 鏈厤缃�, 璇烽厤缃ソ鍚庨噸璇�";
log.error(logInfo);
return error(logInfo);
}
- }else {
- String logInfo = "getSfStatisticsCount-鍙傛暟configKey鏈紶鍏�, 璇烽厤缃ソ鍚庨噸璇�";
+ } else {
+ String logInfo = "getSfStatisticsCount-鍙傛暟configKey鏈紶鍏�, 璇烽厤缃ソ鍚庨噸璇�";
log.error(logInfo);
return error(logInfo);
}
@@ -569,6 +581,7 @@
}
@ApiOperation("鑾峰彇闅忚鍒嗙被缁熻鏄庣粏璇︽儏")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/getSfStatisticsCountDetails")
public AjaxResult getSfStatisticsCountDetails(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes().size() == 0 && serviceSubtaskCountReq.getDeptcodes().size() == 0) {
@@ -577,16 +590,16 @@
PageUtils.startPageByPost(serviceSubtaskCountReq.getPageNum(), serviceSubtaskCountReq.getPageSize());
//澶嶈瘖缁熻
String configKey = serviceSubtaskCountReq.getConfigKey();
- if(StringUtils.isNotEmpty(configKey)){
+ if (StringUtils.isNotEmpty(configKey)) {
String configValue = configService.selectConfigByKey(configKey);
- if(StringUtils.isEmpty(configValue)){
- String logInfo = "getSfStatisticsCountDetails-鍙傛暟 " + configKey + " 鏈厤缃�, 璇烽厤缃ソ鍚庨噸璇�";
+ if (StringUtils.isEmpty(configValue)) {
+ String logInfo = "getSfStatisticsCountDetails-鍙傛暟 " + configKey + " 鏈厤缃�, 璇烽厤缃ソ鍚庨噸璇�";
log.error(logInfo);
return error(logInfo);
}
serviceSubtaskCountReq.setConfigValue(configValue);
- }else {
- String logInfo = "getSfStatisticsCountDetails-鍙傛暟configKey鏈紶鍏�, 璇烽厤缃ソ鍚庨噸璇�";
+ } else {
+ String logInfo = "getSfStatisticsCountDetails-鍙傛暟configKey鏈紶鍏�, 璇烽厤缃ソ鍚庨噸璇�";
log.error(logInfo);
return error(logInfo);
}
--
Gitblit v1.9.3