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/Icd10AssociationController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentcategoryController.java | 31
smartor/src/main/java/com/smartor/service/ISysUserOrgService.java | 62 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordCalldetailController.java | 11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedPhysicalController.java | 27
smartor/src/main/resources/mapper/smartor/SysUserOrgMapper.xml | 147 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedRegistrationController.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServicePatientTempController.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java | 31
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrScenecategoryController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateScriptController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlowController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskController.java | 13
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishController.java | 28
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodeController.java | 11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTagController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSpeciallistCategoryController.java | 26
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseOrganizationController.java | 37
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateTargetoptionController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallrecordController.java | 30
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibResultController.java | 27
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java | 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java | 6
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 31
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggersceneController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/CommonTaskController.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java | 31
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptcategoryController.java | 29
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptOptionController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSatisfactionController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/EquipmentinfoController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptmodelController.java | 29
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLocallibraryController.java | 33
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SysUserOrgController.java | 110 ++
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryTagController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedBloodsugarController.java | 6
smartor/src/main/resources/mapper/smartor/SysUserMapper.xml | 31
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemePlanController.java | 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 53
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTasksmsController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrepeatconfigController.java | 10
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 33
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 65
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java | 42
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptAssortController.java | 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskconfigController.java | 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionController.java | 30
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishtopicController.java | 28
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptmodelController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskVisitResultController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java | 4
smartor/src/main/java/com/smartor/service/impl/SysUserOrgServiceImpl.java | 96 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsParamController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateTargetoptionController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneIntentController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodebranchController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionWjxController.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneExecuteconfigController.java | 30
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTagController.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordController.java | 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskPreachformController.java | 28
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivecontactController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java | 29
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateCategoryController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserDeptController.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTargetoptionController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplatescriptController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java | 25
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java | 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java | 31
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeCategoryController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedDrugController.java | 29
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTopicController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MinioFileController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneGlobalconfigController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java | 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java | 8
smartor/src/main/java/com/smartor/domain/HeLibrary.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdeptController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneRecallController.java | 30
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java | 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java | 5
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 4
smartor/src/main/java/com/smartor/domain/SysUserOrg.java | 46 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsRecordsController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java | 11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggerruleController.java | 11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateCategoryController.java | 9
ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateAssortController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 3
smartor/src/main/java/com/smartor/mapper/SysUserOrgMapper.java | 63 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInspectionController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveOutController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeLocallibraryController.java | 13
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetTagController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSpeciallistController.java | 26
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeCategoryController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospProvisionalController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceCheckController.java | 29
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibExceptionController.java | 30
ruoyi-common/pom.xml | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatFilterlistController.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishoptionController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateScriptController.java | 29
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptCategoryController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptController.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetoptionController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateScriptController.java | 29
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java | 6
150 files changed, 1,657 insertions(+), 964 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java
index 0d93202..43e80cd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import io.swagger.annotations.Api;
@@ -46,7 +47,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞瓙鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:operation:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody BaseDictOperation baseDictOperation) {
startPage();
LoginUser loginUser = getLoginUser();
@@ -85,7 +87,8 @@
@ApiOperation("鏂板鎮ｈ�呮鏌ユ楠岃褰曞瓙")
//@PreAuthorize("@ss.hasPermi('smartor:operation:add')")
@Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody BaseDictOperation baseDictOperation) {
return toAjax(baseDictOperationService.insertBaseDictOperation(baseDictOperation));
}
@@ -96,7 +99,8 @@
@ApiOperation("淇敼鎮ｈ�呮鏌ユ楠岃褰曞瓙")
//@PreAuthorize("@ss.hasPermi('smartor:operation:edit')")
@Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseDictOperation baseDictOperation) {
return toAjax(baseDictOperationService.updateBaseDictOperation(baseDictOperation));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseOrganizationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseOrganizationController.java
index e4bbb61..dd46693 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseOrganizationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseOrganizationController.java
@@ -1,29 +1,21 @@
package com.ruoyi.web.controller.smartor;
-import java.util.List;
-
-import com.ruoyi.common.core.domain.entity.SysUser;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.BaseOrganization;
import com.smartor.service.IBaseOrganizationService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* 鏈烘瀯Controller
@@ -83,11 +75,10 @@
@ApiOperation("鏂板鏈烘瀯")
//@PreAuthorize("@ss.hasPermi('smartor:organization:add')")
@Log(title = "鏈烘瀯", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody BaseOrganization baseOrganization)
{
- SysUser user = getLoginUser().getUser();
- baseOrganization.setOrgid(user.getOrgid());
return toAjax(baseOrganizationService.insertBaseOrganization(baseOrganization));
}
@@ -97,7 +88,9 @@
@ApiOperation("淇敼鏈烘瀯")
//@PreAuthorize("@ss.hasPermi('smartor:organization:edit')")
@Log(title = "鏈烘瀯", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
+
public AjaxResult edit(@RequestBody BaseOrganization baseOrganization)
{
return toAjax(baseOrganizationService.updateBaseOrganization(baseOrganization));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
index ce9861d..f1d9623 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
@@ -23,6 +23,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
@@ -47,15 +48,13 @@
*/
@ApiOperation("鏌ヨ鏍囩鍒楄〃")
//@PreAuthorize("@ss.hasPermi('system:tag:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody BaseTag baseTag) {
PageUtils.startPageByPost(baseTag.getPageNum(), baseTag.getPageSize());
List<BaseTag> list = null;
if (baseTag.getTagcategoryid() == null || baseTag.getTagcategoryid() == 0) baseTag.setTagcategoryid(null);
{
- LoginUser loginUser = getLoginUser();
- SysUser user = loginUser.getUser();
- baseTag.setOrgid(user.getOrgid());
list = baseTagService.selectBaseTagList(baseTag);
}
return getDataTable(list);
@@ -91,10 +90,9 @@
@ApiOperation("鏂板鏍囩")
//@PreAuthorize("@ss.hasPermi('system:tag:add')")
@Log(title = "鏍囩", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody BaseTag baseTag) {
- SysUser user = getLoginUser().getUser();
- baseTag.setOrgid(user.getOrgid());
return toAjax(baseTagService.insertBaseTag(baseTag));
}
@@ -104,6 +102,7 @@
@ApiOperation("淇敼鏍囩")
//@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "鏍囩", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseTag baseTag) {
return toAjax(baseTagService.updateBaseTag(baseTag));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java
index 9154718..420db8b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -37,7 +38,8 @@
* 鏌ヨ鏍囩鍒嗙被鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('system:tagcategory:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody BaseTagcategory baseTagcategory) {
startPage();
List<BaseTagcategory> list = baseTagcategoryService.selectBaseTagcategoryList(baseTagcategory);
@@ -71,10 +73,9 @@
//@PreAuthorize("@ss.hasPermi('system:tagcategory:add')")
@Log(title = "鏍囩鍒嗙被", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鏍囩鍒嗙被")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody BaseTagcategory baseTagcategory) {
- SysUser user = getLoginUser().getUser();
- baseTagcategory.setOrgid(user.getOrgid());
return toAjax(baseTagcategoryService.insertBaseTagcategory(baseTagcategory));
}
@@ -84,6 +85,7 @@
//@PreAuthorize("@ss.hasPermi('system:tagcategory:edit')")
@Log(title = "鏍囩鍒嗙被", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼鏍囩鍒嗙被")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseTagcategory baseTagcategory) {
return toAjax(baseTagcategoryService.updateBaseTagcategory(baseTagcategory));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java
index 3388775..cc3a750 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.Api;
@@ -37,7 +38,8 @@
*/
@ApiOperation("鏌ヨ鐢ㄦ埛鍒楄〃")
//@PreAuthorize("@ss.hasPermi('system:info:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody BaseUserInfo baseUserInfo) {
startPage();
List<BaseUserInfo> list = baseUserInfoService.selectBaseUserInfoList(baseUserInfo);
@@ -73,10 +75,9 @@
@ApiOperation("鏂板鐢ㄦ埛")
//@PreAuthorize("@ss.hasPermi('system:info:add')")
@Log(title = "鐢ㄦ埛", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody BaseUserInfo baseUserInfo) {
- SysUser user = getLoginUser().getUser();
- baseUserInfo.setOrgid(user.getOrgid());
return toAjax(baseUserInfoService.insertBaseUserInfo(baseUserInfo));
}
@@ -86,7 +87,8 @@
@ApiOperation("淇敼鐢ㄦ埛")
//@PreAuthorize("@ss.hasPermi('system:info:edit')")
@Log(title = "鐢ㄦ埛", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseUserInfo baseUserInfo) {
return toAjax(baseUserInfoService.updateBaseUserInfo(baseUserInfo));
}
@@ -110,6 +112,7 @@
* @return
*/
@ApiOperation("鑾峰彇浜哄憳鐨勮仈绯绘柟寮�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@GetMapping("/reportContent")
public AjaxResult getContact(@RequestParam("personCode") String personCode, @RequestParam("noticeWay") String noticeWay) {
if (StringUtils.isEmpty(personCode) || StringUtils.isEmpty(noticeWay)) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/CommonTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/CommonTaskController.java
index c0c378b..5b3517d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/CommonTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/CommonTaskController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
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 e100492..c5131cb 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
@@ -20,6 +20,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
@@ -45,7 +46,8 @@
* 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
//@PreAuthorize("@ss.hasPermi('system:equipmentinfo:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody Equipmentinfo equipmentinfo) {
startPage();
List<Equipmentinfo> list = equipmentinfoService.selectEquipmentinfoList(equipmentinfo);
@@ -78,10 +80,9 @@
*/
//@PreAuthorize("@ss.hasPermi('system:equipmentinfo:add')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody Equipmentinfo equipmentinfo) {
- SysUser user = getLoginUser().getUser();
- equipmentinfo.setOrgid(user.getOrgid());
return toAjax(equipmentinfoService.insertEquipmentinfo(equipmentinfo));
}
@@ -90,6 +91,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:equipmentinfo:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody Equipmentinfo equipmentinfo) {
return toAjax(equipmentinfoService.updateEquipmentinfo(equipmentinfo));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeCategoryController.java
index c42fe54..3e0213d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeCategoryController.java
@@ -18,6 +18,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
@@ -44,6 +45,7 @@
*/
@ApiOperation("鏌ヨ瀹ｆ暀鍒嗙被鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:hecategory:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectHeCategoryList")
public TableDataInfo selectHeCategorylist(@RequestBody HeCategory heCategory) {
// startPage();
@@ -80,10 +82,9 @@
@ApiOperation("鏂板瀹ｆ暀鍒嗙被")
//@PreAuthorize("@ss.hasPermi('smartor:hecategory:add')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody HeCategory heCategory) {
- SysUser user = getLoginUser().getUser();
- heCategory.setOrgid(user.getOrgid());
return toAjax(heCategoryService.insertHeCategory(heCategory));
}
@@ -93,6 +94,7 @@
@ApiOperation("淇敼瀹ｆ暀鍒嗙被")
//@PreAuthorize("@ss.hasPermi('smartor:hecategory:edit')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody HeCategory heCategory) {
return toAjax(heCategoryService.updateHeCategory(heCategory));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java
index c51bc73..8dc65c0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java
@@ -20,6 +20,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
@@ -45,6 +46,7 @@
@ApiOperation("鏌ヨ瀹ｆ暀鍒嗙被鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:assort:list')")
@PostMapping("/selectHeLibraryAssortList")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public TableDataInfo list(@RequestBody HeLibraryAssort heLibraryAssort) {
startPage();
List<HeLibraryAssortVO> list = heLibraryAssortService.selectHeLibraryAssortList(heLibraryAssort);
@@ -80,10 +82,9 @@
@ApiOperation("鏂板瀹ｆ暀鍒嗙被")
//@PreAuthorize("@ss.hasPermi('smartor:assort:add')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody HeLibraryAssort heLibraryAssort) {
- SysUser user = getLoginUser().getUser();
- heLibraryAssort.setOrgid(user.getOrgid());
return toAjax(heLibraryAssortService.insertHeLibraryAssort(heLibraryAssort));
}
@@ -94,9 +95,8 @@
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.INSERT)
@ApiOperation("鏂板瀹ｆ暀鍒嗙被璇︽儏鏍�")
@PostMapping("/addtree")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public AjaxResult addtree(@RequestBody HeLibraryAssortVO heLibraryAssortVO) {
- SysUser user = getLoginUser().getUser();
- heLibraryAssortVO.setOrgid(user.getOrgid());
return toAjax(heLibraryAssortService.insertHeLibraryAssortTree(heLibraryAssortVO));
}
@@ -106,6 +106,7 @@
@ApiOperation("淇敼瀹ｆ暀鍒嗙被")
//@PreAuthorize("@ss.hasPermi('smartor:assort:edit')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody HeLibraryAssort heLibraryAssort) {
return toAjax(heLibraryAssortService.updateHeLibraryAssort(heLibraryAssort));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java
index c5b5c15..ac422b4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java
@@ -7,20 +7,18 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.HeLibrary;
import com.smartor.domain.HeLibraryVO;
-import com.smartor.domain.SvyLibTemplateReq;
-import com.smartor.domain.SvyLibTemplateVO;
import com.smartor.service.IHeLibraryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -44,7 +42,8 @@
*/
@ApiOperation("鏌ヨ瀹ｆ暀璧勬枡搴撳垪琛�")
//@PreAuthorize("@ss.hasPermi('system:library:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody HeLibrary heLibrary) {
PageUtils.startPageByPost(heLibrary.getPageNum(), heLibrary.getPageSize());
List<HeLibrary> list = heLibraryService.selectHeLibraryList(heLibrary);
@@ -90,7 +89,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:library:add')")
@Log(title = "瀹ｆ暀璧勬枡搴�", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody HeLibrary heLibrary) {
SysUser user = getLoginUser().getUser();
heLibrary.setOrgid(user.getOrgid());
@@ -102,6 +102,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:library:edit')")
@Log(title = "瀹ｆ暀璧勬枡搴�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody HeLibrary heLibrary) {
return toAjax(heLibraryService.updateHeLibrary(heLibrary));
@@ -138,6 +139,7 @@
*/
@ApiOperation("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢")
@PostMapping("/selectInfoByCondition")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public AjaxResult selectInfoByCondition(@RequestBody HeLibrary heLibrary) {
if (ObjectUtils.isEmpty(heLibrary)) {
throw new BaseException("鏌ヨ妯℃澘璇︽儏鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
@@ -150,6 +152,7 @@
*/
@ApiOperation("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢(灏忕▼搴忎笓鐢�)")
@PostMapping("/selectInfoByConditionXCH")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public AjaxResult selectInfoByConditionXCH(@RequestBody HeLibrary heLibrary) {
if (ObjectUtils.isEmpty(heLibrary)) {
throw new BaseException("鏌ヨ妯℃澘璇︽儏鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryTagController.java
index 0bb863b..5ed2243 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryTagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryTagController.java
@@ -18,6 +18,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
@@ -41,6 +42,7 @@
* 鏌ヨ鎸囨爣鏍囩鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('system:tag:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@GetMapping("/list")
public TableDataInfo list(HeLibraryTag heLibraryTag) {
startPage();
@@ -75,9 +77,8 @@
//@PreAuthorize("@ss.hasPermi('system:tag:add')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.INSERT)
@PostMapping
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public AjaxResult add(@RequestBody HeLibraryTag heLibraryTag) {
- SysUser user = getLoginUser().getUser();
- heLibraryTag.setOrgid(user.getOrgid());
return toAjax(heLibraryTagService.insertHeLibraryTag(heLibraryTag));
}
@@ -87,6 +88,7 @@
//@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.UPDATE)
@PutMapping
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public AjaxResult edit(@RequestBody HeLibraryTag heLibraryTag) {
return toAjax(heLibraryTagService.updateHeLibraryTag(heLibraryTag));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLocallibraryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLocallibraryController.java
index 366b299..57f5faf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLocallibraryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLocallibraryController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -23,8 +24,7 @@
*/
@RestController
@RequestMapping("/smartor/helibrary")
-public class HeLocallibraryController extends BaseController
-{
+public class HeLocallibraryController extends BaseController {
@Autowired
private IHeLocallibraryService heLocallibraryService;
@@ -32,9 +32,9 @@
* 鏌ヨ瀹ｆ暀搴撳垪琛�
*/
//@PreAuthorize("@ss.hasPermi('smartor:helibrary:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody HeLocallibrary heLocallibrary)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody HeLocallibrary heLocallibrary) {
startPage();
List<HeLocallibrary> list = heLocallibraryService.selectHeLocallibraryList(heLocallibrary);
return getDataTable(list);
@@ -46,8 +46,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:helibrary:export')")
@Log(title = "瀹ｆ暀搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, HeLocallibrary heLocallibrary)
- {
+ public void export(HttpServletResponse response, HeLocallibrary heLocallibrary) {
List<HeLocallibrary> list = heLocallibraryService.selectHeLocallibraryList(heLocallibrary);
ExcelUtil<HeLocallibrary> util = new ExcelUtil<HeLocallibrary>(HeLocallibrary.class);
util.exportExcel(response, list, "瀹ｆ暀搴撴暟鎹�");
@@ -58,8 +57,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:helibrary:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(heLocallibraryService.selectHeLocallibraryById(id));
}
@@ -68,11 +66,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:helibrary:add')")
@Log(title = "瀹ｆ暀搴�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("add")
- public AjaxResult add(@RequestBody HeLocallibrary heLocallibrary)
- {
- SysUser user = getLoginUser().getUser();
- heLocallibrary.setOrgid(user.getOrgid());
+ public AjaxResult add(@RequestBody HeLocallibrary heLocallibrary) {
return toAjax(heLocallibraryService.insertHeLocallibrary(heLocallibrary));
}
@@ -81,9 +77,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:helibrary:edit')")
@Log(title = "瀹ｆ暀搴�", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
- public AjaxResult edit(@RequestBody HeLocallibrary heLocallibrary)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
+ public AjaxResult edit(@RequestBody HeLocallibrary heLocallibrary) {
return toAjax(heLocallibraryService.updateHeLocallibrary(heLocallibrary));
}
@@ -92,9 +88,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:helibrary:remove')")
@Log(title = "瀹ｆ暀搴�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(heLocallibraryService.deleteHeLocallibraryByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10AssociationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10AssociationController.java
index 49d489f..e8beff2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10AssociationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10AssociationController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -37,7 +38,8 @@
*/
@ApiOperation("鏌ヨ鎸囨爣鐤剧梾鍒楄〃")
//@PreAuthorize("@ss.hasPermi('system:icd10:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody Icd10Association icd10Association) {
if (icd10Association.getIsPage()) {
PageUtils.startPageByPost(icd10Association.getPageNum(), icd10Association.getPageSize());
@@ -75,10 +77,9 @@
@ApiOperation("鏂板鎸囨爣鐤剧梾")
//@PreAuthorize("@ss.hasPermi('system:icd10:add')")
@Log(title = "鎸囨爣鐤剧梾", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody Icd10Association Icd10Association) {
- SysUser user = getLoginUser().getUser();
- Icd10Association.setOrgid(user.getOrgid());
return toAjax(iIcd10AssociationService.insertIcd10Association(Icd10Association));
}
@@ -88,6 +89,7 @@
@ApiOperation("淇敼鎸囨爣鐤剧梾")
//@PreAuthorize("@ss.hasPermi('system:icd10:edit')")
@Log(title = "鎸囨爣鐤剧梾", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody Icd10Association Icd10Association) {
return toAjax(iIcd10AssociationService.updateIcd10Association(Icd10Association));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java
index d45ab08..62e3b89 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -37,6 +38,7 @@
*/
@ApiOperation("鏌ヨ鐤剧梾鍒楄〃")
//@PreAuthorize("@ss.hasPermi('system:icd10:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/list")
public TableDataInfo list(@RequestBody Icd10 icd10) {
PageUtils.startPageByPost(icd10.getPageNum(), icd10.getPageSize());
@@ -73,10 +75,9 @@
@ApiOperation("鏂板鐤剧梾")
//@PreAuthorize("@ss.hasPermi('system:icd10:add')")
@Log(title = "鐤剧梾", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody Icd10 icd10) {
- SysUser user = getLoginUser().getUser();
- icd10.setOrgid(user.getOrgid());
return toAjax(icd10Service.insertIcd10(icd10));
}
@@ -86,6 +87,7 @@
@ApiOperation("淇敼鐤剧梾")
//@PreAuthorize("@ss.hasPermi('system:icd10:edit')")
@Log(title = "鐤剧梾", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody Icd10 icd10) {
return toAjax(icd10Service.updateIcd10(icd10));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentController.java
index c3cd9a7..90c1663 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentController.java
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
@@ -39,6 +40,7 @@
* 鏌ヨAI鎰忓浘搴撳垪琛�
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibIntent ivrLibIntent) {
startPage();
@@ -72,10 +74,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:add')")
@Log(title = "AI鎰忓浘搴�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibIntent ivrLibIntent) {
- SysUser user = getLoginUser().getUser();
- ivrLibIntent.setOrgid(user.getOrgid());
return toAjax(ivrLibIntentService.insertIvrLibIntent(ivrLibIntent));
}
@@ -84,6 +85,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:edit')")
@Log(title = "AI鎰忓浘搴�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibIntent ivrLibIntent) {
return toAjax(ivrLibIntentService.updateIvrLibIntent(ivrLibIntent));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentcategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentcategoryController.java
index da391c3..e810825 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentcategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentcategoryController.java
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
@@ -31,8 +32,7 @@
*/
@RestController
@RequestMapping("/smartor/ivrlibintentcategory")
-public class IvrLibIntentcategoryController extends BaseController
-{
+public class IvrLibIntentcategoryController extends BaseController {
@Autowired
private IIvrLibIntentcategoryService ivrLibIntentcategoryService;
@@ -40,9 +40,9 @@
* 鏌ヨAI鎰忓浘搴撳垎绫诲垪琛�
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrLibIntentcategory ivrLibIntentcategory)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibIntentcategory ivrLibIntentcategory) {
startPage();
List<IvrLibIntentcategory> list = ivrLibIntentcategoryService.selectIvrLibIntentcategoryList(ivrLibIntentcategory);
return getDataTable(list);
@@ -54,8 +54,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:export')")
@Log(title = "AI鎰忓浘搴撳垎绫�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrLibIntentcategory ivrLibIntentcategory)
- {
+ public void export(HttpServletResponse response, IvrLibIntentcategory ivrLibIntentcategory) {
List<IvrLibIntentcategory> list = ivrLibIntentcategoryService.selectIvrLibIntentcategoryList(ivrLibIntentcategory);
ExcelUtil<IvrLibIntentcategory> util = new ExcelUtil<IvrLibIntentcategory>(IvrLibIntentcategory.class);
util.exportExcel(response, list, "AI鎰忓浘搴撳垎绫绘暟鎹�");
@@ -66,8 +65,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:query')")
@GetMapping(value = "/{intertcatid}")
- public AjaxResult getInfo(@PathVariable("intertcatid") Long intertcatid)
- {
+ public AjaxResult getInfo(@PathVariable("intertcatid") Long intertcatid) {
return success(ivrLibIntentcategoryService.selectIvrLibIntentcategoryByIntertcatid(intertcatid));
}
@@ -76,11 +74,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:add')")
@Log(title = "AI鎰忓浘搴撳垎绫�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrLibIntentcategory ivrLibIntentcategory)
- {
- SysUser user = getLoginUser().getUser();
- ivrLibIntentcategory.setOrgid(user.getOrgid());
+ public AjaxResult add(@RequestBody IvrLibIntentcategory ivrLibIntentcategory) {
return toAjax(ivrLibIntentcategoryService.insertIvrLibIntentcategory(ivrLibIntentcategory));
}
@@ -89,9 +85,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:edit')")
@Log(title = "AI鎰忓浘搴撳垎绫�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrLibIntentcategory ivrLibIntentcategory)
- {
+ public AjaxResult edit(@RequestBody IvrLibIntentcategory ivrLibIntentcategory) {
return toAjax(ivrLibIntentcategoryService.updateIvrLibIntentcategory(ivrLibIntentcategory));
}
@@ -100,9 +96,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:remove')")
@Log(title = "AI鎰忓浘搴撳垎绫�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{intertcatids}")
- public AjaxResult remove(@PathVariable Long[] intertcatids)
- {
+ @GetMapping("/remove/{intertcatids}")
+ public AjaxResult remove(@PathVariable Long[] intertcatids) {
return toAjax(ivrLibIntentcategoryService.deleteIvrLibIntentcategoryByIntertcatids(intertcatids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptController.java
index e9ef472..3e6772a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptController.java
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
@@ -40,7 +41,8 @@
* 鏌ヨAI璇濇湳搴撳垪琛�
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibScript ivrLibScript)
{
startPage();
@@ -76,11 +78,10 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:add')")
@Log(title = "AI璇濇湳搴�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibScript ivrLibScript)
{
- SysUser user = getLoginUser().getUser();
- ivrLibScript.setOrgid(user.getOrgid());
return toAjax(ivrLibScriptService.insertIvrLibScript(ivrLibScript));
}
@@ -89,6 +90,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:edit')")
@Log(title = "AI璇濇湳搴�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibScript ivrLibScript)
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptcategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptcategoryController.java
index 982d210..6e557bf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptcategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptcategoryController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,8 +32,7 @@
*/
@RestController
@RequestMapping("/smartor/ivrlibscriptcategory")
-public class IvrLibScriptcategoryController extends BaseController
-{
+public class IvrLibScriptcategoryController extends BaseController {
@Autowired
private IIvrLibScriptcategoryService ivrLibScriptcategoryService;
@@ -40,9 +40,9 @@
* 鏌ヨAI璇濇湳搴撳垎绫诲垪琛�
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrLibScriptcategory ivrLibScriptcategory)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrLibScriptcategory ivrLibScriptcategory) {
startPage();
List<IvrLibScriptcategory> list = ivrLibScriptcategoryService.selectIvrLibScriptcategoryList(ivrLibScriptcategory);
return getDataTable(list);
@@ -54,8 +54,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:export')")
@Log(title = "AI璇濇湳搴撳垎绫�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrLibScriptcategory ivrLibScriptcategory)
- {
+ public void export(HttpServletResponse response, IvrLibScriptcategory ivrLibScriptcategory) {
List<IvrLibScriptcategory> list = ivrLibScriptcategoryService.selectIvrLibScriptcategoryList(ivrLibScriptcategory);
ExcelUtil<IvrLibScriptcategory> util = new ExcelUtil<IvrLibScriptcategory>(IvrLibScriptcategory.class);
util.exportExcel(response, list, "AI璇濇湳搴撳垎绫绘暟鎹�");
@@ -66,8 +65,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:query')")
@GetMapping(value = "/{categoryid}")
- public AjaxResult getInfo(@PathVariable("categoryid") Long categoryid)
- {
+ public AjaxResult getInfo(@PathVariable("categoryid") Long categoryid) {
return success(ivrLibScriptcategoryService.selectIvrLibScriptcategoryByCategoryid(categoryid));
}
@@ -76,9 +74,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:add')")
@Log(title = "AI璇濇湳搴撳垎绫�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrLibScriptcategory ivrLibScriptcategory)
- {
+ public AjaxResult add(@RequestBody IvrLibScriptcategory ivrLibScriptcategory) {
SysUser user = getLoginUser().getUser();
ivrLibScriptcategory.setOrgid(user.getOrgid());
return toAjax(ivrLibScriptcategoryService.insertIvrLibScriptcategory(ivrLibScriptcategory));
@@ -89,9 +87,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:edit')")
@Log(title = "AI璇濇湳搴撳垎绫�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrLibScriptcategory ivrLibScriptcategory)
- {
+ public AjaxResult edit(@RequestBody IvrLibScriptcategory ivrLibScriptcategory) {
return toAjax(ivrLibScriptcategoryService.updateIvrLibScriptcategory(ivrLibScriptcategory));
}
@@ -100,9 +98,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:remove')")
@Log(title = "AI璇濇湳搴撳垎绫�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{categoryids}")
- public AjaxResult remove(@PathVariable Long[] categoryids)
- {
+ @GetMapping("/remove/{categoryids}")
+ public AjaxResult remove(@PathVariable Long[] categoryids) {
return toAjax(ivrLibScriptcategoryService.deleteIvrLibScriptcategoryByCategoryids(categoryids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptmodelController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptmodelController.java
index 279069d..1657529 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptmodelController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptmodelController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,8 +32,7 @@
*/
@RestController
@RequestMapping("/smartor/ivrlibscriptmodel")
-public class IvrLibScriptmodelController extends BaseController
-{
+public class IvrLibScriptmodelController extends BaseController {
@Autowired
private IIvrLibScriptmodelService ivrLibScriptmodelService;
@@ -40,9 +40,9 @@
* 鏌ヨAI璇濇湳妯″潡鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrLibScriptmodel ivrLibScriptmodel)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrLibScriptmodel ivrLibScriptmodel) {
startPage();
List<IvrLibScriptmodel> list = ivrLibScriptmodelService.selectIvrLibScriptmodelList(ivrLibScriptmodel);
return getDataTable(list);
@@ -54,8 +54,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:export')")
@Log(title = "AI璇濇湳妯″潡", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrLibScriptmodel ivrLibScriptmodel)
- {
+ public void export(HttpServletResponse response, IvrLibScriptmodel ivrLibScriptmodel) {
List<IvrLibScriptmodel> list = ivrLibScriptmodelService.selectIvrLibScriptmodelList(ivrLibScriptmodel);
ExcelUtil<IvrLibScriptmodel> util = new ExcelUtil<IvrLibScriptmodel>(IvrLibScriptmodel.class);
util.exportExcel(response, list, "AI璇濇湳妯″潡鏁版嵁");
@@ -66,8 +65,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:query')")
@GetMapping(value = "/{modelid}")
- public AjaxResult getInfo(@PathVariable("modelid") Long modelid)
- {
+ public AjaxResult getInfo(@PathVariable("modelid") Long modelid) {
return success(ivrLibScriptmodelService.selectIvrLibScriptmodelByModelid(modelid));
}
@@ -76,9 +74,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:add')")
@Log(title = "AI璇濇湳妯″潡", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrLibScriptmodel ivrLibScriptmodel)
- {
+ public AjaxResult add(@RequestBody IvrLibScriptmodel ivrLibScriptmodel) {
SysUser user = getLoginUser().getUser();
ivrLibScriptmodel.setOrgid(user.getOrgid());
return toAjax(ivrLibScriptmodelService.insertIvrLibScriptmodel(ivrLibScriptmodel));
@@ -89,9 +87,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:edit')")
@Log(title = "AI璇濇湳妯″潡", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrLibScriptmodel ivrLibScriptmodel)
- {
+ public AjaxResult edit(@RequestBody IvrLibScriptmodel ivrLibScriptmodel) {
return toAjax(ivrLibScriptmodelService.updateIvrLibScriptmodel(ivrLibScriptmodel));
}
@@ -100,9 +98,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:remove')")
@Log(title = "AI璇濇湳妯″潡", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{modelids}")
- public AjaxResult remove(@PathVariable Long[] modelids)
- {
+ @GetMapping("/remove/{modelids}")
+ public AjaxResult remove(@PathVariable Long[] modelids) {
return toAjax(ivrLibScriptmodelService.deleteIvrLibScriptmodelByModelids(modelids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateCategoryController.java
index b5cfa6c..c97e70c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateCategoryController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,7 +37,8 @@
*/
@ApiOperation("鏌ヨ閫氱敤妯℃澘鍒嗙被鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:category:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody IvrLibaExtemplateCategory ivrLibaExtemplateCategory) {
startPage();
List<IvrLibaExtemplateCategory> list = ivrLibaExtemplateCategoryService.selectIvrLibaExtemplateCategoryList(ivrLibaExtemplateCategory);
@@ -72,6 +74,7 @@
@ApiOperation("鏂板閫氱敤妯℃澘鍒嗙被")
//@PreAuthorize("@ss.hasPermi('smartor:category:add')")
@Log(title = "閫氱敤妯℃澘鍒嗙被", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaExtemplateCategory ivrLibaExtemplateCategory) {
SysUser user = getLoginUser().getUser();
@@ -85,6 +88,7 @@
@ApiOperation("淇敼閫氱敤妯℃澘鍒嗙被")
//@PreAuthorize("@ss.hasPermi('smartor:category:edit')")
@Log(title = "閫氱敤妯℃澘鍒嗙被", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaExtemplateCategory ivrLibaExtemplateCategory) {
return toAjax(ivrLibaExtemplateCategoryService.updateIvrLibaExtemplateCategory(ivrLibaExtemplateCategory));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateController.java
index 1cfe6ce..565950c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,7 +37,8 @@
*/
@ApiOperation("鏌ヨ閫氳繃妯℃澘鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:extemplate:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody IvrLibaExtemplate ivrLibaExtemplate) {
startPage();
List<IvrLibaExtemplate> list = ivrLibaExtemplateService.selectIvrLibaExtemplateList(ivrLibaExtemplate);
@@ -72,6 +74,7 @@
@ApiOperation("鏂板閫氳繃妯℃澘")
//@PreAuthorize("@ss.hasPermi('smartor:extemplate:add')")
@Log(title = "閫氳繃妯℃澘", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaExtemplate ivrLibaExtemplate) {
SysUser user = getLoginUser().getUser();
@@ -85,6 +88,7 @@
@ApiOperation("淇敼閫氳繃妯℃澘")
//@PreAuthorize("@ss.hasPermi('smartor:extemplate:edit')")
@Log(title = "閫氳繃妯℃澘", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaExtemplate ivrLibaExtemplate) {
return toAjax(ivrLibaExtemplateService.updateIvrLibaExtemplate(ivrLibaExtemplate));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplatescriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplatescriptController.java
index 3dff3c3..8b15d28 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplatescriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplatescriptController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,7 +37,8 @@
*/
@ApiOperation("鏌ヨ閫氱敤妯℃澘璇濇湳鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:extemplatescript:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody IvrLibaExtemplatescript ivrLibaExtemplatescript) {
startPage();
List<IvrLibaExtemplatescript> list = ivrLibaExtemplatescriptService.selectIvrLibaExtemplatescriptList(ivrLibaExtemplatescript);
@@ -72,7 +74,8 @@
@ApiOperation("鏂板閫氱敤妯℃澘璇濇湳")
//@PreAuthorize("@ss.hasPermi('smartor:extemplatescript:add')")
@Log(title = "閫氱敤妯℃澘璇濇湳", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaExtemplatescript ivrLibaExtemplatescript) {
SysUser user = getLoginUser().getUser();
ivrLibaExtemplatescript.setOrgid(user.getOrgid());
@@ -85,7 +88,8 @@
@ApiOperation("淇敼閫氱敤妯℃澘璇濇湳")
//@PreAuthorize("@ss.hasPermi('smartor:extemplatescript:edit')")
@Log(title = "閫氱敤妯℃澘璇濇湳", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaExtemplatescript ivrLibaExtemplatescript) {
return toAjax(ivrLibaExtemplatescriptService.updateIvrLibaExtemplatescript(ivrLibaExtemplatescript));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptAssortController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptAssortController.java
index 9f70ede..5bdda3d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptAssortController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptAssortController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -39,6 +40,7 @@
*/
@ApiOperation("鏌ヨ闂璇濇湳鍒嗙被搴�(鏍戠姸)")
//@PreAuthorize("@ss.hasPermi('system:assort:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectIvrLibaScriptAssortList")
public TableDataInfo list(@RequestBody IvrLibaScriptAssort ivrLibaScriptAssort) {
List<IvrLibaScriptAssortVO> list = ivrLibaScriptAssortService.selectIvrLibaScriptAssortList(ivrLibaScriptAssort);
@@ -76,7 +78,8 @@
@ApiOperation("鏂板闂璇濇湳鍒嗙被搴�")
//@PreAuthorize("@ss.hasPermi('system:assort:add')")
@Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaScriptAssort ivrLibaScriptAssort) {
SysUser user = getLoginUser().getUser();
ivrLibaScriptAssort.setOrgid(user.getOrgid());
@@ -89,6 +92,7 @@
//@PreAuthorize("@ss.hasPermi('system:assort:add')")
@Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.INSERT)
@ApiOperation("鏂板闂璇濇湳鍒嗙被鏍�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/addtree")
public AjaxResult addtree(@RequestBody IvrLibaScriptAssortVO ivrLibaScriptAssortVO) {
SysUser user = getLoginUser().getUser();
@@ -102,7 +106,8 @@
@ApiOperation("淇敼闂璇濇湳鍒嗙被搴�")
//@PreAuthorize("@ss.hasPermi('system:assort:edit')")
@Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaScriptAssort ivrLibaScriptAssort) {
return toAjax(ivrLibaScriptAssortService.updateIvrLibaScriptAssort(ivrLibaScriptAssort));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java
index 73b2d40..91def6b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -40,7 +41,7 @@
*/
@ApiOperation("鏌ヨ闂璇濇湳搴撳垪琛�")
//@PreAuthorize("@ss.hasPermi('system:script:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public TableDataInfo list(@RequestBody IvrLibaScript ivrLibaScript) {
PageUtils.startPageByPost(ivrLibaScript.getPageNum(),ivrLibaScript.getPageSize());
List<IvrLibaScript> list = ivrLibaScriptService.selectIvrLibaScriptList(ivrLibaScript);
@@ -76,7 +77,8 @@
@ApiOperation("鏂板闂璇濇湳搴�")
//@PreAuthorize("@ss.hasPermi('system:script:add')")
@Log(title = "闂璇濇湳搴�", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaScript ivrLibaScript) {
SysUser user = getLoginUser().getUser();
ivrLibaScript.setOrgid(user.getOrgid());
@@ -89,7 +91,8 @@
@ApiOperation("淇敼闂璇濇湳搴�")
//@PreAuthorize("@ss.hasPermi('system:script:edit')")
@Log(title = "闂璇濇湳搴�", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaScript ivrLibaScript) {
return toAjax(ivrLibaScriptService.updateIvrLibaScript(ivrLibaScript));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTagController.java
index 35bf62a..bf5ced4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTagController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -10,7 +11,6 @@
import com.smartor.domain.IvrLibaScriptTag;
import com.smartor.service.IIvrLibaScriptTagService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -32,7 +32,8 @@
* 鏌ヨ闂璇濇湳鏍囩搴撳垪琛�
*/
//@PreAuthorize("@ss.hasPermi('system:tag:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody IvrLibaScriptTag ivrLibaScriptTag) {
startPage();
List<IvrLibaScriptTag> list = ivrLibaScriptTagService.selectIvrLibaScriptTagList(ivrLibaScriptTag);
@@ -65,6 +66,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:tag:add')")
@Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaScriptTag ivrLibaScriptTag) {
SysUser user = getLoginUser().getUser();
@@ -77,6 +79,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaScriptTag ivrLibaScriptTag) {
return toAjax(ivrLibaScriptTagService.updateIvrLibaScriptTag(ivrLibaScriptTag));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetController.java
index 27c5381..7bc3010 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -32,7 +33,8 @@
* 鏌ヨ闂璇濇湳鎸囨爣搴撳垪琛�
*/
//@PreAuthorize("@ss.hasPermi('system:target:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody IvrLibaScriptTarget ivrLibaScriptTarget) {
startPage();
List<IvrLibaScriptTarget> list = ivrLibaScriptTargetService.selectIvrLibaScriptTargetList(ivrLibaScriptTarget);
@@ -65,6 +67,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:target:add')")
@Log(title = "闂璇濇湳鎸囨爣搴�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaScriptTarget ivrLibaScriptTarget) {
SysUser user = getLoginUser().getUser();
@@ -77,6 +80,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:target:edit')")
@Log(title = "闂璇濇湳鎸囨爣搴�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaScriptTarget ivrLibaScriptTarget) {
return toAjax(ivrLibaScriptTargetService.updateIvrLibaScriptTarget(ivrLibaScriptTarget));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetoptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetoptionController.java
index 9bb6797..a98d1fd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetoptionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetoptionController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -32,7 +33,8 @@
* 鏌ヨ闂璇濇湳鎸囨爣閫夐」搴撳垪琛�
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
startPage();
List<IvrLibaScriptTargetoption> list = ivrLibaScriptTargetoptionService.selectIvrLibaScriptTargetoptionList(ivrLibaScriptTargetoption);
@@ -65,6 +67,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:add')")
@Log(title = "闂璇濇湳鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
SysUser user = getLoginUser().getUser();
@@ -77,6 +80,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
@Log(title = "闂璇濇湳鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
return toAjax(ivrLibaScriptTargetoptionService.updateIvrLibaScriptTargetoption(ivrLibaScriptTargetoption));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java
index e536283..bf90b71 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -39,6 +40,7 @@
*/
@ApiOperation("鏌ヨ鎸囨爣鍒嗙被鍒楄〃")
//@PreAuthorize("@ss.hasPermi('system:assort:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectIvrLibaTargetAssortList")
public TableDataInfo list(@RequestBody IvrLibaTargetAssort ivrLibaTargetAssort) {
// PageUtils.startPageByPost(ivrLibaTargetAssort.getPageNum(), ivrLibaTargetAssort.getPageSize());
@@ -75,6 +77,7 @@
@ApiOperation("鏂板鎸囨爣鍒嗙被")
//@PreAuthorize("@ss.hasPermi('system:assort:add')")
@Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTargetAssort ivrLibaTargetAssort) {
SysUser user = getLoginUser().getUser();
@@ -88,6 +91,7 @@
//@PreAuthorize("@ss.hasPermi('system:assort:add')")
@Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鎸囨爣鍒嗙被鏍�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/addtree")
public AjaxResult addtree(@RequestBody IvrLibaTargetAssortVO ivrLibaTargetAssortVO) {
SysUser user = getLoginUser().getUser();
@@ -101,6 +105,7 @@
@ApiOperation("淇敼鎸囨爣鍒嗙被")
//@PreAuthorize("@ss.hasPermi('system:assort:edit')")
@Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTargetAssort ivrLibaTargetAssort) {
return toAjax(ivrLibaTargetAssortService.updateIvrLibaTargetAssort(ivrLibaTargetAssort));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
index a577c98..6e7599e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;
import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
@@ -40,7 +41,8 @@
*/
@ApiOperation("鏌ヨ鎸囨爣鍒楄〃")
//@PreAuthorize("@ss.hasPermi('system:target:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody IvrLibaTarget ivrLibaTarget) {
PageUtils.startPageByPost(ivrLibaTarget.getPageNum(), ivrLibaTarget.getPageSize());
List<IvrLibaTarget> list = ivrLibaTargetService.selectIvrLibaTargetList(ivrLibaTarget);
@@ -76,6 +78,7 @@
//@PreAuthorize("@ss.hasPermi('system:target:add')")
@Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鎸囨爣锛堣繖涓帴鍙ｆ病鍟ョ敤浜嗭紝鐢ㄢ�濇柊澧炴垨淇敼鎸囨爣淇℃伅鈥滆繖涓帴鍙ｅソ涓�浜涳級")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTargetVO ivrLibaTargetVO) {
SysUser user = getLoginUser().getUser();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetTagController.java
index 1d2dc9a..6cc831d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetTagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetTagController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -32,7 +33,8 @@
* 鏌ヨ鎸囨爣鏍囩鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('system:tag:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody IvrLibaTargetTag ivrLibaTargetTag) {
startPage();
List<IvrLibaTargetTag> list = ivrLibaTargetTagService.selectIvrLibaTargetTagList(ivrLibaTargetTag);
@@ -65,6 +67,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:tag:add')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTargetTag ivrLibaTargetTag) {
SysUser user = getLoginUser().getUser();
@@ -77,6 +80,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTargetTag ivrLibaTargetTag) {
return toAjax(ivrLibaTargetTagService.updateIvrLibaTargetTag(ivrLibaTargetTag));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java
index cc18677..75b5286 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -28,8 +29,7 @@
@Api(description = "鎸囨爣閫夐」搴�")
@RestController
@RequestMapping("/smartor/targetoption")
-public class IvrLibaTargetoptionController extends BaseController
-{
+public class IvrLibaTargetoptionController extends BaseController {
@Autowired
private IIvrLibaTargetoptionService ivrLibaTargetoptionService;
@@ -38,10 +38,10 @@
*/
@ApiOperation("鏌ヨ鎸囨爣閫夐」搴撳垪琛�")
//@PreAuthorize("@ss.hasPermi('system:targetoption:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrLibaTargetoption ivrLibaTargetoption)
- {
- PageUtils.startPageByPost(ivrLibaTargetoption.getPageNum(),ivrLibaTargetoption.getPageSize());
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrLibaTargetoption ivrLibaTargetoption) {
+ PageUtils.startPageByPost(ivrLibaTargetoption.getPageNum(), ivrLibaTargetoption.getPageSize());
List<IvrLibaTargetoption> list = ivrLibaTargetoptionService.selectIvrLibaTargetoptionList(ivrLibaTargetoption);
return getDataTable(list);
}
@@ -53,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('system:targetoption:export')")
@Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrLibaTargetoption ivrLibaTargetoption)
- {
+ public void export(HttpServletResponse response, IvrLibaTargetoption ivrLibaTargetoption) {
List<IvrLibaTargetoption> list = ivrLibaTargetoptionService.selectIvrLibaTargetoptionList(ivrLibaTargetoption);
ExcelUtil<IvrLibaTargetoption> util = new ExcelUtil<IvrLibaTargetoption>(IvrLibaTargetoption.class);
util.exportExcel(response, list, "鎸囨爣閫夐」搴撴暟鎹�");
@@ -66,8 +65,7 @@
@ApiOperation("鑾峰彇鎸囨爣閫夐」搴撹缁嗕俊鎭�")
//@PreAuthorize("@ss.hasPermi('system:targetoption:query')")
@GetMapping(value = "/getInfo/{targetoptionid}")
- public AjaxResult getInfo(@PathVariable("targetoptionid") Long targetoptionid)
- {
+ public AjaxResult getInfo(@PathVariable("targetoptionid") Long targetoptionid) {
return success(ivrLibaTargetoptionService.selectIvrLibaTargetoptionByTargetoptionid(targetoptionid));
}
@@ -77,9 +75,9 @@
@ApiOperation("鏂板鎸囨爣閫夐」搴�")
//@PreAuthorize("@ss.hasPermi('system:targetoption:add')")
@Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrLibaTargetoption ivrLibaTargetoption)
- {
+ public AjaxResult add(@RequestBody IvrLibaTargetoption ivrLibaTargetoption) {
SysUser user = getLoginUser().getUser();
ivrLibaTargetoption.setOrgid(user.getOrgid());
return toAjax(ivrLibaTargetoptionService.insertIvrLibaTargetoption(ivrLibaTargetoption));
@@ -91,9 +89,9 @@
@ApiOperation("淇敼鎸囨爣閫夐」搴�")
//@PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
@Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrLibaTargetoption ivrLibaTargetoption)
- {
+ public AjaxResult edit(@RequestBody IvrLibaTargetoption ivrLibaTargetoption) {
return toAjax(ivrLibaTargetoptionService.updateIvrLibaTargetoption(ivrLibaTargetoption));
}
@@ -103,9 +101,8 @@
@ApiOperation("鍒犻櫎鎸囨爣閫夐」搴�")
//@PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
@Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{targetoptionids}")
- public AjaxResult remove(@PathVariable Long[] targetoptionids)
- {
+ @GetMapping("/remove/{targetoptionids}")
+ public AjaxResult remove(@PathVariable Long[] targetoptionids) {
return toAjax(ivrLibaTargetoptionService.deleteIvrLibaTargetoptionByTargetoptionids(targetoptionids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateAssortController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateAssortController.java
index 9b28da0..47c6b1e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateAssortController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateAssortController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -38,6 +39,7 @@
*/
@ApiOperation("鏌ヨ妯℃澘鍒嗙被鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:assort:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectIvrLibaTemplateAssortList")
public TableDataInfo selectIvrLibaTemplateAssortList(@RequestBody IvrLibaTemplateAssort ivrLibaTemplateAssort) {
// startPage();
@@ -74,6 +76,7 @@
@ApiOperation("鏂板妯℃澘鍒嗙被")
//@PreAuthorize("@ss.hasPermi('smartor:assort:add')")
@Log(title = "妯℃澘鍒嗙被", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTemplateAssort ivrLibaTemplateAssort) {
SysUser user = getLoginUser().getUser();
@@ -87,6 +90,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:assort:add')")
@Log(title = "妯℃澘鍒嗙被", businessType = BusinessType.INSERT)
@ApiOperation("鏂板妯℃澘鍒嗙被鏍�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/addtree")
public AjaxResult addtree(@RequestBody IvrLibaTemplateAssortVO ivrLibaTemplateAssortVO) {
SysUser user = getLoginUser().getUser();
@@ -100,6 +104,7 @@
@ApiOperation("淇敼妯℃澘鍒嗙被")
//@PreAuthorize("@ss.hasPermi('smartor:assort:edit')")
@Log(title = "妯℃澘鍒嗙被", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTemplateAssort ivrLibaTemplateAssort) {
return toAjax(ivrLibaTemplateAssortService.updateIvrLibaTemplateAssort(ivrLibaTemplateAssort));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
index 9a6051a..1e3176b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;
import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -52,7 +53,8 @@
*/
@ApiOperation("鏌ヨ闅忚妯℃澘搴撳垪琛�")
//@PreAuthorize("@ss.hasPermi('smartor:template:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody IvrLibaTemplate ivrLibaTemplate) {
//鍒嗛〉
PageUtils.startPageByPost(ivrLibaTemplate.getPageNum(), ivrLibaTemplate.getPageSize());
@@ -89,6 +91,7 @@
@ApiOperation("鏂板闅忚妯℃澘搴�")
//@PreAuthorize("@ss.hasPermi('smartor:template:add')")
@Log(title = "妯℃澘搴�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTemplate ivrLibaTemplate) {
SysUser user = getLoginUser().getUser();
@@ -102,6 +105,7 @@
@ApiOperation("淇敼闅忚妯℃澘搴�")
//@PreAuthorize("@ss.hasPermi('smartor:template:edit')")
@Log(title = "妯℃澘搴�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTemplate ivrLibaTemplate) {
return toAjax(ivrLibaTemplateService.updateIvrLibaTemplate(ivrLibaTemplate));
@@ -122,6 +126,7 @@
* 鏂板鎴栦慨鏀归殢璁挎ā鏉垮簱璇︽儏
*/
@ApiOperation("鏂板鎴栦慨鏀归殢璁挎ā鏉垮簱璇︽儏")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/saveOrUpdateScript")
public AjaxResult saveOrUpdateScript(@RequestBody IvrLibaTemplateVO ivrLibaTemplateVO) {
if (ObjectUtils.isEmpty(ivrLibaTemplateVO)) {
@@ -136,6 +141,7 @@
* 鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢
*/
@ApiOperation("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectInfoByCondition")
public AjaxResult selectInfoByCondition(@RequestBody IvrLibaTemplateVO ivrLibaTemplateVO) {
if (ivrLibaTemplateVO.getId() == null) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateScriptController.java
index ba21a4a..0bd58e2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateScriptController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -27,8 +28,7 @@
@Api(description = "妯＄増闂璇濇湳搴�")
@RestController
@RequestMapping("/smartor/templatescript")
-public class IvrLibaTemplateScriptController extends BaseController
-{
+public class IvrLibaTemplateScriptController extends BaseController {
@Autowired
private IIvrLibaTemplateScriptService ivrLibaTemplateScriptService;
@@ -37,9 +37,9 @@
*/
@ApiOperation("鏌ヨ妯＄増闂璇濇湳搴撳垪琛�")
//@PreAuthorize("@ss.hasPermi('smartor:script:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrLibaTemplateScript ivrLibaTemplateScript)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrLibaTemplateScript ivrLibaTemplateScript) {
startPage();
List<IvrLibaTemplateScript> list = ivrLibaTemplateScriptService.selectIvrLibaTemplateScriptList(ivrLibaTemplateScript);
return getDataTable(list);
@@ -52,8 +52,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:script:export')")
@Log(title = "妯＄増闂璇濇湳搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrLibaTemplateScript ivrLibaTemplateScript)
- {
+ public void export(HttpServletResponse response, IvrLibaTemplateScript ivrLibaTemplateScript) {
List<IvrLibaTemplateScript> list = ivrLibaTemplateScriptService.selectIvrLibaTemplateScriptList(ivrLibaTemplateScript);
ExcelUtil<IvrLibaTemplateScript> util = new ExcelUtil<IvrLibaTemplateScript>(IvrLibaTemplateScript.class);
util.exportExcel(response, list, "妯＄増闂璇濇湳搴撴暟鎹�");
@@ -65,8 +64,7 @@
@ApiOperation("鑾峰彇妯＄増闂璇濇湳搴撹缁嗕俊鎭�")
//@PreAuthorize("@ss.hasPermi('smartor:script:query')")
@GetMapping(value = "/getInfo/{ID}")
- public AjaxResult getInfo(@PathVariable("ID") Long ID)
- {
+ public AjaxResult getInfo(@PathVariable("ID") Long ID) {
return success(ivrLibaTemplateScriptService.selectIvrLibaTemplateScriptByID(ID));
}
@@ -76,9 +74,9 @@
@ApiOperation("鏂板妯＄増闂璇濇湳搴�")
//@PreAuthorize("@ss.hasPermi('smartor:script:add')")
@Log(title = "妯＄増闂璇濇湳搴�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrLibaTemplateScript ivrLibaTemplateScript)
- {
+ public AjaxResult add(@RequestBody IvrLibaTemplateScript ivrLibaTemplateScript) {
SysUser user = getLoginUser().getUser();
ivrLibaTemplateScript.setOrgid(user.getOrgid());
return toAjax(ivrLibaTemplateScriptService.insertIvrLibaTemplateScript(ivrLibaTemplateScript));
@@ -90,9 +88,9 @@
@ApiOperation("淇敼妯＄増闂璇濇湳搴�")
//@PreAuthorize("@ss.hasPermi('smartor:script:edit')")
@Log(title = "妯＄増闂璇濇湳搴�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrLibaTemplateScript ivrLibaTemplateScript)
- {
+ public AjaxResult edit(@RequestBody IvrLibaTemplateScript ivrLibaTemplateScript) {
return toAjax(ivrLibaTemplateScriptService.updateIvrLibaTemplateScript(ivrLibaTemplateScript));
}
@@ -102,9 +100,8 @@
@ApiOperation("鍒犻櫎妯＄増闂璇濇湳搴�")
//@PreAuthorize("@ss.hasPermi('smartor:script:remove')")
@Log(title = "妯＄増闂璇濇湳搴�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{IDs}")
- public AjaxResult remove(@PathVariable Long[] IDs)
- {
+ @GetMapping("/remove/{IDs}")
+ public AjaxResult remove(@PathVariable Long[] IDs) {
return toAjax(ivrLibaTemplateScriptService.deleteIvrLibaTemplateScriptByIDs(IDs));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTagController.java
index ebe8bce..6eb35bc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTagController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,7 +37,8 @@
*/
// @ApiOperation("鏌ヨ妯℃澘鏍囩鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:tag:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody IvrLibaTemplateTag ivrLibaTemplateTag) {
startPage();
List<IvrLibaTemplateTag> list = ivrLibaTemplateTagService.selectIvrLibaTemplateTagList(ivrLibaTemplateTag);
@@ -72,7 +74,8 @@
@ApiOperation("鏂板妯℃澘鏍囩")
//@PreAuthorize("@ss.hasPermi('smartor:tag:add')")
@Log(title = "妯℃澘鏍囩", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTemplateTag ivrLibaTemplateTag) {
SysUser user = getLoginUser().getUser();
ivrLibaTemplateTag.setOrgid(user.getOrgid());
@@ -85,7 +88,8 @@
@ApiOperation("淇敼妯℃澘鏍囩")
//@PreAuthorize("@ss.hasPermi('smartor:tag:edit')")
@Log(title = "妯℃澘鏍囩", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTemplateTag ivrLibaTemplateTag) {
return toAjax(ivrLibaTemplateTagService.updateIvrLibaTemplateTag(ivrLibaTemplateTag));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTargetoptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTargetoptionController.java
index 574cbc4..1547335 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTargetoptionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTargetoptionController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,7 +37,8 @@
*/
@ApiOperation("鏌ヨ妯℃澘鎸囨爣閫夐」搴撳垪琛�")
//@PreAuthorize("@ss.hasPermi('system:targetoption:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption) {
startPage();
List<IvrLibaTemplateTargetoption> list = ivrLibaTemplateTargetoptionService.selectIvrLibaTemplateTargetoptionList(ivrLibaTemplateTargetoption);
@@ -72,6 +74,7 @@
@ApiOperation("鏂板妯℃澘鎸囨爣閫夐」搴�")
//@PreAuthorize("@ss.hasPermi('system:targetoption:add')")
@Log(title = "妯℃澘鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption) {
SysUser user = getLoginUser().getUser();
@@ -85,6 +88,7 @@
@ApiOperation("淇敼妯℃澘鎸囨爣閫夐」搴�")
//@PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
@Log(title = "妯℃澘鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption) {
return toAjax(ivrLibaTemplateTargetoptionService.updateIvrLibaTemplateTargetoption(ivrLibaTemplateTargetoption));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneController.java
index 44e0972..3c5f0af 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +25,13 @@
/**
* AI澶栧懠鍦烘櫙绠＄悊Controller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@RestController
@RequestMapping("/smartor/ivrscene")
-public class IvrSceneController extends BaseController
-{
+public class IvrSceneController extends BaseController {
@Autowired
private IIvrSceneService ivrSceneService;
@@ -38,9 +39,9 @@
* 鏌ヨAI澶栧懠鍦烘櫙绠＄悊鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscene:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrScene ivrScene)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrScene ivrScene) {
startPage();
List<IvrScene> list = ivrSceneService.selectIvrSceneList(ivrScene);
return getDataTable(list);
@@ -52,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrscene:export')")
@Log(title = "AI澶栧懠鍦烘櫙绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrScene ivrScene)
- {
+ public void export(HttpServletResponse response, IvrScene ivrScene) {
List<IvrScene> list = ivrSceneService.selectIvrSceneList(ivrScene);
ExcelUtil<IvrScene> util = new ExcelUtil<IvrScene>(IvrScene.class);
util.exportExcel(response, list, "AI澶栧懠鍦烘櫙绠＄悊鏁版嵁");
@@ -64,8 +64,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscene:query')")
@GetMapping(value = "/{sceneid}")
- public AjaxResult getInfo(@PathVariable("sceneid") Long sceneid)
- {
+ public AjaxResult getInfo(@PathVariable("sceneid") Long sceneid) {
return success(ivrSceneService.selectIvrSceneBySceneid(sceneid));
}
@@ -74,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscene:add')")
@Log(title = "AI澶栧懠鍦烘櫙绠＄悊", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrScene ivrScene)
- {
+ public AjaxResult add(@RequestBody IvrScene ivrScene) {
return toAjax(ivrSceneService.insertIvrScene(ivrScene));
}
@@ -85,9 +84,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscene:edit')")
@Log(title = "AI澶栧懠鍦烘櫙绠＄悊", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrScene ivrScene)
- {
+ public AjaxResult edit(@RequestBody IvrScene ivrScene) {
return toAjax(ivrSceneService.updateIvrScene(ivrScene));
}
@@ -96,9 +95,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscene:remove')")
@Log(title = "AI澶栧懠鍦烘櫙绠＄悊", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{sceneids}")
- public AjaxResult remove(@PathVariable Long[] sceneids)
- {
+ @GetMapping("/remove/{sceneids}")
+ public AjaxResult remove(@PathVariable Long[] sceneids) {
return toAjax(ivrSceneService.deleteIvrSceneBySceneids(sceneids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneExecuteconfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneExecuteconfigController.java
index 9ce8c74..eadd0ad 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneExecuteconfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneExecuteconfigController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -29,8 +31,7 @@
*/
@RestController
@RequestMapping("/smartor/ivrexecuteconfig")
-public class IvrSceneExecuteconfigController extends BaseController
-{
+public class IvrSceneExecuteconfigController extends BaseController {
@Autowired
private IIvrSceneExecuteconfigService ivrSceneExecuteconfigService;
@@ -38,9 +39,9 @@
* 鏌ヨAI澶栧懠鎵ц閰嶇疆鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrSceneExecuteconfig ivrSceneExecuteconfig)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrSceneExecuteconfig ivrSceneExecuteconfig) {
startPage();
List<IvrSceneExecuteconfig> list = ivrSceneExecuteconfigService.selectIvrSceneExecuteconfigList(ivrSceneExecuteconfig);
return getDataTable(list);
@@ -52,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:export')")
@Log(title = "AI澶栧懠鎵ц閰嶇疆", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrSceneExecuteconfig ivrSceneExecuteconfig)
- {
+ public void export(HttpServletResponse response, IvrSceneExecuteconfig ivrSceneExecuteconfig) {
List<IvrSceneExecuteconfig> list = ivrSceneExecuteconfigService.selectIvrSceneExecuteconfigList(ivrSceneExecuteconfig);
ExcelUtil<IvrSceneExecuteconfig> util = new ExcelUtil<IvrSceneExecuteconfig>(IvrSceneExecuteconfig.class);
util.exportExcel(response, list, "AI澶栧懠鎵ц閰嶇疆鏁版嵁");
@@ -64,8 +64,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:query')")
@GetMapping(value = "/{scenecfgid}")
- public AjaxResult getInfo(@PathVariable("scenecfgid") Long scenecfgid)
- {
+ public AjaxResult getInfo(@PathVariable("scenecfgid") Long scenecfgid) {
return success(ivrSceneExecuteconfigService.selectIvrSceneExecuteconfigByScenecfgid(scenecfgid));
}
@@ -74,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:add')")
@Log(title = "AI澶栧懠鎵ц閰嶇疆", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrSceneExecuteconfig ivrSceneExecuteconfig)
- {
+ public AjaxResult add(@RequestBody IvrSceneExecuteconfig ivrSceneExecuteconfig) {
return toAjax(ivrSceneExecuteconfigService.insertIvrSceneExecuteconfig(ivrSceneExecuteconfig));
}
@@ -85,9 +84,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:edit')")
@Log(title = "AI澶栧懠鎵ц閰嶇疆", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrSceneExecuteconfig ivrSceneExecuteconfig)
- {
+ public AjaxResult edit(@RequestBody IvrSceneExecuteconfig ivrSceneExecuteconfig) {
return toAjax(ivrSceneExecuteconfigService.updateIvrSceneExecuteconfig(ivrSceneExecuteconfig));
}
@@ -96,9 +95,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:remove')")
@Log(title = "AI澶栧懠鎵ц閰嶇疆", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{scenecfgids}")
- public AjaxResult remove(@PathVariable Long[] scenecfgids)
- {
+ @GetMapping("/remove/{scenecfgids}")
+ public AjaxResult remove(@PathVariable Long[] scenecfgids) {
return toAjax(ivrSceneExecuteconfigService.deleteIvrSceneExecuteconfigByScenecfgids(scenecfgids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlowController.java
index 7bf965e..b4c6aaa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlowController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlowController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +25,13 @@
/**
* AI澶栧懠娴佺▼Controller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@RestController
@RequestMapping("/smartor/ivrflow")
-public class IvrSceneFlowController extends BaseController
-{
+public class IvrSceneFlowController extends BaseController {
@Autowired
private IIvrSceneFlowService ivrSceneFlowService;
@@ -38,9 +39,9 @@
* 鏌ヨAI澶栧懠娴佺▼鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrflow:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrSceneFlow ivrSceneFlow)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrSceneFlow ivrSceneFlow) {
startPage();
List<IvrSceneFlow> list = ivrSceneFlowService.selectIvrSceneFlowList(ivrSceneFlow);
return getDataTable(list);
@@ -52,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrflow:export')")
@Log(title = "AI澶栧懠娴佺▼", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrSceneFlow ivrSceneFlow)
- {
+ public void export(HttpServletResponse response, IvrSceneFlow ivrSceneFlow) {
List<IvrSceneFlow> list = ivrSceneFlowService.selectIvrSceneFlowList(ivrSceneFlow);
ExcelUtil<IvrSceneFlow> util = new ExcelUtil<IvrSceneFlow>(IvrSceneFlow.class);
util.exportExcel(response, list, "AI澶栧懠娴佺▼鏁版嵁");
@@ -64,8 +64,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrflow:query')")
@GetMapping(value = "/{flowid}")
- public AjaxResult getInfo(@PathVariable("flowid") Long flowid)
- {
+ public AjaxResult getInfo(@PathVariable("flowid") Long flowid) {
return success(ivrSceneFlowService.selectIvrSceneFlowByFlowid(flowid));
}
@@ -74,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrflow:add')")
@Log(title = "AI澶栧懠娴佺▼", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrSceneFlow ivrSceneFlow)
- {
+ public AjaxResult add(@RequestBody IvrSceneFlow ivrSceneFlow) {
return toAjax(ivrSceneFlowService.insertIvrSceneFlow(ivrSceneFlow));
}
@@ -85,9 +84,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrflow:edit')")
@Log(title = "AI澶栧懠娴佺▼", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrSceneFlow ivrSceneFlow)
- {
+ public AjaxResult edit(@RequestBody IvrSceneFlow ivrSceneFlow) {
return toAjax(ivrSceneFlowService.updateIvrSceneFlow(ivrSceneFlow));
}
@@ -96,9 +95,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrflow:remove')")
@Log(title = "AI澶栧懠娴佺▼", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{flowids}")
- public AjaxResult remove(@PathVariable Long[] flowids)
- {
+ @GetMapping("/remove/{flowids}")
+ public AjaxResult remove(@PathVariable Long[] flowids) {
return toAjax(ivrSceneFlowService.deleteIvrSceneFlowByFlowids(flowids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodeController.java
index 8b9854e..9325510 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodeController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +40,8 @@
* 鏌ヨAI澶栧懠娴佺▼鑺傜偣鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrflownode:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody IvrSceneFlownode ivrSceneFlownode)
{
startPage();
@@ -74,7 +77,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrflownode:add')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneFlownode ivrSceneFlownode)
{
return toAjax(ivrSceneFlownodeService.insertIvrSceneFlownode(ivrSceneFlownode));
@@ -85,7 +89,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrflownode:edit')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneFlownode ivrSceneFlownode)
{
return toAjax(ivrSceneFlownodeService.updateIvrSceneFlownode(ivrSceneFlownode));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodebranchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodebranchController.java
index d58a9dc..8632bfc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodebranchController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodebranchController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +25,13 @@
/**
* AI澶栧懠娴佺▼鑺傜偣鍒嗘敮Controller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@RestController
@RequestMapping("/smartor/ivrflownodebranch")
-public class IvrSceneFlownodebranchController extends BaseController
-{
+public class IvrSceneFlownodebranchController extends BaseController {
@Autowired
private IIvrSceneFlownodebranchService ivrSceneFlownodebranchService;
@@ -38,9 +39,9 @@
* 鏌ヨAI澶栧懠娴佺▼鑺傜偣鍒嗘敮鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrSceneFlownodebranch ivrSceneFlownodebranch)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrSceneFlownodebranch ivrSceneFlownodebranch) {
startPage();
List<IvrSceneFlownodebranch> list = ivrSceneFlownodebranchService.selectIvrSceneFlownodebranchList(ivrSceneFlownodebranch);
return getDataTable(list);
@@ -52,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:export')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣鍒嗘敮", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrSceneFlownodebranch ivrSceneFlownodebranch)
- {
+ public void export(HttpServletResponse response, IvrSceneFlownodebranch ivrSceneFlownodebranch) {
List<IvrSceneFlownodebranch> list = ivrSceneFlownodebranchService.selectIvrSceneFlownodebranchList(ivrSceneFlownodebranch);
ExcelUtil<IvrSceneFlownodebranch> util = new ExcelUtil<IvrSceneFlownodebranch>(IvrSceneFlownodebranch.class);
util.exportExcel(response, list, "AI澶栧懠娴佺▼鑺傜偣鍒嗘敮鏁版嵁");
@@ -64,8 +64,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:query')")
@GetMapping(value = "/{branchid}")
- public AjaxResult getInfo(@PathVariable("branchid") Long branchid)
- {
+ public AjaxResult getInfo(@PathVariable("branchid") Long branchid) {
return success(ivrSceneFlownodebranchService.selectIvrSceneFlownodebranchByBranchid(branchid));
}
@@ -74,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:add')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣鍒嗘敮", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrSceneFlownodebranch ivrSceneFlownodebranch)
- {
+ public AjaxResult add(@RequestBody IvrSceneFlownodebranch ivrSceneFlownodebranch) {
return toAjax(ivrSceneFlownodebranchService.insertIvrSceneFlownodebranch(ivrSceneFlownodebranch));
}
@@ -85,9 +84,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:edit')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣鍒嗘敮", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrSceneFlownodebranch ivrSceneFlownodebranch)
- {
+ public AjaxResult edit(@RequestBody IvrSceneFlownodebranch ivrSceneFlownodebranch) {
return toAjax(ivrSceneFlownodebranchService.updateIvrSceneFlownodebranch(ivrSceneFlownodebranch));
}
@@ -96,9 +95,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:remove')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣鍒嗘敮", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{branchids}")
- public AjaxResult remove(@PathVariable Long[] branchids)
- {
+ @GetMapping("/remove/{branchids}")
+ public AjaxResult remove(@PathVariable Long[] branchids) {
return toAjax(ivrSceneFlownodebranchService.deleteIvrSceneFlownodebranchByBranchids(branchids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneGlobalconfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneGlobalconfigController.java
index bd6126e..7aaff74 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneGlobalconfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneGlobalconfigController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +25,13 @@
/**
* AI澶栧懠鍏ㄥ眬閰嶇疆Controller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@RestController
@RequestMapping("/smartor/ivrglobalconfig")
-public class IvrSceneGlobalconfigController extends BaseController
-{
+public class IvrSceneGlobalconfigController extends BaseController {
@Autowired
private IIvrSceneGlobalconfigService ivrSceneGlobalconfigService;
@@ -38,9 +39,9 @@
* 鏌ヨAI澶栧懠鍏ㄥ眬閰嶇疆鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrSceneGlobalconfig ivrSceneGlobalconfig)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrSceneGlobalconfig ivrSceneGlobalconfig) {
startPage();
List<IvrSceneGlobalconfig> list = ivrSceneGlobalconfigService.selectIvrSceneGlobalconfigList(ivrSceneGlobalconfig);
return getDataTable(list);
@@ -52,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:export')")
@Log(title = "AI澶栧懠鍏ㄥ眬閰嶇疆", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrSceneGlobalconfig ivrSceneGlobalconfig)
- {
+ public void export(HttpServletResponse response, IvrSceneGlobalconfig ivrSceneGlobalconfig) {
List<IvrSceneGlobalconfig> list = ivrSceneGlobalconfigService.selectIvrSceneGlobalconfigList(ivrSceneGlobalconfig);
ExcelUtil<IvrSceneGlobalconfig> util = new ExcelUtil<IvrSceneGlobalconfig>(IvrSceneGlobalconfig.class);
util.exportExcel(response, list, "AI澶栧懠鍏ㄥ眬閰嶇疆鏁版嵁");
@@ -64,8 +64,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:query')")
@GetMapping(value = "/{gblconfigid}")
- public AjaxResult getInfo(@PathVariable("gblconfigid") Long gblconfigid)
- {
+ public AjaxResult getInfo(@PathVariable("gblconfigid") Long gblconfigid) {
return success(ivrSceneGlobalconfigService.selectIvrSceneGlobalconfigByGblconfigid(gblconfigid));
}
@@ -74,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:add')")
@Log(title = "AI澶栧懠鍏ㄥ眬閰嶇疆", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrSceneGlobalconfig ivrSceneGlobalconfig)
- {
+ public AjaxResult add(@RequestBody IvrSceneGlobalconfig ivrSceneGlobalconfig) {
return toAjax(ivrSceneGlobalconfigService.insertIvrSceneGlobalconfig(ivrSceneGlobalconfig));
}
@@ -85,9 +84,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:edit')")
@Log(title = "AI澶栧懠鍏ㄥ眬閰嶇疆", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrSceneGlobalconfig ivrSceneGlobalconfig)
- {
+ public AjaxResult edit(@RequestBody IvrSceneGlobalconfig ivrSceneGlobalconfig) {
return toAjax(ivrSceneGlobalconfigService.updateIvrSceneGlobalconfig(ivrSceneGlobalconfig));
}
@@ -96,9 +95,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:remove')")
@Log(title = "AI澶栧懠鍏ㄥ眬閰嶇疆", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{gblconfigids}")
- public AjaxResult remove(@PathVariable Long[] gblconfigids)
- {
+ @GetMapping("/remove/{gblconfigids}")
+ public AjaxResult remove(@PathVariable Long[] gblconfigids) {
return toAjax(ivrSceneGlobalconfigService.deleteIvrSceneGlobalconfigByGblconfigids(gblconfigids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneIntentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneIntentController.java
index ff35d96..5ea737e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneIntentController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneIntentController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +25,13 @@
/**
* AI澶栧懠鎰忓浘Controller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@RestController
@RequestMapping("/smartor/ivrintent")
-public class IvrSceneIntentController extends BaseController
-{
+public class IvrSceneIntentController extends BaseController {
@Autowired
private IIvrSceneIntentService ivrSceneIntentService;
@@ -38,9 +39,9 @@
* 鏌ヨAI澶栧懠鎰忓浘鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrintent:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrSceneIntent ivrSceneIntent)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrSceneIntent ivrSceneIntent) {
startPage();
List<IvrSceneIntent> list = ivrSceneIntentService.selectIvrSceneIntentList(ivrSceneIntent);
return getDataTable(list);
@@ -52,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrintent:export')")
@Log(title = "AI澶栧懠鎰忓浘", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrSceneIntent ivrSceneIntent)
- {
+ public void export(HttpServletResponse response, IvrSceneIntent ivrSceneIntent) {
List<IvrSceneIntent> list = ivrSceneIntentService.selectIvrSceneIntentList(ivrSceneIntent);
ExcelUtil<IvrSceneIntent> util = new ExcelUtil<IvrSceneIntent>(IvrSceneIntent.class);
util.exportExcel(response, list, "AI澶栧懠鎰忓浘鏁版嵁");
@@ -64,8 +64,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrintent:query')")
@GetMapping(value = "/{sceneintentid}")
- public AjaxResult getInfo(@PathVariable("sceneintentid") Long sceneintentid)
- {
+ public AjaxResult getInfo(@PathVariable("sceneintentid") Long sceneintentid) {
return success(ivrSceneIntentService.selectIvrSceneIntentBySceneintentid(sceneintentid));
}
@@ -74,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrintent:add')")
@Log(title = "AI澶栧懠鎰忓浘", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrSceneIntent ivrSceneIntent)
- {
+ public AjaxResult add(@RequestBody IvrSceneIntent ivrSceneIntent) {
return toAjax(ivrSceneIntentService.insertIvrSceneIntent(ivrSceneIntent));
}
@@ -85,9 +84,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrintent:edit')")
@Log(title = "AI澶栧懠鎰忓浘", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrSceneIntent ivrSceneIntent)
- {
+ public AjaxResult edit(@RequestBody IvrSceneIntent ivrSceneIntent) {
return toAjax(ivrSceneIntentService.updateIvrSceneIntent(ivrSceneIntent));
}
@@ -96,9 +95,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrintent:remove')")
@Log(title = "AI澶栧懠鎰忓浘", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{sceneintentids}")
- public AjaxResult remove(@PathVariable Long[] sceneintentids)
- {
+ @GetMapping("/remove/{sceneintentids}")
+ public AjaxResult remove(@PathVariable Long[] sceneintentids) {
return toAjax(ivrSceneIntentService.deleteIvrSceneIntentBySceneintentids(sceneintentids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneRecallController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneRecallController.java
index b520448..e0bf4df 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneRecallController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneRecallController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -29,8 +31,7 @@
*/
@RestController
@RequestMapping("/smartor/ivrrecall")
-public class IvrSceneRecallController extends BaseController
-{
+public class IvrSceneRecallController extends BaseController {
@Autowired
private IIvrSceneRecallService ivrSceneRecallService;
@@ -38,9 +39,9 @@
* 鏌ヨAI澶栧懠閲嶆嫧閰嶇疆鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrSceneRecall ivrSceneRecall)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrSceneRecall ivrSceneRecall) {
startPage();
List<IvrSceneRecall> list = ivrSceneRecallService.selectIvrSceneRecallList(ivrSceneRecall);
return getDataTable(list);
@@ -52,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:export')")
@Log(title = "AI澶栧懠閲嶆嫧閰嶇疆", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrSceneRecall ivrSceneRecall)
- {
+ public void export(HttpServletResponse response, IvrSceneRecall ivrSceneRecall) {
List<IvrSceneRecall> list = ivrSceneRecallService.selectIvrSceneRecallList(ivrSceneRecall);
ExcelUtil<IvrSceneRecall> util = new ExcelUtil<IvrSceneRecall>(IvrSceneRecall.class);
util.exportExcel(response, list, "AI澶栧懠閲嶆嫧閰嶇疆鏁版嵁");
@@ -64,8 +64,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:query')")
@GetMapping(value = "/{recallid}")
- public AjaxResult getInfo(@PathVariable("recallid") Long recallid)
- {
+ public AjaxResult getInfo(@PathVariable("recallid") Long recallid) {
return success(ivrSceneRecallService.selectIvrSceneRecallByRecallid(recallid));
}
@@ -74,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:add')")
@Log(title = "AI澶栧懠閲嶆嫧閰嶇疆", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrSceneRecall ivrSceneRecall)
- {
+ public AjaxResult add(@RequestBody IvrSceneRecall ivrSceneRecall) {
return toAjax(ivrSceneRecallService.insertIvrSceneRecall(ivrSceneRecall));
}
@@ -85,9 +84,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:edit')")
@Log(title = "AI澶栧懠閲嶆嫧閰嶇疆", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrSceneRecall ivrSceneRecall)
- {
+ public AjaxResult edit(@RequestBody IvrSceneRecall ivrSceneRecall) {
return toAjax(ivrSceneRecallService.updateIvrSceneRecall(ivrSceneRecall));
}
@@ -96,9 +95,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:remove')")
@Log(title = "AI澶栧懠閲嶆嫧閰嶇疆", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{recallids}")
- public AjaxResult remove(@PathVariable Long[] recallids)
- {
+ @GetMapping("/remove/{recallids}")
+ public AjaxResult remove(@PathVariable Long[] recallids) {
return toAjax(ivrSceneRecallService.deleteIvrSceneRecallByRecallids(recallids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptController.java
index 9010c56..bdf5ef2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +25,13 @@
/**
* AI澶栧懠璇濇湳Controller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@RestController
@RequestMapping("/smartor/ivrscript")
-public class IvrSceneScriptController extends BaseController
-{
+public class IvrSceneScriptController extends BaseController {
@Autowired
private IIvrSceneScriptService ivrSceneScriptService;
@@ -38,9 +39,9 @@
* 鏌ヨAI澶栧懠璇濇湳鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscript:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrSceneScript ivrSceneScript)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrSceneScript ivrSceneScript) {
startPage();
List<IvrSceneScript> list = ivrSceneScriptService.selectIvrSceneScriptList(ivrSceneScript);
return getDataTable(list);
@@ -52,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrscript:export')")
@Log(title = "AI澶栧懠璇濇湳", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrSceneScript ivrSceneScript)
- {
+ public void export(HttpServletResponse response, IvrSceneScript ivrSceneScript) {
List<IvrSceneScript> list = ivrSceneScriptService.selectIvrSceneScriptList(ivrSceneScript);
ExcelUtil<IvrSceneScript> util = new ExcelUtil<IvrSceneScript>(IvrSceneScript.class);
util.exportExcel(response, list, "AI澶栧懠璇濇湳鏁版嵁");
@@ -64,8 +64,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscript:query')")
@GetMapping(value = "/{scenescrid}")
- public AjaxResult getInfo(@PathVariable("scenescrid") Long scenescrid)
- {
+ public AjaxResult getInfo(@PathVariable("scenescrid") Long scenescrid) {
return success(ivrSceneScriptService.selectIvrSceneScriptByScenescrid(scenescrid));
}
@@ -74,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscript:add')")
@Log(title = "AI澶栧懠璇濇湳", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrSceneScript ivrSceneScript)
- {
+ public AjaxResult add(@RequestBody IvrSceneScript ivrSceneScript) {
return toAjax(ivrSceneScriptService.insertIvrSceneScript(ivrSceneScript));
}
@@ -85,9 +84,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscript:edit')")
@Log(title = "AI澶栧懠璇濇湳", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrSceneScript ivrSceneScript)
- {
+ public AjaxResult edit(@RequestBody IvrSceneScript ivrSceneScript) {
return toAjax(ivrSceneScriptService.updateIvrSceneScript(ivrSceneScript));
}
@@ -96,9 +95,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscript:remove')")
@Log(title = "AI澶栧懠璇濇湳", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{scenescrids}")
- public AjaxResult remove(@PathVariable Long[] scenescrids)
- {
+ @GetMapping("/remove/{scenescrids}")
+ public AjaxResult remove(@PathVariable Long[] scenescrids) {
return toAjax(ivrSceneScriptService.deleteIvrSceneScriptByScenescrids(scenescrids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptmodelController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptmodelController.java
index c1881a5..e1d7177 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptmodelController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptmodelController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +25,13 @@
/**
* AI澶栧懠璇濇湳妯″潡Controller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@RestController
@RequestMapping("/smartor/ivrscriptmodel")
-public class IvrSceneScriptmodelController extends BaseController
-{
+public class IvrSceneScriptmodelController extends BaseController {
@Autowired
private IIvrSceneScriptmodelService ivrSceneScriptmodelService;
@@ -38,9 +39,9 @@
* 鏌ヨAI澶栧懠璇濇湳妯″潡鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrSceneScriptmodel ivrSceneScriptmodel)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrSceneScriptmodel ivrSceneScriptmodel) {
startPage();
List<IvrSceneScriptmodel> list = ivrSceneScriptmodelService.selectIvrSceneScriptmodelList(ivrSceneScriptmodel);
return getDataTable(list);
@@ -52,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:export')")
@Log(title = "AI澶栧懠璇濇湳妯″潡", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrSceneScriptmodel ivrSceneScriptmodel)
- {
+ public void export(HttpServletResponse response, IvrSceneScriptmodel ivrSceneScriptmodel) {
List<IvrSceneScriptmodel> list = ivrSceneScriptmodelService.selectIvrSceneScriptmodelList(ivrSceneScriptmodel);
ExcelUtil<IvrSceneScriptmodel> util = new ExcelUtil<IvrSceneScriptmodel>(IvrSceneScriptmodel.class);
util.exportExcel(response, list, "AI澶栧懠璇濇湳妯″潡鏁版嵁");
@@ -64,8 +64,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:query')")
@GetMapping(value = "/{scenemodid}")
- public AjaxResult getInfo(@PathVariable("scenemodid") Long scenemodid)
- {
+ public AjaxResult getInfo(@PathVariable("scenemodid") Long scenemodid) {
return success(ivrSceneScriptmodelService.selectIvrSceneScriptmodelByScenemodid(scenemodid));
}
@@ -74,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:add')")
@Log(title = "AI澶栧懠璇濇湳妯″潡", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrSceneScriptmodel ivrSceneScriptmodel)
- {
+ public AjaxResult add(@RequestBody IvrSceneScriptmodel ivrSceneScriptmodel) {
return toAjax(ivrSceneScriptmodelService.insertIvrSceneScriptmodel(ivrSceneScriptmodel));
}
@@ -85,9 +84,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:edit')")
@Log(title = "AI澶栧懠璇濇湳妯″潡", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrSceneScriptmodel ivrSceneScriptmodel)
- {
+ public AjaxResult edit(@RequestBody IvrSceneScriptmodel ivrSceneScriptmodel) {
return toAjax(ivrSceneScriptmodelService.updateIvrSceneScriptmodel(ivrSceneScriptmodel));
}
@@ -96,9 +95,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:remove')")
@Log(title = "AI澶栧懠璇濇湳妯″潡", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{scenemodids}")
- public AjaxResult remove(@PathVariable Long[] scenemodids)
- {
+ @GetMapping("/remove/{scenemodids}")
+ public AjaxResult remove(@PathVariable Long[] scenemodids) {
return toAjax(ivrSceneScriptmodelService.deleteIvrSceneScriptmodelByScenemodids(scenemodids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrScenecategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrScenecategoryController.java
index 18d1230..1ccf382 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrScenecategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrScenecategoryController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +40,8 @@
* 鏌ヨAI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody IvrScenecategory ivrScenecategory) {
startPage();
List<IvrScenecategory> list = ivrScenecategoryService.selectIvrScenecategoryList(ivrScenecategory);
@@ -72,6 +74,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:add')")
@Log(title = "AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrScenecategory ivrScenecategory) {
SysUser user = getLoginUser().getUser();
@@ -84,6 +87,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:edit')")
@Log(title = "AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrScenecategory ivrScenecategory) {
return toAjax(ivrScenecategoryService.updateIvrScenecategory(ivrScenecategory));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java
index 6d36944..eb3f540 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -40,7 +41,8 @@
*/
@ApiOperation("鏌ヨ璇煶浠诲姟妯℃澘搴撳垪琛�")
//@PreAuthorize("@ss.hasPermi('system:template:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody IvrTaskTemplate ivrTaskTemplate) {
startPage();
List<IvrTaskTemplate> list = ivrTaskTemplateService.selectIvrTaskTemplateList(ivrTaskTemplate);
@@ -68,6 +70,7 @@
public AjaxResult getInfo(@PathVariable("ID") Long ID) {
return success(ivrTaskTemplateService.selectIvrTaskTemplateByID(ID));
}
+
/**
* 鑾峰彇闅忚浠诲姟闅忚妯℃澘搴撹缁嗕俊鎭�
*/
@@ -83,6 +86,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:template:add')")
@ApiOperation("鏂板璇煶浠诲姟妯℃澘搴�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrTaskTemplate ivrTaskTemplate) {
SysUser user = getLoginUser().getUser();
@@ -107,6 +111,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:template:edit')")
@ApiOperation("淇敼璇煶浠诲姟妯℃澘搴�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTaskTemplate ivrTaskTemplate) {
return toAjax(ivrTaskTemplateService.updateIvrTaskTemplate(ivrTaskTemplate));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateScriptController.java
index cae4836..9ed60b6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateScriptController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -27,8 +28,7 @@
@Api(description = "闅忚浠诲姟妯＄増闂璇濇湳搴揅ontroller")
@RestController
@RequestMapping("/smartor/taskTemplateScript")
-public class IvrTaskTemplateScriptController extends BaseController
-{
+public class IvrTaskTemplateScriptController extends BaseController {
@Autowired
private IIvrTaskTemplateScriptService ivrTaskTemplateScriptService;
@@ -37,9 +37,9 @@
*/
@ApiOperation("鏌ヨ闅忚浠诲姟妯＄増闂璇濇湳搴撳垪琛�")
//@PreAuthorize("@ss.hasPermi('system:script:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrTaskTemplateScript ivrTaskTemplateScript)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrTaskTemplateScript ivrTaskTemplateScript) {
startPage();
List<IvrTaskTemplateScript> list = ivrTaskTemplateScriptService.selectIvrTaskTemplateScriptList(ivrTaskTemplateScript);
return getDataTable(list);
@@ -52,8 +52,7 @@
//@PreAuthorize("@ss.hasPermi('system:script:export')")
@Log(title = "闅忚浠诲姟妯＄増闂璇濇湳搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrTaskTemplateScript ivrTaskTemplateScript)
- {
+ public void export(HttpServletResponse response, IvrTaskTemplateScript ivrTaskTemplateScript) {
List<IvrTaskTemplateScript> list = ivrTaskTemplateScriptService.selectIvrTaskTemplateScriptList(ivrTaskTemplateScript);
ExcelUtil<IvrTaskTemplateScript> util = new ExcelUtil<IvrTaskTemplateScript>(IvrTaskTemplateScript.class);
util.exportExcel(response, list, "闅忚浠诲姟妯＄増闂璇濇湳搴撴暟鎹�");
@@ -65,8 +64,7 @@
@ApiOperation("鑾峰彇闅忚浠诲姟妯＄増闂璇濇湳搴撹缁嗕俊鎭�")
//@PreAuthorize("@ss.hasPermi('system:script:query')")
@GetMapping(value = "/getInfo/{ID}")
- public AjaxResult getInfo(@PathVariable("ID") Long ID)
- {
+ public AjaxResult getInfo(@PathVariable("ID") Long ID) {
return success(ivrTaskTemplateScriptService.selectIvrTaskTemplateScriptByID(ID));
}
@@ -75,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('system:script:add')")
@ApiOperation("鏂板闅忚浠诲姟妯＄増闂璇濇湳搴�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrTaskTemplateScript ivrTaskTemplateScript)
- {
+ public AjaxResult add(@RequestBody IvrTaskTemplateScript ivrTaskTemplateScript) {
SysUser user = getLoginUser().getUser();
ivrTaskTemplateScript.setOrgid(user.getOrgid());
return toAjax(ivrTaskTemplateScriptService.insertIvrTaskTemplateScript(ivrTaskTemplateScript));
@@ -88,9 +86,9 @@
*/
//@PreAuthorize("@ss.hasPermi('system:script:edit')")
@ApiOperation("淇敼闅忚浠诲姟妯＄増闂璇濇湳搴�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrTaskTemplateScript ivrTaskTemplateScript)
- {
+ public AjaxResult edit(@RequestBody IvrTaskTemplateScript ivrTaskTemplateScript) {
return toAjax(ivrTaskTemplateScriptService.updateIvrTaskTemplateScript(ivrTaskTemplateScript));
}
@@ -99,9 +97,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:script:remove')")
@ApiOperation("鍒犻櫎闅忚浠诲姟妯＄増闂璇濇湳搴�")
- @GetMapping("/remove/{IDs}")
- public AjaxResult remove(@PathVariable Long[] IDs)
- {
+ @GetMapping("/remove/{IDs}")
+ public AjaxResult remove(@PathVariable Long[] IDs) {
return toAjax(ivrTaskTemplateScriptService.deleteIvrTaskTemplateScriptByIDs(IDs));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateTargetoptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateTargetoptionController.java
index 94ad6bf..f407839 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateTargetoptionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateTargetoptionController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,7 +37,8 @@
*/
@ApiOperation("鏌ヨ闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴撳垪琛�")
//@PreAuthorize("@ss.hasPermi('system:targetoption:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption) {
startPage();
List<IvrTaskTemplateTargetoption> list = ivrTaskTemplateTargetoptionService.selectIvrTaskTemplateTargetoptionList(ivrTaskTemplateTargetoption);
@@ -70,6 +72,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:add')")
@ApiOperation("鏂板闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption) {
SysUser user = getLoginUser().getUser();
@@ -82,6 +85,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
@ApiOperation("淇敼闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption) {
return toAjax(ivrTaskTemplateTargetoptionService.updateIvrTaskTemplateTargetoption(ivrTaskTemplateTargetoption));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskVisitResultController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskVisitResultController.java
index 410b981..c41bfa0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskVisitResultController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskVisitResultController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -37,7 +38,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呴殢璁夸俊鎭�")
//@PreAuthorize("@ss.hasPermi('system:result:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(IvrTaskVisitResult ivrTaskVisitResult) {
startPage();
List<IvrTaskVisitResult> list = ivrTaskVisitResultService.selectIvrTaskVisitResultList(ivrTaskVisitResult);
@@ -73,6 +75,7 @@
@ApiOperation("鏂板浠诲姟闅忚缁撴灉")
//@PreAuthorize("@ss.hasPermi('system:result:add')")
@Log(title = "浠诲姟闅忚缁撴灉", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrTaskVisitResult ivrTaskVisitResult) {
return toAjax(ivrTaskVisitResultService.insertIvrTaskVisitResult(ivrTaskVisitResult));
@@ -84,6 +87,7 @@
@ApiOperation("淇敼浠诲姟闅忚缁撴灉")
//@PreAuthorize("@ss.hasPermi('system:result:edit')")
@Log(title = "浠诲姟闅忚缁撴灉", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTaskVisitResult ivrTaskVisitResult) {
return toAjax(ivrTaskVisitResultService.updateIvrTaskVisitResult(ivrTaskVisitResult));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallrecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallrecordController.java
index ed6609f..52509f8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallrecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallrecordController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -29,8 +31,7 @@
*/
@RestController
@RequestMapping("/smartor/ivrtaskcallrecord")
-public class IvrTaskcallrecordController extends BaseController
-{
+public class IvrTaskcallrecordController extends BaseController {
@Autowired
private IIvrTaskcallrecordService ivrTaskcallrecordService;
@@ -38,9 +39,9 @@
* 鏌ヨ璇煶浠诲姟鍛煎彨璁板綍鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrTaskcallrecord ivrTaskcallrecord)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrTaskcallrecord ivrTaskcallrecord) {
startPage();
List<IvrTaskcallrecord> list = ivrTaskcallrecordService.selectIvrTaskcallrecordList(ivrTaskcallrecord);
return getDataTable(list);
@@ -52,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:export')")
@Log(title = "璇煶浠诲姟鍛煎彨璁板綍", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrTaskcallrecord ivrTaskcallrecord)
- {
+ public void export(HttpServletResponse response, IvrTaskcallrecord ivrTaskcallrecord) {
List<IvrTaskcallrecord> list = ivrTaskcallrecordService.selectIvrTaskcallrecordList(ivrTaskcallrecord);
ExcelUtil<IvrTaskcallrecord> util = new ExcelUtil<IvrTaskcallrecord>(IvrTaskcallrecord.class);
util.exportExcel(response, list, "璇煶浠诲姟鍛煎彨璁板綍鏁版嵁");
@@ -64,8 +64,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:query')")
@GetMapping(value = "/{uuid}")
- public AjaxResult getInfo(@PathVariable("uuid") String uuid)
- {
+ public AjaxResult getInfo(@PathVariable("uuid") String uuid) {
return success(ivrTaskcallrecordService.selectIvrTaskcallrecordByUuid(uuid));
}
@@ -74,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:add')")
@Log(title = "璇煶浠诲姟鍛煎彨璁板綍", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrTaskcallrecord ivrTaskcallrecord)
- {
+ public AjaxResult add(@RequestBody IvrTaskcallrecord ivrTaskcallrecord) {
return toAjax(ivrTaskcallrecordService.insertIvrTaskcallrecord(ivrTaskcallrecord));
}
@@ -85,9 +84,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:edit')")
@Log(title = "璇煶浠诲姟鍛煎彨璁板綍", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrTaskcallrecord ivrTaskcallrecord)
- {
+ public AjaxResult edit(@RequestBody IvrTaskcallrecord ivrTaskcallrecord) {
return toAjax(ivrTaskcallrecordService.updateIvrTaskcallrecord(ivrTaskcallrecord));
}
@@ -96,9 +95,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:remove')")
@Log(title = "璇煶浠诲姟鍛煎彨璁板綍", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{uuids}")
- public AjaxResult remove(@PathVariable String[] uuids)
- {
+ @GetMapping("/remove/{uuids}")
+ public AjaxResult remove(@PathVariable String[] uuids) {
return toAjax(ivrTaskcallrecordService.deleteIvrTaskcallrecordByUuids(uuids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTasksmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTasksmsController.java
index 8d4f149..304eb62 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTasksmsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTasksmsController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +25,13 @@
/**
* 璇煶浠诲姟鐭俊Controller
- *
+ *
* @author smartor
* @date 2023-03-24
*/
@RestController
@RequestMapping("/smartor/ivrtasksms")
-public class IvrTasksmsController extends BaseController
-{
+public class IvrTasksmsController extends BaseController {
@Autowired
private IIvrTasksmsService ivrTasksmsService;
@@ -38,9 +39,9 @@
* 鏌ヨ璇煶浠诲姟鐭俊鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody IvrTasksms ivrTasksms)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody IvrTasksms ivrTasksms) {
startPage();
List<IvrTasksms> list = ivrTasksmsService.selectIvrTasksmsList(ivrTasksms);
return getDataTable(list);
@@ -52,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:export')")
@Log(title = "璇煶浠诲姟鐭俊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrTasksms ivrTasksms)
- {
+ public void export(HttpServletResponse response, IvrTasksms ivrTasksms) {
List<IvrTasksms> list = ivrTasksmsService.selectIvrTasksmsList(ivrTasksms);
ExcelUtil<IvrTasksms> util = new ExcelUtil<IvrTasksms>(IvrTasksms.class);
util.exportExcel(response, list, "璇煶浠诲姟鐭俊鏁版嵁");
@@ -64,8 +64,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(ivrTasksmsService.selectIvrTasksmsById(id));
}
@@ -74,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:add')")
@Log(title = "璇煶浠诲姟鐭俊", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrTasksms ivrTasksms)
- {
+ public AjaxResult add(@RequestBody IvrTasksms ivrTasksms) {
return toAjax(ivrTasksmsService.insertIvrTasksms(ivrTasksms));
}
@@ -85,9 +84,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:edit')")
@Log(title = "璇煶浠诲姟鐭俊", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrTasksms ivrTasksms)
- {
+ public AjaxResult edit(@RequestBody IvrTasksms ivrTasksms) {
return toAjax(ivrTasksmsService.updateIvrTasksms(ivrTasksms));
}
@@ -96,9 +95,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:remove')")
@Log(title = "璇煶浠诲姟鐭俊", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(ivrTasksmsService.deleteIvrTasksmsByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java
index 8d19c8b..493cb8b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;
import cn.hutool.db.Page;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,10 +37,11 @@
* 鏌ヨ鐥呭彶鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('system:history:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectMedicalHistoryList")
@ApiOperation("鏌ヨ鐥呭彶鍒楄〃")
- public TableDataInfo selectMedicalHistorylist(@RequestBody MedicalHistory medicalHistory) {
- PageUtils.startPageByPost(medicalHistory.getPageNum(),medicalHistory.getPageSize());
+ public TableDataInfo selectMedicalHistorylist(@RequestBody MedicalHistory medicalHistory) {
+ PageUtils.startPageByPost(medicalHistory.getPageNum(), medicalHistory.getPageSize());
List<MedicalHistory> list = medicalHistoryService.selectMedicalHistoryList(medicalHistory);
return getDataTable(list);
}
@@ -63,7 +65,7 @@
//@PreAuthorize("@ss.hasPermi('system:history:query')")
@ApiOperation("鑾峰彇鐥呭彶璇︾粏淇℃伅")
@GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id,@PathVariable("pid") Long pid) {
+ public AjaxResult getInfo(@PathVariable("id") Long id, @PathVariable("pid") Long pid) {
return success(medicalHistoryService.selectMedicalHistoryById(id));
}
@@ -73,6 +75,7 @@
//@PreAuthorize("@ss.hasPermi('system:history:add')")
@Log(title = "鐥呭彶", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鐥呭彶")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody MedicalHistory medicalHistory) {
medicalHistory.setOrgid(getOrgid());
@@ -85,6 +88,7 @@
//@PreAuthorize("@ss.hasPermi('system:history:edit')")
@Log(title = "鐥呭彶", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼鐥呭彶")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody MedicalHistory medicalHistory) {
return toAjax(medicalHistoryService.updateMedicalHistory(medicalHistory));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MinioFileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MinioFileController.java
index bf5e09f..85cdde8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MinioFileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MinioFileController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -37,7 +38,8 @@
* 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
//@PreAuthorize("@ss.hasPermi('system:file:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody MinioFile minioFile) {
startPage();
List<MinioFile> list = minioFileService.selectMinioFileList(minioFile);
@@ -70,6 +72,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:file:add')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody MinioFile minioFile) {
return toAjax(minioFileService.insertMinioFile(minioFile));
@@ -80,6 +83,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:file:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody MinioFile minioFile) {
return toAjax(minioFileService.updateMinioFile(minioFile));
@@ -106,7 +110,7 @@
@ResponseBody
@ApiOperation(value = "涓婁紶鏂囦欢鍒版枃浠剁鐞�,鏀寔鎵归噺涓婁紶")
@ApiImplicitParam(name = "files", value = "鏂囦欢瀵硅薄", dataType = "File")
- public AjaxResult commonUploadFile(@RequestParam(value = "path",required = false) String path, @RequestParam("files") List<MultipartFile> files) {
+ public AjaxResult commonUploadFile(@RequestParam(value = "path", required = false) String path, @RequestParam("files") List<MultipartFile> files) {
if (CollectionUtils.isEmpty(files)) {
return error("鏈�夋嫨鏂囦欢锛�");
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
index a5318fe..9107aa3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.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.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
@@ -50,7 +51,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呮。妗堝垪琛�")
//@PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody PatArchive patArchive) {
PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
@@ -87,6 +89,7 @@
@ApiOperation("鏂板鎮ｈ�呮。妗�")
//@PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
@Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatArchive patArchive) {
return toAjax(patArchiveService.insertPatArchive(patArchive));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java
index a121469..9861cb7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.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.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -40,7 +41,8 @@
* 鏌ヨExcel瀵煎叆鎮ｈ�呮。妗堝垪琛�
*/
@ApiOperation("鏌ヨExcel瀵煎叆鎮ｈ�呮。妗堝垪琛�")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody PatArchiveImport patArchiveImport) {
PageUtils.startPageByPost(patArchiveImport.getPageNum(), patArchiveImport.getPageSize());
List<PatArchiveImport> list = patArchiveImportService.selectPatArchiveImportList(patArchiveImport);
@@ -71,6 +73,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:import:add')")
@Log(title = "Excel瀵煎叆鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatArchiveImport patArchiveImport) {
SysUser user = getLoginUser().getUser();
@@ -84,6 +87,7 @@
@ApiOperation("淇敼Excel瀵煎叆鎮ｈ�呮。妗�")
//@PreAuthorize("@ss.hasPermi('smartor:import:edit')")
@Log(title = "Excel瀵煎叆鎮ｈ�呮。妗�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatArchiveImport patArchiveImport) {
return toAjax(patArchiveImportService.updatePatArchiveImport(patArchiveImport));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveOutController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveOutController.java
index 40cfdae..3fcdc7f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveOutController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveOutController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -32,7 +33,8 @@
* 鏌ヨ澶栭儴鎮ｈ�呮。妗堝垪琛�
*/
@ApiOperation("鏌ヨ澶栭儴鎮ｈ�呮。妗堝垪琛�")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(PatArchiveOut patArchiveOut) {
startPage();
List<PatArchiveOut> list = patArchiveOutService.selectPatArchiveOutList(patArchiveOut);
@@ -63,6 +65,7 @@
* 鏂板澶栭儴鎮ｈ�呮。妗�
*/
@ApiOperation("鏂板澶栭儴鎮ｈ�呮。妗�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatArchiveOut patArchiveOut) {
SysUser user = getLoginUser().getUser();
@@ -74,6 +77,7 @@
* 淇敼澶栭儴鎮ｈ�呮。妗�
*/
@ApiOperation("淇敼澶栭儴鎮ｈ�呮。妗�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatArchiveOut patArchiveOut) {
return toAjax(patArchiveOutService.updatePatArchiveOut(patArchiveOut));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivecontactController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivecontactController.java
index a02114c..46438fc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivecontactController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivecontactController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -37,6 +38,7 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�")
//@PreAuthorize("@ss.hasPermi('system:archivecontact:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectPatArchivecontactList")
public TableDataInfo selectPatArchivecontactlist(@RequestBody PatArchivecontact patArchivecontact) {
PageUtils.startPageByPost(patArchivecontact.getPageNum(), patArchivecontact.getPageSize());
@@ -73,6 +75,7 @@
@ApiOperation("鏂板鎮ｈ�呰仈绯绘柟寮�")
//@PreAuthorize("@ss.hasPermi('system:archivecontact:add')")
@Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatArchivecontact patArchivecontact) {
SysUser user = getLoginUser().getUser();
@@ -86,6 +89,7 @@
@ApiOperation("淇敼鎮ｈ�呰仈绯绘柟寮�")
//@PreAuthorize("@ss.hasPermi('system:archivecontact:edit')")
@Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatArchivecontact patArchivecontact) {
return toAjax(patArchivecontactService.updatePatArchivecontact(patArchivecontact));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java
index a4c5596..786a821 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.smartor.domain.PatArchivetag;
import com.smartor.service.IPatArchivetagService;
@@ -40,7 +41,8 @@
* 鏌ヨ鎮ｈ�呮。妗堟爣绛惧垪琛�
*/
//@PreAuthorize("@ss.hasPermi('system:archivetag:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
@ApiOperation("鏌ヨ鎮ｈ�呮。妗堟爣绛惧垪琛�")
public TableDataInfo list(@RequestBody PatArchivetag patArchivetag) {
startPage();
@@ -75,6 +77,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:archivetag:add')")
@ApiOperation("鏂板鎮ｈ�呮。妗堟爣绛�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatArchivetag patArchivetag) {
SysUser user = getLoginUser().getUser();
@@ -87,6 +90,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:archivetag:edit')")
@ApiOperation("淇敼鎮ｈ�呮。妗堟爣绛�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatArchivetag patArchivetag) {
return toAjax(patArchivetagService.updatePatArchivetag(patArchivetag));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatFilterlistController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatFilterlistController.java
index f144f89..1ba1e63 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatFilterlistController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatFilterlistController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -72,6 +73,7 @@
//@PreAuthorize("@ss.hasPermi('system:filterlist:add')")
@Log(title = "鎮ｈ�呰繃婊ゅ悕鍗�", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鎮ｈ�呰繃婊ゅ悕鍗�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatFilterlist patFilterlist) {
SysUser user = getLoginUser().getUser();
@@ -85,6 +87,7 @@
//@PreAuthorize("@ss.hasPermi('system:filterlist:edit')")
@Log(title = "鎮ｈ�呰繃婊ゅ悕鍗�", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼鎮ｈ�呰繃婊ゅ悕鍗�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatFilterlist patFilterlist) {
return toAjax(patFilterlistService.updatePatFilterlist(patFilterlist));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedBloodsugarController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedBloodsugarController.java
index 2b3fcac..5d72044 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedBloodsugarController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedBloodsugarController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,7 +37,8 @@
* 鏌ヨ鎮ｈ�呰绯栬褰曞垪琛�
*/
//@PreAuthorize("@ss.hasPermi('system:bloodsugar:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
@ApiOperation("鏌ヨ鎮ｈ�呰绯栬褰曞垪琛�")
public TableDataInfo list(@RequestBody PatMedBloodsugar patMedBloodsugar) {
startPage();
@@ -73,6 +75,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:bloodsugar:add')")
@Log(title = "鏂板鎮ｈ�呰绯栬褰�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
@ApiOperation("鏂板鎮ｈ�呰绯栬褰�")
public AjaxResult add(@RequestBody PatMedBloodsugar patMedBloodsugar) {
@@ -84,6 +87,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:bloodsugar:edit')")
@Log(title = "鎮ｈ�呰绯栬褰�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
@ApiOperation("淇敼鎮ｈ�呰绯栬褰�")
public AjaxResult edit(@RequestBody PatMedBloodsugar patMedBloodsugar) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedDrugController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedDrugController.java
index f902833..1f4a99f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedDrugController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedDrugController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -26,8 +27,7 @@
@Api(description = "鎮ｈ�呯敤鑽褰�")
@RestController
@RequestMapping("/system/drug")
-public class PatMedDrugController extends BaseController
-{
+public class PatMedDrugController extends BaseController {
@Autowired
private IPatMedDrugService patMedDrugService;
@@ -36,9 +36,9 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呯敤鑽褰曞垪琛�")
//@PreAuthorize("@ss.hasPermi('system:drug:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody PatMedDrug patMedDrug)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody PatMedDrug patMedDrug) {
startPage();
List<PatMedDrug> list = patMedDrugService.selectPatMedDrugList(patMedDrug);
return getDataTable(list);
@@ -51,8 +51,7 @@
//@PreAuthorize("@ss.hasPermi('system:drug:export')")
@Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, PatMedDrug patMedDrug)
- {
+ public void export(HttpServletResponse response, PatMedDrug patMedDrug) {
List<PatMedDrug> list = patMedDrugService.selectPatMedDrugList(patMedDrug);
ExcelUtil<PatMedDrug> util = new ExcelUtil<PatMedDrug>(PatMedDrug.class);
util.exportExcel(response, list, "鎮ｈ�呯敤鑽褰曟暟鎹�");
@@ -64,8 +63,7 @@
@ApiOperation("鑾峰彇鎮ｈ�呯敤鑽褰曡缁嗕俊鎭�")
//@PreAuthorize("@ss.hasPermi('system:drug:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patMedDrugService.selectPatMedDrugById(id));
}
@@ -75,9 +73,9 @@
@ApiOperation("鏂板鎮ｈ�呯敤鑽褰�")
//@PreAuthorize("@ss.hasPermi('system:drug:add')")
@Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody PatMedDrug patMedDrug)
- {
+ public AjaxResult add(@RequestBody PatMedDrug patMedDrug) {
return toAjax(patMedDrugService.insertPatMedDrug(patMedDrug));
}
@@ -87,9 +85,9 @@
@ApiOperation("淇敼鎮ｈ�呯敤鑽褰�")
//@PreAuthorize("@ss.hasPermi('system:drug:edit')")
@Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody PatMedDrug patMedDrug)
- {
+ public AjaxResult edit(@RequestBody PatMedDrug patMedDrug) {
return toAjax(patMedDrugService.updatePatMedDrug(patMedDrug));
}
@@ -99,9 +97,8 @@
@ApiOperation("鍒犻櫎鎮ｈ�呯敤鑽褰�")
//@PreAuthorize("@ss.hasPermi('system:drug:remove')")
@Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patMedDrugService.deletePatMedDrugByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java
index eedff2d..8b5b4ec 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,7 +37,8 @@
* 鏌ヨ鎮ｈ�呴珮琛�鍘嬭褰曞垪琛�
*/
//@PreAuthorize("@ss.hasPermi('system:hypertension:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
@ApiOperation("鏌ヨ鎮ｈ�呴珮琛�鍘嬭褰曞垪琛�")
public TableDataInfo list(@RequestBody PatMedHypertension patMedHypertension) {
startPage();
@@ -74,6 +76,7 @@
@ApiOperation("鎮ｈ�呴珮琛�鍘嬭褰�")
//@PreAuthorize("@ss.hasPermi('system:hypertension:add')")
@Log(title = "鎮ｈ�呴珮琛�鍘嬭褰�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedHypertension patMedHypertension) {
return toAjax(patMedHypertensionService.insertPatMedHypertension(patMedHypertension));
@@ -85,6 +88,7 @@
@ApiOperation("鎮ｈ�呴珮琛�鍘嬭褰�")
//@PreAuthorize("@ss.hasPermi('system:hypertension:edit')")
@Log(title = "鎮ｈ�呴珮琛�鍘嬭褰�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedHypertension patMedHypertension) {
return toAjax(patMedHypertensionService.updatePatMedHypertension(patMedHypertension));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
index fad426e..f0c91d1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.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.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -47,6 +48,7 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呬綇闄㈣褰曞垪琛�")
//@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectPatMedInhospList")
public TableDataInfo selectPatMedInhosplist(@RequestBody PatMedInhosp patMedInhosp) {
PageUtils.startPageByPost(patMedInhosp.getPageNum(), patMedInhosp.getPageSize());
@@ -76,6 +78,7 @@
/**
* 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
*/
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@ApiOperation("鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�")
@PostMapping("/selectPatMedInhospListByCondition")
public TableDataInfo selectPatMedInhospListByCondition(@RequestBody PatMedInhospVO patMedInhospVO) {
@@ -104,6 +107,7 @@
/**
* 鏌ヨ鍑恒�佸叆闄㈢湅鐥呬汉娆″拰浜烘暟锛堜汉鏁板垎涓洪娆℃湇鍔°�佸啀娆℃湇鍔°�佷笓鐥呮湇鍔★級
*/
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectPatMedInhospListCount")
@ApiOperation("鏌ヨ鍑恒�佸叆闄㈢湅鐥呬汉娆″拰浜烘暟")
public AjaxResult selectPatMedInhospListCount(@RequestBody PatMedReq patMedReq) {
@@ -141,6 +145,7 @@
@ApiOperation("鏂板鎮ｈ�呬綇闄㈣褰�")
//@PreAuthorize("@ss.hasPermi('smartor:patinhosp:add')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedInhosp patMedInhosp) {
SysUser user = getLoginUser().getUser();
@@ -154,6 +159,7 @@
@ApiOperation("淇敼鎮ｈ�呬綇闄㈣褰�")
//@PreAuthorize("@ss.hasPermi('smartor:patinhosp:edit')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedInhosp patMedInhosp) {
return toAjax(patMedInhospService.updatePatMedInhosp(patMedInhosp));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInspectionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInspectionController.java
index a629b3b..46bd0ea 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInspectionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInspectionController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,7 +37,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞垪琛�")
//@PreAuthorize("@ss.hasPermi('system:inspection:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody PatMedInspection patMedInspection) {
startPage();
List<PatMedInspection> list = patMedInspectionService.selectPatMedInspectionList(patMedInspection);
@@ -72,6 +74,7 @@
//@PreAuthorize("@ss.hasPermi('system:inspection:add')")
@Log(title = "鏂板鎮ｈ�呮鏌ユ楠岃褰�", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鎮ｈ�呮鏌ユ楠岃褰�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedInspection patMedInspection) {
SysUser user = getLoginUser().getUser();
@@ -85,6 +88,7 @@
//@PreAuthorize("@ss.hasPermi('system:inspection:edit')")
@Log(title = "淇敼鎮ｈ�呮鏌ユ楠岃褰�", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼鎮ｈ�呮鏌ユ楠岃褰�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedInspection patMedInspection) {
return toAjax(patMedInspectionService.updatePatMedInspection(patMedInspection));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
index bea5353..2002404 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
@@ -2,10 +2,13 @@
import java.util.List;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.utils.PageUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -34,8 +37,7 @@
@Api("鎮ｈ�呮墜鏈褰�")
@RestController
@RequestMapping("/smartor/operation")
-public class PatMedOperationController extends BaseController
-{
+public class PatMedOperationController extends BaseController {
@Autowired
private IPatMedOperationService patMedOperationService;
@@ -44,9 +46,9 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呮墜鏈褰曞垪琛�")
//@PreAuthorize("@ss.hasPermi('smartor:operation:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody PatMedOperation patMedOperation)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody PatMedOperation patMedOperation) {
//startPage();
PageUtils.startPageByPost(patMedOperation.getPageNum(), patMedOperation.getPageSize());
List<PatMedOperation> list = patMedOperationService.selectPatMedOperationList(patMedOperation);
@@ -60,8 +62,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:operation:export')")
@Log(title = "鎮ｈ�呮墜鏈褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, PatMedOperation patMedOperation)
- {
+ public void export(HttpServletResponse response, PatMedOperation patMedOperation) {
List<PatMedOperation> list = patMedOperationService.selectPatMedOperationList(patMedOperation);
ExcelUtil<PatMedOperation> util = new ExcelUtil<PatMedOperation>(PatMedOperation.class);
util.exportExcel(response, list, "鎮ｈ�呮墜鏈褰曟暟鎹�");
@@ -73,8 +74,7 @@
@ApiOperation("鑾峰彇鎮ｈ�呮墜鏈褰曡缁嗕俊鎭�")
//@PreAuthorize("@ss.hasPermi('smartor:operation:query')")
@GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patMedOperationService.selectPatMedOperationById(id));
}
@@ -84,9 +84,9 @@
@ApiOperation("鏂板鎮ｈ�呮墜鏈褰�")
//@PreAuthorize("@ss.hasPermi('smartor:operation:add')")
@Log(title = "鎮ｈ�呮墜鏈褰�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody PatMedOperation patMedOperation)
- {
+ public AjaxResult add(@RequestBody PatMedOperation patMedOperation) {
return toAjax(patMedOperationService.insertPatMedOperation(patMedOperation));
}
@@ -96,9 +96,9 @@
@ApiOperation("淇敼鎮ｈ�呮墜鏈褰�")
//@PreAuthorize("@ss.hasPermi('smartor:operation:edit')")
@Log(title = "鎮ｈ�呮墜鏈褰�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody PatMedOperation patMedOperation)
- {
+ public AjaxResult edit(@RequestBody PatMedOperation patMedOperation) {
return toAjax(patMedOperationService.updatePatMedOperation(patMedOperation));
}
@@ -108,9 +108,8 @@
@ApiOperation("鍒犻櫎鎮ｈ�呮墜鏈褰�")
//@PreAuthorize("@ss.hasPermi('smartor:operation:remove')")
@Log(title = "鎮ｈ�呮墜鏈褰�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patMedOperationService.deletePatMedOperationByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java
index a9fddf2..1652d8b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java
@@ -1,9 +1,13 @@
package com.ruoyi.web.controller.smartor;
import java.util.List;
+
+import com.ruoyi.common.annotation.AddOrgId;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -32,8 +36,7 @@
@Api("鎮ｈ�呮鏌ユ楠岃褰曞瓙")
@RestController
@RequestMapping("/smartor/item")
-public class PatMedOperationItemController extends BaseController
-{
+public class PatMedOperationItemController extends BaseController {
@Autowired
private IPatMedOperationItemService patMedOperationItemService;
@@ -43,8 +46,7 @@
@ApiOperation("鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞瓙鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:item:list')")
@GetMapping("/list")
- public TableDataInfo list(PatMedOperationItem patMedOperationItem)
- {
+ public TableDataInfo list(PatMedOperationItem patMedOperationItem) {
startPage();
List<PatMedOperationItem> list = patMedOperationItemService.selectPatMedOperationItemList(patMedOperationItem);
return getDataTable(list);
@@ -57,8 +59,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:item:export')")
@Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, PatMedOperationItem patMedOperationItem)
- {
+ public void export(HttpServletResponse response, PatMedOperationItem patMedOperationItem) {
List<PatMedOperationItem> list = patMedOperationItemService.selectPatMedOperationItemList(patMedOperationItem);
ExcelUtil<PatMedOperationItem> util = new ExcelUtil<PatMedOperationItem>(PatMedOperationItem.class);
util.exportExcel(response, list, "鎮ｈ�呮鏌ユ楠岃褰曞瓙鏁版嵁");
@@ -70,8 +71,7 @@
@ApiOperation("鑾峰彇鎮ｈ�呮鏌ユ楠岃褰曞瓙璇︾粏淇℃伅")
//@PreAuthorize("@ss.hasPermi('smartor:item:query')")
@GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patMedOperationItemService.selectPatMedOperationItemById(id));
}
@@ -81,9 +81,9 @@
@ApiOperation("鏂板鎮ｈ�呮鏌ユ楠岃褰曞瓙")
//@PreAuthorize("@ss.hasPermi('smartor:item:add')")
@Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody PatMedOperationItem patMedOperationItem)
- {
+ public AjaxResult add(@RequestBody PatMedOperationItem patMedOperationItem) {
return toAjax(patMedOperationItemService.insertPatMedOperationItem(patMedOperationItem));
}
@@ -93,9 +93,9 @@
@ApiOperation("淇敼鎮ｈ�呮鏌ユ楠岃褰曞瓙")
//@PreAuthorize("@ss.hasPermi('smartor:item:edit')")
@Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody PatMedOperationItem patMedOperationItem)
- {
+ public AjaxResult edit(@RequestBody PatMedOperationItem patMedOperationItem) {
return toAjax(patMedOperationItemService.updatePatMedOperationItem(patMedOperationItem));
}
@@ -105,9 +105,8 @@
@ApiOperation("鍒犻櫎鎮ｈ�呮鏌ユ楠岃褰曞瓙")
//@PreAuthorize("@ss.hasPermi('smartor:item:remove')")
@Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patMedOperationItemService.deletePatMedOperationItemByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
index 344cba0..a7ac3ec 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
@@ -7,6 +7,7 @@
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -55,6 +56,7 @@
* 鏌ヨ鎮ｈ�呴棬璇婅褰曞垪琛�
*/
//@PreAuthorize("@ss.hasPermi('smartor:patouthosp:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectPatMedOuthospList")
@ApiOperation("鏌ヨ鎮ｈ�呴棬璇婅褰曞垪琛�")
public TableDataInfo selectPatMedOuthosplist(@RequestBody PatMedOuthosp patMedOuthosp) {
@@ -68,6 +70,7 @@
/**
* 鏌ヨ鎮ｈ�呴棬璇婅褰曞垪琛�
*/
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectPatMedOuthospCount")
@ApiOperation("鏌ヨ闂ㄨ瘖鐪嬬梾浜烘鍜屼汉鏁�")
public AjaxResult selectPatMedOuthospCount(@RequestBody PatMedReq patMedReq) {
@@ -118,6 +121,7 @@
@ApiOperation("鏂板鎮ｈ�呴棬璇婅褰�")
//@PreAuthorize("@ss.hasPermi('smartor:patouthosp:add')")
@Log(title = "鎮ｈ�呴棬璇婅褰�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedOuthosp patMedOuthosp) {
SysUser user = getLoginUser().getUser();
@@ -131,6 +135,7 @@
@ApiOperation("淇敼鎮ｈ�呴棬璇婅褰�")
//@PreAuthorize("@ss.hasPermi('smartor:patouthosp:edit')")
@Log(title = "鎮ｈ�呴棬璇婅褰�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedOuthosp patMedOuthosp) {
return toAjax(patMedOuthospService.updatePatMedOuthosp(patMedOuthosp));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospProvisionalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospProvisionalController.java
index a05b287..54a03bd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospProvisionalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospProvisionalController.java
@@ -1,9 +1,13 @@
package com.ruoyi.web.controller.smartor;
import java.util.List;
+
+import com.ruoyi.common.annotation.AddOrgId;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -32,8 +36,7 @@
@Api("鎮ｈ�呴棬璇婅褰曪紙杩囨浮锛�")
@RestController
@RequestMapping("/smartor/provisional")
-public class PatMedOuthospProvisionalController extends BaseController
-{
+public class PatMedOuthospProvisionalController extends BaseController {
@Autowired
private IPatMedOuthospProvisionalService patMedOuthospProvisionalService;
@@ -42,9 +45,9 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呴棬璇婅褰曪紙杩囨浮锛夊垪琛�")
//@PreAuthorize("@ss.hasPermi('smartor:provisional:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody PatMedOuthospProvisional patMedOuthospProvisional)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody PatMedOuthospProvisional patMedOuthospProvisional) {
startPage();
List<PatMedOuthospProvisional> list = patMedOuthospProvisionalService.selectPatMedOuthospProvisionalList(patMedOuthospProvisional);
return getDataTable(list);
@@ -57,8 +60,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:provisional:export')")
@Log(title = "鎮ｈ�呴棬璇婅褰曪紙杩囨浮锛�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, PatMedOuthospProvisional patMedOuthospProvisional)
- {
+ public void export(HttpServletResponse response, PatMedOuthospProvisional patMedOuthospProvisional) {
List<PatMedOuthospProvisional> list = patMedOuthospProvisionalService.selectPatMedOuthospProvisionalList(patMedOuthospProvisional);
ExcelUtil<PatMedOuthospProvisional> util = new ExcelUtil<PatMedOuthospProvisional>(PatMedOuthospProvisional.class);
util.exportExcel(response, list, "鎮ｈ�呴棬璇婅褰曪紙杩囨浮锛夋暟鎹�");
@@ -70,8 +72,7 @@
@ApiOperation("鑾峰彇鎮ｈ�呴棬璇婅褰曪紙杩囨浮锛夎缁嗕俊鎭�")
//@PreAuthorize("@ss.hasPermi('smartor:provisional:query')")
@GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patMedOuthospProvisionalService.selectPatMedOuthospProvisionalById(id));
}
@@ -81,9 +82,9 @@
@ApiOperation("鏂板鎮ｈ�呴棬璇婅褰曪紙杩囨浮锛�")
//@PreAuthorize("@ss.hasPermi('smartor:provisional:add')")
@Log(title = "鎮ｈ�呴棬璇婅褰曪紙杩囨浮锛�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody PatMedOuthospProvisional patMedOuthospProvisional)
- {
+ public AjaxResult add(@RequestBody PatMedOuthospProvisional patMedOuthospProvisional) {
return toAjax(patMedOuthospProvisionalService.insertPatMedOuthospProvisional(patMedOuthospProvisional));
}
@@ -93,9 +94,9 @@
@ApiOperation("淇敼鎮ｈ�呴棬璇婅褰曪紙杩囨浮锛�")
//@PreAuthorize("@ss.hasPermi('smartor:provisional:edit')")
@Log(title = "鎮ｈ�呴棬璇婅褰曪紙杩囨浮锛�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody PatMedOuthospProvisional patMedOuthospProvisional)
- {
+ public AjaxResult edit(@RequestBody PatMedOuthospProvisional patMedOuthospProvisional) {
return toAjax(patMedOuthospProvisionalService.updatePatMedOuthospProvisional(patMedOuthospProvisional));
}
@@ -105,9 +106,8 @@
@ApiOperation("鍒犻櫎鎮ｈ�呴棬璇婅褰曪紙杩囨浮锛�")
//@PreAuthorize("@ss.hasPermi('smartor:provisional:remove')")
@Log(title = "鎮ｈ�呴棬璇婅褰曪紙杩囨浮锛�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patMedOuthospProvisionalService.deletePatMedOuthospProvisionalByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedPhysicalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedPhysicalController.java
index 006cb42..97737f0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedPhysicalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedPhysicalController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,8 +35,7 @@
@Api(description = "鎮ｈ�呬綋妫�璁板綍")
@RestController
@RequestMapping("/smartor/patphysical")
-public class PatMedPhysicalController extends BaseController
-{
+public class PatMedPhysicalController extends BaseController {
@Autowired
private IPatMedPhysicalService patMedPhysicalService;
@@ -44,9 +44,9 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呬綋妫�璁板綍鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:patphysical:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectPatMedPhysicalList")
- public TableDataInfo selectPatMedPhysicallist(@RequestBody PatMedPhysical patMedPhysical)
- {
+ public TableDataInfo selectPatMedPhysicallist(@RequestBody PatMedPhysical patMedPhysical) {
startPage();
SysUser user = getLoginUser().getUser();
patMedPhysical.setOrgid(user.getOrgid());
@@ -61,8 +61,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:patphysical:export')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, PatMedPhysical patMedPhysical)
- {
+ public void export(HttpServletResponse response, PatMedPhysical patMedPhysical) {
List<PatMedPhysical> list = patMedPhysicalService.selectPatMedPhysicalList(patMedPhysical);
ExcelUtil<PatMedPhysical> util = new ExcelUtil<PatMedPhysical>(PatMedPhysical.class);
util.exportExcel(response, list, "鎮ｈ�呬綋妫�璁板綍鏁版嵁");
@@ -74,8 +73,7 @@
@ApiOperation("鑾峰彇鎮ｈ�呬綋妫�璁板綍璇︾粏淇℃伅")
//@PreAuthorize("@ss.hasPermi('smartor:patphysical:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patMedPhysicalService.selectPatMedPhysicalById(id));
}
@@ -85,9 +83,9 @@
@ApiOperation("鏂板鎮ｈ�呬綋妫�璁板綍")
//@PreAuthorize("@ss.hasPermi('smartor:patphysical:add')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody PatMedPhysical patMedPhysical)
- {
+ public AjaxResult add(@RequestBody PatMedPhysical patMedPhysical) {
return toAjax(patMedPhysicalService.insertPatMedPhysical(patMedPhysical));
}
@@ -97,9 +95,9 @@
@ApiOperation("淇敼鎮ｈ�呬綋妫�璁板綍")
//@PreAuthorize("@ss.hasPermi('smartor:patphysical:edit')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody PatMedPhysical patMedPhysical)
- {
+ public AjaxResult edit(@RequestBody PatMedPhysical patMedPhysical) {
return toAjax(patMedPhysicalService.updatePatMedPhysical(patMedPhysical));
}
@@ -109,9 +107,8 @@
@ApiOperation("鍒犻櫎鎮ｈ�呬綋妫�璁板綍")
//@PreAuthorize("@ss.hasPermi('smartor:patphysical:remove')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patMedPhysicalService.deletePatMedPhysicalByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedRegistrationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedRegistrationController.java
index 94afd1a..219fd3a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedRegistrationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedRegistrationController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -71,6 +72,7 @@
@ApiOperation("鏂板鎮ｈ�呮寕鍙疯褰�")
//@PreAuthorize("@ss.hasPermi('system:registration:add')")
@Log(title = "鎮ｈ�呮寕鍙疯褰�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedRegistration patMedRegistration) {
return toAjax(patMedRegistrationService.insertPatMedRegistration(patMedRegistration));
@@ -82,6 +84,7 @@
@ApiOperation("淇敼鎮ｈ�呮寕鍙疯褰�")
//@PreAuthorize("@ss.hasPermi('system:registration:edit')")
@Log(title = "鎮ｈ�呮寕鍙疯褰�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedRegistration patMedRegistration) {
return toAjax(patMedRegistrationService.updatePatMedRegistration(patMedRegistration));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java
index b109bb2..60cbc44 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -21,15 +22,14 @@
/**
* 鎮ｈ�呬綋閲嶈褰旵ontroller
- *
+ *
* @author ruoyi
* @date 2023-06-07
*/
@Api(description = "鎮ｈ�呬綋閲嶈褰�")
@RestController
@RequestMapping("/system/weight")
-public class PatMedWeightController extends BaseController
-{
+public class PatMedWeightController extends BaseController {
@Autowired
private IPatMedWeightService patMedWeightService;
@@ -38,9 +38,9 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呬綋閲嶈褰曞垪琛�")
//@PreAuthorize("@ss.hasPermi('system:weight:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody PatMedWeight patMedWeight)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody PatMedWeight patMedWeight) {
startPage();
List<PatMedWeight> list = patMedWeightService.selectPatMedWeightList(patMedWeight);
return getDataTable(list);
@@ -53,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('system:weight:export')")
@Log(title = "鎮ｈ�呬綋閲嶈褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, PatMedWeight patMedWeight)
- {
+ public void export(HttpServletResponse response, PatMedWeight patMedWeight) {
List<PatMedWeight> list = patMedWeightService.selectPatMedWeightList(patMedWeight);
ExcelUtil<PatMedWeight> util = new ExcelUtil<PatMedWeight>(PatMedWeight.class);
util.exportExcel(response, list, "鎮ｈ�呬綋閲嶈褰曟暟鎹�");
@@ -67,8 +66,7 @@
//@PreAuthorize("@ss.hasPermi('system:weight:query')")
@ApiImplicitParam(name = "getInfo", value = "涓婚敭ID", dataType = "long", dataTypeClass = Long.class)
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patMedWeightService.selectPatMedWeightById(id));
}
@@ -78,9 +76,9 @@
@ApiOperation("鏂板鎮ｈ�呬綋閲嶈褰�")
//@PreAuthorize("@ss.hasPermi('system:weight:add')")
@Log(title = "鎮ｈ�呬綋閲嶈褰�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody PatMedWeight patMedWeight)
- {
+ public AjaxResult add(@RequestBody PatMedWeight patMedWeight) {
return toAjax(patMedWeightService.insertPatMedWeight(patMedWeight));
}
@@ -90,9 +88,9 @@
@ApiOperation("淇敼鎮ｈ�呬綋閲嶈褰�")
//@PreAuthorize("@ss.hasPermi('system:weight:edit')")
@Log(title = "淇敼鎮ｈ�呬綋閲嶈褰�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody PatMedWeight patMedWeight)
- {
+ public AjaxResult edit(@RequestBody PatMedWeight patMedWeight) {
return toAjax(patMedWeightService.updatePatMedWeight(patMedWeight));
}
@@ -103,9 +101,8 @@
//@PreAuthorize("@ss.hasPermi('system:weight:remove')")
@Log(title = "鍒犻櫎鎮ｈ�呬綋閲嶈褰�", businessType = BusinessType.DELETE)
@ApiImplicitParam(name = "remove", value = "涓婚敭ID", dataType = "long", dataTypeClass = Array.class)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patMedWeightService.deletePatMedWeightByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSatisfactionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSatisfactionController.java
index 3a5cfc1..5d25789 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSatisfactionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSatisfactionController.java
@@ -3,6 +3,7 @@
import java.util.List;
import com.github.pagehelper.ISelect;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.PageUtils;
@@ -48,7 +49,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呮弧鎰忓害鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:satisfaction:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody PatSatisfaction patSatisfaction) {
PageUtils.startPageByPost(patSatisfaction.getPageNum(), patSatisfaction.getPageSize());
List<PatSatisfaction> list = patSatisfactionService.selectPatSatisfactionList(patSatisfaction);
@@ -61,7 +63,7 @@
patSatisfactionService.selectPatSatisfactionList(patSatisfaction);
}
});
- return getDataTable2(total,list);
+ return getDataTable2(total, list);
}
/**
@@ -93,6 +95,7 @@
@ApiOperation("鏂板鎮ｈ�呮弧鎰忓害")
//@PreAuthorize("@ss.hasPermi('smartor:satisfaction:add')")
@Log(title = "鎮ｈ�呮弧鎰忓害", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatSatisfaction patSatisfaction) {
LoginUser loginUser = getLoginUser();
@@ -127,6 +130,7 @@
@ApiOperation("淇敼鎮ｈ�呮弧鎰忓害")
//@PreAuthorize("@ss.hasPermi('smartor:satisfaction:edit')")
@Log(title = "鎮ｈ�呮弧鎰忓害", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatSatisfaction patSatisfaction) {
LoginUser loginUser = getLoginUser();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSpeciallistCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSpeciallistCategoryController.java
index 2b86fd4..35b0c24 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSpeciallistCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSpeciallistCategoryController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -26,8 +27,7 @@
@Api("涓撶梾鎮ｈ�呭垎绫�")
@RestController
@RequestMapping("/smartor/patSpeciallistCategory")
-public class PatSpeciallistCategoryController extends BaseController
-{
+public class PatSpeciallistCategoryController extends BaseController {
@Autowired
private IPatSpeciallistCategoryService patSpeciallistCategoryService;
@@ -37,8 +37,7 @@
@ApiOperation("鏌ヨ涓撶梾鎮ｈ�呭垎绫诲垪琛�")
//@PreAuthorize("@ss.hasPermi('system:category:list')")
@GetMapping("/list")
- public TableDataInfo list(PatSpeciallistCategory patSpeciallistCategory)
- {
+ public TableDataInfo list(PatSpeciallistCategory patSpeciallistCategory) {
startPage();
List<PatSpeciallistCategory> list = patSpeciallistCategoryService.selectPatSpeciallistCategoryList(patSpeciallistCategory);
return getDataTable(list);
@@ -51,8 +50,7 @@
//@PreAuthorize("@ss.hasPermi('system:category:export')")
@Log(title = "涓撶梾鎮ｈ�呭垎绫�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, PatSpeciallistCategory patSpeciallistCategory)
- {
+ public void export(HttpServletResponse response, PatSpeciallistCategory patSpeciallistCategory) {
List<PatSpeciallistCategory> list = patSpeciallistCategoryService.selectPatSpeciallistCategoryList(patSpeciallistCategory);
ExcelUtil<PatSpeciallistCategory> util = new ExcelUtil<PatSpeciallistCategory>(PatSpeciallistCategory.class);
util.exportExcel(response, list, "涓撶梾鎮ｈ�呭垎绫绘暟鎹�");
@@ -64,8 +62,7 @@
@ApiOperation("鑾峰彇涓撶梾鎮ｈ�呭垎绫昏缁嗕俊鎭�")
//@PreAuthorize("@ss.hasPermi('system:category:query')")
@GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patSpeciallistCategoryService.selectPatSpeciallistCategoryById(id));
}
@@ -74,9 +71,9 @@
*/
//@PreAuthorize("@ss.hasPermi('system:category:add')")
@Log(title = "涓撶梾鎮ｈ�呭垎绫�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody PatSpeciallistCategory patSpeciallistCategory)
- {
+ public AjaxResult add(@RequestBody PatSpeciallistCategory patSpeciallistCategory) {
return toAjax(patSpeciallistCategoryService.insertPatSpeciallistCategory(patSpeciallistCategory));
}
@@ -86,9 +83,9 @@
@ApiOperation("淇敼涓撶梾鎮ｈ�呭垎绫�")
//@PreAuthorize("@ss.hasPermi('system:category:edit')")
@Log(title = "涓撶梾鎮ｈ�呭垎绫�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody PatSpeciallistCategory patSpeciallistCategory)
- {
+ public AjaxResult edit(@RequestBody PatSpeciallistCategory patSpeciallistCategory) {
return toAjax(patSpeciallistCategoryService.updatePatSpeciallistCategory(patSpeciallistCategory));
}
@@ -98,9 +95,8 @@
@ApiOperation("鍒犻櫎涓撶梾鎮ｈ�呭垎绫�")
//@PreAuthorize("@ss.hasPermi('system:category:remove')")
@Log(title = "涓撶梾鎮ｈ�呭垎绫�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patSpeciallistCategoryService.deletePatSpeciallistCategoryByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSpeciallistController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSpeciallistController.java
index 9805203..1aa60fa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSpeciallistController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSpeciallistController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -26,8 +27,7 @@
@Api(description = "涓撶梾鎮ｈ��")
@RestController
@RequestMapping("/smartor/speciallist")
-public class PatSpeciallistController extends BaseController
-{
+public class PatSpeciallistController extends BaseController {
@Autowired
private IPatSpeciallistService patSpeciallistService;
@@ -37,8 +37,7 @@
//@PreAuthorize("@ss.hasPermi('system:speciallist:list')")
@ApiOperation("鏌ヨ涓撶梾鎮ｈ�呭垪琛�")
@GetMapping("/list")
- public TableDataInfo list(PatSpeciallist patSpeciallist)
- {
+ public TableDataInfo list(PatSpeciallist patSpeciallist) {
startPage();
List<PatSpeciallist> list = patSpeciallistService.selectPatSpeciallistList(patSpeciallist);
return getDataTable(list);
@@ -51,8 +50,7 @@
@Log(title = "涓撶梾鎮ｈ��", businessType = BusinessType.EXPORT)
@ApiOperation("瀵煎嚭涓撶梾鎮ｈ�呭垪琛�")
@PostMapping("/export")
- public void export(HttpServletResponse response, PatSpeciallist patSpeciallist)
- {
+ public void export(HttpServletResponse response, PatSpeciallist patSpeciallist) {
List<PatSpeciallist> list = patSpeciallistService.selectPatSpeciallistList(patSpeciallist);
ExcelUtil<PatSpeciallist> util = new ExcelUtil<PatSpeciallist>(PatSpeciallist.class);
util.exportExcel(response, list, "涓撶梾鎮ｈ�呮暟鎹�");
@@ -63,8 +61,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:speciallist:query')")
@GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patSpeciallistService.selectPatSpeciallistById(id));
}
@@ -74,9 +71,9 @@
//@PreAuthorize("@ss.hasPermi('system:speciallist:add')")
@Log(title = "涓撶梾鎮ｈ��", businessType = BusinessType.INSERT)
@ApiOperation("鏂板涓撶梾鎮ｈ��")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody PatSpeciallist patSpeciallist)
- {
+ public AjaxResult add(@RequestBody PatSpeciallist patSpeciallist) {
return toAjax(patSpeciallistService.insertPatSpeciallist(patSpeciallist));
}
@@ -86,9 +83,9 @@
//@PreAuthorize("@ss.hasPermi('system:speciallist:edit')")
@Log(title = "涓撶梾鎮ｈ��", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼涓撶梾鎮ｈ��")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody PatSpeciallist patSpeciallist)
- {
+ public AjaxResult edit(@RequestBody PatSpeciallist patSpeciallist) {
return toAjax(patSpeciallistService.updatePatSpeciallist(patSpeciallist));
}
@@ -98,9 +95,8 @@
//@PreAuthorize("@ss.hasPermi('system:speciallist:remove')")
@Log(title = "涓撶梾鎮ｈ��", businessType = BusinessType.DELETE)
@ApiOperation("鍒犻櫎涓撶梾鎮ｈ��")
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patSpeciallistService.deletePatSpeciallistByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java
index e9708f0..baed11c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -30,7 +31,8 @@
* 鏌ヨ鏂规缁撴瑙勫垯鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody SchemeAutofinshrule schemeAutofinshrule) {
startPage();
List<SchemeAutofinshrule> list = schemeAutofinshruleService.selectSchemeAutofinshruleList(schemeAutofinshrule);
@@ -63,6 +65,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:add')")
@Log(title = "鏂规缁撴瑙勫垯", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeAutofinshrule schemeAutofinshrule) {
return toAjax(schemeAutofinshruleService.insertSchemeAutofinshrule(schemeAutofinshrule));
@@ -73,6 +76,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:edit')")
@Log(title = "鏂规缁撴瑙勫垯", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeAutofinshrule schemeAutofinshrule) {
return toAjax(schemeAutofinshruleService.updateSchemeAutofinshrule(schemeAutofinshrule));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeCategoryController.java
index 043550a..7c79b83 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeCategoryController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +25,13 @@
/**
* 鏂规鍒嗙被Controller
- *
+ *
* @author smartor
* @date 2023-03-04
*/
@RestController
@RequestMapping("/smartor/schemecategory")
-public class SchemeCategoryController extends BaseController
-{
+public class SchemeCategoryController extends BaseController {
@Autowired
private ISchemeCategoryService schemeCategoryService;
@@ -38,9 +39,9 @@
* 鏌ヨ鏂规鍒嗙被鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemecategory:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody SchemeCategory schemeCategory)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody SchemeCategory schemeCategory) {
startPage();
List<SchemeCategory> list = schemeCategoryService.selectSchemeCategoryList(schemeCategory);
return getDataTable(list);
@@ -52,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:schemecategory:export')")
@Log(title = "鏂规鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SchemeCategory schemeCategory)
- {
+ public void export(HttpServletResponse response, SchemeCategory schemeCategory) {
List<SchemeCategory> list = schemeCategoryService.selectSchemeCategoryList(schemeCategory);
ExcelUtil<SchemeCategory> util = new ExcelUtil<SchemeCategory>(SchemeCategory.class);
util.exportExcel(response, list, "鏂规鍒嗙被鏁版嵁");
@@ -64,8 +64,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemecategory:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(schemeCategoryService.selectSchemeCategoryById(id));
}
@@ -74,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemecategory:add')")
@Log(title = "鏂规鍒嗙被", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody SchemeCategory schemeCategory)
- {
+ public AjaxResult add(@RequestBody SchemeCategory schemeCategory) {
return toAjax(schemeCategoryService.insertSchemeCategory(schemeCategory));
}
@@ -85,9 +84,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemecategory:edit')")
@Log(title = "鏂规鍒嗙被", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody SchemeCategory schemeCategory)
- {
+ public AjaxResult edit(@RequestBody SchemeCategory schemeCategory) {
return toAjax(schemeCategoryService.updateSchemeCategory(schemeCategory));
}
@@ -96,9 +95,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemecategory:remove')")
@Log(title = "鏂规鍒嗙被", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(schemeCategoryService.deleteSchemeCategoryByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeLocallibraryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeLocallibraryController.java
index 399f026..321b23e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeLocallibraryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeLocallibraryController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +25,7 @@
/**
* 鏈嶅姟鏂规搴揅ontroller
- *
+ *
* @author smartor
* @date 2023-03-04
*/
@@ -38,7 +40,8 @@
* 鏌ヨ鏈嶅姟鏂规搴撳垪琛�
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemelibrary:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody SchemeLocallibrary schemeLocallibrary)
{
startPage();
@@ -74,7 +77,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemelibrary:add')")
@Log(title = "鏈嶅姟鏂规搴�", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeLocallibrary schemeLocallibrary)
{
return toAjax(schemeLocallibraryService.insertSchemeLocallibrary(schemeLocallibrary));
@@ -85,7 +89,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemelibrary:edit')")
@Log(title = "鏈嶅姟鏂规搴�", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeLocallibrary schemeLocallibrary)
{
return toAjax(schemeLocallibraryService.updateSchemeLocallibrary(schemeLocallibrary));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemePlanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemePlanController.java
index e8d84e3..8f300f7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemePlanController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemePlanController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +25,7 @@
/**
* 绠＄悊璁″垝Controller
- *
+ *
* @author smartor
* @date 2023-03-04
*/
@@ -38,7 +40,8 @@
* 鏌ヨ绠＄悊璁″垝鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemeplan:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody SchemePlan schemePlan)
{
startPage();
@@ -74,7 +77,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemeplan:add')")
@Log(title = "绠＄悊璁″垝", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody SchemePlan schemePlan)
{
return toAjax(schemePlanService.insertSchemePlan(schemePlan));
@@ -85,7 +89,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemeplan:edit')")
@Log(title = "绠＄悊璁″垝", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemePlan schemePlan)
{
return toAjax(schemePlanService.updateSchemePlan(schemePlan));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskController.java
index 571b197..b8280a8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +25,7 @@
/**
* 鏂规浠诲姟Controller
- *
+ *
* @author smartor
* @date 2023-03-04
*/
@@ -38,7 +40,8 @@
* 鏌ヨ鏂规浠诲姟鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetask:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody SchemeTask schemeTask)
{
startPage();
@@ -74,7 +77,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetask:add')")
@Log(title = "鏂规浠诲姟", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTask schemeTask)
{
return toAjax(schemeTaskService.insertSchemeTask(schemeTask));
@@ -85,7 +89,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetask:edit')")
@Log(title = "鏂规浠诲姟", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTask schemeTask)
{
return toAjax(schemeTaskService.updateSchemeTask(schemeTask));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskconfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskconfigController.java
index 2b95b3c..007946f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskconfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskconfigController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +25,7 @@
/**
* 鏂规浠诲姟閰嶇疆Controller
- *
+ *
* @author smartor
* @date 2023-03-04
*/
@@ -38,7 +40,8 @@
* 鏌ヨ鏂规浠诲姟閰嶇疆鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody SchemeTaskconfig schemeTaskconfig)
{
startPage();
@@ -74,7 +77,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:add')")
@Log(title = "鏂规浠诲姟閰嶇疆", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTaskconfig schemeTaskconfig)
{
return toAjax(schemeTaskconfigService.insertSchemeTaskconfig(schemeTaskconfig));
@@ -85,7 +89,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:edit')")
@Log(title = "鏂规浠诲姟閰嶇疆", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTaskconfig schemeTaskconfig)
{
return toAjax(schemeTaskconfigService.updateSchemeTaskconfig(schemeTaskconfig));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordCalldetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordCalldetailController.java
index 7ff933e..c88f7b8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordCalldetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordCalldetailController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +40,8 @@
* 鏌ヨ鏂规AI澶栧懠浠诲姟璇︽儏鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody SchemeTaskrecordCalldetail schemeTaskrecordCalldetail)
{
startPage();
@@ -74,7 +77,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:add')")
@Log(title = "鏂规AI澶栧懠浠诲姟璇︽儏", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTaskrecordCalldetail schemeTaskrecordCalldetail)
{
return toAjax(schemeTaskrecordCalldetailService.insertSchemeTaskrecordCalldetail(schemeTaskrecordCalldetail));
@@ -85,7 +89,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:edit')")
@Log(title = "鏂规AI澶栧懠浠诲姟璇︽儏", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTaskrecordCalldetail schemeTaskrecordCalldetail)
{
return toAjax(schemeTaskrecordCalldetailService.updateSchemeTaskrecordCalldetail(schemeTaskrecordCalldetail));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordController.java
index 16fb441..3a15970 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +25,7 @@
/**
* 鏂规浠诲姟澶勭悊璁板綍Controller
- *
+ *
* @author smartor
* @date 2023-03-04
*/
@@ -38,7 +40,8 @@
* 鏌ヨ鏂规浠诲姟澶勭悊璁板綍鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody SchemeTaskrecord schemeTaskrecord)
{
startPage();
@@ -74,7 +77,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:add')")
@Log(title = "鏂规浠诲姟澶勭悊璁板綍", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTaskrecord schemeTaskrecord)
{
return toAjax(schemeTaskrecordService.insertSchemeTaskrecord(schemeTaskrecord));
@@ -85,7 +89,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:edit')")
@Log(title = "鏂规浠诲姟澶勭悊璁板綍", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTaskrecord schemeTaskrecord)
{
return toAjax(schemeTaskrecordService.updateSchemeTaskrecord(schemeTaskrecord));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrepeatconfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrepeatconfigController.java
index 59af7f9..8d460ce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrepeatconfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrepeatconfigController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +39,8 @@
* 鏌ヨ鏂规浠诲姟閲嶅彂閰嶇疆鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody SchemeTaskrepeatconfig schemeTaskrepeatconfig) {
startPage();
List<SchemeTaskrepeatconfig> list = schemeTaskrepeatconfigService.selectSchemeTaskrepeatconfigList(schemeTaskrepeatconfig);
@@ -71,7 +73,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:add')")
@Log(title = "鏂规浠诲姟閲嶅彂閰嶇疆", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTaskrepeatconfig schemeTaskrepeatconfig) {
return toAjax(schemeTaskrepeatconfigService.insertSchemeTaskrepeatconfig(schemeTaskrepeatconfig));
}
@@ -81,7 +84,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:edit')")
@Log(title = "鏂规浠诲姟閲嶅彂閰嶇疆", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTaskrepeatconfig schemeTaskrepeatconfig) {
return toAjax(schemeTaskrepeatconfigService.updateSchemeTaskrepeatconfig(schemeTaskrepeatconfig));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggerruleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggerruleController.java
index 4839261..a06bc89 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggerruleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggerruleController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +40,8 @@
* 鏌ヨ鏂规瑙﹀彂鏉′欢瑙勫垯鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody SchemeTriggerrule schemeTriggerrule)
{
startPage();
@@ -74,7 +77,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:add')")
@Log(title = "鏂规瑙﹀彂鏉′欢瑙勫垯", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTriggerrule schemeTriggerrule)
{
return toAjax(schemeTriggerruleService.insertSchemeTriggerrule(schemeTriggerrule));
@@ -85,7 +89,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:edit')")
@Log(title = "鏂规瑙﹀彂鏉′欢瑙勫垯", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTriggerrule schemeTriggerrule)
{
return toAjax(schemeTriggerruleService.updateSchemeTriggerrule(schemeTriggerrule));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggersceneController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggersceneController.java
index cfbacc4..98ff59c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggersceneController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggersceneController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +25,13 @@
/**
* 鏂规瑙﹀彂鍦烘櫙Controller
- *
+ *
* @author smartor
* @date 2023-03-04
*/
@RestController
@RequestMapping("/smartor/schemetriggerscene")
-public class SchemeTriggersceneController extends BaseController
-{
+public class SchemeTriggersceneController extends BaseController {
@Autowired
private ISchemeTriggersceneService schemeTriggersceneService;
@@ -38,9 +39,9 @@
* 鏌ヨ鏂规瑙﹀彂鍦烘櫙鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody SchemeTriggerscene schemeTriggerscene)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody SchemeTriggerscene schemeTriggerscene) {
startPage();
List<SchemeTriggerscene> list = schemeTriggersceneService.selectSchemeTriggersceneList(schemeTriggerscene);
return getDataTable(list);
@@ -52,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:export')")
@Log(title = "鏂规瑙﹀彂鍦烘櫙", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SchemeTriggerscene schemeTriggerscene)
- {
+ public void export(HttpServletResponse response, SchemeTriggerscene schemeTriggerscene) {
List<SchemeTriggerscene> list = schemeTriggersceneService.selectSchemeTriggersceneList(schemeTriggerscene);
ExcelUtil<SchemeTriggerscene> util = new ExcelUtil<SchemeTriggerscene>(SchemeTriggerscene.class);
util.exportExcel(response, list, "鏂规瑙﹀彂鍦烘櫙鏁版嵁");
@@ -64,8 +64,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(schemeTriggersceneService.selectSchemeTriggersceneById(id));
}
@@ -74,9 +73,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:add')")
@Log(title = "鏂规瑙﹀彂鍦烘櫙", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody SchemeTriggerscene schemeTriggerscene)
- {
+ public AjaxResult add(@RequestBody SchemeTriggerscene schemeTriggerscene) {
return toAjax(schemeTriggersceneService.insertSchemeTriggerscene(schemeTriggerscene));
}
@@ -85,9 +84,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:edit')")
@Log(title = "鏂规瑙﹀彂鍦烘櫙", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody SchemeTriggerscene schemeTriggerscene)
- {
+ public AjaxResult edit(@RequestBody SchemeTriggerscene schemeTriggerscene) {
return toAjax(schemeTriggersceneService.updateSchemeTriggerscene(schemeTriggerscene));
}
@@ -96,9 +95,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:remove')")
@Log(title = "鏂规瑙﹀彂鍦烘櫙", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(schemeTriggersceneService.deleteSchemeTriggersceneByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceCheckController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceCheckController.java
index 2fc10d5..f5e1bba 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceCheckController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceCheckController.java
@@ -1,9 +1,13 @@
package com.ruoyi.web.controller.smartor;
import java.util.List;
+
+import com.ruoyi.common.annotation.AddOrgId;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -32,8 +36,7 @@
@Api("闅忚鏈嶅姟鍙戦�佸垽鏂�")
@RestController
@RequestMapping("/smartor/check")
-public class ServiceCheckController extends BaseController
-{
+public class ServiceCheckController extends BaseController {
@Autowired
private IServiceCheckService serviceCheckService;
@@ -43,8 +46,7 @@
@ApiOperation("鏌ヨ闅忚鏈嶅姟鍙戦�佸垽鏂垪琛�")
//@PreAuthorize("@ss.hasPermi('smartor:check:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceCheck serviceCheck)
- {
+ public TableDataInfo list(ServiceCheck serviceCheck) {
startPage();
List<ServiceCheck> list = serviceCheckService.selectServiceCheckList(serviceCheck);
return getDataTable(list);
@@ -57,8 +59,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:check:export')")
@Log(title = "闅忚鏈嶅姟鍙戦�佸垽鏂�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ServiceCheck serviceCheck)
- {
+ public void export(HttpServletResponse response, ServiceCheck serviceCheck) {
List<ServiceCheck> list = serviceCheckService.selectServiceCheckList(serviceCheck);
ExcelUtil<ServiceCheck> util = new ExcelUtil<ServiceCheck>(ServiceCheck.class);
util.exportExcel(response, list, "闅忚鏈嶅姟鍙戦�佸垽鏂暟鎹�");
@@ -70,8 +71,7 @@
@ApiOperation("鑾峰彇闅忚鏈嶅姟鍙戦�佸垽鏂缁嗕俊鎭�")
//@PreAuthorize("@ss.hasPermi('smartor:check:query')")
@GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(serviceCheckService.selectServiceCheckById(id));
}
@@ -81,9 +81,9 @@
@ApiOperation("鏂板闅忚鏈嶅姟鍙戦�佸垽鏂�")
//@PreAuthorize("@ss.hasPermi('smartor:check:add')")
@Log(title = "闅忚鏈嶅姟鍙戦�佸垽鏂�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody ServiceCheck serviceCheck)
- {
+ public AjaxResult add(@RequestBody ServiceCheck serviceCheck) {
return toAjax(serviceCheckService.insertServiceCheck(serviceCheck));
}
@@ -93,9 +93,9 @@
@ApiOperation("淇敼闅忚鏈嶅姟鍙戦�佸垽鏂�")
//@PreAuthorize("@ss.hasPermi('smartor:check:edit')")
@Log(title = "闅忚鏈嶅姟鍙戦�佸垽鏂�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody ServiceCheck serviceCheck)
- {
+ public AjaxResult edit(@RequestBody ServiceCheck serviceCheck) {
return toAjax(serviceCheckService.updateServiceCheck(serviceCheck));
}
@@ -105,9 +105,8 @@
@ApiOperation("鍒犻櫎闅忚鏈嶅姟鍙戦�佸垽鏂�")
//@PreAuthorize("@ss.hasPermi('smartor:check:remove')")
@Log(title = "闅忚鏈嶅姟鍙戦�佸垽鏂�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceCheckService.deleteServiceCheckByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
index df4bdab..4b117e0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -89,6 +90,7 @@
*/
@ApiOperation("鏂板涓婚敭")
@Log(title = "涓婚敭", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody ServiceOutPath serviceOutPath) {
return toAjax(serviceOutPathService.insertServiceOutPath(serviceOutPath));
@@ -100,6 +102,7 @@
@ApiOperation("淇敼涓婚敭")
//@PreAuthorize("@ss.hasPermi('smartor:path:edit')")
@Log(title = "涓婚敭", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody ServiceOutPath serviceOutPath) {
return toAjax(serviceOutPathService.updateServiceOutPath(serviceOutPath));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServicePatientTempController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServicePatientTempController.java
index e073a10..f987749 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServicePatientTempController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServicePatientTempController.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.ruoyi.common.annotation.AddOrgId;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -80,7 +81,8 @@
@ApiOperation("鏂板銆愯濉啓鍔熻兘鍚嶇О銆�")
//@PreAuthorize("@ss.hasPermi('smartor:temp:add')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody ServicePatientTemp servicePatientTemp) {
return toAjax(servicePatientTempService.insertServicePatientTemp(servicePatientTemp));
}
@@ -91,7 +93,8 @@
@ApiOperation("淇敼銆愯濉啓鍔熻兘鍚嶇О銆�")
//@PreAuthorize("@ss.hasPermi('smartor:temp:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody ServicePatientTemp servicePatientTemp) {
return toAjax(servicePatientTempService.updateServicePatientTemp(servicePatientTemp));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
index 37dcd03..659e6b2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
@@ -83,7 +83,7 @@
//@PreAuthorize("@ss.hasPermi('system:answer:add')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.INSERT)
@ApiOperation("鏂板浠诲姟闂嵎闂閫夐」")
- @PostMapping("/add")
+@PostMapping("/add")
public AjaxResult add(@RequestBody ServiceSubtaskAnswer serviceSubtaskAnswer) {
SysUser user = getLoginUser().getUser();
serviceSubtaskAnswer.setOrgid(user.getOrgid());
@@ -96,7 +96,7 @@
//@PreAuthorize("@ss.hasPermi('system:answer:edit')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼浠诲姟闂嵎闂閫夐」")
- @PostMapping("/edit")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody ServiceSubtaskAnswer serviceSubtaskAnswer) {
log.info("銆恠aveQuestionCache-----edit銆戠殑鍏ュ弬涓猴細{}", serviceSubtaskAnswer);
return toAjax(serviceSubtaskAnswerService.updateServiceSubtaskAnswer(serviceSubtaskAnswer));
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);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskPreachformController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskPreachformController.java
index 102a360..4294496 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskPreachformController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskPreachformController.java
@@ -1,9 +1,12 @@
package com.ruoyi.web.controller.smartor;
import java.util.List;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -32,8 +35,7 @@
@Api("銆愯濉啓鍔熻兘鍚嶇О銆�")
@RestController
@RequestMapping("/smartor/preachform")
-public class ServiceSubtaskPreachformController extends BaseController
-{
+public class ServiceSubtaskPreachformController extends BaseController {
@Autowired
private IServiceSubtaskPreachformService serviceSubtaskPreachformService;
@@ -42,9 +44,8 @@
*/
@ApiOperation("鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�")
//@PreAuthorize("@ss.hasPermi('smartor:preachform:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody ServiceSubtaskPreachform serviceSubtaskPreachform)
- {
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody ServiceSubtaskPreachform serviceSubtaskPreachform) {
startPage();
List<ServiceSubtaskPreachform> list = serviceSubtaskPreachformService.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
return getDataTable(list);
@@ -57,8 +58,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:preachform:export')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ServiceSubtaskPreachform serviceSubtaskPreachform)
- {
+ public void export(HttpServletResponse response, ServiceSubtaskPreachform serviceSubtaskPreachform) {
List<ServiceSubtaskPreachform> list = serviceSubtaskPreachformService.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
ExcelUtil<ServiceSubtaskPreachform> util = new ExcelUtil<ServiceSubtaskPreachform>(ServiceSubtaskPreachform.class);
util.exportExcel(response, list, "銆愯濉啓鍔熻兘鍚嶇О銆戞暟鎹�");
@@ -70,8 +70,7 @@
@ApiOperation("鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�")
//@PreAuthorize("@ss.hasPermi('smartor:preachform:query')")
@GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(serviceSubtaskPreachformService.selectServiceSubtaskPreachformById(id));
}
@@ -82,8 +81,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:preachform:add')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public AjaxResult add(@RequestBody ServiceSubtaskPreachform serviceSubtaskPreachform)
- {
+ public AjaxResult add(@RequestBody ServiceSubtaskPreachform serviceSubtaskPreachform) {
return toAjax(serviceSubtaskPreachformService.insertServiceSubtaskPreachform(serviceSubtaskPreachform));
}
@@ -94,8 +92,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:preachform:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody ServiceSubtaskPreachform serviceSubtaskPreachform)
- {
+ public AjaxResult edit(@RequestBody ServiceSubtaskPreachform serviceSubtaskPreachform) {
return toAjax(serviceSubtaskPreachformService.updateServiceSubtaskPreachform(serviceSubtaskPreachform));
}
@@ -105,9 +102,8 @@
@ApiOperation("鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�")
//@PreAuthorize("@ss.hasPermi('smartor:preachform:remove')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceSubtaskPreachformService.deleteServiceSubtaskPreachformByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index a66e113..a1346c9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.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.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -60,7 +61,8 @@
*/
@ApiOperation("鏌ヨ浠诲姟鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody ServiceTask serviceTask) {
PageUtils.startPageByPost(serviceTask.getPageNum(), serviceTask.getPageSize());
// List<ServiceTask> list = serviceTaskService.selectServiceTaskList(serviceTask);
@@ -129,6 +131,7 @@
@ApiOperation("鏂板浠诲姟")
//@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:add')")
@Log(title = "璇煶浠诲姟", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody ServiceTask ServiceTask) {
SysUser user = getLoginUser().getUser();
@@ -155,6 +158,7 @@
@ApiOperation("淇敼浠诲姟")
//@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:edit')")
@Log(title = "浠诲姟", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody ServiceTask ServiceTask) {
return toAjax(serviceTaskService.updateServiceTask(ServiceTask));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdeptController.java
index 14a203b..64920ea 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdeptController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -32,7 +33,8 @@
*/
@ApiOperation("鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:taskdept:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody ServiceTaskdept serviceTaskdept) {
startPage();
List<ServiceTaskdept> list = serviceTaskdeptService.selectServiceTaskdeptList(serviceTaskdept);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
index 6907b56..2d65c2b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
@@ -1,9 +1,13 @@
package com.ruoyi.web.controller.smartor;
import java.util.List;
+
+import com.ruoyi.common.annotation.AddOrgId;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -32,8 +36,7 @@
@Api("璇婃柇妯℃澘绉戝鍏宠仈")
@RestController
@RequestMapping("/smartor/taskdiag")
-public class ServiceTaskdiagController extends BaseController
-{
+public class ServiceTaskdiagController extends BaseController {
@Autowired
private IServiceTaskdiagService serviceTaskdiagService;
@@ -42,9 +45,9 @@
*/
@ApiOperation("鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody ServiceTaskdiag serviceTaskdiag)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody ServiceTaskdiag serviceTaskdiag) {
startPage();
List<ServiceTaskdiag> list = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag);
return getDataTable(list);
@@ -57,8 +60,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:export')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ServiceTaskdiag serviceTaskdiag)
- {
+ public void export(HttpServletResponse response, ServiceTaskdiag serviceTaskdiag) {
List<ServiceTaskdiag> list = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag);
ExcelUtil<ServiceTaskdiag> util = new ExcelUtil<ServiceTaskdiag>(ServiceTaskdiag.class);
util.exportExcel(response, list, "妯℃澘绉戝鍏宠仈鏁版嵁");
@@ -70,8 +72,7 @@
@ApiOperation("鑾峰彇妯℃澘绉戝鍏宠仈璇︾粏淇℃伅")
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:query')")
@GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(serviceTaskdiagService.selectServiceTaskdiagById(id));
}
@@ -81,9 +82,9 @@
@ApiOperation("鏂板妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:add')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody ServiceTaskdiag serviceTaskdiag)
- {
+ public AjaxResult add(@RequestBody ServiceTaskdiag serviceTaskdiag) {
return toAjax(serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag));
}
@@ -93,9 +94,9 @@
@ApiOperation("淇敼妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:edit')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody ServiceTaskdiag serviceTaskdiag)
- {
+ public AjaxResult edit(@RequestBody ServiceTaskdiag serviceTaskdiag) {
return toAjax(serviceTaskdiagService.updateServiceTaskdiag(serviceTaskdiag));
}
@@ -105,9 +106,8 @@
@ApiOperation("鍒犻櫎妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:remove')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{id}")
- public AjaxResult remove(@PathVariable Long id)
- {
+ @GetMapping("/remove/{id}")
+ public AjaxResult remove(@PathVariable Long id) {
return toAjax(serviceTaskdiagService.deleteServiceTaskdiagById(id));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java
index 7f719d3..b3a5392 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java
@@ -1,9 +1,13 @@
package com.ruoyi.web.controller.smartor;
import java.util.List;
+
+import com.ruoyi.common.annotation.AddOrgId;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -32,8 +36,7 @@
@Api("鎵嬫湳妯℃澘绉戝鍏宠仈")
@RestController
@RequestMapping("/smartor/taskoper")
-public class ServiceTaskoperController extends BaseController
-{
+public class ServiceTaskoperController extends BaseController {
@Autowired
private IServiceTaskoperService serviceTaskoperService;
@@ -42,9 +45,9 @@
*/
@ApiOperation("鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:taskoper:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody ServiceTaskoper serviceTaskoper)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody ServiceTaskoper serviceTaskoper) {
startPage();
List<ServiceTaskoper> list = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper);
return getDataTable(list);
@@ -57,8 +60,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:taskoper:export')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ServiceTaskoper serviceTaskoper)
- {
+ public void export(HttpServletResponse response, ServiceTaskoper serviceTaskoper) {
List<ServiceTaskoper> list = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper);
ExcelUtil<ServiceTaskoper> util = new ExcelUtil<ServiceTaskoper>(ServiceTaskoper.class);
util.exportExcel(response, list, "妯℃澘绉戝鍏宠仈鏁版嵁");
@@ -70,8 +72,7 @@
@ApiOperation("鑾峰彇妯℃澘绉戝鍏宠仈璇︾粏淇℃伅")
//@PreAuthorize("@ss.hasPermi('smartor:taskoper:query')")
@GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(serviceTaskoperService.selectServiceTaskoperById(id));
}
@@ -81,9 +82,9 @@
@ApiOperation("鏂板妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:taskoper:add')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody ServiceTaskoper serviceTaskoper)
- {
+ public AjaxResult add(@RequestBody ServiceTaskoper serviceTaskoper) {
return toAjax(serviceTaskoperService.insertServiceTaskoper(serviceTaskoper));
}
@@ -93,9 +94,9 @@
@ApiOperation("淇敼妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:taskoper:edit')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody ServiceTaskoper serviceTaskoper)
- {
+ public AjaxResult edit(@RequestBody ServiceTaskoper serviceTaskoper) {
return toAjax(serviceTaskoperService.updateServiceTaskoper(serviceTaskoper));
}
@@ -105,9 +106,8 @@
@ApiOperation("鍒犻櫎妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:taskoper:remove')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{id}")
- public AjaxResult remove(@PathVariable Long id)
- {
+ @GetMapping("/remove/{id}")
+ public AjaxResult remove(@PathVariable Long id) {
return toAjax(serviceTaskoperService.deleteServiceTaskoperById(id));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsParamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsParamController.java
index 1cdacc4..290d799 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsParamController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsParamController.java
@@ -35,7 +35,7 @@
* 鏌ヨ鐭俊鍙傛暟鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:smsparam:list')")
- @PostMapping("/list")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody SmsParam smsParam) {
startPage();
List<SmsParam> list = smsParamService.selectSmsParamList(smsParam);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsRecordsController.java
index 49c66af..8489987 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsRecordsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsRecordsController.java
@@ -35,7 +35,7 @@
* 鏌ヨ鐭俊璁板綍鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:smsrecords:list')")
- @PostMapping("/list")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody SmsRecords smsRecords) {
startPage();
List<SmsRecords> list = smsRecordsService.selectSmsRecordsList(smsRecords);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java
index 0ad0f48..38fb37c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java
@@ -27,8 +27,7 @@
*/
@RestController
@RequestMapping("/smartor/smstemplet")
-public class SmsTempletController extends BaseController
-{
+public class SmsTempletController extends BaseController {
@Autowired
private ISmsTempletService smsTempletService;
@@ -36,9 +35,8 @@
* 鏌ヨ鐭俊妯℃澘鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:smstemplet:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody SmsTemplet smsTemplet)
- {
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody SmsTemplet smsTemplet) {
startPage();
List<SmsTemplet> list = smsTempletService.selectSmsTempletList(smsTemplet);
return getDataTable(list);
@@ -50,8 +48,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:smstemplet:export')")
@Log(title = "鐭俊妯℃澘", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SmsTemplet smsTemplet)
- {
+ public void export(HttpServletResponse response, SmsTemplet smsTemplet) {
List<SmsTemplet> list = smsTempletService.selectSmsTempletList(smsTemplet);
ExcelUtil<SmsTemplet> util = new ExcelUtil<SmsTemplet>(SmsTemplet.class);
util.exportExcel(response, list, "鐭俊妯℃澘鏁版嵁");
@@ -62,8 +59,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:smstemplet:query')")
@GetMapping(value = "/{templetid}")
- public AjaxResult getInfo(@PathVariable("templetid") Long templetid)
- {
+ public AjaxResult getInfo(@PathVariable("templetid") Long templetid) {
return success(smsTempletService.selectSmsTempletByTempletid(templetid));
}
@@ -73,8 +69,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:smstemplet:add')")
@Log(title = "鐭俊妯℃澘", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public AjaxResult add(@RequestBody SmsTemplet smsTemplet)
- {
+ public AjaxResult add(@RequestBody SmsTemplet smsTemplet) {
return toAjax(smsTempletService.insertSmsTemplet(smsTemplet));
}
@@ -84,8 +79,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:smstemplet:edit')")
@Log(title = "鐭俊妯℃澘", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody SmsTemplet smsTemplet)
- {
+ public AjaxResult edit(@RequestBody SmsTemplet smsTemplet) {
return toAjax(smsTempletService.updateSmsTemplet(smsTemplet));
}
@@ -94,9 +88,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:smstemplet:remove')")
@Log(title = "鐭俊妯℃澘", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{templetids}")
- public AjaxResult remove(@PathVariable Long[] templetids)
- {
+ @GetMapping("/remove/{templetids}")
+ public AjaxResult remove(@PathVariable Long[] templetids) {
return toAjax(smsTempletService.deleteSmsTempletByTempletids(templetids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java
index 54ce334..49d2f3c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.smartor.domain.IvrLibaScriptAssortVO;
import com.smartor.domain.SvyCategoryVO;
import io.swagger.annotations.Api;
@@ -38,7 +39,8 @@
* 鏌ヨ闂嵎鍒嗙被鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:svycategory:list')")
- @PostMapping("/list")
+ @PostMapping("list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public TableDataInfo list(@RequestBody SvyCategory svyCategory) {
// startPage();
List<SvyCategoryVO> list = svyCategoryService.selectSvyCategoryList(svyCategory);
@@ -73,6 +75,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:svycategory:add')")
@Log(title = "闂嵎鍒嗙被", businessType = BusinessType.INSERT)
@ApiOperation("鏂板闂嵎鍒嗙被")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyCategory svyCategory) {
return toAjax(svyCategoryService.insertSvyCategory(svyCategory));
@@ -84,6 +87,7 @@
//@PreAuthorize("@ss.hasPermi('system:assort:add')")
@Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.INSERT)
@ApiOperation("鏂板闂嵎鍒嗙被鏍�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/addtree")
public AjaxResult addtree(@RequestBody SvyCategoryVO svyCategoryVO) {
return toAjax(svyCategoryService.insertSvyCategoryTree(svyCategoryVO));
@@ -95,6 +99,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:svycategory:edit')")
@Log(title = "闂嵎鍒嗙被", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼闂嵎鍒嗙被")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyCategory svyCategory) {
return toAjax(svyCategoryService.updateSvyCategory(svyCategory));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishController.java
index f99a0aa..bc8fe0d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishController.java
@@ -2,6 +2,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +24,13 @@
/**
* 闂嵎鏈�缁堢粨鏋淐ontroller
- *
+ *
* @author ruoyi
* @date 2023-03-03
*/
@RestController
@RequestMapping("/smartor/svyfinish")
-public class SvyFinishController extends BaseController
-{
+public class SvyFinishController extends BaseController {
@Autowired
private ISvyFinishService svyFinishService;
@@ -38,9 +38,8 @@
* 鏌ヨ闂嵎鏈�缁堢粨鏋滃垪琛�
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyfinish:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody SvyFinish svyFinish)
- {
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody SvyFinish svyFinish) {
startPage();
List<SvyFinish> list = svyFinishService.selectSvyFinishList(svyFinish);
return getDataTable(list);
@@ -52,8 +51,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:svyfinish:export')")
@Log(title = "闂嵎鏈�缁堢粨鏋�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SvyFinish svyFinish)
- {
+ public void export(HttpServletResponse response, SvyFinish svyFinish) {
List<SvyFinish> list = svyFinishService.selectSvyFinishList(svyFinish);
ExcelUtil<SvyFinish> util = new ExcelUtil<SvyFinish>(SvyFinish.class);
util.exportExcel(response, list, "闂嵎鏈�缁堢粨鏋滄暟鎹�");
@@ -64,8 +62,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyfinish:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(svyFinishService.selectSvyFinishById(id));
}
@@ -75,8 +72,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:svyfinish:add')")
@Log(title = "闂嵎鏈�缁堢粨鏋�", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public AjaxResult add(@RequestBody SvyFinish svyFinish)
- {
+ public AjaxResult add(@RequestBody SvyFinish svyFinish) {
return toAjax(svyFinishService.insertSvyFinish(svyFinish));
}
@@ -86,8 +82,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:svyfinish:edit')")
@Log(title = "闂嵎鏈�缁堢粨鏋�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody SvyFinish svyFinish)
- {
+ public AjaxResult edit(@RequestBody SvyFinish svyFinish) {
return toAjax(svyFinishService.updateSvyFinish(svyFinish));
}
@@ -96,9 +91,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyfinish:remove')")
@Log(title = "闂嵎鏈�缁堢粨鏋�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(svyFinishService.deleteSvyFinishByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishoptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishoptionController.java
index f9fdf77..7c8bf95 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishoptionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishoptionController.java
@@ -23,7 +23,7 @@
/**
* 闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏Controller
- *
+ *
* @author ruoyi
* @date 2023-03-03
*/
@@ -38,7 +38,7 @@
* 鏌ヨ闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:list')")
- @PostMapping("/list")
+@PostMapping("list")
public TableDataInfo list(@RequestBody SvyFinishoption svyFinishoption)
{
startPage();
@@ -74,7 +74,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:add')")
@Log(title = "闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+@PostMapping("/add")
public AjaxResult add(@RequestBody SvyFinishoption svyFinishoption)
{
return toAjax(svyFinishoptionService.insertSvyFinishoption(svyFinishoption));
@@ -85,7 +85,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:edit')")
@Log(title = "闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyFinishoption svyFinishoption)
{
return toAjax(svyFinishoptionService.updateSvyFinishoption(svyFinishoption));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishtopicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishtopicController.java
index 51089a6..f6e8333 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishtopicController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishtopicController.java
@@ -2,6 +2,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +24,13 @@
/**
* 闂嵎璋冩煡缁撴灉璇︽儏Controller
- *
+ *
* @author ruoyi
* @date 2023-03-03
*/
@RestController
@RequestMapping("/smartor/svyfinishtopic")
-public class SvyFinishtopicController extends BaseController
-{
+public class SvyFinishtopicController extends BaseController {
@Autowired
private ISvyFinishtopicService svyFinishtopicService;
@@ -38,9 +38,8 @@
* 鏌ヨ闂嵎璋冩煡缁撴灉璇︽儏鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody SvyFinishtopic svyFinishtopic)
- {
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody SvyFinishtopic svyFinishtopic) {
startPage();
List<SvyFinishtopic> list = svyFinishtopicService.selectSvyFinishtopicList(svyFinishtopic);
return getDataTable(list);
@@ -52,8 +51,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:export')")
@Log(title = "闂嵎璋冩煡缁撴灉璇︽儏", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SvyFinishtopic svyFinishtopic)
- {
+ public void export(HttpServletResponse response, SvyFinishtopic svyFinishtopic) {
List<SvyFinishtopic> list = svyFinishtopicService.selectSvyFinishtopicList(svyFinishtopic);
ExcelUtil<SvyFinishtopic> util = new ExcelUtil<SvyFinishtopic>(SvyFinishtopic.class);
util.exportExcel(response, list, "闂嵎璋冩煡缁撴灉璇︽儏鏁版嵁");
@@ -64,8 +62,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(svyFinishtopicService.selectSvyFinishtopicById(id));
}
@@ -75,8 +72,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:add')")
@Log(title = "闂嵎璋冩煡缁撴灉璇︽儏", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public AjaxResult add(@RequestBody SvyFinishtopic svyFinishtopic)
- {
+ public AjaxResult add(@RequestBody SvyFinishtopic svyFinishtopic) {
return toAjax(svyFinishtopicService.insertSvyFinishtopic(svyFinishtopic));
}
@@ -86,8 +82,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:edit')")
@Log(title = "闂嵎璋冩煡缁撴灉璇︽儏", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody SvyFinishtopic svyFinishtopic)
- {
+ public AjaxResult edit(@RequestBody SvyFinishtopic svyFinishtopic) {
return toAjax(svyFinishtopicService.updateSvyFinishtopic(svyFinishtopic));
}
@@ -96,9 +91,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:remove')")
@Log(title = "闂嵎璋冩煡缁撴灉璇︽儏", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(svyFinishtopicService.deleteSvyFinishtopicByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibExceptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibExceptionController.java
index d91ac64..4e95895 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibExceptionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibExceptionController.java
@@ -2,6 +2,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +24,13 @@
/**
* 闂嵎寮傚父Controller
- *
+ *
* @author ruoyi
* @date 2023-03-02
*/
@RestController
@RequestMapping("/smartor/svyexception")
-public class SvyLibExceptionController extends BaseController
-{
+public class SvyLibExceptionController extends BaseController {
@Autowired
private ISvyLibExceptionService svyLibExceptionService;
@@ -38,9 +38,8 @@
* 鏌ヨ闂嵎寮傚父鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyexception:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody SvyLibException svyLibException)
- {
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody SvyLibException svyLibException) {
startPage();
List<SvyLibException> list = svyLibExceptionService.selectSvyLibExceptionList(svyLibException);
return getDataTable(list);
@@ -52,8 +51,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:svyexception:export')")
@Log(title = "闂嵎寮傚父", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SvyLibException svyLibException)
- {
+ public void export(HttpServletResponse response, SvyLibException svyLibException) {
List<SvyLibException> list = svyLibExceptionService.selectSvyLibExceptionList(svyLibException);
ExcelUtil<SvyLibException> util = new ExcelUtil<SvyLibException>(SvyLibException.class);
util.exportExcel(response, list, "闂嵎寮傚父鏁版嵁");
@@ -64,8 +62,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyexception:query')")
@GetMapping(value = "/{ecid}")
- public AjaxResult getInfo(@PathVariable("ecid") Long ecid)
- {
+ public AjaxResult getInfo(@PathVariable("ecid") Long ecid) {
return success(svyLibExceptionService.selectSvyLibExceptionByEcid(ecid));
}
@@ -74,9 +71,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyexception:add')")
@Log(title = "闂嵎寮傚父", businessType = BusinessType.INSERT)
+
@PostMapping("/add")
- public AjaxResult add(@RequestBody SvyLibException svyLibException)
- {
+ public AjaxResult add(@RequestBody SvyLibException svyLibException) {
return toAjax(svyLibExceptionService.insertSvyLibException(svyLibException));
}
@@ -85,9 +82,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyexception:edit')")
@Log(title = "闂嵎寮傚父", businessType = BusinessType.UPDATE)
+
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody SvyLibException svyLibException)
- {
+ public AjaxResult edit(@RequestBody SvyLibException svyLibException) {
return toAjax(svyLibExceptionService.updateSvyLibException(svyLibException));
}
@@ -96,9 +93,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyexception:remove')")
@Log(title = "闂嵎寮傚父", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ecids}")
- public AjaxResult remove(@PathVariable Long[] ecids)
- {
+ @GetMapping("/remove/{ecids}")
+ public AjaxResult remove(@PathVariable Long[] ecids) {
return toAjax(svyLibExceptionService.deleteSvyLibExceptionByEcids(ecids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibResultController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibResultController.java
index 8c67281..041b469 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibResultController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibResultController.java
@@ -31,8 +31,7 @@
*/
@RestController
@RequestMapping("/smartor/svyresult")
-public class SvyLibResultController extends BaseController
-{
+public class SvyLibResultController extends BaseController {
@Autowired
private ISvyLibResultService svyLibResultService;
@@ -40,9 +39,8 @@
* 鏌ヨ闂嵎缁撴灉鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyresult:list')")
- @PostMapping("/list")
- public TableDataInfo list(@RequestBody SvyLibResult svyLibResult)
- {
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody SvyLibResult svyLibResult) {
startPage();
List<SvyLibResult> list = svyLibResultService.selectSvyLibResultList(svyLibResult);
return getDataTable(list);
@@ -54,8 +52,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:svyresult:export')")
@Log(title = "闂嵎缁撴灉", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SvyLibResult svyLibResult)
- {
+ public void export(HttpServletResponse response, SvyLibResult svyLibResult) {
List<SvyLibResult> list = svyLibResultService.selectSvyLibResultList(svyLibResult);
ExcelUtil<SvyLibResult> util = new ExcelUtil<SvyLibResult>(SvyLibResult.class);
util.exportExcel(response, list, "闂嵎缁撴灉鏁版嵁");
@@ -66,8 +63,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyresult:query')")
@GetMapping(value = "/{resultid}")
- public AjaxResult getInfo(@PathVariable("resultid") Long resultid)
- {
+ public AjaxResult getInfo(@PathVariable("resultid") Long resultid) {
return success(svyLibResultService.selectSvyLibResultByResultid(resultid));
}
@@ -76,9 +72,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyresult:add')")
@Log(title = "闂嵎缁撴灉", businessType = BusinessType.INSERT)
+
@PostMapping("/add")
- public AjaxResult add(@RequestBody SvyLibResult svyLibResult)
- {
+ public AjaxResult add(@RequestBody SvyLibResult svyLibResult) {
SysUser user = getLoginUser().getUser();
svyLibResult.setOrgid(user.getOrgid());
return toAjax(svyLibResultService.insertSvyLibResult(svyLibResult));
@@ -89,9 +85,9 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyresult:edit')")
@Log(title = "闂嵎缁撴灉", businessType = BusinessType.UPDATE)
+
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody SvyLibResult svyLibResult)
- {
+ public AjaxResult edit(@RequestBody SvyLibResult svyLibResult) {
return toAjax(svyLibResultService.updateSvyLibResult(svyLibResult));
}
@@ -100,9 +96,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svyresult:remove')")
@Log(title = "闂嵎缁撴灉", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{resultids}")
- public AjaxResult remove(@PathVariable Long[] resultids)
- {
+ @GetMapping("/remove/{resultids}")
+ public AjaxResult remove(@PathVariable Long[] resultids) {
return toAjax(svyLibResultService.deleteSvyLibResultByResultids(resultids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptCategoryController.java
index 3331993..6a49d7b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptCategoryController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -39,7 +40,8 @@
*/
@ApiOperation("鏌ヨ闂嵎棰樼洰鍒嗙被鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:category:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody SvyLibScriptCategory svyLibScriptCategory) {
// startPage();
List<SvyLibScriptCategoryVO> list = svyLibScriptCategoryService.selectSvyLibScriptCategoryList(svyLibScriptCategory);
@@ -68,11 +70,12 @@
return success(svyLibScriptCategoryService.selectSvyLibScriptCategoryById(id));
}
-// /**
+ // /**
// * 鏂板闂嵎棰樼洰鍒嗙被
// */
// //@PreAuthorize("@ss.hasPermi('smartor:category:add')")
// @Log(title = "闂嵎棰樼洰鍒嗙被", businessType = BusinessType.INSERT)
+// @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
// @PostMapping("/add")
// public AjaxResult add(@RequestBody SvyLibScriptCategory svyLibScriptCategory) {
// return toAjax(svyLibScriptCategoryService.insertSvyLibScriptCategory(svyLibScriptCategory));
@@ -83,6 +86,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:category:edit')")
@Log(title = "闂嵎棰樼洰鍒嗙被", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibScriptCategory svyLibScriptCategory) {
return toAjax(svyLibScriptCategoryService.updateSvyLibScriptCategory(svyLibScriptCategory));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptController.java
index d00a561..fce0ebd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.PageUtils;
@@ -44,7 +45,8 @@
*/
@ApiOperation("鏌ヨ闂嵎棰樼洰鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:svyScript:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody SvyLibScript svyLibScript) {
PageUtils.startPageByPost(svyLibScript.getPageNum(), svyLibScript.getPageSize());
List<SvyLibScript> list = svyLibScriptService.selectSvyLibScriptList(svyLibScript);
@@ -80,6 +82,7 @@
@ApiOperation("鏂板闂嵎棰樼洰")
//@PreAuthorize("@ss.hasPermi('smartor:svyScript:add')")
@Log(title = "闂嵎棰樼洰", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyLibScript svyLibScript) {
SysUser user = getLoginUser().getUser();
@@ -108,6 +111,7 @@
@ApiOperation("淇敼闂嵎棰樼洰")
//@PreAuthorize("@ss.hasPermi('smartor:svyScript:edit')")
@Log(title = "闂嵎棰樼洰", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibScript svyLibScript) {
return toAjax(svyLibScriptService.updateSvyLibScript(svyLibScript));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptOptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptOptionController.java
index 67b267f..f45e934 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptOptionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptOptionController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +38,8 @@
* 鏌ヨ闂嵎闂閫夐」鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:svytopicoption:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody SvyLibScriptOption svyLibTopicoption) {
startPage();
List<SvyLibScriptOption> list = svyLibTopicoptionService.selectSvyLibScriptOptionList(svyLibTopicoption);
@@ -70,6 +72,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svytopicoption:add')")
@Log(title = "闂嵎闂閫夐」", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyLibScriptOption svyLibTopicoption) {
SysUser user = getLoginUser().getUser();
@@ -82,6 +85,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:svytopicoption:edit')")
@Log(title = "闂嵎闂閫夐」", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibScriptOption svyLibTopicoption) {
return toAjax(svyLibTopicoptionService.updateSvyLibScriptOption(svyLibTopicoption));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateCategoryController.java
index 7fa0f56..76ed6b0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateCategoryController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -37,7 +38,8 @@
*/
@ApiOperation("鏌ヨ闂嵎妯℃澘鍒嗙被鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:category:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody SvyLibTemplateCategory svyLibTemplateCategory) {
List<SvyLibTemplateCategoryVO> list = svyLibTemplateCategoryService.selectSvyLibTemplateCategoryList(svyLibTemplateCategory);
return getDataTable(list);
@@ -65,12 +67,13 @@
return success(svyLibTemplateCategoryService.selectSvyLibTemplateCategoryById(id));
}
-// /**
+ // /**
// * 鏂板闂嵎妯℃澘鍒嗙被
// */
// @ApiOperation("鏂板闂嵎妯℃澘鍒嗙被")
// //@PreAuthorize("@ss.hasPermi('smartor:category:add')")
// @Log(Template = "闂嵎妯℃澘鍒嗙被", businessType = BusinessType.INSERT)
+// @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
// @PostMapping("/add")
// public AjaxResult add(@RequestBody SvyLibTemplateCategory svyLibTemplateCategory) {
// return toAjax(svyLibTemplateCategoryService.insertSvyLibTemplateCategory(svyLibTemplateCategory));
@@ -82,6 +85,7 @@
@ApiOperation("淇敼闂嵎妯℃澘鍒嗙被")
//@PreAuthorize("@ss.hasPermi('smartor:category:edit')")
@Log(title = "闂嵎妯℃澘鍒嗙被", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTemplateCategory svyLibTemplateCategory) {
return toAjax(svyLibTemplateCategoryService.updateSvyLibTemplateCategory(svyLibTemplateCategory));
@@ -105,6 +109,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:assort:add')")
@Log(title = "闂嵎妯℃澘鍒嗙被鏍�", businessType = BusinessType.INSERT)
@ApiOperation("闂嵎妯℃澘鍒嗙被鏍�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/addtree")
public AjaxResult addtree(@RequestBody SvyLibTemplateCategoryVO svyLibTemplateCategoryVO) {
SysUser user = getLoginUser().getUser();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
index e61dfc3..4eb699d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
@@ -119,7 +119,8 @@
@ApiOperation("淇敼闂嵎")
//@PreAuthorize("@ss.hasPermi('smartor:svyTemplate:edit')")
@Log(title = "闂嵎", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTemplate svyLibTemplate) {
return toAjax(svyLibTemplateService.updateSvyLibTemplate(svyLibTemplate));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java
index b13795d..7aa12cd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -69,7 +70,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:script:add')")
@Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.INSERT)
- @PostMapping
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyLibTemplateScript svyLibTemplateScript)
{
SysUser user = getLoginUser().getUser();
@@ -82,7 +84,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:script:edit')")
@Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.UPDATE)
- @PutMapping
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTemplateScript svyLibTemplateScript)
{
return toAjax(svyLibTemplateScriptService.updateSvyLibTemplateScript(svyLibTemplateScript));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionController.java
index 4816961..1442fa9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -24,8 +25,7 @@
*/
@RestController
@RequestMapping("/smartor/svytargetoption")
-public class SvyLibTemplateTargetoptionController extends BaseController
-{
+public class SvyLibTemplateTargetoptionController extends BaseController {
@Autowired
private ISvyLibTemplateTargetoptionService svyLibTemplateTargetoptionService;
@@ -34,8 +34,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:list')")
@GetMapping("/list")
- public TableDataInfo list(SvyLibTemplateTargetoption svyLibTemplateTargetoption)
- {
+ public TableDataInfo list(SvyLibTemplateTargetoption svyLibTemplateTargetoption) {
startPage();
List<SvyLibTemplateTargetoption> list = svyLibTemplateTargetoptionService.selectSvyLibTemplateTargetoptionList(svyLibTemplateTargetoption);
return getDataTable(list);
@@ -47,8 +46,7 @@
//@PreAuthorize("@ss.hasPermi('system:targetoption:export')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SvyLibTemplateTargetoption svyLibTemplateTargetoption)
- {
+ public void export(HttpServletResponse response, SvyLibTemplateTargetoption svyLibTemplateTargetoption) {
List<SvyLibTemplateTargetoption> list = svyLibTemplateTargetoptionService.selectSvyLibTemplateTargetoptionList(svyLibTemplateTargetoption);
ExcelUtil<SvyLibTemplateTargetoption> util = new ExcelUtil<SvyLibTemplateTargetoption>(SvyLibTemplateTargetoption.class);
util.exportExcel(response, list, "闂嵎闂鎸囨爣閫夐」搴撴暟鎹�");
@@ -59,8 +57,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(svyLibTemplateTargetoptionService.selectSvyLibTemplateTargetoptionById(id));
}
@@ -69,9 +66,9 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:add')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody SvyLibTemplateTargetoption svyLibTemplateTargetoption)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody SvyLibTemplateTargetoption svyLibTemplateTargetoption) {
SysUser user = getLoginUser().getUser();
svyLibTemplateTargetoption.setOrgid(user.getOrgid());
return toAjax(svyLibTemplateTargetoptionService.insertSvyLibTemplateTargetoption(svyLibTemplateTargetoption));
@@ -82,9 +79,9 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody SvyLibTemplateTargetoption svyLibTemplateTargetoption)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody SvyLibTemplateTargetoption svyLibTemplateTargetoption) {
return toAjax(svyLibTemplateTargetoptionService.updateSvyLibTemplateTargetoption(svyLibTemplateTargetoption));
}
@@ -93,9 +90,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(svyLibTemplateTargetoptionService.deleteSvyLibTemplateTargetoptionByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionWjxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionWjxController.java
index 19bd1fd..07f3cac 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionWjxController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionWjxController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -68,7 +69,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:wjx:add')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
- @PostMapping
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyLibTemplateTargetoptionWjx svyLibTemplateTargetoptionWjx)
{
return toAjax(svyLibTemplateTargetoptionWjxService.insertSvyLibTemplateTargetoptionWjx(svyLibTemplateTargetoptionWjx));
@@ -79,7 +81,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:wjx:edit')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTemplateTargetoptionWjx svyLibTemplateTargetoptionWjx)
{
return toAjax(svyLibTemplateTargetoptionWjxService.updateSvyLibTemplateTargetoptionWjx(svyLibTemplateTargetoptionWjx));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java
index 52fa21f..8d2e056 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.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.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -60,7 +61,8 @@
*/
@ApiOperation("鏌ヨ闂嵎浠诲姟锛堜换鍔★級鍒楄〃")
//@PreAuthorize("@ss.hasPermi('system:task:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody SvyTask svyTask) {
PageUtils.startPageByPost(svyTask.getPageNum(), svyTask.getPageSize());
List<SvyTask> list = svyTaskService.selectSvyTaskList(svyTask);
@@ -126,6 +128,7 @@
@ApiOperation("鏂板闂嵎浠诲姟锛堜换鍔★級")
//@PreAuthorize("@ss.hasPermi('system:task:add')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyTask svyTask) {
SysUser user = getLoginUser().getUser();
@@ -139,6 +142,7 @@
@ApiOperation("淇敼闂嵎浠诲姟锛堜换鍔★級")
//@PreAuthorize("@ss.hasPermi('system:task:edit')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTask svyTask) {
return toAjax(svyTaskService.updateSvyTask(svyTask));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptController.java
index 40686b1..eb6cda3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -72,6 +73,7 @@
@ApiOperation("鏂板浠诲姟闂嵎棰樼洰")
//@PreAuthorize("@ss.hasPermi('system:script:add')")
@Log(title = "浠诲姟闂嵎棰樼洰", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyTaskScript svyTaskScript) {
SysUser user = getLoginUser().getUser();
@@ -85,6 +87,7 @@
@ApiOperation("淇敼浠诲姟闂嵎棰樼洰")
//@PreAuthorize("@ss.hasPermi('system:script:edit')")
@Log(title = "浠诲姟闂嵎棰樼洰", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTaskScript svyTaskScript) {
return toAjax(svyTaskScriptService.updateSvyTaskScript(svyTaskScript));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateController.java
index 10a0c1d..31b3e8a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -87,6 +88,7 @@
@ApiOperation("淇敼浠诲姟闂嵎妯℃澘")
//@PreAuthorize("@ss.hasPermi('system:template:edit')")
@Log(title = "浠诲姟闂嵎妯℃澘", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTaskTemplate svyTaskTemplate) {
return toAjax(svyTaskTemplateService.updateSvyTaskTemplate(svyTaskTemplate));
@@ -108,6 +110,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:template:add')")
@ApiOperation("鏂板鎴栦慨鏀归殢璁夸换鍔￠棶鍗锋ā鏉垮簱")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/saveOrUpdateTaskTemp")
public AjaxResult saveOrUpdateTaskTemp(@RequestBody SvyTaskTemplateVO svyTaskTemplateVO) {
SysUser user = getLoginUser().getUser();
@@ -123,6 +126,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:template:add')")
@ApiOperation("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectInfoByCondition")
public AjaxResult selectInfoByCondition(@RequestBody SvyTaskTemplateVO svyTaskTemplateVO) {
return AjaxResult.success(svyTaskTemplateService.selectInfoByCondition(svyTaskTemplateVO));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateScriptController.java
index 061fc62..20ea4c0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateScriptController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -67,7 +68,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:script:add')")
@Log(title = "闂嵎浠诲姟妯＄増闂璇濇湳搴�", businessType = BusinessType.INSERT)
- @PostMapping
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyTaskTemplateScript svyTaskTemplateScript) {
SysUser user = getLoginUser().getUser();
svyTaskTemplateScript.setOrgid(user.getOrgid());
@@ -79,7 +81,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:script:edit')")
@Log(title = "闂嵎浠诲姟妯＄増闂璇濇湳搴�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTaskTemplateScript svyTaskTemplateScript) {
return toAjax(svyTaskTemplateScriptService.updateSvyTaskTemplateScript(svyTaskTemplateScript));
}
@@ -101,6 +104,7 @@
* @return
*/
@ApiOperation("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectInfoByCondition")
public AjaxResult selectInfoByCondition(@RequestBody SvyTaskTemplateScriptVO svyTaskTemplateScriptVO) {
return AjaxResult.success(svyTaskTemplateScriptService.selectInfoByCondition(svyTaskTemplateScriptVO));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateTargetoptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateTargetoptionController.java
index c2f3ef1..0de79b0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateTargetoptionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateTargetoptionController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -65,7 +66,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:add')")
@Log(title = "闂嵎浠诲姟妯℃澘鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
- @PostMapping
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyTaskTemplateTargetoption svyTaskTemplateTargetoption) {
SysUser user = getLoginUser().getUser();
svyTaskTemplateTargetoption.setOrgid(user.getOrgid());
@@ -77,7 +79,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
@Log(title = "闂嵎浠诲姟妯℃澘鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTaskTemplateTargetoption svyTaskTemplateTargetoption) {
return toAjax(svyTaskTemplateTargetoptionService.updateSvyTaskTemplateTargetoption(svyTaskTemplateTargetoption));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTopicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTopicController.java
index f4595ce..e4ba656 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTopicController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTopicController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -40,7 +41,8 @@
* 鏌ヨ棰樼洰鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('system:topic:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody SvyTopic svyTopic) {
startPage();
List<SvyTopic> list = svyTopicService.selectSvyTopicList(svyTopic);
@@ -73,6 +75,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:topic:add')")
@Log(title = "棰樼洰", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyTopic svyTopic) {
SysUser user = getLoginUser().getUser();
@@ -85,6 +88,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:topic:edit')")
@Log(title = "棰樼洰", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTopic svyTopic) {
return toAjax(svyTopicService.updateSvyTopic(svyTopic));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SysUserOrgController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SysUserOrgController.java
new file mode 100644
index 0000000..12c61b6
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SysUserOrgController.java
@@ -0,0 +1,110 @@
+package com.ruoyi.web.controller.smartor;
+
+import java.util.List;
+
+import com.ruoyi.common.annotation.AddOrgId;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.smartor.domain.SysUserOrg;
+import com.smartor.service.ISysUserOrgService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱擟ontroller
+ *
+ * @author lihu
+ * @date 2026-01-07
+ */
+@Api("鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�")
+@RestController
+@RequestMapping("/smartor/org")
+public class SysUserOrgController extends BaseController {
+ @Autowired
+ private ISysUserOrgService sysUserOrgService;
+
+ /**
+ * 鏌ヨ鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斿垪琛�
+ */
+ @ApiOperation("鏌ヨ鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斿垪琛�")
+ //@PreAuthorize("@ss.hasPermi('smartor:org:list')")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody SysUserOrg sysUserOrg) {
+ startPage();
+ List<SysUserOrg> list = sysUserOrgService.selectSysUserOrgList(sysUserOrg);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斿垪琛�
+ */
+ @ApiOperation("瀵煎嚭鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斿垪琛�")
+ //@PreAuthorize("@ss.hasPermi('smartor:org:export')")
+ @Log(title = "鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysUserOrg sysUserOrg) {
+ List<SysUserOrg> list = sysUserOrgService.selectSysUserOrgList(sysUserOrg);
+ ExcelUtil<SysUserOrg> util = new ExcelUtil<SysUserOrg>(SysUserOrg.class);
+ util.exportExcel(response, list, "鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱旀暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱旇缁嗕俊鎭�
+ */
+ @ApiOperation("鑾峰彇鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱旇缁嗕俊鎭�")
+ //@PreAuthorize("@ss.hasPermi('smartor:org:query')")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(sysUserOrgService.selectSysUserOrgById(id));
+ }
+
+ /**
+ * 鏂板鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ */
+ @ApiOperation("鏂板鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�")
+ //@PreAuthorize("@ss.hasPermi('smartor:org:add')")
+ @Log(title = "鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody SysUserOrg sysUserOrg) {
+ return toAjax(sysUserOrgService.insertSysUserOrg(sysUserOrg));
+ }
+
+ /**
+ * 淇敼鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ */
+ @ApiOperation("淇敼鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�")
+ //@PreAuthorize("@ss.hasPermi('smartor:org:edit')")
+ @Log(title = "鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody SysUserOrg sysUserOrg) {
+ return toAjax(sysUserOrgService.updateSysUserOrg(sysUserOrg));
+ }
+
+ /**
+ * 鍒犻櫎鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ */
+ @ApiOperation("鍒犻櫎鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�")
+ //@PreAuthorize("@ss.hasPermi('smartor:org:remove')")
+ @Log(title = "鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�", businessType = BusinessType.DELETE)
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(sysUserOrgService.deleteSysUserOrgByIds(ids));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java
index 09f27fa..ff0714c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java
@@ -73,7 +73,8 @@
//@PreAuthorize("@ss.hasPermi('smartor:dept:add')")
@ApiOperation("鏂板妯℃澘绉戝鍏宠仈")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody List<TemplateDept> templateDepts) {
SysUser user = getLoginUser().getUser();
return toAjax(templateDeptService.insertTemplateDept(templateDepts,user.getGuid()));
@@ -85,7 +86,8 @@
@ApiOperation("淇敼妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:dept:edit')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody TemplateDept templateDept) {
return toAjax(templateDeptService.updateTemplateDept(templateDept));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
index 3b67108..610eed3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
@@ -56,7 +56,8 @@
* 鏌ヨ鐭俊璐﹀彿鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:smsaccount:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody BaseSmsaccount baseSmsaccount) {
startPage();
List<BaseSmsaccount> list = baseSmsaccountService.selectBaseSmsaccountList(baseSmsaccount);
@@ -99,7 +100,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:smsaccount:edit')")
@Log(title = "鐭俊璐﹀彿", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseSmsaccount baseSmsaccount) {
return toAjax(baseSmsaccountService.updateBaseSmsaccount(baseSmsaccount));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
index 27c1c48..4d4ba96 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -90,7 +90,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:config:add')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysConfig config)
{
if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
@@ -106,7 +107,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:config:edit')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysConfig config)
{
if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
index 9be2b1e..a7f8cac 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -84,7 +84,8 @@
@ApiOperation("鏂板閮ㄩ棬")
//@PreAuthorize("@ss.hasPermi('system:dept:add')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysDept dept)
{
if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
@@ -101,7 +102,8 @@
@ApiOperation("淇敼閮ㄩ棬")
//@PreAuthorize("@ss.hasPermi('system:dept:edit')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysDept dept)
{
Long deptId = dept.getDeptId();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
index 6b8e744..510004d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -88,7 +88,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:dict:add')")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysDictData dict)
{
dict.setCreateBy(getUsername());
@@ -100,7 +101,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:dict:edit')")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysDictData dict)
{
dict.setUpdateBy(getUsername());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
index 67c2ba9..ca14513 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
@@ -69,7 +69,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:dict:add')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysDictType dict)
{
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
@@ -85,7 +86,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:dict:edit')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysDictType dict)
{
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 55d14d9..d51991f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -85,7 +85,7 @@
public AjaxResult login(@RequestBody LoginBody loginBody) {
AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
- String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid());
+ String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid(), loginBody.getCampusid());
ajax.put(Constants.TOKEN, token);
return ajax;
}
@@ -116,7 +116,7 @@
*/
// @IpWhitelist
@GetMapping("/SSOLogin")
- public RedirectView SSOLogin(@RequestParam(required = false) String userName, @RequestParam(required = false) String orgid, @RequestParam(required = false) String deptId, @RequestParam(required = false) String token) {
+ public RedirectView SSOLogin(@RequestParam(required = false) String userName, @RequestParam(required = false) String orgid, @RequestParam(required = false) String campusid, @RequestParam(required = false) String deptId, @RequestParam(required = false) String token) {
if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token)) {
throw new BaseException("鍙傛暟涓嶈兘涓虹┖");
}
@@ -152,7 +152,7 @@
userName = rsaPublicKeyExample.decryptedData(userName, pri_key);
}
if (StringUtils.isEmpty(deptId)) deptId = "null";
- String token2 = loginService.loginByUserName(userName + "&" + orgid + "&" + deptId);
+ String token2 = loginService.loginByUserName(userName + "&" + orgid + "&" + deptId + "&" + campusid);
if (StringUtils.isEmpty(token2)) {
throw new BaseException("鐧婚檰澶辫触");
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index cf3e86e..305aea1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.system;
import java.util.List;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -28,8 +30,7 @@
*/
@RestController
@RequestMapping("/system/menu")
-public class SysMenuController extends BaseController
-{
+public class SysMenuController extends BaseController {
@Autowired
private ISysMenuService menuService;
@@ -37,9 +38,9 @@
* 鑾峰彇鑿滃崟鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('system:menu:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@GetMapping("/list")
- public AjaxResult list(SysMenu menu)
- {
+ public AjaxResult list(SysMenu menu) {
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return success(menus);
}
@@ -49,8 +50,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:menu:query')")
@GetMapping(value = "/{menuId}")
- public AjaxResult getInfo(@PathVariable Long menuId)
- {
+ public AjaxResult getInfo(@PathVariable Long menuId) {
return success(menuService.selectMenuById(menuId));
}
@@ -58,8 +58,7 @@
* 鑾峰彇鑿滃崟涓嬫媺鏍戝垪琛�
*/
@GetMapping("/treeselect")
- public AjaxResult treeselect(SysMenu menu)
- {
+ public AjaxResult treeselect(SysMenu menu) {
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return success(menuService.buildMenuTreeSelect(menus));
}
@@ -68,8 +67,7 @@
* 鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍�
*/
@GetMapping(value = "/roleMenuTreeselect/{roleId}")
- public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
- {
+ public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
List<SysMenu> menus = menuService.selectMenuList(getUserId());
AjaxResult ajax = AjaxResult.success();
ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
@@ -82,15 +80,12 @@
*/
//@PreAuthorize("@ss.hasPermi('system:menu:add')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@Validated @RequestBody SysMenu menu)
- {
- if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
- {
+ public AjaxResult add(@Validated @RequestBody SysMenu menu) {
+ if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
return error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
- }
- else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
- {
+ } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
return error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
}
menu.setCreateBy(getUsername());
@@ -102,19 +97,14 @@
*/
//@PreAuthorize("@ss.hasPermi('system:menu:edit')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@Validated @RequestBody SysMenu menu)
- {
- if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
- {
+ public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
+ if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
- }
- else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
- {
+ } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
- }
- else if (menu.getMenuId().equals(menu.getParentId()))
- {
+ } else if (menu.getMenuId().equals(menu.getParentId())) {
return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屼笂绾ц彍鍗曚笉鑳介�夋嫨鑷繁");
}
menu.setUpdateBy(getUsername());
@@ -127,14 +117,11 @@
//@PreAuthorize("@ss.hasPermi('system:menu:remove')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{menuId}")
- public AjaxResult remove(@PathVariable("menuId") Long menuId)
- {
- if (menuService.hasChildByMenuId(menuId))
- {
+ public AjaxResult remove(@PathVariable("menuId") Long menuId) {
+ if (menuService.hasChildByMenuId(menuId)) {
return warn("瀛樺湪瀛愯彍鍗�,涓嶅厑璁稿垹闄�");
}
- if (menuService.checkMenuExistRole(menuId))
- {
+ if (menuService.checkMenuExistRole(menuId)) {
return warn("鑿滃崟宸插垎閰�,涓嶅厑璁稿垹闄�");
}
return toAjax(menuService.deleteMenuById(menuId));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
index 3d375ee..5df2145 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
@@ -62,7 +62,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:notice:add')")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysNotice notice) {
notice.setCreateBy(getUsername());
return toAjax(noticeService.insertNotice(notice));
@@ -73,7 +74,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:notice:edit')")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysNotice notice) {
notice.setUpdateBy(getUsername());
return toAjax(noticeService.updateNotice(notice));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
index c9aa093..8df0110 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -30,8 +32,7 @@
*/
@RestController
@RequestMapping("/system/post")
-public class SysPostController extends BaseController
-{
+public class SysPostController extends BaseController {
@Autowired
private ISysPostService postService;
@@ -40,8 +41,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:post:list')")
@GetMapping("/list")
- public TableDataInfo list(SysPost post)
- {
+ public TableDataInfo list(SysPost post) {
startPage();
List<SysPost> list = postService.selectPostList(post);
return getDataTable(list);
@@ -50,8 +50,7 @@
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.EXPORT)
//@PreAuthorize("@ss.hasPermi('system:post:export')")
@PostMapping("/export")
- public void export(HttpServletResponse response, SysPost post)
- {
+ public void export(HttpServletResponse response, SysPost post) {
List<SysPost> list = postService.selectPostList(post);
ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
util.exportExcel(response, list, "宀椾綅鏁版嵁");
@@ -62,8 +61,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:post:query')")
@GetMapping(value = "/{postId}")
- public AjaxResult getInfo(@PathVariable Long postId)
- {
+ public AjaxResult getInfo(@PathVariable Long postId) {
return success(postService.selectPostById(postId));
}
@@ -72,15 +70,12 @@
*/
//@PreAuthorize("@ss.hasPermi('system:post:add')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@Validated @RequestBody SysPost post)
- {
- if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
- {
+ public AjaxResult add(@Validated @RequestBody SysPost post) {
+ if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
return error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
- }
- else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
- {
+ } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
return error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
}
post.setCreateBy(getUsername());
@@ -92,15 +87,12 @@
*/
//@PreAuthorize("@ss.hasPermi('system:post:edit')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@Validated @RequestBody SysPost post)
- {
- if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
- {
+ public AjaxResult edit(@Validated @RequestBody SysPost post) {
+ if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
return error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
- }
- else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
- {
+ } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
return error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
}
post.setUpdateBy(getUsername());
@@ -113,8 +105,7 @@
//@PreAuthorize("@ss.hasPermi('system:post:remove')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{postIds}")
- public AjaxResult remove(@PathVariable Long[] postIds)
- {
+ public AjaxResult remove(@PathVariable Long[] postIds) {
return toAjax(postService.deletePostByIds(postIds));
}
@@ -122,8 +113,7 @@
* 鑾峰彇宀椾綅閫夋嫨妗嗗垪琛�
*/
@GetMapping("/optionselect")
- public AjaxResult optionselect()
- {
+ public AjaxResult optionselect() {
List<SysPost> posts = postService.selectPostAll();
return success(posts);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index a27d38d..6e5ac2d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUserRole;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -92,7 +93,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:role:add')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysRole role) {
role.setOrgid(getLoginUser().getUser().getOrgid());
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
@@ -110,7 +112,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysRole role) {
role.setOrgid(getLoginUser().getUser().getOrgid());
roleService.checkRoleAllowed(role);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 3ec9a80..dd306d6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.system;
import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.constant.UserConstants;
@@ -157,6 +158,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:user:add')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysUser user) {
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
@@ -178,6 +180,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysUser user) {
userService.checkUserAllowed(user);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserDeptController.java
index b5c0309..2565e92 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserDeptController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -71,6 +72,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:dept:add')")
@ApiOperation("瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody SysUserDept sysUserDept) {
@@ -83,6 +85,7 @@
@ApiOperation("淇敼銆愯濉啓鍔熻兘鍚嶇О銆�")
//@PreAuthorize("@ss.hasPermi('smartor:dept:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SysUserDept sysUserDept) {
return toAjax(sysUserDeptService.updateSysUserDept(sysUserDept));
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index f1bbbb7..77ed9e0 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -167,6 +167,12 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
+
+ <!-- AOP鏀寔 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
index f937bef..a814c3a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
@@ -35,6 +35,11 @@
private String orgid;
/**
+ * 闄㈠尯
+ */
+ private String campusid;
+
+ /**
* 閮ㄩ棬ID
*/
private String deptId;
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
index e04de46..2098da9 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
@@ -106,7 +106,10 @@
sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
- sessionFactory.setPlugins(new Interceptor[]{hospitalFilterInterceptor});
+
+ //涓嶅啀鎵цhospitalFilterInterceptor鎷︽埅鍣�
+ //sessionFactory.setPlugins(new Interceptor[]{hospitalFilterInterceptor});
+
return sessionFactory.getObject();
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
index c06cea3..59b383a 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
@@ -18,7 +18,7 @@
@Component
-@Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})})
+//@Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})})
public class HospitalFilterInterceptor implements Interceptor {
@Value("${spring.profiles.active}")
@@ -85,8 +85,8 @@
if (originalSql.contains("insert into") || originalSql.contains("INSERT INTO") || originalSql.contains("from sys_menu") || originalSql.contains("sys_job") || originalSql.contains("update sys_menu") || originalSql.contains("information_schema.tables") || originalSql.contains("information_schema.columns") || originalSql.contains("gen_table") || originalSql.toUpperCase().contains("ORGID IS NULL") || originalSql.toUpperCase().contains("FROM CRYXX") || originalSql.toUpperCase().contains("FROM MZXX") || originalSql.toUpperCase().contains("FROM JBXX") || originalSql.toUpperCase().contains("FROM BMXX") || originalSql.toUpperCase().contains("FROM HZJBXX") || originalSql.toUpperCase().contains("RENAME TABLE") || originalSql.toUpperCase().contains("FROM YHYKSXX") || originalSql.toUpperCase().contains("FROM YHYJSXX") || originalSql.toUpperCase().contains("ALTER TABLE") || originalSql.toUpperCase().contains("CREATE TABLE")) {
return originalSql;
}
- if(originalSql.contains("and onorgid")){
- originalSql=originalSql.replace("and onorgid","");
+ if (originalSql.contains("and onorgid")) {
+ originalSql = originalSql.replace("and onorgid", "");
return originalSql;
}
// 鎻愬彇 orgid 鐨� WHERE 瀛愬彞
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 22ffcfc..af9e233 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -62,7 +62,7 @@
* @param uuid 鍞竴鏍囪瘑
* @return 缁撴灉
*/
- public String login(String username, String password, String code, String uuid, String orgid) {
+ public String login(String username, String password, String code, String uuid, String orgid, String campusid) {
boolean captchaEnabled = configService.selectCaptchaEnabled();
// 楠岃瘉鐮佸紑鍏�
if (captchaEnabled) {
@@ -71,7 +71,7 @@
// 鐢ㄦ埛楠岃瘉
Authentication authentication = null;
try {
- UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username + "&" + orgid, password);
+ UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username + "&" + orgid + "&" + campusid, password);
AuthenticationContextHolder.setContext(authenticationToken);
// 璇ユ柟娉曚細鍘昏皟鐢║serDetailsServiceImpl.loadUserByUsername
authentication = authenticationManager.authenticate(authenticationToken);
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
index b21433d..a25521d 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
@@ -100,7 +100,8 @@
*/
//@PreAuthorize("@ss.hasPermi('monitor:job:edit')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException {
if (!CronUtils.isValid(job.getCronExpression())) {
return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘");
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index f89a766..e85f781 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -53,7 +53,7 @@
* @param userName 鐢ㄦ埛鍚�
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
- public SysUser selectUserByUserNameByCondition(@Param("userName") String userName, @Param("orgid") String orgid, @Param("deptId") String deptId);
+ public SysUser selectUserByUserNameByCondition(@Param("userName") String userName, @Param("deptId") String deptId);
/**
* 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 74ba552..bc4fc24 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -15,7 +15,9 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
import com.smartor.domain.SvyTaskVO;
+import com.smartor.domain.SysUserOrg;
import com.smartor.mapper.SysUserDeptMapper;
+import com.smartor.mapper.SysUserOrgMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +42,9 @@
@Autowired
private SysUserMapper userMapper;
+
+ @Autowired
+ private SysUserOrgMapper sysUserOrgMapper;
@Autowired
private SysDeptMapper sysDeptMapper;
@@ -173,7 +178,19 @@
@Override
public SysUser selectUserByUserName2(String userName) {
String[] split = userName.split("&");
- SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], null);
+ SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], null);
+
+ //鑾峰彇褰撳墠鐧婚檰浜虹殑鏈烘瀯鍜岄櫌鍖�
+ SysUserOrg sysUserOrg = new SysUserOrg();
+ sysUserOrg.setUserId(sysUser.getUserId());
+ sysUserOrg.setOrgid(split[1].equals("null") ? "" : split[1]);
+ sysUserOrg.setCampusid(split[2].equals("null") ? "" : split[2]);
+ List<SysUserOrg> sysUserOrgs = sysUserOrgMapper.selectSysUserOrgList(sysUserOrg);
+ if (!CollectionUtils.isEmpty(sysUserOrgs)) {
+ sysUser.setOrgid(sysUserOrgs.get(0).getOrgid());
+ sysUser.setCampusid(sysUserOrgs.get(0).getCampusid());
+ }
+
if (Objects.isNull(sysUser)) return sysUser;
List<SysDept> sysDepts = null;
if (StringUtils.isNotEmpty(split[0]) && split[0].equals("admin")) {
@@ -281,7 +298,19 @@
if (split[2].contains("null")) {
split[2] = null;
}
- SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], split[2]);
+ SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[2]);
+
+ //鑾峰彇褰撳墠鐧婚檰浜虹殑鏈烘瀯鍜岄櫌鍖�
+ SysUserOrg sysUserOrg = new SysUserOrg();
+ sysUserOrg.setUserId(sysUser.getUserId());
+ sysUserOrg.setOrgid(split[1].equals("null") ? "" : split[1]);
+ sysUserOrg.setCampusid(split[3].equals("null") ? "" : split[3]);
+ List<SysUserOrg> sysUserOrgs = sysUserOrgMapper.selectSysUserOrgList(sysUserOrg);
+ if (!CollectionUtils.isEmpty(sysUserOrgs)) {
+ sysUser.setOrgid(sysUserOrgs.get(0).getOrgid());
+ sysUser.setCampusid(sysUserOrgs.get(0).getCampusid());
+ }
+
log.info("selectUserByUserNameAndDeptId鐨剆ysUser鐨勫�间负锛歿}", sysUser);
if (Objects.isNull(sysUser)) return sysUser;
List<SysDept> sysDepts = null;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 3c24a94..79c0fec 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -35,8 +35,6 @@
<result property="userType" column="user_type"/>
<result property="searchscope" column="searchscope"/>
<result property="guid" column="guid"/>
- <result property="orgid" column="orgid"/>
- <result property="campusid" column="campusid"/>
<association property="dept" column="dept_id" javaType="com.ruoyi.common.core.domain.entity.SysDept"
resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -50,7 +48,6 @@
<result property="orderNum" column="order_num"/>
<result property="leader" column="leader"/>
<result property="status" column="dept_status"/>
- <result property="campusid" column="campusid"/>
</resultMap>
<resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
@@ -67,7 +64,6 @@
u.dept_id,
u.id_card,
u.hosp_info,
- u.campusid,
u.dept_info,
u.searchscope,
u.user_name,
@@ -92,7 +88,6 @@
u.create_time,
u.remark,
u.guid,
- u.orgid,
d.dept_id,
d.parent_id,
d.ancestors,
@@ -117,7 +112,6 @@
u.nick_name, u.user_name,
u.email,u.id_card,
u.avatar,
- u.campusid,
u.dept_name,
u.dept_code,
u.birthday,
@@ -130,9 +124,6 @@
<if test="userId != null">
AND u.user_id = #{userId}
</if>
- <if test="orgid != null and orgid != ''">
- AND u.orgid = #{orgid}
- </if>
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
</if>
@@ -141,9 +132,6 @@
</if>
<if test="status != null and status != ''">
AND u.status = #{status}
- </if>
- <if test="campusid != null and campusid != ''">
- AND u.campusid = #{campusid}
</if>
<if test="idCard != null and idCard != ''">
AND u.id_card = #{idCard}
@@ -184,7 +172,7 @@
</select>
<select id="getUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select u.user_id,u.title,u.his_user_id,u.hosp_info,u.dept_info, u.searchscope, u.dept_id, u.user_type,
- u.nick_name, u.user_name,u.campusid,
+ u.nick_name, u.user_name,
u.email,u.id_card,
u.avatar,
u.dept_name,
@@ -196,12 +184,6 @@
where u.del_flag = '0'
<if test="userId != null">
AND u.user_id = #{userId}
- </if>
- <if test="orgid != null and orgid != ''">
- AND u.orgid = #{orgid}
- </if>
- <if test="campusid != null and campusid != ''">
- AND u.campusid = #{campusid}
</if>
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
@@ -257,7 +239,6 @@
u.email,
u.dept_code,
u.dept_name,
- u.campusid,
u.birthday,
u.job_phone,
u.phonenumber, u.status,u.id_card,
@@ -287,7 +268,6 @@
resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.hosp_info, u.dept_info,u.searchscope, u.user_name, u.user_type,
u.nick_name,
- u.campusid,
u.email,
u.his_user_id,
u.title,
@@ -325,9 +305,6 @@
u.del_flag = '0'
<if test="userName != null and userName != ''">
AND u.user_name = #{userName}
- </if>
- <if test="orgid != null and orgid != ''">
- AND u.orgid = #{orgid}
</if>
<if test="deptId != null and deptId != ''">
AND u.dept_id = #{deptId}
@@ -386,10 +363,8 @@
<if test="jobPhone != null and jobPhone != ''">job_phone,</if>
<if test="birthday != null ">birthday,</if>
<if test="hisUserId != null and hisUserId != ''">his_user_id,</if>
- <if test="orgid != null and orgid != ''">orgid,</if>
<if test="deptCode != null and deptCode != ''">dept_code,</if>
<if test="deptName != null and deptName != ''">dept_name,</if>
- <if test="campusid != null and campusid != ''">campusid,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@@ -413,10 +388,8 @@
<if test="jobPhone != null and jobPhone != ''">#{jobPhone},</if>
<if test="birthday != null and birthday != ''">#{birthday},</if>
<if test="hisUserId != null and hisUserId != ''">#{hisUserId},</if>
- <if test="orgid != null and orgid != ''">#{orgid},</if>
<if test="deptCode != null and deptCode != ''">#{deptCode},</if>
<if test="deptName != null and deptName != ''">#{deptName},</if>
- <if test="campusid != null and campusid != ''">#{campusid},</if>
sysdate()
)
</insert>
@@ -444,7 +417,6 @@
<if test="idCard != null and idCard != ''">id_card=#{idCard},</if>
<if test="jobPhone != null and jobPhone != ''">job_phone=#{jobPhone},</if>
<if test="birthday != null ">birthday=#{birthday},</if>
- <if test="orgid != null ">orgid=#{orgid},</if>
<if test="title != null and title != ''">
title = #{title},
</if>
@@ -453,7 +425,6 @@
</if>
<if test="deptCode != null and deptCode != ''">dept_code=#{deptCode},</if>
<if test="deptName != null and deptName != ''">dept_name=#{deptName},</if>
- <if test="campusid != null and campusid != ''">campusid=#{campusid},</if>
update_time = sysdate()
</set>
where user_id = #{userId}
diff --git a/smartor/src/main/java/com/smartor/domain/HeLibrary.java b/smartor/src/main/java/com/smartor/domain/HeLibrary.java
index 3609fd2..a395059 100644
--- a/smartor/src/main/java/com/smartor/domain/HeLibrary.java
+++ b/smartor/src/main/java/com/smartor/domain/HeLibrary.java
@@ -119,6 +119,12 @@
@Excel(name = " 鏈烘瀯ID ")
@ApiModelProperty("鏈烘瀯ID")
private String orgid;
+ /**
+ * 鏈烘瀯ID
+ */
+ @Excel(name = " 鏈烘瀯ID ")
+ @ApiModelProperty("鏈烘瀯ID")
+ private String campusid;
/**
* 鍒犻櫎鏍囪
diff --git a/smartor/src/main/java/com/smartor/domain/SysUserOrg.java b/smartor/src/main/java/com/smartor/domain/SysUserOrg.java
new file mode 100644
index 0000000..5d44213
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/SysUserOrg.java
@@ -0,0 +1,46 @@
+package com.smartor.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斿璞� sys_user_org
+ *
+ * @author lihu
+ * @date 2026-01-07
+ */
+@Data
+@ApiModel("鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�")
+public class SysUserOrg extends BaseEntity
+ {
+private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ private Long id;
+
+ /** 鐢ㄦ埛ID */
+ @ApiModelProperty("鐢ㄦ埛ID")
+ @Excel(name = "鐢ㄦ埛ID")
+ private Long userId;
+
+ /** 闄㈠尯ID */
+ @ApiModelProperty("闄㈠尯ID")
+ @Excel(name = "闄㈠尯ID")
+ private String campusid;
+
+ /** 鏈烘瀯ID */
+ @ApiModelProperty("鏈烘瀯ID")
+ @Excel(name = "鏈烘瀯ID")
+ private String orgid;
+
+ /** 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛� */
+ @ApiModelProperty("鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
+ private Long delFlag;
+
+ }
+
diff --git a/smartor/src/main/java/com/smartor/mapper/SysUserOrgMapper.java b/smartor/src/main/java/com/smartor/mapper/SysUserOrgMapper.java
new file mode 100644
index 0000000..7519d26
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/SysUserOrgMapper.java
@@ -0,0 +1,63 @@
+package com.smartor.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import com.smartor.domain.SysUserOrg;
+
+/**
+ * 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱擬apper鎺ュ彛
+ *
+ * @author lihu
+ * @date 2026-01-07
+ */
+@Mapper
+public interface SysUserOrgMapper
+{
+ /**
+ * 鏌ヨ鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ *
+ * @param id 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斾富閿�
+ * @return 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ */
+ public SysUserOrg selectSysUserOrgById(Long id);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斿垪琛�
+ *
+ * @param sysUserOrg 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ * @return 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱旈泦鍚�
+ */
+ public List<SysUserOrg> selectSysUserOrgList(SysUserOrg sysUserOrg);
+
+ /**
+ * 鏂板鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ *
+ * @param sysUserOrg 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ * @return 缁撴灉
+ */
+ public int insertSysUserOrg(SysUserOrg sysUserOrg);
+
+ /**
+ * 淇敼鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ *
+ * @param sysUserOrg 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ * @return 缁撴灉
+ */
+ public int updateSysUserOrg(SysUserOrg sysUserOrg);
+
+ /**
+ * 鍒犻櫎鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ *
+ * @param id 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斾富閿�
+ * @return 缁撴灉
+ */
+ public int deleteSysUserOrgById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteSysUserOrgByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/service/ISysUserOrgService.java b/smartor/src/main/java/com/smartor/service/ISysUserOrgService.java
new file mode 100644
index 0000000..a1e3fc4
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/ISysUserOrgService.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.SysUserOrg;
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱擲ervice鎺ュ彛
+ *
+ * @author lihu
+ * @date 2026-01-07
+ */
+public interface ISysUserOrgService
+{
+ /**
+ * 鏌ヨ鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ *
+ * @param id 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斾富閿�
+ * @return 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ */
+ public SysUserOrg selectSysUserOrgById(Long id);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斿垪琛�
+ *
+ * @param sysUserOrg 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ * @return 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱旈泦鍚�
+ */
+ public List<SysUserOrg> selectSysUserOrgList(SysUserOrg sysUserOrg);
+
+ /**
+ * 鏂板鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ *
+ * @param sysUserOrg 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ * @return 缁撴灉
+ */
+ public int insertSysUserOrg(SysUserOrg sysUserOrg);
+
+ /**
+ * 淇敼鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ *
+ * @param sysUserOrg 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ * @return 缁撴灉
+ */
+ public int updateSysUserOrg(SysUserOrg sysUserOrg);
+
+ /**
+ * 鎵归噺鍒犻櫎鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斾富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deleteSysUserOrgByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斾俊鎭�
+ *
+ * @param id 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斾富閿�
+ * @return 缁撴灉
+ */
+ public int deleteSysUserOrgById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/SysUserOrgServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SysUserOrgServiceImpl.java
new file mode 100644
index 0000000..4112f77
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/SysUserOrgServiceImpl.java
@@ -0,0 +1,96 @@
+package com.smartor.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.smartor.mapper.SysUserOrgMapper;
+import com.smartor.domain.SysUserOrg;
+import com.smartor.service.ISysUserOrgService;
+
+/**
+ * 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱擲ervice涓氬姟灞傚鐞�
+ *
+ * @author lihu
+ * @date 2026-01-07
+ */
+@Service
+public class SysUserOrgServiceImpl implements ISysUserOrgService
+{
+ @Autowired
+ private SysUserOrgMapper sysUserOrgMapper;
+
+ /**
+ * 鏌ヨ鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ *
+ * @param id 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斾富閿�
+ * @return 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ */
+ @Override
+ public SysUserOrg selectSysUserOrgById(Long id)
+ {
+ return sysUserOrgMapper.selectSysUserOrgById(id);
+ }
+
+ /**
+ * 鏌ヨ鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斿垪琛�
+ *
+ * @param sysUserOrg 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ * @return 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ */
+ @Override
+ public List<SysUserOrg> selectSysUserOrgList(SysUserOrg sysUserOrg)
+ {
+ return sysUserOrgMapper.selectSysUserOrgList(sysUserOrg);
+ }
+
+ /**
+ * 鏂板鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ *
+ * @param sysUserOrg 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertSysUserOrg(SysUserOrg sysUserOrg)
+ {
+ sysUserOrg.setCreateTime(DateUtils.getNowDate());
+ return sysUserOrgMapper.insertSysUserOrg(sysUserOrg);
+ }
+
+ /**
+ * 淇敼鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ *
+ * @param sysUserOrg 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateSysUserOrg(SysUserOrg sysUserOrg)
+ {
+ sysUserOrg.setUpdateTime(DateUtils.getNowDate());
+ return sysUserOrgMapper.updateSysUserOrg(sysUserOrg);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斾富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteSysUserOrgByIds(Long[] ids)
+ {
+ return sysUserOrgMapper.deleteSysUserOrgByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斾俊鎭�
+ *
+ * @param id 鐢ㄦ埛涓庢満鏋勯櫌鍖哄叧鑱斾富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteSysUserOrgById(Long id)
+ {
+ return sysUserOrgMapper.deleteSysUserOrgById(id);
+ }
+}
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
index 478b758..4ebdb2f 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
@@ -6,7 +6,6 @@
<resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
<id property="userId" column="user_id"/>
- <id property="orgid" column="orgid"/>
<id property="hisUserId" column="his_user_id"/>
<result property="deptId" column="dept_id"/>
<result property="userCode" column="user_code"/>
@@ -35,7 +34,6 @@
<result property="userType" column="user_type"/>
<result property="searchscope" column="searchscope"/>
<result property="guid" column="guid"/>
- <result property="campusid" column="campusid"/>
<association property="dept" column="dept_id" javaType="com.ruoyi.common.core.domain.entity.SysDept"
resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -49,7 +47,6 @@
<result property="orderNum" column="order_num"/>
<result property="leader" column="leader"/>
<result property="status" column="dept_status"/>
- <result property="campusid" column="campusid"/>
</resultMap>
<resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
@@ -68,7 +65,6 @@
u.id_card,
u.hosp_info,
u.dept_info,
- u.campusid,
u.searchscope,
u.user_name,
u.user_type,
@@ -90,7 +86,6 @@
u.create_time,
u.remark,
u.guid,
- u.orgid,
d.dept_id,
d.parent_id,
d.ancestors,
@@ -105,6 +100,7 @@
r.data_scope,
r.status as role_status
from sys_user u
+ left join sys_user_org o on o.user_id = u.user_id
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
@@ -113,12 +109,10 @@
<select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select u.user_code,u.user_id,u.title,u.his_user_id,u.hosp_info,u.dept_info, u.searchscope, u.dept_id,
u.user_type,
- u.campusid,
u.nick_name, u.user_name,
u.email,u.id_card,
u.avatar,
u.birthday,
- u.orgid,
u.job_phone,
u.phonenumber, u.sex, u.status,
u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user
@@ -130,9 +124,6 @@
</if>
<if test="userName != null and userName != ''">
AND u.user_name = #{userName}
- </if>
- <if test="orgid != null and orgid != ''">
- AND u.orgid = #{orgid}
</if>
<if test="nickName != null and nickName != ''">
AND u.nick_name like concat('%', #{nickName}, '%')
@@ -148,9 +139,6 @@
</if>
<if test="jobPhone != null and jobPhone != ''">
AND u.job_phone = #{jobPhone}
- </if>
- <if test="campusid != null and campusid != ''">
- AND u.campusid = #{campusid}
</if>
<if test="birthday != null and birthday != ''">
AND u.birthday = #{birthday}
@@ -183,8 +171,6 @@
u.email,
u.birthday,
u.job_phone,
- u.orgid,
- u.campusid,
u.phonenumber, u.status,u.id_card,
u.create_time
from sys_user u
@@ -204,9 +190,6 @@
<if test="hisUserId != null and hisUserId != ''">
AND u.his_user_id = #{hisUserId}
</if>
- <if test="campusid != null and campusid != ''">
- AND u.campusid = #{campusid}
- </if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</select>
@@ -217,10 +200,8 @@
u.nick_name,
u.user_code,
u.email,
- u.campusid,
u.his_user_id,
u.title,
- u.orgid,
u.job_phone,
u.birthday,
u.phonenumber, u.status,u.id_card,
@@ -298,11 +279,9 @@
<if test="birthday != null ">birthday,</if>
<if test="hisUserId != null and hisUserId != ''">his_user_id,</if>
<if test="guid != null and guid != ''">guid,</if>
- <if test="orgid != null and orgid != ''">orgid,</if>
<if test="deptCode != null and deptCode != ''">dept_code,</if>
<if test="deptName != null and deptName != ''">dept_name,</if>
<if test="userCode != null and userCode != ''">user_code,</if>
- <if test="campusid != null and campusid != ''">campusid,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@@ -327,11 +306,9 @@
<if test="birthday != null">#{birthday},</if>
<if test="hisUserId != null and hisUserId != ''">#{hisUserId},</if>
<if test="guid != null and guid != ''">#{guid},</if>
- <if test="orgid != null and orgid != ''">#{orgid},</if>
<if test="deptCode != null and deptCode != ''">#{deptCode},</if>
<if test="deptName != null and deptName != ''">#{deptName},</if>
<if test="userCode != null and userCode != ''">#{userCode},</if>
- <if test="campusid != null and campusid != ''">#{campusid},</if>
sysdate()
)
</insert>
@@ -341,7 +318,7 @@
insert into sys_user(
user_id, dept_id, user_name, nick_name, email, avatar, phonenumber, sex, password, status, create_by, remark,
user_type, dept_info, hosp_info, searchscope, id_card, title, job_phone, birthday, his_user_id, guid,
- orgid,user_code,campusid,
+ user_code,
create_time
) values
<foreach collection="list" item="item" separator=",">
@@ -368,9 +345,7 @@
#{item.birthday},
#{item.hisUserId},
#{item.guid},
- #{item.orgid},
#{item.userCode},
- #{item.campusid},
now()
)
</foreach>
@@ -399,9 +374,7 @@
<if test="idCard != null and idCard != ''">id_card=#{idCard},</if>
<if test="jobPhone != null and jobPhone != ''">job_phone=#{jobPhone},</if>
<if test="birthday != null ">birthday=#{birthday},</if>
- <if test="orgid != null ">orgid=#{orgid},</if>
<if test="userCode != null ">user_code=#{userCode},</if>
- <if test="campusid != null ">campusid=#{campusid},</if>
<if test="title != null and title != ''">
title = #{title},
</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserOrgMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserOrgMapper.xml
new file mode 100644
index 0000000..8ac3dbd
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/SysUserOrgMapper.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.smartor.mapper.SysUserOrgMapper">
+
+ <resultMap type="com.smartor.domain.SysUserOrg" id="SysUserOrgResult">
+ <result property="id" column="id"/>
+ <result property="userId" column="user_id"/>
+ <result property="campusid" column="campusid"/>
+ <result property="orgid" column="orgid"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="createTime" column="create_time"/>
+ <result property="createBy" column="create_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="updateBy" column="update_by"/>
+ </resultMap>
+
+ <sql id="selectSysUserOrgVo">
+ select id,
+ user_id,
+ campusid,
+ orgid,
+ del_flag,
+ create_time,
+ create_by,
+ update_time,
+ update_by
+ from sys_user_org
+ </sql>
+
+ <select id="selectSysUserOrgList" parameterType="com.smartor.domain.SysUserOrg"
+ resultMap="SysUserOrgResult">
+ <include refid="selectSysUserOrgVo"/>
+ <where>
+ del_flag=0
+ <if test="userId != null ">
+ and user_id = #{userId}
+ </if>
+ <if test="campusid != null and campusid != ''">
+ and campusid = #{campusid}
+ </if>
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectSysUserOrgById" parameterType="Long"
+ resultMap="SysUserOrgResult">
+ <include refid="selectSysUserOrgVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertSysUserOrg" parameterType="com.smartor.domain.SysUserOrg" useGeneratedKeys="true"
+ keyProperty="id">
+ insert into sys_user_org
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="userId != null">user_id,
+ </if>
+ <if test="campusid != null">campusid,
+ </if>
+ <if test="orgid != null">orgid,
+ </if>
+ <if test="delFlag != null">del_flag,
+ </if>
+ <if test="createTime != null">create_time,
+ </if>
+ <if test="createBy != null">create_by,
+ </if>
+ <if test="updateTime != null">update_time,
+ </if>
+ <if test="updateBy != null">update_by,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="userId != null">#{userId},
+ </if>
+ <if test="campusid != null">#{campusid},
+ </if>
+ <if test="orgid != null">#{orgid},
+ </if>
+ <if test="delFlag != null">#{delFlag},
+ </if>
+ <if test="createTime != null">#{createTime},
+ </if>
+ <if test="createBy != null">#{createBy},
+ </if>
+ <if test="updateTime != null">#{updateTime},
+ </if>
+ <if test="updateBy != null">#{updateBy},
+ </if>
+ </trim>
+ </insert>
+
+ <update id="updateSysUserOrg" parameterType="com.smartor.domain.SysUserOrg">
+ update sys_user_org
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="userId != null">user_id =
+ #{userId},
+ </if>
+ <if test="campusid != null">campusid =
+ #{campusid},
+ </if>
+ <if test="orgid != null">orgid =
+ #{orgid},
+ </if>
+ <if test="delFlag != null">del_flag =
+ #{delFlag},
+ </if>
+ <if test="createTime != null">create_time =
+ #{createTime},
+ </if>
+ <if test="createBy != null">create_by =
+ #{createBy},
+ </if>
+ <if test="updateTime != null">update_time =
+ #{updateTime},
+ </if>
+ <if test="updateBy != null">update_by =
+ #{updateBy},
+ </if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <update id="deleteSysUserOrgById" parameterType="Long">
+ update sys_user_org
+ <trim prefix="SET" suffixOverrides=",">
+ del_flag =1
+ </trim>
+ where id = #{id}
+ </update>
+
+ <update id="deleteSysUserOrgByIds" parameterType="String">
+ update sys_user_org
+ <trim prefix="SET" suffixOverrides=",">
+ del_flag =1
+ </trim>
+ where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </update>
+
+
+</mapper>
--
Gitblit v1.9.3