From 907641e56c2085aaa81f267946dc3e3e9fca73e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 09:39:02 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordCalldetailController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedPhysicalController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedRegistrationController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java | 12
smartor/src/main/java/com/smartor/mapper/PatArchiveImportMapper.java | 63
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java | 28
smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java | 351 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateScriptController.java | 12
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 158
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskAnswerController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlowController.java | 12
ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java | 2
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 27
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodeController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 53
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptController.java | 14
smartor/src/main/java/com/smartor/mapper/PatArchiveMapper.java | 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTagController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSpeciallistCategoryController.java | 12
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateTargetoptionController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibResultController.java | 12
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java | 10
smartor/src/main/java/com/smartor/domain/PatArchiveReq.java | 25
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TempDetpRelevanceController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 52
ruoyi-ui/src/views/system/role/index.vue | 4
smartor/src/main/java/com/smartor/domain/SvyLibTemplateVO.java | 15
ruoyi-ui/src/views/system/menu/index.vue | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTagController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskRecordController.java | 12
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 923 ++----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/EquipmentinfoController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLocallibraryController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptoptionController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentController.java | 12
smartor/src/main/java/com/smartor/domain/IvrTaskTemplate.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemePlanController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTasksmsController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java | 12
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 131
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrepeatconfigController.java | 12
smartor/src/main/java/com/smartor/mapper/PatMedInhospMapper.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptTagController.java | 12
smartor/src/main/java/com/smartor/service/IPatMedInhospService.java | 10
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 29
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptAssortController.java | 14
smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java | 52
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatWildcardController.java | 12
smartor/src/main/java/com/smartor/domain/HeLibraryVO.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java | 16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java | 12
smartor/src/main/java/com/smartor/domain/PatArchiveImport.java | 107
smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java | 30
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptWjxController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsParamController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java | 12
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 58
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 88
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateWjxController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserDeptController.java | 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatTaskRelevanceController.java | 14
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 140 +
smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java | 194 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedDrugController.java | 14
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTopicController.java | 12
smartor/src/main/java/com/smartor/domain/SendTaskVO.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MinioFileController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java | 12
smartor/src/main/java/com/smartor/domain/HeLibrary.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneRecallController.java | 14
smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java | 6
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 338 +-
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 215 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggerruleController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateCategoryController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateAssortController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInspectionController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeCategoryController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateController.java | 16
smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishoptionController.java | 12
smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml | 29
ruoyi-admin/src/main/resources/application-druid.yml | 17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateScriptController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10AssociationController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentcategoryController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrScenecategoryController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskController.java | 12
smartor/src/main/java/com/smartor/service/IPatArchiveService.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneController.java | 12
smartor/src/main/resources/mapper/smartor/SvyTaskTemplateMapper.xml | 19
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java | 12
smartor/src/main/java/com/smartor/service/impl/PatArchiveImportServiceImpl.java | 163 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallrecordController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java | 14
smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml | 216 +
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 458 ++-
smartor/src/main/java/com/smartor/domain/IvrTaskTemplateVO.java | 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggersceneController.java | 12
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptServiceImpl.java | 25
smartor/src/main/java/com/smartor/service/IPatArchiveImportService.java | 64
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 41
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptcategoryController.java | 12
smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptOptionController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptmodelController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java | 134 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryTagController.java | 12
smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java | 83
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedBloodsugarController.java | 12
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java | 14
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 29
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 213 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskconfigController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishtopicController.java | 12
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptmodelController.java | 12
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskVisitResultController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateTargetoptionController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneIntentController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodebranchController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionWjxController.java | 12
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 206 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneExecuteconfigController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTagController.java | 12
smartor/src/main/java/com/smartor/service/IServiceSubtaskAnswerService.java | 2
smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordController.java | 12
smartor/src/main/java/com/smartor/domain/SvyTaskTemplate.java | 11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivecontactController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateCategoryController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTargetoptionController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplatescriptController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java | 12
smartor/src/main/java/com/smartor/domain/ServiceTask.java | 41
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 384 --
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java | 16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeCategoryController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneGlobalconfigController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java | 12
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 101
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java | 12
smartor/src/main/java/com/smartor/domain/PatArchive.java | 57
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java | 14
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java | 18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsRecordsController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java | 2
smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java | 105
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java | 12
ruoyi-admin/pom.xml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeLocallibraryController.java | 12
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java | 16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetTagController.java | 12
smartor/src/main/java/com/smartor/domain/ThiedInhospInfo.java | 17
smartor/src/main/java/com/smartor/domain/ServiceSubTaskAnswerReq.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSpeciallistController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibExceptionController.java | 12
ruoyi-common/pom.xml | 6
smartor/src/main/java/com/smartor/domain/PatMedInhospVO.java | 308 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatFilterlistController.java | 12
smartor/src/main/java/com/smartor/domain/PatMedInhosp.java | 60
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 30
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateScriptController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptCategoryController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetoptionController.java | 12
smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml | 6
207 files changed, 5,087 insertions(+), 2,623 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index f425abc..1528d0a 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -163,7 +163,7 @@
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>3.1.0</version>
+ <version>5.1.0</version>
</dependency>
</dependencies>
<build>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 089b629..e1aebbd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -26,6 +26,11 @@
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
import org.springframework.stereotype.Component;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -52,6 +57,8 @@
@Autowired
private IIvrTaskTemplateService ivrTaskTemplateService;
+ @Autowired
+ private ISvyTaskTemplateService svyTaskTemplateService;
@Autowired
private ServiceSubtaskMapper ivrTaskcallMapper;
@@ -109,46 +116,42 @@
} else {
commonTaskcallMQ = mapper.readValue(content, CommonTaskcallMQ.class);
}
- if (commonTaskcallMQ.getTaskType() == 1) {
- //闅忚
- sfHandle(commonTaskcallMQ, ip);
- } else if (commonTaskcallMQ.getTaskType() == 2) {
- //闂嵎
- wjHandle(commonTaskcallMQ, ip);
- } else if (commonTaskcallMQ.getTaskType() == 3) {
- //瀹ｆ暀
- xjHandle(commonTaskcallMQ, ip);
- }
+ if (commonTaskcallMQ != null) tsakHandle(commonTaskcallMQ, ip, commonTaskcallMQ.getTaskType());
+
//澶勭悊瀹屾垚锛岀Щ闄edis
redisCache.deleteObject(message.toString());
//灏嗙姸鎬佹敼鎴愬畬鎴�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(Long.valueOf(commonTaskcallMQ.getTaskid()));
- serviceTask.setSendState(5);
+ serviceTask.setSendState(5L);
+ serviceTask.setFail(1L);
svyTaskMapper.updateServiceTask(serviceTask);
-
} catch (Exception e) {
Integer integer = redisCache.getCacheObject(commonTaskcallMQ.getTaskid().toString());
- if (integer != null && integer == 2) {
+ if (integer != null && integer == 3) {
+ redisCache.deleteObject(message.toString());
+ ServiceTask serviceTask = new ServiceTask();
+ serviceTask.setTaskid(Long.valueOf(commonTaskcallMQ.getTaskid().toString()));
+ serviceTask.setFail(0L);
+ svyTaskMapper.updateServiceTask(serviceTask);
//灏嗘秷鎭粠闃熷垪涓垹闄�
} else if (integer == null) {
redisCache.setCacheObject(commonTaskcallMQ.getTaskid().toString(), 1, 120, TimeUnit.MINUTES);
} else {
redisCache.setCacheObject(commonTaskcallMQ.getTaskid().toString(), integer + 1, 120, TimeUnit.MINUTES);
}
-
log.error("============娑堣垂澶辫触,灏濊瘯娑堟伅琛ュ彂鍐嶆娑堣垂!============== {}", e.getMessage());
redisCache.setCacheObject(message.toString(), message.toString(), 60, TimeUnit.SECONDS);
}
}
/**
- * 闅忚浠诲姟澶勭悊
+ * 浠诲姟澶勭悊
*
* @param commonTaskcallMQ
*/
- public void sfHandle(CommonTaskcallMQ commonTaskcallMQ, String ip) {
- log.error("杩涢殢璁夸簡鍚楋紵{}", commonTaskcallMQ);
+ public void tsakHandle(CommonTaskcallMQ commonTaskcallMQ, String ip, Integer type) {
+ log.error("杩涗换鍔′簡鍚楋紵{}", commonTaskcallMQ);
//鍒ゆ柇涓�涓媍ommonTaskcallMQ涓殑stopstate鏄惁涓巌vr_task涓殑涓�鑷达紝涓嶄竴鑷达紝鍒欒鏄庢槸鏆傚仠浜�
ServiceTask ivrTask1 = ivrTaskMapper.selectServiceTaskByTaskid(commonTaskcallMQ.getTaskid());
if (ivrTask1.getStopState() != commonTaskcallMQ.getStopState()) {
@@ -226,10 +229,10 @@
}
} else if (descByCode.equals("澶氬獟浣�")) {
//澶氬獟浣�
- return;
+ continue;
} else if (descByCode.equals("绾歌川")) {
//绾歌川
- return;
+ continue;
} else if (descByCode.equals("鐭俊")) {
//鐭俊
// http://localhost:8099/followvisit/particty?param1=3¶m2=348
@@ -238,22 +241,39 @@
String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
- String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
- SendMagParam sendMagParam = new SendMagParam();
- sendMagParam.setType("4");
- sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "¶m2=" + patid + "¶m5=false");
- Boolean aBoolean = sendService.sendMsg(sendMagParam);
+ try {
+ String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
+ SendMagParam sendMagParam = new SendMagParam();
+ sendMagParam.setType("4");
+ if (type == 1) {
+ sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "¶m2=" + patid + "¶m5=false");
+ } else if (type == 1) {
+ sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false");
+ } else if (type == 3) {
+ sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainxj?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false");
+ }
+ Boolean aBoolean = sendService.sendMsg(sendMagParam);
-
- //浠诲姟鍙戦�佽褰�
- ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
- serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
- serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
- serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
- serviceSubtaskRecord.setPreachform("4");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setResult(aBoolean == true ? "鎴愬姛" : "澶辫触");
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
+ //浠诲姟鍙戦�佽褰�
+ ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
+ serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
+ serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
+ serviceSubtaskRecord.setPreachform("4");
+ serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
+ serviceSubtaskRecord.setResult(aBoolean == true ? "success" : "error");
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+ serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
+ } catch (UnsupportedEncodingException e) {
+ String guid = UUID.randomUUID().toString();
+ log.error("鐭俊浠诲姟锛屽彂閫佸け璐ュ師鍥狅細{},{}", e.getMessage(), guid);
+ serviceSubtask.setResult("error");
+ serviceSubtask.setRemark("绯荤粺閿欒锛堜换鍔★級");
+ serviceSubtask.setGuid(guid);
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ }
}
} else if (descByCode.equals("鍏紬鍙�")) {
//鍏紬鍙�
@@ -261,6 +281,7 @@
String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
+
// SendMagParam sendMagParam = new SendMagParam();
// sendMagParam.setType("5");
// sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + ivrTask1.getTaskName() + "¶m5=false");
@@ -272,252 +293,56 @@
// sendMagParam.setContent(JSON.toJSONString(map));
// sendMagParam.setOpenid(serviceSubtask.getOpenid());
// Boolean aBoolean = sendService.sendMsg(sendMagParam);
+ String url = null;
+ try {
+ if (type == 1) {
+ url = ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
+ } else if (type == 2) {
+ url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
+ } else if (type == 3) {
+ url = ip + ":" + req_path + "/outsideChainxj?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
+ }
- String url = ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + ivrTask1.getTaskName() + "¶m5=false";
- String wxCode = getWXCode(serviceSubtask.getIdcardno(), url);
-
- //浠诲姟鍙戦�佽褰�
- ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
- serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
- serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
- serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
- serviceSubtaskRecord.setPreachform("4");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setResult("鎴愬姛");
- if (wxCode.equals("0")) serviceSubtaskRecord.setResult("澶辫触");
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
+ String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), "鏃�");
+ Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
+ if (!map.isEmpty()) {
+ serviceSubtask.setResult("success");
+ serviceSubtask.setSendstate(3L);
+ if ((Boolean) map.get("succ") == false) {
+ serviceSubtask.setResult("error");
+ serviceSubtask.setRemark(map.get("msg").toString());
+ serviceSubtask.setSendstate(5L);
+ }
+ }
+ //浠诲姟鍙戦�佽褰�
+ ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
+ serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
+ serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
+ serviceSubtaskRecord.setPreachform("5");
+ serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
+ serviceSubtaskRecord.setResult("success");
+ if ((Boolean) map.get("succ") == false) {
+ serviceSubtaskRecord.setResult("error");
+ }
+ serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
+ } catch (Exception e) {
+ String guid = UUID.randomUUID().toString();
+ log.error("鍏紬鍙蜂换鍔★紝鍙戦�佸け璐ュ師鍥狅細{},{}", e.getMessage(), guid);
+ serviceSubtask.setResult("error");
+ serviceSubtask.setRemark("绯荤粺閿欒锛堜换鍔★級");
+ serviceSubtask.setGuid(guid);
+ serviceSubtask.setSendstate(5L);
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ }
}
}
//閫氱煡 MQ 娑堟伅宸茶鎺ユ敹,鍙互ACK(浠庨槦鍒椾腑鍒犻櫎)浜� 锛堣繖涓渶瑕佹牴鎹笟鍔″啀鍘诲鐞咥CK锛�
}
}
}
-
- /**
- * 瀹ｆ暀浠诲姟澶勭悊
- *
- * @param commonTaskcallMQ
- */
- private void xjHandle(CommonTaskcallMQ commonTaskcallMQ, String ip) {
- log.error("杩涘鏁欎簡鍚楋紵{}", commonTaskcallMQ);
- //鍒ゆ柇涓�涓媍ommonTaskcallMQ涓殑stopstate鏄惁涓巌vr_task涓殑涓�鑷达紝涓嶄竴鑷达紝鍒欒鏄庢槸鏆傚仠浜�
- ServiceTask ivrTask1 = ivrTaskMapper.selectServiceTaskByTaskid(commonTaskcallMQ.getTaskid());
- if (ivrTask1.getStopState() != commonTaskcallMQ.getStopState()) {
- //灏嗘秷鎭粠闃熷垪涓墧闄�
- return;
- }
-
- if (StringUtils.isNotEmpty(commonTaskcallMQ.getPreachform())) {
- //濡備綍浠诲姟鍙戦�佹柟寮忎笉涓虹┖
- String[] split = commonTaskcallMQ.getPreachform().split(",");
- System.out.println("split鐨勫�间负锛�" + split);
- for (String serviceFrom : split) {
- String descByCode = ServiceFromEnum.getDescByCode(Integer.valueOf(serviceFrom));
- //杩欓噷鍙互鑰冭檻鐢ㄧ瓥鐣ユā寮忎紭鍖栦竴涓嬶紝涓嶇劧澶毦鐪嬩簡
-
- //閫氳繃妯℃澘ID鑾峰彇妯℃澘闂
- IvrTaskTemplateVO ivrTaskTemplateVO1 = null;
- if (commonTaskcallMQ.getTaskType().equals("1")) {
- IvrTaskTemplateVO ivrTaskTemplateVO = new IvrTaskTemplateVO();
- ivrTaskTemplateVO.setId(Long.valueOf(commonTaskcallMQ.getTemplateid()));
- ivrTaskTemplateVO1 = ivrTaskTemplateService.selectInfoByCondition(ivrTaskTemplateVO);
- }
- //閫氳繃浠诲姟ID鎷垮埌鎮ｈ�呬俊鎭�
- ServiceSubtaskVO ivrTaskcall = new ServiceSubtaskVO();
- ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid());
- List<ServiceSubtask> ivrTaskcalls = ivrTaskcallMapper.selectServiceSubtaskList(ivrTaskcall);
- if (descByCode.equals("鐢佃瘽")) {
- for (ServiceSubtask ivrTaskcall1 : ivrTaskcalls) {
- ServiceTask ivrTask = ivrTaskMapper.selectServiceTaskByTaskid(ivrTaskcall1.getTaskid());
- if (ivrTask.getSendState() != null && ivrTask.getSendState() == 3 || ivrTask.getSendState() != null && ivrTask.getSendState() == 4) {
- //濡備綍浠诲姟琚�滄殏鍋溾�濇垨鈥滅粓姝⑩��
- break;
- }
-
- //浠诲姟鍙戦�佽褰曪紙杩欎釜浠ｇ爜搴旇鍐欏湪phoneTask涓紝鍏堝啓鍦ㄨ繖锛屽悗闈㈠啀鏀癸級
- ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
- serviceSubtaskRecord.setTaskid(ivrTaskcall1.getTaskid().toString());
- serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
- serviceSubtaskRecord.setTasktype(ivrTaskcall1.getType());
- serviceSubtaskRecord.setPreachform("3");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
-
- //閫氳繃澶氱嚎绋嬬殑鏂瑰紡鍘绘墦鐢佃瘽
- executorService.submit(new PhoneTask(ivrTaskcall1, ivrTaskTemplateVO1, redisCache, sendService, phonePath, robotPhoneUtils));
- }
- } else if (descByCode.equals("澶氬獟浣�")) {
- //澶氬獟浣�
- } else if (descByCode.equals("绾歌川")) {
- //绾歌川
- } else if (descByCode.equals("鐭俊")) {
- //鐭俊
-// http://localhost:8099/followvisit/particty?param1=3¶m2=348
- //瀵箄rl涓袱涓弬鏁板姞瀵�
- RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
-
-
- for (ServiceSubtask ivrTaskSingle : ivrTaskcalls) {
- String patid = rsaPublicKeyExample.encryptedData(ivrTaskSingle.getPatid().toString(), pub_key);
- SendMagParam sendMagParam = new SendMagParam();
- sendMagParam.setType("4");
- sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "¶m2=" + patid + "¶m5=false");
- Boolean aBoolean = sendService.sendMsg(sendMagParam);
-
- //浠诲姟鍙戦�佽褰�
- ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
- serviceSubtaskRecord.setTaskid(ivrTaskSingle.getTaskid().toString());
- serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
- serviceSubtaskRecord.setTasktype(ivrTaskSingle.getType());
- serviceSubtaskRecord.setPreachform("4");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setResult(aBoolean == true ? "鎴愬姛" : "澶辫触");
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- }
- } else if (descByCode.equals("鍏紬鍙�")) {
- //鍏紬鍙�
- RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
- for (ServiceSubtask ivrTaskSingle : ivrTaskcalls) {
- String patid = rsaPublicKeyExample.encryptedData(ivrTaskSingle.getPatid().toString(), pub_key);
-// SendMagParam sendMagParam = new SendMagParam();
-// sendMagParam.setType("5");
-// sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainxj?param1=" + taskId + "¶m2=" + patid + "¶m3=" + ivrTask1.getTaskName() + "¶m5=false");
-// log.info("閾炬帴瀹屾暣璺緞锛歿}", req_path + "/outsideChainxj?param1=" + taskId + "¶m2=" + patid + "¶m3=" + ivrTask1.getTaskName() + "¶m5=false");
-// //杩欎釜妯℃澘ID鍏堝啓姝伙紝鍚庨潰鍋氭垚鍙��
-// sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4");
-// Map map = new HashMap();
-// map.put("first", ivrTask1.getTaskName());
-// sendMagParam.setContent(JSON.toJSONString(map));
-// sendMagParam.setOpenid(ivrTaskSingle.getOpenid());
- //鏂板崕鍖婚櫌鏈夎嚜宸辩殑鍏紬鍙峰彂閫佹帴鍙ｏ紝鎴戜滑鐨勫厛涓嶇敤锛堝厛淇濈暀锛屽叾瀹冮」鐩彲浠ョ敤锛�
-// Boolean aBoolean = sendService.sendMsg(sendMagParam);
-// log.error("鏄惁鍙戦�佹垚鍔燂細{}", aBoolean);
-
- String url = ip + ":" + req_path + "/outsideChainxj?param1=" + taskId + "¶m2=" + patid + "¶m3=" + ivrTask1.getTaskName() + "¶m5=false";
- String wxCode = getWXCode(ivrTaskSingle.getIdcardno(), url);
- //浠诲姟鍙戦�佽褰�
- ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
- serviceSubtaskRecord.setTaskid(ivrTaskSingle.getTaskid().toString());
- serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
- serviceSubtaskRecord.setTasktype(ivrTaskSingle.getType());
- serviceSubtaskRecord.setPreachform("4");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setResult("鎴愬姛");
- if (!wxCode.equals("0")) {
- serviceSubtaskRecord.setResult("澶辫触");
- }
-
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- }
- }
- //閫氱煡 MQ 娑堟伅宸茶鎺ユ敹,鍙互ACK(浠庨槦鍒椾腑鍒犻櫎)浜� 锛堣繖涓渶瑕佹牴鎹笟鍔″啀鍘诲鐞咥CK锛�
- }
- }
- }
-
- /**
- * 闂嵎浠诲姟澶勭悊
- *
- * @param commonTaskcallMQ
- */
- private void wjHandle(CommonTaskcallMQ commonTaskcallMQ, String ip) {
- log.error("杩涢棶鍗蜂簡鍚楋紵{}", commonTaskcallMQ);
- //鍒ゆ柇涓�涓媍ommonTaskcallMQ涓殑stopstate鏄惁涓巌vr_task涓殑涓�鑷达紝涓嶄竴鑷达紝鍒欒鏄庢槸鏆傚仠浜�
- ServiceTask svyTask = svyTaskMapper.selectServiceTaskByTaskid(commonTaskcallMQ.getTaskid());
- log.error("svyTask.getStopState()鐨勫�间负锛歿} 锛� commonTaskcallMQ.getStopState()鐨勫�间负锛歿}", svyTask.getStopState(), commonTaskcallMQ.getStopState());
-
- if (svyTask.getStopState() != commonTaskcallMQ.getStopState()) {
- //灏嗘秷鎭粠闃熷垪涓墧闄�
- return;
- }
-
- if (StringUtils.isNotEmpty(commonTaskcallMQ.getPreachform())) {
- //濡備綍浠诲姟鍙戦�佹柟寮忎笉涓虹┖
- String[] split = commonTaskcallMQ.getPreachform().split(",");
- System.out.println("split鐨勫�间负锛�" + split);
- for (String serviceFrom : split) {
- String descByCode = ServiceFromEnum.getDescByCode(Integer.valueOf(serviceFrom));
- //杩欓噷鍙互鑰冭檻鐢ㄧ瓥鐣ユā寮忎紭鍖栦竴涓嬶紝涓嶇劧澶毦鐪嬩簡
-
- //閫氳繃妯℃澘ID鑾峰彇妯℃澘闂
- SvyTaskTemplateVO svyTaskTemplateVO = new SvyTaskTemplateVO();
- svyTaskTemplateVO.setId(Long.valueOf(commonTaskcallMQ.getTemplateid()));
- SvyTaskTemplateVO svyTaskTemplateVO1 = iSvyTaskTemplateService.selectInfoByCondition(svyTaskTemplateVO);
-
- //閫氳繃浠诲姟ID鎷垮埌鎮ｈ�呬俊鎭�
- ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
- serviceSubtaskVO.setTaskid(commonTaskcallMQ.getTaskid());
- List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
- log.error("selectServiceSubtaskList鏁版嵁鏄灏戯紵{}", selectServiceSubtaskList.size());
- if (descByCode.equals("鐢佃瘽")) {
- for (ServiceSubtask svyTaskSingle1 : selectServiceSubtaskList) {
- ServiceTask svyTask1 = svyTaskMapper.selectServiceTaskByTaskid(svyTaskSingle1.getTaskid());
- if (svyTask1.getSendState() != null && svyTask1.getSendState().equals("3") || svyTask1.getSendState() != null && svyTask1.getSendState().equals("4")) {
- //濡備綍浠诲姟琚�滄殏鍋溾�濇垨鈥滅粓姝⑩��
- break;
- }
-
- //浠诲姟鍙戦�佽褰曪紙杩欎釜浠ｇ爜搴旇鍐欏湪phoneTask涓紝鍏堝啓鍦ㄨ繖锛屽悗闈㈠啀鏀癸級
- ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
- serviceSubtaskRecord.setTaskid(svyTaskSingle1.getTaskid().toString());
- serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
- serviceSubtaskRecord.setTasktype(svyTaskSingle1.getType());
- serviceSubtaskRecord.setPreachform("3");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- //閫氳繃澶氱嚎绋嬬殑鏂瑰紡鍘绘墦鐢佃瘽
-// executorService.submit(new PhoneTask(ivrTaskcall1, ivrTaskTemplateVO1, redisCache, sendService, phonePath, robotPhoneUtils));
- }
- } else if (descByCode.equals("澶氬獟浣�")) {
- //澶氬獟浣�
- } else if (descByCode.equals("绾歌川")) {
- //绾歌川
- } else if (descByCode.equals("鐭俊")) {
- //鐭俊
- } else if (descByCode.equals("鍏紬鍙�")) {
- log.error("杩涢棶鍗峰叕浼楀彿浜嗗悧锛焮}", descByCode);
- //鍏紬鍙�
- RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- String taskId = rsaPublicKeyExample.encryptedData(svyTask.getTaskid().toString(), pub_key);
- for (ServiceSubtask svyTaskSingle1 : selectServiceSubtaskList) {
- String patid = rsaPublicKeyExample.encryptedData(svyTaskSingle1.getPatid().toString(), pub_key);
- String url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + svyTask.getTaskName() + "¶m5=false";
- //杩欎釜鏄垜浠嚜宸辩殑寰俊鍏紬鍙峰彂閫佹柟寮忥紝
- SendMagParam sendMagParam = new SendMagParam();
- sendMagParam.setType("5");
- sendMagParam.setUrl(url);
- log.info("閾炬帴瀹屾暣璺緞锛歿}", req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + svyTask.getTaskName() + "¶m5=false");
- //杩欎釜妯℃澘ID鍏堝啓姝伙紝鍚庨潰鍋氭垚鍙��
- sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4");
- Map map = new HashMap();
- map.put("first", svyTask.getTaskName());
- sendMagParam.setContent(JSON.toJSONString(map));
- sendMagParam.setOpenid(svyTaskSingle1.getOpenid());
- Boolean aBoolean = sendService.sendMsg(sendMagParam);
- log.error("鍙戦�佹垚鍔熶簡鍚楋紵{}", aBoolean);
-// String wxCode = getWXCode(svyTaskSingle1.getIdcardno(), url);
-
- //浠诲姟鍙戦�佽褰�
- ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
- serviceSubtaskRecord.setTaskid(svyTaskSingle1.getTaskid().toString());
- serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
- serviceSubtaskRecord.setTasktype(svyTaskSingle1.getType());
- serviceSubtaskRecord.setPreachform("4");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setResult("鎴愬姛");
-// if (!wxCode.equals("0")) {
-// serviceSubtaskRecord.setResult("澶辫触");
-// }
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- }
- }
- //閫氱煡 MQ 娑堟伅宸茶鎺ユ敹,鍙互ACK(浠庨槦鍒椾腑鍒犻櫎)浜� 锛堣繖涓渶瑕佹牴鎹笟鍔″啀鍘诲鐞咥CK锛�
- }
- }
- }
-
// /**
// * 鏈哄櫒浜虹涓�鍙ヨ瘽璇煶
@@ -582,17 +407,18 @@
return key;
}
- private String getWXCode(String idcard, String url) {
+ private String getWXCode(String idcard, String url, String taskName, String taskDesc, String submitprompt) {
XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
xinHuaWXReq.setIdcard(idcard);
xinHuaWXReq.setUrl(url);
- xinHuaWXReq.setKeyword1(null);
- xinHuaWXReq.setKeyword2(null);
- xinHuaWXReq.setKeyword3(null);
- xinHuaWXReq.setKeyword4(null);
+ xinHuaWXReq.setKeyword1("娴欎腑鍖诲ぇ浜岄櫌鍑洪櫌闅忚");
+ xinHuaWXReq.setKeyword2(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ xinHuaWXReq.setKeyword3(taskName);
+ xinHuaWXReq.setKeyword4("鐤剧梾搴峰娉ㄦ剰浜嬮」");
+
String result = HttpUtils.sendPost(thirdWXUrl, new Gson().toJson(xinHuaWXReq));
JSONObject jsonObject = JSONObject.parseObject(result);
- String code = (String) jsonObject.get("code");
+ String code = (String) jsonObject.toString();
return code;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index ed0e4c9..8ad8488 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -11,6 +11,8 @@
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.framework.config.ServerConfig;
import com.smartor.domain.HtmlContentVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.converter.PicturesManager;
import org.apache.poi.hwpf.converter.WordToHtmlConverter;
@@ -18,6 +20,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -43,6 +46,7 @@
* @author ruoyi
*/
@RestController
+@Api(description = "閫氳繃璇锋眰澶勭悊")
@RequestMapping("/common")
public class CommonController {
private static final Logger log = LoggerFactory.getLogger(CommonController.class);
@@ -51,6 +55,9 @@
private ServerConfig serverConfig;
private static final String FILE_DELIMETER = ",";
+
+ @Value("${uploadSwitch}")
+ private Integer uploadSwitch;
/**
* 閫氱敤涓嬭浇璇锋眰
@@ -81,6 +88,7 @@
/**
* 鍒嗙被涓婁紶璇锋眰
*/
+ @ApiOperation("鍒嗙被涓婁紶璇锋眰")
@PostMapping("/uploadSort")
public AjaxResult uploadFileSort(MultipartFile file) {
try {
@@ -98,7 +106,15 @@
}
// 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
String fileName = FileUploadUtils.uploadSort(filePath, file);
- String url = serverConfig.getUrl() + fileName;
+ String url = null;
+ //鏂板崕鍖婚櫌鐗规畩锛岃繖涓棰戠殑璁块棶寰楄浆
+ String xhPath = "http://218.108.11.22:8093/profile-api";
+ if (uploadSwitch == 1) {
+ String fn = fileName.replaceAll("/profile", "");
+ url = xhPath + fn;
+ } else {
+ url = serverConfig.getUrl() + fileName;
+ }
AjaxResult ajax = AjaxResult.success();
ajax.put("url", url);
ajax.put("fileName", fileName);
@@ -113,6 +129,7 @@
/**
* 涓婁紶骞惰浆鎴恏tml璇锋眰
*/
+ @ApiOperation("word鏂囦欢涓婁紶骞惰浆鎴恏tml")
@PostMapping("/uploadShow")
public AjaxResult uploadFileShow(MultipartFile file) {
try {
@@ -125,7 +142,15 @@
//灏唚ord杞垚html
convertDocToHtml(filePath + "\\" + file.getOriginalFilename(), filePath + "\\" + file.getOriginalFilename().split("\\.", 2)[0] + ".html");
- String url = serverConfig.getUrl() + fileName.replaceAll("\\.[^.]*$", ".html");
+ String url = null;
+ String xhPath = "http://218.108.11.22:8093/profile-api";
+ if (uploadSwitch == 1) {
+ String fn = fileName.replaceAll("\\.[^.]*$", ".html").replaceAll("/profile", "");
+ url = xhPath + fn;
+
+ } else {
+ url = serverConfig.getUrl() + fileName.replaceAll("\\.[^.]*$", ".html");
+ }
AjaxResult ajax = AjaxResult.success();
ajax.put("url", url);
ajax.put("fileName", fileName);
@@ -140,6 +165,7 @@
/**
* 閫氱敤涓婁紶璇锋眰锛堝崟涓級
*/
+ @ApiOperation("閫氱敤涓婁紶璇锋眰")
@PostMapping("/upload")
public AjaxResult uploadFile(MultipartFile file) {
try {
@@ -218,19 +244,37 @@
* @param
* @return
*/
+ @ApiOperation("瀵屾枃鏈浆html")
@PostMapping("/htmlContent")
public AjaxResult htmlContent(@RequestBody HtmlContentVO htmlContentVO) {
+ log.error("htmlContentVO鍏ュ弬涓猴細{}", htmlContentVO);
// 鑾峰彇鏂囦欢鐨勫師濮嬪悕绉�
String fileName = htmlContentVO.getFileName();
+ if (!fileName.endsWith(".html")) {
+ // 鍘绘帀涔嬪墠鐨勬墿灞曞悕
+ int lastIndex = fileName.lastIndexOf('.');
+ if (lastIndex != -1) {
+ fileName = fileName.substring(0, lastIndex); // 鍘绘帀鎵╁睍鍚�
+ }
+ // 娣诲姞.html鍚庣紑
+ fileName += ".html";
+ }
FileUtils.createFile(RuoYiConfig.getUploadPath() + "/show/" + fileName.split("\\.", 2)[0]);
// 灏嗘枃浠朵繚瀛樺埌鎸囧畾鐩綍
File outputFile = new File(RuoYiConfig.getUploadPath() + "/show/" + fileName.split("\\.", 2)[0] + "/" + fileName);
try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile), "UTF-8"))) {
- writer.write(htmlContentVO.getContent());
+ if (StringUtils.isNotEmpty(htmlContentVO.getContent()))
+ writer.write(htmlContentVO.getContent());
} catch (IOException e) {
e.printStackTrace();
}
- String url = serverConfig.getUrl() + "/profile/upload/show/" + fileName.split("\\.", 2)[0] + "/" + fileName;
+ String url = null;
+ String xhPath = "http://218.108.11.22:8093/profile-api";
+ if (uploadSwitch == 1) {
+ url = xhPath + "/upload/show/" + fileName.split("\\.", 2)[0] + "/" + fileName;
+ } else {
+ url = serverConfig.getUrl() + "/profile/upload/show/" + fileName.split("\\.", 2)[0] + "/" + fileName;
+ }
return AjaxResult.success(url);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
index 69470d0..cf628a7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
@@ -23,7 +23,7 @@
/**
* 缂撳瓨鐩戞帶
- *
+ *
* @author ruoyi
*/
@RestController
@@ -44,7 +44,7 @@
caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "瀵嗙爜閿欒娆℃暟"));
}
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ //@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping()
public AjaxResult getInfo() throws Exception
{
@@ -68,14 +68,14 @@
return AjaxResult.success(result);
}
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ //@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping("/getNames")
public AjaxResult cache()
{
return AjaxResult.success(caches);
}
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ //@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping("/getKeys/{cacheName}")
public AjaxResult getCacheKeys(@PathVariable String cacheName)
{
@@ -83,7 +83,7 @@
return AjaxResult.success(cacheKeys);
}
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ //@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping("/getValue/{cacheName}/{cacheKey}")
public AjaxResult getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey)
{
@@ -92,7 +92,7 @@
return AjaxResult.success(sysCache);
}
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ //@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@DeleteMapping("/clearCacheName/{cacheName}")
public AjaxResult clearCacheName(@PathVariable String cacheName)
{
@@ -101,7 +101,7 @@
return AjaxResult.success();
}
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ //@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@DeleteMapping("/clearCacheKey/{cacheKey}")
public AjaxResult clearCacheKey(@PathVariable String cacheKey)
{
@@ -109,7 +109,7 @@
return AjaxResult.success();
}
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ //@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@DeleteMapping("/clearCacheAll")
public AjaxResult clearCacheAll()
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
index cc805ad..0f4ada8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
@@ -16,7 +16,7 @@
@RequestMapping("/monitor/server")
public class ServerController
{
- @PreAuthorize("@ss.hasPermi('monitor:server:list')")
+ //@PreAuthorize("@ss.hasPermi('monitor:server:list')")
@GetMapping()
public AjaxResult getInfo() throws Exception
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
index e0175f4..fc65510 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
@@ -22,7 +22,7 @@
/**
* 绯荤粺璁块棶璁板綍
- *
+ *
* @author ruoyi
*/
@RestController
@@ -35,7 +35,7 @@
@Autowired
private SysPasswordService passwordService;
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+ //@PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
@GetMapping("/list")
public TableDataInfo list(SysLogininfor logininfor)
{
@@ -45,7 +45,7 @@
}
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+ //@PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, SysLogininfor logininfor)
{
@@ -54,7 +54,7 @@
util.exportExcel(response, list, "鐧诲綍鏃ュ織");
}
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+ //@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}")
public AjaxResult remove(@PathVariable Long[] infoIds)
@@ -62,7 +62,7 @@
return toAjax(logininforService.deleteLogininforByIds(infoIds));
}
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+ //@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
public AjaxResult clean()
@@ -71,7 +71,7 @@
return success();
}
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
+ //@PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
@Log(title = "璐︽埛瑙ｉ攣", businessType = BusinessType.OTHER)
@GetMapping("/unlock/{userName}")
public AjaxResult unlock(@PathVariable("userName") String userName)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
index 6ca78cf..1a7883c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
@@ -31,7 +31,7 @@
@Autowired
private ISysOperLogService operLogService;
- @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+ //@PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
@GetMapping("/list")
public TableDataInfo list(SysOperLog operLog)
{
@@ -41,7 +41,7 @@
}
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+ //@PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, SysOperLog operLog)
{
@@ -51,7 +51,7 @@
}
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+ //@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
@DeleteMapping("/{operIds}")
public AjaxResult remove(@PathVariable Long[] operIds)
{
@@ -59,7 +59,7 @@
}
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+ //@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
@DeleteMapping("/clean")
public AjaxResult clean()
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
index f539fce..c9b252e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@@ -25,7 +25,7 @@
/**
* 鍦ㄧ嚎鐢ㄦ埛鐩戞帶
- *
+ *
* @author ruoyi
*/
@RestController
@@ -38,7 +38,7 @@
@Autowired
private RedisCache redisCache;
- @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+ //@PreAuthorize("@ss.hasPermi('monitor:online:list')")
@GetMapping("/list")
public TableDataInfo list(String ipaddr, String userName)
{
@@ -81,7 +81,7 @@
/**
* 寮洪��鐢ㄦ埛
*/
- @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
+ //@PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
@Log(title = "鍦ㄧ嚎鐢ㄦ埛", businessType = BusinessType.FORCE)
@DeleteMapping("/{tokenId}")
public AjaxResult forceLogout(@PathVariable String tokenId)
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 b51a332..390ba15 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
@@ -44,7 +44,7 @@
* 鏌ヨ鏍囩鍒楄〃
*/
@ApiOperation("鏌ヨ鏍囩鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:tag:list')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody BaseTag baseTag) {
PageUtils.startPageByPost(baseTag.getPageNum(), baseTag.getPageSize());
@@ -57,7 +57,7 @@
* 瀵煎嚭鏍囩鍒楄〃
*/
@ApiOperation("瀵煎嚭鏍囩鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:tag:export')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:export')")
@Log(title = "鏍囩", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseTag baseTag) {
@@ -71,7 +71,7 @@
*/
@ApiOperation("鑾峰彇鏍囩璇︾粏淇℃伅")
@ApiImplicitParam(name = "remove", value = "涓婚敭ID", dataType = "long", dataTypeClass = Long.class)
- @PreAuthorize("@ss.hasPermi('system:tag:query')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:query')")
@GetMapping(value = "/{tagid}")
public AjaxResult getInfo(@PathVariable("tagid") Long tagid) {
return success(baseTagService.selectBaseTagByTagid(tagid));
@@ -81,7 +81,7 @@
* 鏂板鏍囩
*/
@ApiOperation("鏂板鏍囩")
- @PreAuthorize("@ss.hasPermi('system:tag:add')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:add')")
@Log(title = "鏍囩", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody BaseTag baseTag) {
@@ -92,7 +92,7 @@
* 淇敼鏍囩
*/
@ApiOperation("淇敼鏍囩")
- @PreAuthorize("@ss.hasPermi('system:tag:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "鏍囩", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseTag baseTag) {
@@ -104,7 +104,7 @@
*/
@ApiOperation("鍒犻櫎鏍囩")
@ApiImplicitParam(name = "remove", value = "涓婚敭ID", dataType = "long", dataTypeClass = Array.class)
- @PreAuthorize("@ss.hasPermi('system:tag:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:remove')")
@Log(title = "鏍囩", businessType = BusinessType.DELETE)
@GetMapping("/remove/{tagids}")
public AjaxResult remove(@PathVariable Long[] tagids) {
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 83af2e8..cd8cf88 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
@@ -35,7 +35,7 @@
/**
* 鏌ヨ鏍囩鍒嗙被鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:tagcategory:list')")
+ //@PreAuthorize("@ss.hasPermi('system:tagcategory:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody BaseTagcategory baseTagcategory) {
startPage();
@@ -46,7 +46,7 @@
/**
* 瀵煎嚭鏍囩鍒嗙被鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:tagcategory:export')")
+ //@PreAuthorize("@ss.hasPermi('system:tagcategory:export')")
@Log(title = "鏍囩鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseTagcategory baseTagcategory) {
@@ -58,7 +58,7 @@
/**
* 鑾峰彇鏍囩鍒嗙被璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:tagcategory:query')")
+ //@PreAuthorize("@ss.hasPermi('system:tagcategory:query')")
@GetMapping(value = "/{tagcategoryid}")
public AjaxResult getInfo(@PathVariable("tagcategoryid") Long tagcategoryid) {
return success(baseTagcategoryService.selectBaseTagcategoryByTagcategoryid(tagcategoryid));
@@ -67,7 +67,7 @@
/**
* 鏂板鏍囩鍒嗙被
*/
- @PreAuthorize("@ss.hasPermi('system:tagcategory:add')")
+ //@PreAuthorize("@ss.hasPermi('system:tagcategory:add')")
@Log(title = "鏍囩鍒嗙被", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鏍囩鍒嗙被")
@PostMapping("/add")
@@ -78,7 +78,7 @@
/**
* 淇敼鏍囩鍒嗙被
*/
- @PreAuthorize("@ss.hasPermi('system:tagcategory:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:tagcategory:edit')")
@Log(title = "鏍囩鍒嗙被", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼鏍囩鍒嗙被")
@PostMapping("/edit")
@@ -89,7 +89,7 @@
/**
* 鏍规嵁鍒嗙被ID鍒犻櫎鏍囩鍒嗙被
*/
- @PreAuthorize("@ss.hasPermi('system:tagcategory:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:tagcategory:remove')")
@Log(title = "鏍囩鍒嗙被", businessType = BusinessType.DELETE)
@ApiOperation("鏍规嵁鍒嗙被ID鍒犻櫎鏍囩鍒嗙被")
@GetMapping("/remove/{tagcategoryids}")
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 8faf264..2d7d307 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
@@ -35,7 +35,7 @@
* 鏌ヨ鐢ㄦ埛鍒楄〃
*/
@ApiOperation("鏌ヨ鐢ㄦ埛鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:info:list')")
+ //@PreAuthorize("@ss.hasPermi('system:info:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody BaseUserInfo baseUserInfo) {
startPage();
@@ -47,7 +47,7 @@
* 瀵煎嚭鐢ㄦ埛鍒楄〃
*/
@ApiOperation("瀵煎嚭鐢ㄦ埛鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:info:export')")
+ //@PreAuthorize("@ss.hasPermi('system:info:export')")
@Log(title = "鐢ㄦ埛" , businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseUserInfo baseUserInfo) {
@@ -60,7 +60,7 @@
* 鑾峰彇鐢ㄦ埛璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鐢ㄦ埛璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:info:query')")
+ //@PreAuthorize("@ss.hasPermi('system:info:query')")
@GetMapping(value = "/{userid}")
public AjaxResult getInfo(@PathVariable("userid") Long userid) {
return success(baseUserInfoService.selectBaseUserInfoByUserid(userid));
@@ -70,7 +70,7 @@
* 鏂板鐢ㄦ埛
*/
@ApiOperation("鏂板鐢ㄦ埛")
- @PreAuthorize("@ss.hasPermi('system:info:add')")
+ //@PreAuthorize("@ss.hasPermi('system:info:add')")
@Log(title = "鐢ㄦ埛" , businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody BaseUserInfo baseUserInfo) {
@@ -81,7 +81,7 @@
* 淇敼鐢ㄦ埛
*/
@ApiOperation("淇敼鐢ㄦ埛")
- @PreAuthorize("@ss.hasPermi('system:info:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:info:edit')")
@Log(title = "鐢ㄦ埛" , businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseUserInfo baseUserInfo) {
@@ -92,7 +92,7 @@
* 鍒犻櫎鐢ㄦ埛
*/
@ApiOperation("鍒犻櫎鐢ㄦ埛")
- @PreAuthorize("@ss.hasPermi('system:info:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:info:remove')")
@Log(title = "鐢ㄦ埛" , businessType = BusinessType.DELETE)
@GetMapping("/remove/{userids}")
public AjaxResult remove(@PathVariable Long[] userids) {
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 40125f8..5d159d9 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
@@ -43,7 +43,7 @@
/**
* 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:equipmentinfo:list')")
+ //@PreAuthorize("@ss.hasPermi('system:equipmentinfo:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody Equipmentinfo equipmentinfo) {
startPage();
@@ -54,7 +54,7 @@
/**
* 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:equipmentinfo:export')")
+ //@PreAuthorize("@ss.hasPermi('system:equipmentinfo:export')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, Equipmentinfo equipmentinfo) {
@@ -66,7 +66,7 @@
/**
* 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:equipmentinfo:query')")
+ //@PreAuthorize("@ss.hasPermi('system:equipmentinfo:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(equipmentinfoService.selectEquipmentinfoById(id));
@@ -75,7 +75,7 @@
/**
* 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
*/
- @PreAuthorize("@ss.hasPermi('system:equipmentinfo:add')")
+ //@PreAuthorize("@ss.hasPermi('system:equipmentinfo:add')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody Equipmentinfo equipmentinfo) {
@@ -85,7 +85,7 @@
/**
* 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
*/
- @PreAuthorize("@ss.hasPermi('system:equipmentinfo:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:equipmentinfo:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody Equipmentinfo equipmentinfo) {
@@ -95,7 +95,7 @@
/**
* 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
*/
- @PreAuthorize("@ss.hasPermi('system:equipmentinfo:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:equipmentinfo:remove')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 f36dcf4..dfd71d7 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
@@ -42,7 +42,7 @@
* 鏌ヨ瀹ｆ暀鍒嗙被鍒楄〃
*/
@ApiOperation("鏌ヨ瀹ｆ暀鍒嗙被鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:hecategory:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:hecategory:list')")
@PostMapping("/selectHeCategoryList")
public TableDataInfo selectHeCategorylist(@RequestBody HeCategory heCategory) {
// startPage();
@@ -54,7 +54,7 @@
* 瀵煎嚭瀹ｆ暀鍒嗙被鍒楄〃
*/
@ApiOperation("瀵煎嚭瀹ｆ暀鍒嗙被鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:hecategory:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:hecategory:export')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, HeCategory heCategory) {
@@ -67,7 +67,7 @@
* 鑾峰彇瀹ｆ暀鍒嗙被璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇瀹ｆ暀鍒嗙被璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:hecategory:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:hecategory:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(heCategoryService.selectHeCategoryById(id));
@@ -77,7 +77,7 @@
* 鏂板瀹ｆ暀鍒嗙被
*/
@ApiOperation("鏂板瀹ｆ暀鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:hecategory:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:hecategory:add')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody HeCategory heCategory) {
@@ -88,7 +88,7 @@
* 淇敼瀹ｆ暀鍒嗙被
*/
@ApiOperation("淇敼瀹ｆ暀鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:hecategory:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:hecategory:edit')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody HeCategory heCategory) {
@@ -99,7 +99,7 @@
* 鍒犻櫎瀹ｆ暀鍒嗙被
*/
@ApiOperation("鍒犻櫎瀹ｆ暀鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:hecategory:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:hecategory:remove')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 403bfee..c7fbbc1 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
@@ -42,7 +42,7 @@
* 鏌ヨ瀹ｆ暀鍒嗙被鍒楄〃
*/
@ApiOperation("鏌ヨ瀹ｆ暀鍒嗙被鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:assort:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:list')")
@PostMapping("/selectHeLibraryAssortList")
public TableDataInfo list(@RequestBody HeLibraryAssort heLibraryAssort) {
startPage();
@@ -54,7 +54,7 @@
* 瀵煎嚭瀹ｆ暀鍒嗙被鍒楄〃
*/
@ApiOperation("瀵煎嚭瀹ｆ暀鍒嗙被鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:assort:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:export')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, HeLibraryAssort heLibraryAssort) {
@@ -67,7 +67,7 @@
* 鑾峰彇瀹ｆ暀鍒嗙被璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇瀹ｆ暀鍒嗙被璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:assort:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(heLibraryAssortService.selectHeLibraryAssortById(id));
@@ -77,7 +77,7 @@
* 鏂板瀹ｆ暀鍒嗙被
*/
@ApiOperation("鏂板瀹ｆ暀鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:assort:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:add')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody HeLibraryAssort heLibraryAssort) {
@@ -87,7 +87,7 @@
/**
* 鏂板瀹ｆ暀鍒嗙被璇︽儏鏍�
*/
- @PreAuthorize("@ss.hasPermi('smartor:assort:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:add')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.INSERT)
@ApiOperation("鏂板瀹ｆ暀鍒嗙被璇︽儏鏍�")
@PostMapping("/addtree")
@@ -99,7 +99,7 @@
* 淇敼瀹ｆ暀鍒嗙被
*/
@ApiOperation("淇敼瀹ｆ暀鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:assort:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:edit')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody HeLibraryAssort heLibraryAssort) {
@@ -110,7 +110,7 @@
* 鍒犻櫎瀹ｆ暀鍒嗙被
*/
@ApiOperation("鍒犻櫎瀹ｆ暀鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:assort:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:remove')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 e542da5..038dd47 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
@@ -37,7 +37,7 @@
* 鏌ヨ瀹ｆ暀璧勬枡搴撳垪琛�
*/
@ApiOperation("鏌ヨ瀹ｆ暀璧勬枡搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('system:library:list')")
+ //@PreAuthorize("@ss.hasPermi('system:library:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody HeLibrary heLibrary) {
startPage();
@@ -48,7 +48,7 @@
/**
* 瀵煎嚭瀹ｆ暀璧勬枡搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:library:export')")
+ //@PreAuthorize("@ss.hasPermi('system:library:export')")
@Log(title = "瀹ｆ暀璧勬枡搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, HeLibrary heLibrary) {
@@ -60,7 +60,7 @@
/**
* 鑾峰彇瀹ｆ暀璧勬枡搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:library:query')")
+ //@PreAuthorize("@ss.hasPermi('system:library:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(heLibraryService.selectHeLibraryById(id));
@@ -69,7 +69,7 @@
/**
* 鏂板瀹ｆ暀璧勬枡搴�
*/
- @PreAuthorize("@ss.hasPermi('system:library:add')")
+ //@PreAuthorize("@ss.hasPermi('system:library:add')")
@Log(title = "瀹ｆ暀璧勬枡搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody HeLibrary heLibrary) {
@@ -79,7 +79,7 @@
/**
* 淇敼瀹ｆ暀璧勬枡搴�
*/
- @PreAuthorize("@ss.hasPermi('system:library:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:library:edit')")
@Log(title = "瀹ｆ暀璧勬枡搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody HeLibrary heLibrary) {
@@ -90,7 +90,7 @@
* 鍒犻櫎瀹ｆ暀璧勬枡搴�
*/
@ApiOperation("鍒犻櫎瀹ｆ暀璧勬枡搴�")
- @PreAuthorize("@ss.hasPermi('system:library:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:library:remove')")
@Log(title = "瀹ｆ暀璧勬枡搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -101,7 +101,7 @@
* 鏂板鎴栦慨鏀瑰鏁欒鎯�
*/
@ApiOperation("鏂板鎴栦慨鏀瑰鏁欒鎯�")
- @PreAuthorize("@ss.hasPermi('system:script:list')")
+ //@PreAuthorize("@ss.hasPermi('system:script:list')")
@PostMapping("/saveOrUpdateHeLibrary")
public AjaxResult saveOrUpdateHeLibrary(@RequestBody HeLibraryVO heLibraryVO) {
if (ObjectUtils.isEmpty(heLibraryVO)) {
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 38ece5f..e19e2dd 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
@@ -39,7 +39,7 @@
/**
* 鏌ヨ鎸囨爣鏍囩鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:tag:list')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:list')")
@GetMapping("/list")
public TableDataInfo list(HeLibraryTag heLibraryTag) {
startPage();
@@ -50,7 +50,7 @@
/**
* 瀵煎嚭鎸囨爣鏍囩鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:tag:export')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:export')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, HeLibraryTag heLibraryTag) {
@@ -62,7 +62,7 @@
/**
* 鑾峰彇鎸囨爣鏍囩璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:tag:query')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(heLibraryTagService.selectHeLibraryTagById(id));
@@ -71,7 +71,7 @@
/**
* 鏂板鎸囨爣鏍囩
*/
- @PreAuthorize("@ss.hasPermi('system:tag:add')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:add')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody HeLibraryTag heLibraryTag) {
@@ -81,7 +81,7 @@
/**
* 淇敼鎸囨爣鏍囩
*/
- @PreAuthorize("@ss.hasPermi('system:tag:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody HeLibraryTag heLibraryTag) {
@@ -91,7 +91,7 @@
/**
* 鍒犻櫎鎸囨爣鏍囩
*/
- @PreAuthorize("@ss.hasPermi('system:tag:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:remove')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 2284bf3..05a1bfa 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
@@ -23,7 +23,7 @@
/**
* 瀹ｆ暀搴揅ontroller
- *
+ *
* @author smartor
* @date 2023-03-04
*/
@@ -37,7 +37,7 @@
/**
* 鏌ヨ瀹ｆ暀搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:helibrary:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:helibrary:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody HeLocallibrary heLocallibrary)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭瀹ｆ暀搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:helibrary:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:helibrary:export')")
@Log(title = "瀹ｆ暀搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, HeLocallibrary heLocallibrary)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇瀹ｆ暀搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('smartor:helibrary:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:helibrary:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板瀹ｆ暀搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:helibrary:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:helibrary:add')")
@Log(title = "瀹ｆ暀搴�", businessType = BusinessType.INSERT)
@PostMapping("add")
public AjaxResult add(@RequestBody HeLocallibrary heLocallibrary)
@@ -83,7 +83,7 @@
/**
* 淇敼瀹ｆ暀搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:helibrary:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:helibrary:edit')")
@Log(title = "瀹ｆ暀搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody HeLocallibrary heLocallibrary)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎瀹ｆ暀搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:helibrary:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:helibrary:remove')")
@Log(title = "瀹ｆ暀搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] 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 f458dc1..3cbcebe 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
@@ -35,7 +35,7 @@
* 鏌ヨ鎸囨爣鐤剧梾鍒楄〃
*/
@ApiOperation("鏌ヨ鎸囨爣鐤剧梾鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:icd10:list')")
+ //@PreAuthorize("@ss.hasPermi('system:icd10:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody Icd10Association icd10Association) {
if (icd10Association.getIsPage()) {
@@ -49,7 +49,7 @@
* 瀵煎嚭鎸囨爣鐤剧梾鍒楄〃
*/
@ApiOperation("瀵煎嚭鎸囨爣鐤剧梾鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:icd10:export')")
+ //@PreAuthorize("@ss.hasPermi('system:icd10:export')")
@Log(title = "鎸囨爣鐤剧梾", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, Icd10Association Icd10Association) {
@@ -62,7 +62,7 @@
* 鑾峰彇鎸囨爣鐤剧梾璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎸囨爣鐤剧梾璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:icd10:query')")
+ //@PreAuthorize("@ss.hasPermi('system:icd10:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(iIcd10AssociationService.selectIcd10AssociationById(id));
@@ -72,7 +72,7 @@
* 鏂板鎸囨爣鐤剧梾
*/
@ApiOperation("鏂板鎸囨爣鐤剧梾")
- @PreAuthorize("@ss.hasPermi('system:icd10:add')")
+ //@PreAuthorize("@ss.hasPermi('system:icd10:add')")
@Log(title = "鎸囨爣鐤剧梾", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody Icd10Association Icd10Association) {
@@ -83,7 +83,7 @@
* 淇敼鎸囨爣鐤剧梾
*/
@ApiOperation("淇敼鎸囨爣鐤剧梾")
- @PreAuthorize("@ss.hasPermi('system:icd10:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:icd10:edit')")
@Log(title = "鎸囨爣鐤剧梾", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody Icd10Association Icd10Association) {
@@ -94,7 +94,7 @@
* 鍒犻櫎鎸囨爣鐤剧梾
*/
@ApiOperation("鍒犻櫎鎸囨爣鐤剧梾")
- @PreAuthorize("@ss.hasPermi('system:icd10:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:icd10:remove')")
@Log(title = "鎸囨爣鐤剧梾", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 4c567cc..2fbb199 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
@@ -35,7 +35,7 @@
* 鏌ヨ鐤剧梾鍒楄〃
*/
@ApiOperation("鏌ヨ鐤剧梾鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:icd10:list')")
+ //@PreAuthorize("@ss.hasPermi('system:icd10:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody Icd10 icd10) {
PageUtils.startPageByPost(icd10.getPageNum(),icd10.getPageSize());
@@ -47,7 +47,7 @@
* 瀵煎嚭鐤剧梾鍒楄〃
*/
@ApiOperation("瀵煎嚭鐤剧梾鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:icd10:export')")
+ //@PreAuthorize("@ss.hasPermi('system:icd10:export')")
@Log(title = "鐤剧梾", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, Icd10 icd10) {
@@ -60,7 +60,7 @@
* 鑾峰彇鐤剧梾璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鐤剧梾璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:icd10:query')")
+ //@PreAuthorize("@ss.hasPermi('system:icd10:query')")
@GetMapping(value = "/getInfo/{icdid}")
public AjaxResult getInfo(@PathVariable("icdid") Long icdid) {
return success(icd10Service.selectIcd10ByIcdid(icdid));
@@ -70,7 +70,7 @@
* 鏂板鐤剧梾
*/
@ApiOperation("鏂板鐤剧梾")
- @PreAuthorize("@ss.hasPermi('system:icd10:add')")
+ //@PreAuthorize("@ss.hasPermi('system:icd10:add')")
@Log(title = "鐤剧梾", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody Icd10 icd10) {
@@ -81,7 +81,7 @@
* 淇敼鐤剧梾
*/
@ApiOperation("淇敼鐤剧梾")
- @PreAuthorize("@ss.hasPermi('system:icd10:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:icd10:edit')")
@Log(title = "鐤剧梾", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody Icd10 icd10) {
@@ -92,7 +92,7 @@
* 鍒犻櫎鐤剧梾
*/
@ApiOperation("鍒犻櫎鐤剧梾")
- @PreAuthorize("@ss.hasPermi('system:icd10:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:icd10:remove')")
@Log(title = "鐤剧梾", businessType = BusinessType.DELETE)
@GetMapping("/remove/{icdids}")
public AjaxResult remove(@PathVariable Long[] icdids) {
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 53d6aca..be6cbed 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI鎰忓浘搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibIntent ivrLibIntent)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI鎰忓浘搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:export')")
@Log(title = "AI鎰忓浘搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibIntent ivrLibIntent)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI鎰忓浘搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:query')")
@GetMapping(value = "/{intentid}")
public AjaxResult getInfo(@PathVariable("intentid") Long intentid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI鎰忓浘搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:add')")
@Log(title = "AI鎰忓浘搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibIntent ivrLibIntent)
@@ -83,7 +83,7 @@
/**
* 淇敼AI鎰忓浘搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:edit')")
@Log(title = "AI鎰忓浘搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibIntent ivrLibIntent)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI鎰忓浘搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:remove')")
@Log(title = "AI鎰忓浘搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{intentids}")
public AjaxResult remove(@PathVariable Long[] intentids)
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 27a9a08..d21f32d 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
@@ -23,7 +23,7 @@
/**
* AI鎰忓浘搴撳垎绫籆ontroller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI鎰忓浘搴撳垎绫诲垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibIntentcategory ivrLibIntentcategory)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI鎰忓浘搴撳垎绫诲垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:export')")
@Log(title = "AI鎰忓浘搴撳垎绫�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibIntentcategory ivrLibIntentcategory)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI鎰忓浘搴撳垎绫昏缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:query')")
@GetMapping(value = "/{intertcatid}")
public AjaxResult getInfo(@PathVariable("intertcatid") Long intertcatid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI鎰忓浘搴撳垎绫�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:add')")
@Log(title = "AI鎰忓浘搴撳垎绫�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibIntentcategory ivrLibIntentcategory)
@@ -83,7 +83,7 @@
/**
* 淇敼AI鎰忓浘搴撳垎绫�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:edit')")
@Log(title = "AI鎰忓浘搴撳垎绫�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibIntentcategory ivrLibIntentcategory)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI鎰忓浘搴撳垎绫�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:remove')")
@Log(title = "AI鎰忓浘搴撳垎绫�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{intertcatids}")
public AjaxResult remove(@PathVariable Long[] 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 34380c3..5032f3f 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI璇濇湳搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibScript ivrLibScript)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI璇濇湳搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:export')")
@Log(title = "AI璇濇湳搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibScript ivrLibScript)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI璇濇湳搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:query')")
@GetMapping(value = "/{scriptid}")
public AjaxResult getInfo(@PathVariable("scriptid") Long scriptid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI璇濇湳搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:add')")
@Log(title = "AI璇濇湳搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibScript ivrLibScript)
@@ -83,7 +83,7 @@
/**
* 淇敼AI璇濇湳搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:edit')")
@Log(title = "AI璇濇湳搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibScript ivrLibScript)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI璇濇湳搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:remove')")
@Log(title = "AI璇濇湳搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{scriptids}")
public AjaxResult remove(@PathVariable Long[] scriptids)
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 c510b97..f8757b4 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI璇濇湳搴撳垎绫诲垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibScriptcategory ivrLibScriptcategory)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI璇濇湳搴撳垎绫诲垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:export')")
@Log(title = "AI璇濇湳搴撳垎绫�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibScriptcategory ivrLibScriptcategory)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI璇濇湳搴撳垎绫昏缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:query')")
@GetMapping(value = "/{categoryid}")
public AjaxResult getInfo(@PathVariable("categoryid") Long categoryid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI璇濇湳搴撳垎绫�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:add')")
@Log(title = "AI璇濇湳搴撳垎绫�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibScriptcategory ivrLibScriptcategory)
@@ -83,7 +83,7 @@
/**
* 淇敼AI璇濇湳搴撳垎绫�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:edit')")
@Log(title = "AI璇濇湳搴撳垎绫�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibScriptcategory ivrLibScriptcategory)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI璇濇湳搴撳垎绫�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:remove')")
@Log(title = "AI璇濇湳搴撳垎绫�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{categoryids}")
public AjaxResult remove(@PathVariable Long[] 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 28345ed..222f0b5 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI璇濇湳妯″潡鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibScriptmodel ivrLibScriptmodel)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI璇濇湳妯″潡鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:export')")
@Log(title = "AI璇濇湳妯″潡", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibScriptmodel ivrLibScriptmodel)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI璇濇湳妯″潡璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:query')")
@GetMapping(value = "/{modelid}")
public AjaxResult getInfo(@PathVariable("modelid") Long modelid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI璇濇湳妯″潡
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:add')")
@Log(title = "AI璇濇湳妯″潡", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibScriptmodel ivrLibScriptmodel)
@@ -83,7 +83,7 @@
/**
* 淇敼AI璇濇湳妯″潡
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:edit')")
@Log(title = "AI璇濇湳妯″潡", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibScriptmodel ivrLibScriptmodel)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI璇濇湳妯″潡
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:remove')")
@Log(title = "AI璇濇湳妯″潡", businessType = BusinessType.DELETE)
@GetMapping("/remove/{modelids}")
public AjaxResult remove(@PathVariable Long[] 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 c9297a2..5843c37 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
@@ -34,7 +34,7 @@
* 鏌ヨ閫氱敤妯℃澘鍒嗙被鍒楄〃
*/
@ApiOperation("鏌ヨ閫氱敤妯℃澘鍒嗙被鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:category:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaExtemplateCategory ivrLibaExtemplateCategory) {
startPage();
@@ -46,7 +46,7 @@
* 瀵煎嚭閫氱敤妯℃澘鍒嗙被鍒楄〃
*/
@ApiOperation("瀵煎嚭閫氱敤妯℃澘鍒嗙被鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:category:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:export')")
@Log(title = "閫氱敤妯℃澘鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaExtemplateCategory ivrLibaExtemplateCategory) {
@@ -59,7 +59,7 @@
* 鑾峰彇閫氱敤妯℃澘鍒嗙被璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇閫氱敤妯℃澘鍒嗙被璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:category:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:query')")
@GetMapping(value = "/getInfo/{intertcatid}")
public AjaxResult getInfo(@PathVariable("intertcatid") Long intertcatid) {
return success(ivrLibaExtemplateCategoryService.selectIvrLibaExtemplateCategoryByIntertcatid(intertcatid));
@@ -69,7 +69,7 @@
* 鏂板閫氱敤妯℃澘鍒嗙被
*/
@ApiOperation("鏂板閫氱敤妯℃澘鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:category:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:add')")
@Log(title = "閫氱敤妯℃澘鍒嗙被", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaExtemplateCategory ivrLibaExtemplateCategory) {
@@ -80,7 +80,7 @@
* 淇敼閫氱敤妯℃澘鍒嗙被
*/
@ApiOperation("淇敼閫氱敤妯℃澘鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:category:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:edit')")
@Log(title = "閫氱敤妯℃澘鍒嗙被", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaExtemplateCategory ivrLibaExtemplateCategory) {
@@ -91,7 +91,7 @@
* 鍒犻櫎閫氱敤妯℃澘鍒嗙被
*/
@ApiOperation("鍒犻櫎閫氱敤妯℃澘鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:category:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:remove')")
@Log(title = "閫氱敤妯℃澘鍒嗙被", businessType = BusinessType.DELETE)
@GetMapping("/remove/{intertcatids}")
public AjaxResult remove(@PathVariable Long[] intertcatids) {
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 a76c116..e940f49 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
@@ -34,7 +34,7 @@
* 鏌ヨ閫氳繃妯℃澘鍒楄〃
*/
@ApiOperation("鏌ヨ閫氳繃妯℃澘鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:extemplate:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:extemplate:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaExtemplate ivrLibaExtemplate) {
startPage();
@@ -46,7 +46,7 @@
* 瀵煎嚭閫氳繃妯℃澘鍒楄〃
*/
@ApiOperation("瀵煎嚭閫氳繃妯℃澘鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:extemplate:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:extemplate:export')")
@Log(title = "閫氳繃妯℃澘", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaExtemplate ivrLibaExtemplate) {
@@ -59,7 +59,7 @@
* 鑾峰彇閫氳繃妯℃澘璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇閫氳繃妯℃澘璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:extemplate:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:extemplate:query')")
@GetMapping(value = "/{ID}")
public AjaxResult getInfo(@PathVariable("ID") String ID) {
return success(ivrLibaExtemplateService.selectIvrLibaExtemplateByID(ID));
@@ -69,7 +69,7 @@
* 鏂板閫氳繃妯℃澘
*/
@ApiOperation("鏂板閫氳繃妯℃澘")
- @PreAuthorize("@ss.hasPermi('smartor:extemplate:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:extemplate:add')")
@Log(title = "閫氳繃妯℃澘", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaExtemplate ivrLibaExtemplate) {
@@ -80,7 +80,7 @@
* 淇敼閫氳繃妯℃澘
*/
@ApiOperation("淇敼閫氳繃妯℃澘")
- @PreAuthorize("@ss.hasPermi('smartor:extemplate:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:extemplate:edit')")
@Log(title = "閫氳繃妯℃澘", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaExtemplate ivrLibaExtemplate) {
@@ -91,7 +91,7 @@
* 鍒犻櫎閫氳繃妯℃澘
*/
@ApiOperation("鍒犻櫎閫氳繃妯℃澘")
- @PreAuthorize("@ss.hasPermi('smartor:extemplate:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:extemplate:remove')")
@Log(title = "閫氳繃妯℃澘", businessType = BusinessType.DELETE)
@GetMapping("/remove/{IDs}")
public AjaxResult remove(@PathVariable Long[] IDs) {
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 a0f6abd..05f572a 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
@@ -34,7 +34,7 @@
* 鏌ヨ閫氱敤妯℃澘璇濇湳鍒楄〃
*/
@ApiOperation("鏌ヨ閫氱敤妯℃澘璇濇湳鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:extemplatescript:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:extemplatescript:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaExtemplatescript ivrLibaExtemplatescript) {
startPage();
@@ -46,7 +46,7 @@
* 瀵煎嚭閫氱敤妯℃澘璇濇湳鍒楄〃
*/
@ApiOperation("瀵煎嚭閫氱敤妯℃澘璇濇湳鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:extemplatescript:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:extemplatescript:export')")
@Log(title = "閫氱敤妯℃澘璇濇湳", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaExtemplatescript ivrLibaExtemplatescript) {
@@ -59,7 +59,7 @@
* 鑾峰彇閫氱敤妯℃澘璇濇湳璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇閫氱敤妯℃澘璇濇湳璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:extemplatescript:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:extemplatescript:query')")
@GetMapping(value = "/getInfo/{ID}")
public AjaxResult getInfo(@PathVariable("ID") String ID) {
return success(ivrLibaExtemplatescriptService.selectIvrLibaExtemplatescriptByID(ID));
@@ -69,7 +69,7 @@
* 鏂板閫氱敤妯℃澘璇濇湳
*/
@ApiOperation("鏂板閫氱敤妯℃澘璇濇湳")
- @PreAuthorize("@ss.hasPermi('smartor:extemplatescript:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:extemplatescript:add')")
@Log(title = "閫氱敤妯℃澘璇濇湳", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaExtemplatescript ivrLibaExtemplatescript) {
@@ -80,7 +80,7 @@
* 淇敼閫氱敤妯℃澘璇濇湳
*/
@ApiOperation("淇敼閫氱敤妯℃澘璇濇湳")
- @PreAuthorize("@ss.hasPermi('smartor:extemplatescript:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:extemplatescript:edit')")
@Log(title = "閫氱敤妯℃澘璇濇湳", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaExtemplatescript ivrLibaExtemplatescript) {
@@ -91,7 +91,7 @@
* 鍒犻櫎閫氱敤妯℃澘璇濇湳
*/
@ApiOperation("鍒犻櫎閫氱敤妯℃澘璇濇湳")
- @PreAuthorize("@ss.hasPermi('smartor:extemplatescript:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:extemplatescript:remove')")
@Log(title = "閫氱敤妯℃澘璇濇湳", businessType = BusinessType.DELETE)
@GetMapping("/remove/{IDs}")
public AjaxResult remove(@PathVariable Long[] IDs) {
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 9cdc026..97bb644 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
@@ -37,7 +37,7 @@
* 鍒楄〃
*/
@ApiOperation("鏌ヨ闂璇濇湳鍒嗙被搴�(鏍戠姸)")
- @PreAuthorize("@ss.hasPermi('system:assort:list')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:list')")
@PostMapping("/selectIvrLibaScriptAssortList")
public TableDataInfo list(@RequestBody IvrLibaScriptAssort ivrLibaScriptAssort) {
List<IvrLibaScriptAssortVO> list = ivrLibaScriptAssortService.selectIvrLibaScriptAssortList(ivrLibaScriptAssort);
@@ -49,7 +49,7 @@
* 鍒楄〃
*/
@ApiOperation("瀵煎嚭闂璇濇湳鍒嗙被搴�")
- @PreAuthorize("@ss.hasPermi('system:assort:export')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:export')")
@Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaScriptAssort ivrLibaScriptAssort) {
@@ -63,7 +63,7 @@
* 璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇闂璇濇湳鍒嗙被搴�")
- @PreAuthorize("@ss.hasPermi('system:assort:query')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(ivrLibaScriptAssortService.selectIvrLibaScriptAssortById(id));
@@ -73,7 +73,7 @@
* 鏂板闂璇濇湳鍒嗙被搴�
*/
@ApiOperation("鏂板闂璇濇湳鍒嗙被搴�")
- @PreAuthorize("@ss.hasPermi('system:assort:add')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:add')")
@Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaScriptAssort ivrLibaScriptAssort) {
@@ -83,7 +83,7 @@
/**
* 鏂板闂璇濇湳鍒嗙被鏍�
*/
- @PreAuthorize("@ss.hasPermi('system:assort:add')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:add')")
@Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.INSERT)
@ApiOperation("鏂板闂璇濇湳鍒嗙被鏍�")
@PostMapping("/addtree")
@@ -95,7 +95,7 @@
* 淇敼闂璇濇湳鍒嗙被搴�
*/
@ApiOperation("淇敼闂璇濇湳鍒嗙被搴�")
- @PreAuthorize("@ss.hasPermi('system:assort:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:edit')")
@Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaScriptAssort ivrLibaScriptAssort) {
@@ -106,7 +106,7 @@
* 鍒犻櫎闂璇濇湳鍒嗙被搴�
*/
@ApiOperation("鍒犻櫎闂璇濇湳鍒嗙被搴�")
- @PreAuthorize("@ss.hasPermi('system:assort:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:remove')")
@Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 730bf03..a84b3de 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
@@ -38,7 +38,7 @@
* 鏌ヨ闂璇濇湳搴撳垪琛�
*/
@ApiOperation("鏌ヨ闂璇濇湳搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('system:script:list')")
+ //@PreAuthorize("@ss.hasPermi('system:script:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaScript ivrLibaScript) {
PageUtils.startPageByPost(ivrLibaScript.getPageNum(),ivrLibaScript.getPageSize());
@@ -50,7 +50,7 @@
* 瀵煎嚭闂璇濇湳搴撳垪琛�
*/
@ApiOperation("瀵煎嚭闂璇濇湳搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('system:script:export')")
+ //@PreAuthorize("@ss.hasPermi('system:script:export')")
@Log(title = "闂璇濇湳搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaScript ivrLibaScript) {
@@ -63,7 +63,7 @@
* 鑾峰彇闂璇濇湳搴撹缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇闂璇濇湳搴撹缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:script:query')")
+ //@PreAuthorize("@ss.hasPermi('system:script:query')")
@GetMapping(value = "/getInfo/{questionid}")
public AjaxResult getInfo(@PathVariable("questionid") String questionid) {
return success(ivrLibaScriptService.selectIvrLibaScriptByQuestionid(questionid));
@@ -73,7 +73,7 @@
* 鏂板闂璇濇湳搴�
*/
@ApiOperation("鏂板闂璇濇湳搴�")
- @PreAuthorize("@ss.hasPermi('system:script:add')")
+ //@PreAuthorize("@ss.hasPermi('system:script:add')")
@Log(title = "闂璇濇湳搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaScript ivrLibaScript) {
@@ -84,7 +84,7 @@
* 淇敼闂璇濇湳搴�
*/
@ApiOperation("淇敼闂璇濇湳搴�")
- @PreAuthorize("@ss.hasPermi('system:script:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:script:edit')")
@Log(title = "闂璇濇湳搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaScript ivrLibaScript) {
@@ -95,7 +95,7 @@
* 鍒犻櫎闂璇濇湳搴�
*/
@ApiOperation("鍒犻櫎闂璇濇湳搴�")
- @PreAuthorize("@ss.hasPermi('system:script:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:script:remove')")
@Log(title = "闂璇濇湳搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{questionids}")
public AjaxResult remove(@PathVariable String[] questionids) {
@@ -107,7 +107,7 @@
* 鏌ヨ闂璇濇湳璇︽儏鏍规嵁鏉′欢
*/
@ApiOperation("鏌ヨ闂璇濇湳璇︽儏鏍规嵁鏉′欢")
- @PreAuthorize("@ss.hasPermi('system:script:list')")
+ //@PreAuthorize("@ss.hasPermi('system:script:list')")
@PostMapping("/selectInfoByCondition")
public AjaxResult selectInfoByCondition(@RequestBody IvrLibaScriptVO ivrLibaScriptVO) {
if (ObjectUtils.isEmpty(ivrLibaScriptVO)) {
@@ -122,7 +122,7 @@
* 鏂板鎴栦慨鏀归棶棰樿鎯�
*/
@ApiOperation("鏂板鎴栦慨鏀归棶棰樿鎯�")
- @PreAuthorize("@ss.hasPermi('system:script:list')")
+ //@PreAuthorize("@ss.hasPermi('system:script:list')")
@PostMapping("/saveOrUpdateScript")
public AjaxResult saveOrUpdateScript(@RequestBody IvrLibaScriptVO ivrLibaScriptVO) {
if (ObjectUtils.isEmpty(ivrLibaScriptVO)) {
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 b3428a2..640091d 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
@@ -30,7 +30,7 @@
/**
* 鏌ヨ闂璇濇湳鏍囩搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:tag:list')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaScriptTag ivrLibaScriptTag) {
startPage();
@@ -41,7 +41,7 @@
/**
* 瀵煎嚭闂璇濇湳鏍囩搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:tag:export')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:export')")
@Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaScriptTag ivrLibaScriptTag) {
@@ -53,7 +53,7 @@
/**
* 鑾峰彇闂璇濇湳鏍囩搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:tag:query')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(ivrLibaScriptTagService.selectIvrLibaScriptTagById(id));
@@ -62,7 +62,7 @@
/**
* 鏂板闂璇濇湳鏍囩搴�
*/
- @PreAuthorize("@ss.hasPermi('system:tag:add')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:add')")
@Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaScriptTag ivrLibaScriptTag) {
@@ -72,7 +72,7 @@
/**
* 淇敼闂璇濇湳鏍囩搴�
*/
- @PreAuthorize("@ss.hasPermi('system:tag:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaScriptTag ivrLibaScriptTag) {
@@ -82,7 +82,7 @@
/**
* 鍒犻櫎闂璇濇湳鏍囩搴�
*/
- @PreAuthorize("@ss.hasPermi('system:tag:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:remove')")
@Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 f53bf3e..4bc04f0 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
@@ -30,7 +30,7 @@
/**
* 鏌ヨ闂璇濇湳鎸囨爣搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:target:list')")
+ //@PreAuthorize("@ss.hasPermi('system:target:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaScriptTarget ivrLibaScriptTarget) {
startPage();
@@ -41,7 +41,7 @@
/**
* 瀵煎嚭闂璇濇湳鎸囨爣搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:target:export')")
+ //@PreAuthorize("@ss.hasPermi('system:target:export')")
@Log(title = "闂璇濇湳鎸囨爣搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaScriptTarget ivrLibaScriptTarget) {
@@ -53,7 +53,7 @@
/**
* 鑾峰彇闂璇濇湳鎸囨爣搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:target:query')")
+ //@PreAuthorize("@ss.hasPermi('system:target:query')")
@GetMapping(value = "/getInfo/{questionTargetID}")
public AjaxResult getInfo(@PathVariable("questionTargetID") String questionTargetID) {
return success(ivrLibaScriptTargetService.selectIvrLibaScriptTargetByQuestionTargetID(questionTargetID));
@@ -62,7 +62,7 @@
/**
* 鏂板闂璇濇湳鎸囨爣搴�
*/
- @PreAuthorize("@ss.hasPermi('system:target:add')")
+ //@PreAuthorize("@ss.hasPermi('system:target:add')")
@Log(title = "闂璇濇湳鎸囨爣搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaScriptTarget ivrLibaScriptTarget) {
@@ -72,7 +72,7 @@
/**
* 淇敼闂璇濇湳鎸囨爣搴�
*/
- @PreAuthorize("@ss.hasPermi('system:target:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:target:edit')")
@Log(title = "闂璇濇湳鎸囨爣搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaScriptTarget ivrLibaScriptTarget) {
@@ -82,7 +82,7 @@
/**
* 鍒犻櫎闂璇濇湳鎸囨爣搴�
*/
- @PreAuthorize("@ss.hasPermi('system:target:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:target:remove')")
@Log(title = "闂璇濇湳鎸囨爣搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{questionTargetIDs}")
public AjaxResult remove(@PathVariable Integer[] ids) {
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 3759809..43497a7 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
@@ -30,7 +30,7 @@
/**
* 鏌ヨ闂璇濇湳鎸囨爣閫夐」搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:list')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
startPage();
@@ -41,7 +41,7 @@
/**
* 瀵煎嚭闂璇濇湳鎸囨爣閫夐」搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:export')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:export')")
@Log(title = "闂璇濇湳鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
@@ -53,7 +53,7 @@
/**
* 鑾峰彇闂璇濇湳鎸囨爣閫夐」搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:query')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:query')")
@GetMapping(value = "/getInfo/{targetoptionid}")
public AjaxResult getInfo(@PathVariable("targetoptionid") String targetoptionid) {
return success(ivrLibaScriptTargetoptionService.selectIvrLibaScriptTargetoptionByTargetoptionid(targetoptionid));
@@ -62,7 +62,7 @@
/**
* 鏂板闂璇濇湳鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:add')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:add')")
@Log(title = "闂璇濇湳鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
@@ -72,7 +72,7 @@
/**
* 淇敼闂璇濇湳鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
@Log(title = "闂璇濇湳鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
@@ -82,7 +82,7 @@
/**
* 鍒犻櫎闂璇濇湳鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
@Log(title = "闂璇濇湳鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{targetoptionids}")
public AjaxResult remove(@PathVariable String[] targetoptionids) {
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 2459efa..cfb54ac 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
@@ -37,7 +37,7 @@
* 鏌ヨ鎸囨爣鍒嗙被鍒楄〃
*/
@ApiOperation("鏌ヨ鎸囨爣鍒嗙被鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:assort:list')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:list')")
@PostMapping("/selectIvrLibaTargetAssortList")
public TableDataInfo list(@RequestBody IvrLibaTargetAssort ivrLibaTargetAssort) {
// PageUtils.startPageByPost(ivrLibaTargetAssort.getPageNum(), ivrLibaTargetAssort.getPageSize());
@@ -49,7 +49,7 @@
* 瀵煎嚭鎸囨爣鍒嗙被鍒楄〃
*/
@ApiOperation("瀵煎嚭鎸囨爣鍒嗙被鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:assort:export')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:export')")
@Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaTargetAssort ivrLibaTargetAssort) {
@@ -62,7 +62,7 @@
* 鑾峰彇鎸囨爣鍒嗙被璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎸囨爣鍒嗙被璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:assort:query')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(ivrLibaTargetAssortService.selectIvrLibaTargetAssortById(id));
@@ -72,7 +72,7 @@
* 鏂板鎸囨爣鍒嗙被
*/
@ApiOperation("鏂板鎸囨爣鍒嗙被")
- @PreAuthorize("@ss.hasPermi('system:assort:add')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:add')")
@Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTargetAssort ivrLibaTargetAssort) {
@@ -82,7 +82,7 @@
/**
* 鏂板鎸囨爣鍒嗙被鏍�
*/
- @PreAuthorize("@ss.hasPermi('system:assort:add')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:add')")
@Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鎸囨爣鍒嗙被鏍�")
@PostMapping("/addtree")
@@ -94,7 +94,7 @@
* 淇敼鎸囨爣鍒嗙被
*/
@ApiOperation("淇敼鎸囨爣鍒嗙被")
- @PreAuthorize("@ss.hasPermi('system:assort:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:edit')")
@Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTargetAssort ivrLibaTargetAssort) {
@@ -105,7 +105,7 @@
* 鍒犻櫎鎸囨爣鍒嗙被
*/
@ApiOperation("鍒犻櫎鎸囨爣鍒嗙被")
- @PreAuthorize("@ss.hasPermi('system:assort:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:remove')")
@Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 5471fbc..13defd0 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
@@ -38,7 +38,7 @@
* 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
*/
@ApiOperation("鏌ヨ鎸囨爣鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:target:list')")
+ //@PreAuthorize("@ss.hasPermi('system:target:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaTarget ivrLibaTarget) {
PageUtils.startPageByPost(ivrLibaTarget.getPageNum(), ivrLibaTarget.getPageSize());
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭鎸囨爣鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:target:export')")
+ //@PreAuthorize("@ss.hasPermi('system:target:export')")
@Log(title = "鎸囨爣搴�", businessType = BusinessType.EXPORT)
@ApiOperation("瀵煎嚭鎸囨爣鍒楄〃")
@PostMapping("/export")
@@ -63,7 +63,7 @@
* 鑾峰彇鎸囨爣淇℃伅閫氳繃id
*/
@ApiOperation("鑾峰彇鎸囨爣淇℃伅閫氳繃id")
- @PreAuthorize("@ss.hasPermi('system:target:query')")
+ //@PreAuthorize("@ss.hasPermi('system:target:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(ivrLibaTargetService.selectIvrLibaTargetByTargetID(id));
@@ -72,7 +72,7 @@
/**
* 鏂板鎸囨爣
*/
- @PreAuthorize("@ss.hasPermi('system:target:add')")
+ //@PreAuthorize("@ss.hasPermi('system:target:add')")
@Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鎸囨爣锛堣繖涓帴鍙ｆ病鍟ョ敤浜嗭紝鐢ㄢ�濇柊澧炴垨淇敼鎸囨爣淇℃伅鈥滆繖涓帴鍙ｅソ涓�浜涳級")
@PostMapping("/add")
@@ -94,7 +94,7 @@
* 鍒犻櫎鎸囨爣
*/
@ApiOperation("鍒犻櫎鎸囨爣")
- @PreAuthorize("@ss.hasPermi('system:target:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:target:remove')")
@Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -105,7 +105,7 @@
* 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
*/
@ApiOperation("鏌ヨ鎸囨爣鍜屽叧鑱旂殑鎸囨爣閫夐」")
- @PreAuthorize("@ss.hasPermi('system:target:list')")
+ //@PreAuthorize("@ss.hasPermi('system:target:list')")
@PostMapping("/targetInfo")
public TableDataInfo targetInfo(@RequestBody IvrLibaTarget ivrLibaTarget) {
PageUtils.startPageByPost(ivrLibaTarget.getPageNum(), ivrLibaTarget.getPageSize());
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 8a8de25..cc1ee82 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
@@ -30,7 +30,7 @@
/**
* 鏌ヨ鎸囨爣鏍囩鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:tag:list')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaTargetTag ivrLibaTargetTag) {
startPage();
@@ -41,7 +41,7 @@
/**
* 瀵煎嚭鎸囨爣鏍囩鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:tag:export')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:export')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaTargetTag ivrLibaTargetTag) {
@@ -53,7 +53,7 @@
/**
* 鑾峰彇鎸囨爣鏍囩璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:tag:query')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(ivrLibaTargetTagService.selectIvrLibaTargetTagById(id));
@@ -62,7 +62,7 @@
/**
* 鏂板鎸囨爣鏍囩
*/
- @PreAuthorize("@ss.hasPermi('system:tag:add')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:add')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTargetTag ivrLibaTargetTag) {
@@ -72,7 +72,7 @@
/**
* 淇敼鎸囨爣鏍囩
*/
- @PreAuthorize("@ss.hasPermi('system:tag:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTargetTag ivrLibaTargetTag) {
@@ -82,7 +82,7 @@
/**
* 鍒犻櫎鎸囨爣鏍囩
*/
- @PreAuthorize("@ss.hasPermi('system:tag:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:remove')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 beb9402..7852786 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
@@ -36,7 +36,7 @@
* 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
*/
@ApiOperation("鏌ヨ鎸囨爣閫夐」搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:list')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaTargetoption ivrLibaTargetoption)
{
@@ -49,7 +49,7 @@
* 瀵煎嚭鎸囨爣閫夐」搴撳垪琛�
*/
@ApiOperation("瀵煎嚭鎸囨爣閫夐」搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:export')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:export')")
@Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaTargetoption ivrLibaTargetoption)
@@ -63,7 +63,7 @@
* 鑾峰彇鎸囨爣閫夐」搴撹缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇鎸囨爣閫夐」搴撹缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:query')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:query')")
@GetMapping(value = "/getInfo/{targetoptionid}")
public AjaxResult getInfo(@PathVariable("targetoptionid") Long targetoptionid)
{
@@ -74,7 +74,7 @@
* 鏂板鎸囨爣閫夐」搴�
*/
@ApiOperation("鏂板鎸囨爣閫夐」搴�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:add')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:add')")
@Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTargetoption ivrLibaTargetoption)
@@ -86,7 +86,7 @@
* 淇敼鎸囨爣閫夐」搴�
*/
@ApiOperation("淇敼鎸囨爣閫夐」搴�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
@Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTargetoption ivrLibaTargetoption)
@@ -98,7 +98,7 @@
* 鍒犻櫎鎸囨爣閫夐」搴�
*/
@ApiOperation("鍒犻櫎鎸囨爣閫夐」搴�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
@Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{targetoptionids}")
public AjaxResult remove(@PathVariable Long[] 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 4b2a373..49d1dc1 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
@@ -36,7 +36,7 @@
* 鏌ヨ妯℃澘鍒嗙被鍒楄〃
*/
@ApiOperation("鏌ヨ妯℃澘鍒嗙被鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:assort:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:list')")
@PostMapping("/selectIvrLibaTemplateAssortList")
public TableDataInfo selectIvrLibaTemplateAssortList(@RequestBody IvrLibaTemplateAssort ivrLibaTemplateAssort) {
// startPage();
@@ -48,7 +48,7 @@
* 瀵煎嚭妯℃澘鍒嗙被鍒楄〃
*/
@ApiOperation("瀵煎嚭妯℃澘鍒嗙被鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:assort:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:export')")
@Log(title = "妯℃澘鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaTemplateAssort ivrLibaTemplateAssort) {
@@ -61,7 +61,7 @@
* 鑾峰彇妯℃澘鍒嗙被璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇妯℃澘鍒嗙被璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:assort:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(ivrLibaTemplateAssortService.selectIvrLibaTemplateAssortById(id));
@@ -71,7 +71,7 @@
* 鏂板妯℃澘鍒嗙被
*/
@ApiOperation("鏂板妯℃澘鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:assort:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:add')")
@Log(title = "妯℃澘鍒嗙被", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTemplateAssort ivrLibaTemplateAssort) {
@@ -81,7 +81,7 @@
/**
* 鏂板妯℃澘鍒嗙被鏍�
*/
- @PreAuthorize("@ss.hasPermi('smartor:assort:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:add')")
@Log(title = "妯℃澘鍒嗙被", businessType = BusinessType.INSERT)
@ApiOperation("鏂板妯℃澘鍒嗙被鏍�")
@PostMapping("/addtree")
@@ -93,7 +93,7 @@
* 淇敼妯℃澘鍒嗙被
*/
@ApiOperation("淇敼妯℃澘鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:assort:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:edit')")
@Log(title = "妯℃澘鍒嗙被", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTemplateAssort ivrLibaTemplateAssort) {
@@ -104,7 +104,7 @@
* 鍒犻櫎妯℃澘鍒嗙被
*/
@ApiOperation("鍒犻櫎妯℃澘鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:assort:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:remove')")
@Log(title = "妯℃澘鍒嗙被", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 6c030ae..827743f 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
@@ -50,7 +50,7 @@
* 鏌ヨ妯℃澘搴撳垪琛�
*/
@ApiOperation("鏌ヨ闅忚妯℃澘搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:template:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:template:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaTemplate ivrLibaTemplate) {
//鍒嗛〉
@@ -63,7 +63,7 @@
* 瀵煎嚭妯℃澘搴撳垪琛�
*/
@ApiOperation("瀵煎嚭闅忚妯℃澘搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:template:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:template:export')")
@Log(title = "妯℃澘搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaTemplate ivrLibaTemplate) {
@@ -76,7 +76,7 @@
* 鑾峰彇妯℃澘搴撹缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇闅忚妯℃澘搴撹缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('smartor:template:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:template:query')")
@GetMapping(value = "/{ID}")
public AjaxResult getInfo(@PathVariable("ID") Long ID) {
return success(ivrLibaTemplateService.selectIvrLibaTemplateByID(ID));
@@ -86,7 +86,7 @@
* 鏂板妯℃澘搴�
*/
@ApiOperation("鏂板闅忚妯℃澘搴�")
- @PreAuthorize("@ss.hasPermi('smartor:template:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:template:add')")
@Log(title = "妯℃澘搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTemplate ivrLibaTemplate) {
@@ -97,7 +97,7 @@
* 淇敼妯℃澘搴�
*/
@ApiOperation("淇敼闅忚妯℃澘搴�")
- @PreAuthorize("@ss.hasPermi('smartor:template:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:template:edit')")
@Log(title = "妯℃澘搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTemplate ivrLibaTemplate) {
@@ -108,7 +108,7 @@
* 鍒犻櫎妯℃澘搴�
*/
@ApiOperation("鍒犻櫎闅忚妯℃澘搴�")
- @PreAuthorize("@ss.hasPermi('smartor:template:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:template:remove')")
@Log(title = "妯℃澘搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{IDs}")
public AjaxResult remove(@PathVariable Long[] IDs) {
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 ea0c6bd..b674caa 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
@@ -35,7 +35,7 @@
* 鏌ヨ妯＄増闂璇濇湳搴撳垪琛�
*/
@ApiOperation("鏌ヨ妯＄増闂璇濇湳搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:script:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:script:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaTemplateScript ivrLibaTemplateScript)
{
@@ -48,7 +48,7 @@
* 瀵煎嚭妯＄増闂璇濇湳搴撳垪琛�
*/
@ApiOperation("瀵煎嚭妯＄増闂璇濇湳搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:script:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:script:export')")
@Log(title = "妯＄増闂璇濇湳搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaTemplateScript ivrLibaTemplateScript)
@@ -62,7 +62,7 @@
* 鑾峰彇妯＄増闂璇濇湳搴撹缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇妯＄増闂璇濇湳搴撹缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('smartor:script:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:script:query')")
@GetMapping(value = "/getInfo/{ID}")
public AjaxResult getInfo(@PathVariable("ID") Long ID)
{
@@ -73,7 +73,7 @@
* 鏂板妯＄増闂璇濇湳搴�
*/
@ApiOperation("鏂板妯＄増闂璇濇湳搴�")
- @PreAuthorize("@ss.hasPermi('smartor:script:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:script:add')")
@Log(title = "妯＄増闂璇濇湳搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTemplateScript ivrLibaTemplateScript)
@@ -85,7 +85,7 @@
* 淇敼妯＄増闂璇濇湳搴�
*/
@ApiOperation("淇敼妯＄増闂璇濇湳搴�")
- @PreAuthorize("@ss.hasPermi('smartor:script:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:script:edit')")
@Log(title = "妯＄増闂璇濇湳搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTemplateScript ivrLibaTemplateScript)
@@ -97,7 +97,7 @@
* 鍒犻櫎妯＄増闂璇濇湳搴�
*/
@ApiOperation("鍒犻櫎妯＄増闂璇濇湳搴�")
- @PreAuthorize("@ss.hasPermi('smartor:script:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:script:remove')")
@Log(title = "妯＄増闂璇濇湳搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{IDs}")
public AjaxResult remove(@PathVariable Long[] 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 efe7911..7ba450e 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
@@ -34,7 +34,7 @@
* 鏌ヨ妯℃澘鏍囩鍒楄〃
*/
// @ApiOperation("鏌ヨ妯℃澘鏍囩鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:tag:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:tag:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaTemplateTag ivrLibaTemplateTag) {
startPage();
@@ -46,7 +46,7 @@
* 瀵煎嚭妯℃澘鏍囩鍒楄〃
*/
// @ApiOperation("瀵煎嚭妯℃澘鏍囩鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:tag:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:tag:export')")
@Log(title = "妯℃澘鏍囩", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaTemplateTag ivrLibaTemplateTag) {
@@ -59,7 +59,7 @@
* 鑾峰彇妯℃澘鏍囩璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇妯℃澘鏍囩璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:tag:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:tag:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(ivrLibaTemplateTagService.selectIvrLibaTemplateTagById(id));
@@ -69,7 +69,7 @@
* 鏂板妯℃澘鏍囩
*/
@ApiOperation("鏂板妯℃澘鏍囩")
- @PreAuthorize("@ss.hasPermi('smartor:tag:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:tag:add')")
@Log(title = "妯℃澘鏍囩", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTemplateTag ivrLibaTemplateTag) {
@@ -80,7 +80,7 @@
* 淇敼妯℃澘鏍囩
*/
@ApiOperation("淇敼妯℃澘鏍囩")
- @PreAuthorize("@ss.hasPermi('smartor:tag:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:tag:edit')")
@Log(title = "妯℃澘鏍囩", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTemplateTag ivrLibaTemplateTag) {
@@ -91,7 +91,7 @@
* 鍒犻櫎妯℃澘鏍囩
*/
@ApiOperation("鍒犻櫎妯℃澘鏍囩")
- @PreAuthorize("@ss.hasPermi('smartor:tag:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:tag:remove')")
@Log(title = "妯℃澘鏍囩", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 be42374..81be8a6 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
@@ -34,7 +34,7 @@
* 鏌ヨ妯℃澘鎸囨爣閫夐」搴撳垪琛�
*/
@ApiOperation("鏌ヨ妯℃澘鎸囨爣閫夐」搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:list')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption) {
startPage();
@@ -46,7 +46,7 @@
* 瀵煎嚭妯℃澘鎸囨爣閫夐」搴撳垪琛�
*/
@ApiOperation("瀵煎嚭妯℃澘鎸囨爣閫夐」搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:export')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:export')")
@Log(title = "妯℃澘鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption) {
@@ -59,7 +59,7 @@
* 鑾峰彇妯℃澘鎸囨爣閫夐」搴撹缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇妯℃澘鎸囨爣閫夐」搴撹缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:query')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(ivrLibaTemplateTargetoptionService.selectIvrLibaTemplateTargetoptionById(id));
@@ -69,7 +69,7 @@
* 鏂板妯℃澘鎸囨爣閫夐」搴�
*/
@ApiOperation("鏂板妯℃澘鎸囨爣閫夐」搴�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:add')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:add')")
@Log(title = "妯℃澘鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption) {
@@ -80,7 +80,7 @@
* 淇敼妯℃澘鎸囨爣閫夐」搴�
*/
@ApiOperation("淇敼妯℃澘鎸囨爣閫夐」搴�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
@Log(title = "妯℃澘鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption) {
@@ -91,7 +91,7 @@
* 鍒犻櫎妯℃澘鎸囨爣閫夐」搴�
*/
@ApiOperation("鍒犻櫎妯℃澘鎸囨爣閫夐」搴�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
@Log(title = "妯℃澘鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 0a75be8..44e0972 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI澶栧懠鍦烘櫙绠＄悊鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscene:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscene:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrScene ivrScene)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI澶栧懠鍦烘櫙绠＄悊鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscene:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscene:export')")
@Log(title = "AI澶栧懠鍦烘櫙绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrScene ivrScene)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI澶栧懠鍦烘櫙绠＄悊璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscene:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscene:query')")
@GetMapping(value = "/{sceneid}")
public AjaxResult getInfo(@PathVariable("sceneid") Long sceneid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI澶栧懠鍦烘櫙绠＄悊
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscene:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscene:add')")
@Log(title = "AI澶栧懠鍦烘櫙绠＄悊", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrScene ivrScene)
@@ -83,7 +83,7 @@
/**
* 淇敼AI澶栧懠鍦烘櫙绠＄悊
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscene:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscene:edit')")
@Log(title = "AI澶栧懠鍦烘櫙绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrScene ivrScene)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI澶栧懠鍦烘櫙绠＄悊
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscene:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscene:remove')")
@Log(title = "AI澶栧懠鍦烘櫙绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{sceneids}")
public AjaxResult remove(@PathVariable Long[] 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 ec13ed7..9ce8c74 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
@@ -23,7 +23,7 @@
/**
* AI澶栧懠鎵ц閰嶇疆Controller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI澶栧懠鎵ц閰嶇疆鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrSceneExecuteconfig ivrSceneExecuteconfig)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI澶栧懠鎵ц閰嶇疆鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:export')")
@Log(title = "AI澶栧懠鎵ц閰嶇疆", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrSceneExecuteconfig ivrSceneExecuteconfig)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI澶栧懠鎵ц閰嶇疆璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:query')")
@GetMapping(value = "/{scenecfgid}")
public AjaxResult getInfo(@PathVariable("scenecfgid") Long scenecfgid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI澶栧懠鎵ц閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:add')")
@Log(title = "AI澶栧懠鎵ц閰嶇疆", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneExecuteconfig ivrSceneExecuteconfig)
@@ -83,7 +83,7 @@
/**
* 淇敼AI澶栧懠鎵ц閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:edit')")
@Log(title = "AI澶栧懠鎵ц閰嶇疆", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneExecuteconfig ivrSceneExecuteconfig)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI澶栧懠鎵ц閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:remove')")
@Log(title = "AI澶栧懠鎵ц閰嶇疆", businessType = BusinessType.DELETE)
@GetMapping("/remove/{scenecfgids}")
public AjaxResult remove(@PathVariable Long[] 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 d35f300..7bf965e 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI澶栧懠娴佺▼鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflow:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflow:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrSceneFlow ivrSceneFlow)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI澶栧懠娴佺▼鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflow:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflow:export')")
@Log(title = "AI澶栧懠娴佺▼", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrSceneFlow ivrSceneFlow)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI澶栧懠娴佺▼璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflow:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflow:query')")
@GetMapping(value = "/{flowid}")
public AjaxResult getInfo(@PathVariable("flowid") Long flowid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI澶栧懠娴佺▼
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflow:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflow:add')")
@Log(title = "AI澶栧懠娴佺▼", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneFlow ivrSceneFlow)
@@ -83,7 +83,7 @@
/**
* 淇敼AI澶栧懠娴佺▼
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflow:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflow:edit')")
@Log(title = "AI澶栧懠娴佺▼", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneFlow ivrSceneFlow)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI澶栧懠娴佺▼
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflow:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflow:remove')")
@Log(title = "AI澶栧懠娴佺▼", businessType = BusinessType.DELETE)
@GetMapping("/remove/{flowids}")
public AjaxResult remove(@PathVariable Long[] 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 ba1a18a..8b9854e 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
@@ -23,7 +23,7 @@
/**
* AI澶栧懠娴佺▼鑺傜偣Controller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI澶栧懠娴佺▼鑺傜偣鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflownode:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflownode:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrSceneFlownode ivrSceneFlownode)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI澶栧懠娴佺▼鑺傜偣鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflownode:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflownode:export')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrSceneFlownode ivrSceneFlownode)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI澶栧懠娴佺▼鑺傜偣璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflownode:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflownode:query')")
@GetMapping(value = "/{flownodeid}")
public AjaxResult getInfo(@PathVariable("flownodeid") Long flownodeid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI澶栧懠娴佺▼鑺傜偣
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflownode:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflownode:add')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneFlownode ivrSceneFlownode)
@@ -83,7 +83,7 @@
/**
* 淇敼AI澶栧懠娴佺▼鑺傜偣
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflownode:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflownode:edit')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneFlownode ivrSceneFlownode)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI澶栧懠娴佺▼鑺傜偣
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflownode:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflownode:remove')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣", businessType = BusinessType.DELETE)
@GetMapping("/remove/{flownodeids}")
public AjaxResult remove(@PathVariable Long[] flownodeids)
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 df992d1..d58a9dc 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI澶栧懠娴佺▼鑺傜偣鍒嗘敮鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrSceneFlownodebranch ivrSceneFlownodebranch)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI澶栧懠娴佺▼鑺傜偣鍒嗘敮鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:export')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣鍒嗘敮", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrSceneFlownodebranch ivrSceneFlownodebranch)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI澶栧懠娴佺▼鑺傜偣鍒嗘敮璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:query')")
@GetMapping(value = "/{branchid}")
public AjaxResult getInfo(@PathVariable("branchid") Long branchid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI澶栧懠娴佺▼鑺傜偣鍒嗘敮
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:add')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣鍒嗘敮", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneFlownodebranch ivrSceneFlownodebranch)
@@ -83,7 +83,7 @@
/**
* 淇敼AI澶栧懠娴佺▼鑺傜偣鍒嗘敮
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:edit')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣鍒嗘敮", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneFlownodebranch ivrSceneFlownodebranch)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI澶栧懠娴佺▼鑺傜偣鍒嗘敮
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:remove')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣鍒嗘敮", businessType = BusinessType.DELETE)
@GetMapping("/remove/{branchids}")
public AjaxResult remove(@PathVariable Long[] 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 dc2cdf8..bd6126e 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI澶栧懠鍏ㄥ眬閰嶇疆鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrSceneGlobalconfig ivrSceneGlobalconfig)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI澶栧懠鍏ㄥ眬閰嶇疆鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:export')")
@Log(title = "AI澶栧懠鍏ㄥ眬閰嶇疆", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrSceneGlobalconfig ivrSceneGlobalconfig)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI澶栧懠鍏ㄥ眬閰嶇疆璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:query')")
@GetMapping(value = "/{gblconfigid}")
public AjaxResult getInfo(@PathVariable("gblconfigid") Long gblconfigid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI澶栧懠鍏ㄥ眬閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:add')")
@Log(title = "AI澶栧懠鍏ㄥ眬閰嶇疆", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneGlobalconfig ivrSceneGlobalconfig)
@@ -83,7 +83,7 @@
/**
* 淇敼AI澶栧懠鍏ㄥ眬閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:edit')")
@Log(title = "AI澶栧懠鍏ㄥ眬閰嶇疆", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneGlobalconfig ivrSceneGlobalconfig)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI澶栧懠鍏ㄥ眬閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:remove')")
@Log(title = "AI澶栧懠鍏ㄥ眬閰嶇疆", businessType = BusinessType.DELETE)
@GetMapping("/remove/{gblconfigids}")
public AjaxResult remove(@PathVariable Long[] 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 2a9957e..ff35d96 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI澶栧懠鎰忓浘鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrintent:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrintent:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrSceneIntent ivrSceneIntent)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI澶栧懠鎰忓浘鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrintent:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrintent:export')")
@Log(title = "AI澶栧懠鎰忓浘", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrSceneIntent ivrSceneIntent)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI澶栧懠鎰忓浘璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrintent:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrintent:query')")
@GetMapping(value = "/{sceneintentid}")
public AjaxResult getInfo(@PathVariable("sceneintentid") Long sceneintentid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI澶栧懠鎰忓浘
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrintent:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrintent:add')")
@Log(title = "AI澶栧懠鎰忓浘", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneIntent ivrSceneIntent)
@@ -83,7 +83,7 @@
/**
* 淇敼AI澶栧懠鎰忓浘
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrintent:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrintent:edit')")
@Log(title = "AI澶栧懠鎰忓浘", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneIntent ivrSceneIntent)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI澶栧懠鎰忓浘
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrintent:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrintent:remove')")
@Log(title = "AI澶栧懠鎰忓浘", businessType = BusinessType.DELETE)
@GetMapping("/remove/{sceneintentids}")
public AjaxResult remove(@PathVariable Long[] 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 99c46d1..b520448 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
@@ -23,7 +23,7 @@
/**
* AI澶栧懠閲嶆嫧閰嶇疆Controller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI澶栧懠閲嶆嫧閰嶇疆鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrrecall:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrSceneRecall ivrSceneRecall)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI澶栧懠閲嶆嫧閰嶇疆鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrrecall:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:export')")
@Log(title = "AI澶栧懠閲嶆嫧閰嶇疆", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrSceneRecall ivrSceneRecall)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI澶栧懠閲嶆嫧閰嶇疆璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrrecall:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:query')")
@GetMapping(value = "/{recallid}")
public AjaxResult getInfo(@PathVariable("recallid") Long recallid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI澶栧懠閲嶆嫧閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrrecall:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:add')")
@Log(title = "AI澶栧懠閲嶆嫧閰嶇疆", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneRecall ivrSceneRecall)
@@ -83,7 +83,7 @@
/**
* 淇敼AI澶栧懠閲嶆嫧閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrrecall:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:edit')")
@Log(title = "AI澶栧懠閲嶆嫧閰嶇疆", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneRecall ivrSceneRecall)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI澶栧懠閲嶆嫧閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrrecall:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:remove')")
@Log(title = "AI澶栧懠閲嶆嫧閰嶇疆", businessType = BusinessType.DELETE)
@GetMapping("/remove/{recallids}")
public AjaxResult remove(@PathVariable Long[] 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 8628a64..9010c56 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI澶栧懠璇濇湳鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscript:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscript:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrSceneScript ivrSceneScript)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI澶栧懠璇濇湳鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscript:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscript:export')")
@Log(title = "AI澶栧懠璇濇湳", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrSceneScript ivrSceneScript)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI澶栧懠璇濇湳璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscript:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscript:query')")
@GetMapping(value = "/{scenescrid}")
public AjaxResult getInfo(@PathVariable("scenescrid") Long scenescrid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI澶栧懠璇濇湳
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscript:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscript:add')")
@Log(title = "AI澶栧懠璇濇湳", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneScript ivrSceneScript)
@@ -83,7 +83,7 @@
/**
* 淇敼AI澶栧懠璇濇湳
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscript:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscript:edit')")
@Log(title = "AI澶栧懠璇濇湳", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneScript ivrSceneScript)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI澶栧懠璇濇湳
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscript:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscript:remove')")
@Log(title = "AI澶栧懠璇濇湳", businessType = BusinessType.DELETE)
@GetMapping("/remove/{scenescrids}")
public AjaxResult remove(@PathVariable Long[] 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 82fac46..c1881a5 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI澶栧懠璇濇湳妯″潡鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrSceneScriptmodel ivrSceneScriptmodel)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭AI澶栧懠璇濇湳妯″潡鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:export')")
@Log(title = "AI澶栧懠璇濇湳妯″潡", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrSceneScriptmodel ivrSceneScriptmodel)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇AI澶栧懠璇濇湳妯″潡璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:query')")
@GetMapping(value = "/{scenemodid}")
public AjaxResult getInfo(@PathVariable("scenemodid") Long scenemodid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板AI澶栧懠璇濇湳妯″潡
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:add')")
@Log(title = "AI澶栧懠璇濇湳妯″潡", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneScriptmodel ivrSceneScriptmodel)
@@ -83,7 +83,7 @@
/**
* 淇敼AI澶栧懠璇濇湳妯″潡
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:edit')")
@Log(title = "AI澶栧懠璇濇湳妯″潡", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneScriptmodel ivrSceneScriptmodel)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎AI澶栧懠璇濇湳妯″潡
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:remove')")
@Log(title = "AI澶栧懠璇濇湳妯″潡", businessType = BusinessType.DELETE)
@GetMapping("/remove/{scenemodids}")
public AjaxResult remove(@PathVariable Long[] 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 8e0d532..069e548 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨAI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrScenecategory ivrScenecategory) {
startPage();
@@ -48,7 +48,7 @@
/**
* 瀵煎嚭AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:export')")
@Log(title = "AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrScenecategory ivrScenecategory) {
@@ -60,7 +60,7 @@
/**
* 鑾峰彇AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:query')")
@GetMapping(value = "/{scenecatid}")
public AjaxResult getInfo(@PathVariable("scenecatid") Long scenecatid) {
return success(ivrScenecategoryService.selectIvrScenecategoryByScenecatid(scenecatid));
@@ -69,7 +69,7 @@
/**
* 鏂板AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:add')")
@Log(title = "AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrScenecategory ivrScenecategory) {
@@ -79,7 +79,7 @@
/**
* 淇敼AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:edit')")
@Log(title = "AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrScenecategory ivrScenecategory) {
@@ -89,7 +89,7 @@
/**
* 鍒犻櫎AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:remove')")
@Log(title = "AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被", businessType = BusinessType.DELETE)
@GetMapping("/remove/{scenecatids}")
public AjaxResult remove(@PathVariable Long[] scenecatids) {
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 18c0624..ff6129d 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
@@ -35,7 +35,7 @@
* 鏌ヨ闅忚浠诲姟闅忚妯℃澘搴撳垪琛�
*/
@ApiOperation("鏌ヨ闅忚浠诲姟闅忚妯℃澘搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('system:template:list')")
+ //@PreAuthorize("@ss.hasPermi('system:template:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrTaskTemplate ivrTaskTemplate) {
startPage();
@@ -46,7 +46,7 @@
/**
* 瀵煎嚭闅忚浠诲姟闅忚妯℃澘搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:template:export')")
+ //@PreAuthorize("@ss.hasPermi('system:template:export')")
@ApiOperation("瀵煎嚭闅忚浠诲姟闅忚妯℃澘搴撳垪琛�")
@PostMapping("/export")
public void export(HttpServletResponse response, IvrTaskTemplate ivrTaskTemplate) {
@@ -58,7 +58,7 @@
/**
* 鑾峰彇闅忚浠诲姟闅忚妯℃澘搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:template:query')")
+ //@PreAuthorize("@ss.hasPermi('system:template:query')")
@ApiOperation("鑾峰彇闅忚浠诲姟闅忚妯℃澘搴撹缁嗕俊鎭�")
@GetMapping(value = "/getInfo/{ID}")
public AjaxResult getInfo(@PathVariable("ID") Long ID) {
@@ -68,7 +68,7 @@
/**
* 鏂板闅忚浠诲姟闅忚妯℃澘搴�
*/
- @PreAuthorize("@ss.hasPermi('system:template:add')")
+ //@PreAuthorize("@ss.hasPermi('system:template:add')")
@ApiOperation("鏂板闅忚浠诲姟闅忚妯℃澘搴�")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrTaskTemplate ivrTaskTemplate) {
@@ -78,7 +78,7 @@
/**
* 鏂板鎴栦慨鏀归殢璁夸换鍔￠殢璁挎ā鏉垮簱
*/
- @PreAuthorize("@ss.hasPermi('system:template:add')")
+ //@PreAuthorize("@ss.hasPermi('system:template:add')")
@ApiOperation("鏂板鎴栦慨鏀归殢璁夸换鍔￠殢璁挎ā鏉垮簱")
@PostMapping("/saveOrUpdateTempScript")
public AjaxResult saveOrUpdateTempScript(@RequestBody IvrTaskTemplateVO ivrTaskTemplateVO) {
@@ -88,7 +88,7 @@
/**
* 淇敼闅忚浠诲姟闅忚妯℃澘搴�
*/
- @PreAuthorize("@ss.hasPermi('system:template:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:template:edit')")
@ApiOperation("淇敼闅忚浠诲姟闅忚妯℃澘搴�")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTaskTemplate ivrTaskTemplate) {
@@ -98,7 +98,7 @@
/**
* 鍒犻櫎闅忚浠诲姟闅忚妯℃澘搴�
*/
- @PreAuthorize("@ss.hasPermi('system:template:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:template:remove')")
@ApiOperation("鍒犻櫎闅忚浠诲姟闅忚妯℃澘搴�")
@GetMapping("/remove/{IDs}")
public AjaxResult remove(@PathVariable Long[] IDs) {
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 aaedc0d..1aaf3c6 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
@@ -35,7 +35,7 @@
* 鏌ヨ闅忚浠诲姟妯＄増闂璇濇湳搴撳垪琛�
*/
@ApiOperation("鏌ヨ闅忚浠诲姟妯＄増闂璇濇湳搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('system:script:list')")
+ //@PreAuthorize("@ss.hasPermi('system:script:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrTaskTemplateScript ivrTaskTemplateScript)
{
@@ -48,7 +48,7 @@
* 瀵煎嚭闅忚浠诲姟妯＄増闂璇濇湳搴撳垪琛�
*/
@ApiOperation("瀵煎嚭闅忚浠诲姟妯＄増闂璇濇湳搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('system:script:export')")
+ //@PreAuthorize("@ss.hasPermi('system:script:export')")
@Log(title = "闅忚浠诲姟妯＄増闂璇濇湳搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrTaskTemplateScript ivrTaskTemplateScript)
@@ -62,7 +62,7 @@
* 鑾峰彇闅忚浠诲姟妯＄増闂璇濇湳搴撹缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇闅忚浠诲姟妯＄増闂璇濇湳搴撹缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:script:query')")
+ //@PreAuthorize("@ss.hasPermi('system:script:query')")
@GetMapping(value = "/getInfo/{ID}")
public AjaxResult getInfo(@PathVariable("ID") Long ID)
{
@@ -72,7 +72,7 @@
/**
* 鏂板闅忚浠诲姟妯＄増闂璇濇湳搴�
*/
- @PreAuthorize("@ss.hasPermi('system:script:add')")
+ //@PreAuthorize("@ss.hasPermi('system:script:add')")
@ApiOperation("鏂板闅忚浠诲姟妯＄増闂璇濇湳搴�")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrTaskTemplateScript ivrTaskTemplateScript)
@@ -83,7 +83,7 @@
/**
* 淇敼闅忚浠诲姟妯＄増闂璇濇湳搴�
*/
- @PreAuthorize("@ss.hasPermi('system:script:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:script:edit')")
@ApiOperation("淇敼闅忚浠诲姟妯＄増闂璇濇湳搴�")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTaskTemplateScript ivrTaskTemplateScript)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎闅忚浠诲姟妯＄増闂璇濇湳搴�
*/
- @PreAuthorize("@ss.hasPermi('system:script:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:script:remove')")
@ApiOperation("鍒犻櫎闅忚浠诲姟妯＄増闂璇濇湳搴�")
@GetMapping("/remove/{IDs}")
public AjaxResult remove(@PathVariable Long[] 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 7071766..a5b4ae0 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
@@ -34,7 +34,7 @@
* 鏌ヨ闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴撳垪琛�
*/
@ApiOperation("鏌ヨ闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:list')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption) {
startPage();
@@ -45,7 +45,7 @@
/**
* 瀵煎嚭闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:export')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:export')")
@ApiOperation("瀵煎嚭闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴撳垪琛�")
@PostMapping("/export")
public void export(HttpServletResponse response, IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption) {
@@ -58,7 +58,7 @@
* 鑾峰彇闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴撹缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴撹缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:targetoption:query')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(ivrTaskTemplateTargetoptionService.selectIvrTaskTemplateTargetoptionById(id));
@@ -67,7 +67,7 @@
/**
* 鏂板闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:add')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:add')")
@ApiOperation("鏂板闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴�")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption) {
@@ -77,7 +77,7 @@
/**
* 淇敼闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
@ApiOperation("淇敼闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴�")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption) {
@@ -87,7 +87,7 @@
/**
* 鍒犻櫎闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
@ApiOperation("鍒犻櫎闅忚浠诲姟妯℃澘鎸囨爣閫夐」搴�")
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 fe86834..410b981 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
@@ -36,7 +36,7 @@
*
*/
@ApiOperation("鏌ヨ鎮ｈ�呴殢璁夸俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:result:list')")
+ //@PreAuthorize("@ss.hasPermi('system:result:list')")
@PostMapping("/list")
public TableDataInfo list(IvrTaskVisitResult ivrTaskVisitResult) {
startPage();
@@ -48,7 +48,7 @@
* 瀵煎嚭浠诲姟闅忚缁撴灉鍒楄〃
*/
@ApiOperation("瀵煎嚭浠诲姟闅忚缁撴灉鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:result:export')")
+ //@PreAuthorize("@ss.hasPermi('system:result:export')")
@Log(title = "浠诲姟闅忚缁撴灉", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrTaskVisitResult ivrTaskVisitResult) {
@@ -61,7 +61,7 @@
* 鑾峰彇浠诲姟闅忚缁撴灉璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇浠诲姟闅忚缁撴灉璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:result:query')")
+ //@PreAuthorize("@ss.hasPermi('system:result:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(ivrTaskVisitResultService.selectIvrTaskVisitResultById(id));
@@ -71,7 +71,7 @@
* 鏂板浠诲姟闅忚缁撴灉
*/
@ApiOperation("鏂板浠诲姟闅忚缁撴灉")
- @PreAuthorize("@ss.hasPermi('system:result:add')")
+ //@PreAuthorize("@ss.hasPermi('system:result:add')")
@Log(title = "浠诲姟闅忚缁撴灉", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrTaskVisitResult ivrTaskVisitResult) {
@@ -82,7 +82,7 @@
* 淇敼浠诲姟闅忚缁撴灉
*/
@ApiOperation("淇敼浠诲姟闅忚缁撴灉")
- @PreAuthorize("@ss.hasPermi('system:result:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:result:edit')")
@Log(title = "浠诲姟闅忚缁撴灉", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTaskVisitResult ivrTaskVisitResult) {
@@ -93,7 +93,7 @@
* 鍒犻櫎浠诲姟闅忚缁撴灉
*/
@ApiOperation("鍒犻櫎浠诲姟闅忚缁撴灉")
- @PreAuthorize("@ss.hasPermi('system:result:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:result:remove')")
@Log(title = "浠诲姟闅忚缁撴灉", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 bec7787..ed6609f 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
@@ -23,7 +23,7 @@
/**
* 璇煶浠诲姟鍛煎彨璁板綍Controller
- *
+ *
* @author smartor
* @date 2023-03-24
*/
@@ -37,7 +37,7 @@
/**
* 鏌ヨ璇煶浠诲姟鍛煎彨璁板綍鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrTaskcallrecord ivrTaskcallrecord)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭璇煶浠诲姟鍛煎彨璁板綍鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:export')")
@Log(title = "璇煶浠诲姟鍛煎彨璁板綍", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrTaskcallrecord ivrTaskcallrecord)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇璇煶浠诲姟鍛煎彨璁板綍璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:query')")
@GetMapping(value = "/{uuid}")
public AjaxResult getInfo(@PathVariable("uuid") String uuid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板璇煶浠诲姟鍛煎彨璁板綍
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:add')")
@Log(title = "璇煶浠诲姟鍛煎彨璁板綍", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrTaskcallrecord ivrTaskcallrecord)
@@ -83,7 +83,7 @@
/**
* 淇敼璇煶浠诲姟鍛煎彨璁板綍
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:edit')")
@Log(title = "璇煶浠诲姟鍛煎彨璁板綍", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTaskcallrecord ivrTaskcallrecord)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎璇煶浠诲姟鍛煎彨璁板綍
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:remove')")
@Log(title = "璇煶浠诲姟鍛煎彨璁板綍", businessType = BusinessType.DELETE)
@GetMapping("/remove/{uuids}")
public AjaxResult remove(@PathVariable String[] 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 7b96026..8d4f149 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ璇煶浠诲姟鐭俊鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrTasksms ivrTasksms)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭璇煶浠诲姟鐭俊鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:export')")
@Log(title = "璇煶浠诲姟鐭俊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IvrTasksms ivrTasksms)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇璇煶浠诲姟鐭俊璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板璇煶浠诲姟鐭俊
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:add')")
@Log(title = "璇煶浠诲姟鐭俊", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrTasksms ivrTasksms)
@@ -83,7 +83,7 @@
/**
* 淇敼璇煶浠诲姟鐭俊
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:edit')")
@Log(title = "璇煶浠诲姟鐭俊", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTasksms ivrTasksms)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎璇煶浠诲姟鐭俊
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:remove')")
@Log(title = "璇煶浠诲姟鐭俊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] 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 2eb6c2b..6ec8ebd 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
@@ -35,7 +35,7 @@
/**
* 鏌ヨ鐥呭彶鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:history:list')")
+ //@PreAuthorize("@ss.hasPermi('system:history:list')")
@PostMapping("/selectMedicalHistoryList")
@ApiOperation("鏌ヨ鐥呭彶鍒楄〃")
public TableDataInfo selectMedicalHistorylist(@RequestBody MedicalHistory medicalHistory) {
@@ -47,7 +47,7 @@
/**
* 瀵煎嚭鐥呭彶鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:history:export')")
+ //@PreAuthorize("@ss.hasPermi('system:history:export')")
@Log(title = "鐥呭彶", businessType = BusinessType.EXPORT)
@ApiOperation("瀵煎嚭鐥呭彶鍒楄〃")
@PostMapping("/export")
@@ -60,7 +60,7 @@
/**
* 鑾峰彇鐥呭彶璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:history:query')")
+ //@PreAuthorize("@ss.hasPermi('system:history:query')")
@ApiOperation("鑾峰彇鐥呭彶璇︾粏淇℃伅")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id,@PathVariable("pid") Long pid) {
@@ -70,7 +70,7 @@
/**
* 鏂板鐥呭彶
*/
- @PreAuthorize("@ss.hasPermi('system:history:add')")
+ //@PreAuthorize("@ss.hasPermi('system:history:add')")
@Log(title = "鐥呭彶", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鐥呭彶")
@PostMapping("/add")
@@ -81,7 +81,7 @@
/**
* 淇敼鐥呭彶
*/
- @PreAuthorize("@ss.hasPermi('system:history:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:history:edit')")
@Log(title = "鐥呭彶", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼鐥呭彶")
@PostMapping("/edit")
@@ -92,7 +92,7 @@
/**
* 鍒犻櫎鐥呭彶
*/
- @PreAuthorize("@ss.hasPermi('system:history:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:history:remove')")
@Log(title = "鐥呭彶", businessType = BusinessType.DELETE)
@ApiOperation("鍒犻櫎鐥呭彶")
@GetMapping("/remove/{ids}")
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 6d47030..bf5e09f 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
@@ -36,7 +36,7 @@
/**
* 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:file:list')")
+ //@PreAuthorize("@ss.hasPermi('system:file:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody MinioFile minioFile) {
startPage();
@@ -47,7 +47,7 @@
/**
* 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:file:export')")
+ //@PreAuthorize("@ss.hasPermi('system:file:export')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, MinioFile minioFile) {
@@ -59,7 +59,7 @@
/**
* 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:file:query')")
+ //@PreAuthorize("@ss.hasPermi('system:file:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(minioFileService.selectMinioFileById(id));
@@ -68,7 +68,7 @@
/**
* 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
*/
- @PreAuthorize("@ss.hasPermi('system:file:add')")
+ //@PreAuthorize("@ss.hasPermi('system:file:add')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody MinioFile minioFile) {
@@ -78,7 +78,7 @@
/**
* 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
*/
- @PreAuthorize("@ss.hasPermi('system:file:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:file:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody MinioFile minioFile) {
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
*/
- @PreAuthorize("@ss.hasPermi('system:file:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:file:remove')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -116,7 +116,7 @@
/**
* 鑾峰彇锛堝鏁欙級寮曠敤妯℃澘
*/
- @PreAuthorize("@ss.hasPermi('system:file:list')")
+ //@PreAuthorize("@ss.hasPermi('system:file:list')")
@ApiOperation(value = "鑾峰彇锛堝鏁欙級寮曠敤妯℃澘")
@GetMapping("/getEduTemplage")
public AjaxResult getEduTemplage() {
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 79c9d1a..2ac7b55 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
@@ -44,7 +44,7 @@
* 鏌ヨ鎮ｈ�呮。妗堝垪琛�
*/
@ApiOperation("鏌ヨ鎮ｈ�呮。妗堝垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody PatArchive patArchive) {
startPage();
@@ -56,7 +56,7 @@
* 瀵煎嚭鎮ｈ�呮。妗堝垪琛�
*/
@ApiOperation("瀵煎嚭鎮ｈ�呮。妗堝垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:export')")
@Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatArchive patArchive) {
@@ -69,7 +69,7 @@
* 鑾峰彇鎮ｈ�呮。妗堣缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇鎮ｈ�呮。妗堣缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:query')")
@GetMapping(value = "/getInfo/{patid}")
@ApiImplicitParam(name = "patid" , value = "鎮ｈ�卛d")
public AjaxResult getInfo(@PathVariable(name = "patid") Long patid) {
@@ -80,7 +80,7 @@
// * 鏂板鎮ｈ�呮。妗�
// */
// @ApiOperation("鏂板鎮ｈ�呮。妗�")
-// @PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
+// //@PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
// @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
// @PostMapping("/add")
// public AjaxResult add(@RequestBody PatArchive patArchive) {
@@ -91,7 +91,7 @@
* 鏂板鎮ｈ�呮。妗�
*/
@ApiOperation("淇敼鎮ｈ�呮。妗�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:update')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:update')")
@Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.UPDATE)
@PostMapping("/update")
public AjaxResult update(@RequestBody PatArchive patArchive) {
@@ -102,7 +102,7 @@
* 鏂板鎴栦慨鏀规偅鑰呮。淇℃伅
*/
@ApiOperation("鏂板鎴栦慨鏀规偅鑰呮。淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
@Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.UPDATE)
@PostMapping("/saveOrUpdatePatInfo")
public AjaxResult saveOrUpdatePatInfo(@RequestBody PatArchiveVO patArchiveVO) {
@@ -113,7 +113,7 @@
* 鍒犻櫎鎮ｈ�呮。妗�
*/
@ApiOperation("鍒犻櫎鎮ｈ�呮。妗�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:remove')")
@Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.DELETE)
@GetMapping("/remove/{patids}")
@ApiImplicitParam(name = "patids" , value = "鎮ｈ�卛d闆嗗悎" , dataType = "long" , dataTypeClass = Long.class)
@@ -207,7 +207,7 @@
@PostMapping("/getPatientInfo")
public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize());
- List<ServiceSubtask> patientInfo = patArchiveService.getPatientInfo(patArchiveReq);
+ List<PatArchiveOthreInfo> patientInfo = patArchiveService.getPatientInfo(patArchiveReq);
long count = PageUtils.count(new ISelect() {
@Override
public void doSelect() {
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
new file mode 100644
index 0000000..98a636d
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java
@@ -0,0 +1,134 @@
+package com.ruoyi.web.controller.smartor;
+
+import java.util.List;
+
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.smartor.domain.SvyLibScriptRes;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.http.MediaType;
+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.PatArchiveImport;
+import com.smartor.service.IPatArchiveImportService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * Excel瀵煎叆鎮ｈ�呮。妗圕ontroller
+ *
+ * @author lihu
+ * @date 2024-09-05
+ */
+@Api("Excel瀵煎叆鎮ｈ�呮。妗�")
+@RestController
+@RequestMapping("/smartor/import")
+public class PatArchiveImportController extends BaseController {
+ @Autowired
+ private IPatArchiveImportService patArchiveImportService;
+
+ /**
+ * 鏌ヨExcel瀵煎叆鎮ｈ�呮。妗堝垪琛�
+ */
+ @ApiOperation("鏌ヨExcel瀵煎叆鎮ｈ�呮。妗堝垪琛�")
+ //@PreAuthorize("@ss.hasPermi('smartor:import:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(PatArchiveImport patArchiveImport) {
+ startPage();
+ List<PatArchiveImport> list = patArchiveImportService.selectPatArchiveImportList(patArchiveImport);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鑾峰彇Excel瀵煎叆鎮ｈ�呮。妗堣缁嗕俊鎭�
+ */
+ @ApiOperation("鑾峰彇Excel瀵煎叆鎮ｈ�呮。妗堣缁嗕俊鎭�")
+ //@PreAuthorize("@ss.hasPermi('smartor:import:query')")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(patArchiveImportService.selectPatArchiveImportById(id));
+ }
+
+ /**
+ * 鏂板Excel瀵煎叆鎮ｈ�呮。妗�
+ */
+ //@PreAuthorize("@ss.hasPermi('smartor:import:add')")
+ @Log(title = "Excel瀵煎叆鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody PatArchiveImport patArchiveImport) {
+ return toAjax(patArchiveImportService.insertPatArchiveImport(patArchiveImport));
+ }
+
+ /**
+ * 淇敼Excel瀵煎叆鎮ｈ�呮。妗�
+ */
+ @ApiOperation("淇敼Excel瀵煎叆鎮ｈ�呮。妗�")
+ //@PreAuthorize("@ss.hasPermi('smartor:import:edit')")
+ @Log(title = "Excel瀵煎叆鎮ｈ�呮。妗�", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody PatArchiveImport patArchiveImport) {
+ return toAjax(patArchiveImportService.updatePatArchiveImport(patArchiveImport));
+ }
+
+ /**
+ * 鍒犻櫎Excel瀵煎叆鎮ｈ�呮。妗�
+ */
+ @ApiOperation("鍒犻櫎Excel瀵煎叆鎮ｈ�呮。妗�")
+ //@PreAuthorize("@ss.hasPermi('smartor:import:remove')")
+ @Log(title = "Excel瀵煎叆鎮ｈ�呮。妗�", businessType = BusinessType.DELETE)
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(patArchiveImportService.deletePatArchiveImportByIds(ids));
+ }
+
+ /**
+ * 鑾峰彇瀵煎叆鎮ｈ�呮ā鏉�
+ *
+ * @param response
+ */
+ @ApiOperation("鑾峰彇瀵煎叆鎮ｈ�呮ā鏉�")
+ @GetMapping("/getImportPatTemplate")
+ public void getImportPatTemplate(HttpServletResponse response) {
+ ExcelUtil<PatArchiveImport> util = new ExcelUtil<PatArchiveImport>(PatArchiveImport.class);
+ util.importTemplateExcel(response, "瀵煎叆鎮ｈ��");
+ }
+
+ @GetMapping("/download")
+ public void fileDownload(HttpServletResponse response) {
+ try {
+ String filePath = "D:\\import\\鎮ｈ�呬俊鎭�.xlsx";
+ response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+ FileUtils.setAttachmentResponseHeader(response, "鎮ｈ�呬俊鎭�.xlsx");
+ FileUtils.writeBytes(filePath, response.getOutputStream());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ @ApiOperation("瀵煎叆Excel鎮ｈ�呬俊鎭�")
+ //@PreAuthorize("@ss.hasPermi('smartor:import:list')")
+ @PostMapping("/importPatInfo")
+ public TableDataInfo importPatInfo(MultipartFile multipartFile) {
+ return getDataTable(patArchiveImportService.importPatInfo(multipartFile));
+ }
+}
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 2411735..144760f 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
@@ -35,7 +35,7 @@
* 鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�
*/
@ApiOperation("鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�")
- @PreAuthorize("@ss.hasPermi('system:archivecontact:list')")
+ //@PreAuthorize("@ss.hasPermi('system:archivecontact:list')")
@PostMapping("/selectPatArchivecontactList")
public TableDataInfo selectPatArchivecontactlist(@RequestBody PatArchivecontact patArchivecontact) {
PageUtils.startPageByPost(patArchivecontact.getPageNum(), patArchivecontact.getPageSize());
@@ -47,7 +47,7 @@
* 瀵煎嚭鎮ｈ�呰仈绯绘柟寮忓垪琛�
*/
@ApiOperation("瀵煎嚭鎮ｈ�呰仈绯绘柟寮忓垪琛�")
- @PreAuthorize("@ss.hasPermi('system:archivecontact:export')")
+ //@PreAuthorize("@ss.hasPermi('system:archivecontact:export')")
@Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatArchivecontact patArchivecontact) {
@@ -60,7 +60,7 @@
* 鑾峰彇鎮ｈ�呰仈绯绘柟寮忚缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇鎮ｈ�呰仈绯绘柟寮忚缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:archivecontact:query')")
+ //@PreAuthorize("@ss.hasPermi('system:archivecontact:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patArchivecontactService.selectPatArchivecontactById(id));
@@ -70,7 +70,7 @@
* 鏂板鎮ｈ�呰仈绯绘柟寮�
*/
@ApiOperation("鏂板鎮ｈ�呰仈绯绘柟寮�")
- @PreAuthorize("@ss.hasPermi('system:archivecontact:add')")
+ //@PreAuthorize("@ss.hasPermi('system:archivecontact:add')")
@Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody PatArchivecontact patArchivecontact) {
@@ -81,7 +81,7 @@
* 淇敼鎮ｈ�呰仈绯绘柟寮�
*/
@ApiOperation("淇敼鎮ｈ�呰仈绯绘柟寮�")
- @PreAuthorize("@ss.hasPermi('system:archivecontact:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:archivecontact:edit')")
@Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatArchivecontact patArchivecontact) {
@@ -92,7 +92,7 @@
* 鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
*/
@ApiOperation("鍒犻櫎鎮ｈ�呰仈绯绘柟寮�")
- @PreAuthorize("@ss.hasPermi('system:archivecontact:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:archivecontact:remove')")
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patArchivecontactService.deletePatArchivecontactByIds(ids));
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 edbf9e2..e6ad211 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
@@ -38,7 +38,7 @@
/**
* 鏌ヨ鎮ｈ�呮。妗堟爣绛惧垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:archivetag:list')")
+ //@PreAuthorize("@ss.hasPermi('system:archivetag:list')")
@PostMapping("/list")
@ApiOperation("鏌ヨ鎮ｈ�呮。妗堟爣绛惧垪琛�")
public TableDataInfo list(@RequestBody PatArchivetag patArchivetag) {
@@ -50,7 +50,7 @@
/**
* 瀵煎嚭鎮ｈ�呮。妗堟爣绛惧垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:archivetag:export')")
+ //@PreAuthorize("@ss.hasPermi('system:archivetag:export')")
@PostMapping("/export")
@ApiOperation("瀵煎嚭鎮ｈ�呮。妗堟爣绛惧垪琛�")
public void export(HttpServletResponse response, PatArchivetag patArchivetag) {
@@ -63,7 +63,7 @@
* 鑾峰彇鎮ｈ�呮。妗堟爣绛捐缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇鎮ｈ�呮。妗堟爣绛捐缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:archivetag:query')")
+ //@PreAuthorize("@ss.hasPermi('system:archivetag:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patArchivetagService.selectPatArchivetagById(id));
@@ -72,7 +72,7 @@
/**
* 鏂板鎮ｈ�呮。妗堟爣绛�
*/
- @PreAuthorize("@ss.hasPermi('system:archivetag:add')")
+ //@PreAuthorize("@ss.hasPermi('system:archivetag:add')")
@ApiOperation("鏂板鎮ｈ�呮。妗堟爣绛�")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatArchivetag patArchivetag) {
@@ -82,7 +82,7 @@
/**
* 淇敼鎮ｈ�呮。妗堟爣绛�
*/
- @PreAuthorize("@ss.hasPermi('system:archivetag:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:archivetag:edit')")
@ApiOperation("淇敼鎮ｈ�呮。妗堟爣绛�")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatArchivetag patArchivetag) {
@@ -92,7 +92,7 @@
/**
* 鍒犻櫎鎮ｈ�呮。妗堟爣绛�
*/
- @PreAuthorize("@ss.hasPermi('system:archivetag:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:archivetag:remove')")
@ApiOperation("鍒犻櫎鎮ｈ�呮。妗堟爣绛�")
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 2cdf54d..971c4f3 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
@@ -33,7 +33,7 @@
/**
* 鏌ヨ鎮ｈ�呰繃婊ゅ悕鍗曞垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:filterlist:list')")
+ //@PreAuthorize("@ss.hasPermi('system:filterlist:list')")
@ApiOperation("鏌ヨ鎮ｈ�呰繃婊ゅ悕鍗曞垪琛�")
@GetMapping("/list")
public TableDataInfo list(PatFilterlist patFilterlist) {
@@ -45,7 +45,7 @@
/**
* 瀵煎嚭鎮ｈ�呰繃婊ゅ悕鍗曞垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:filterlist:export')")
+ //@PreAuthorize("@ss.hasPermi('system:filterlist:export')")
@Log(title = "鎮ｈ�呰繃婊ゅ悕鍗�", businessType = BusinessType.EXPORT)
@ApiOperation("瀵煎嚭鎮ｈ�呰繃婊ゅ悕鍗曞垪琛�")
@PostMapping("/export")
@@ -58,7 +58,7 @@
/**
* 鑾峰彇鎮ｈ�呰繃婊ゅ悕鍗曡缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:filterlist:query')")
+ //@PreAuthorize("@ss.hasPermi('system:filterlist:query')")
@ApiOperation("鑾峰彇鎮ｈ�呰繃婊ゅ悕鍗曡缁嗕俊鎭�")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -68,7 +68,7 @@
/**
* 鏂板鎮ｈ�呰繃婊ゅ悕鍗�
*/
- @PreAuthorize("@ss.hasPermi('system:filterlist:add')")
+ //@PreAuthorize("@ss.hasPermi('system:filterlist:add')")
@Log(title = "鎮ｈ�呰繃婊ゅ悕鍗�", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鎮ｈ�呰繃婊ゅ悕鍗�")
@PostMapping("/add")
@@ -79,7 +79,7 @@
/**
* 淇敼鎮ｈ�呰繃婊ゅ悕鍗�
*/
- @PreAuthorize("@ss.hasPermi('system:filterlist:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:filterlist:edit')")
@Log(title = "鎮ｈ�呰繃婊ゅ悕鍗�", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼鎮ｈ�呰繃婊ゅ悕鍗�")
@PostMapping("/edit")
@@ -90,7 +90,7 @@
/**
* 鍒犻櫎鎮ｈ�呰繃婊ゅ悕鍗�
*/
- @PreAuthorize("@ss.hasPermi('system:filterlist:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:filterlist:remove')")
@Log(title = "鎮ｈ�呰繃婊ゅ悕鍗�", businessType = BusinessType.DELETE)
@ApiOperation("鍒犻櫎鎮ｈ�呰繃婊ゅ悕鍗�")
@GetMapping("/remove/{ids}")
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 495f15f..2b3fcac 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
@@ -35,7 +35,7 @@
/**
* 鏌ヨ鎮ｈ�呰绯栬褰曞垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:bloodsugar:list')")
+ //@PreAuthorize("@ss.hasPermi('system:bloodsugar:list')")
@PostMapping("/list")
@ApiOperation("鏌ヨ鎮ｈ�呰绯栬褰曞垪琛�")
public TableDataInfo list(@RequestBody PatMedBloodsugar patMedBloodsugar) {
@@ -48,7 +48,7 @@
* 瀵煎嚭鎮ｈ�呰绯栬褰曞垪琛�
*/
@ApiOperation("瀵煎嚭鎮ｈ�呰绯栬褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('system:bloodsugar:export')")
+ //@PreAuthorize("@ss.hasPermi('system:bloodsugar:export')")
@Log(title = "瀵煎嚭鎮ｈ�呰绯栬褰曞垪琛�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatMedBloodsugar patMedBloodsugar) {
@@ -60,7 +60,7 @@
/**
* 鑾峰彇鎮ｈ�呰绯栬褰曡缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:bloodsugar:query')")
+ //@PreAuthorize("@ss.hasPermi('system:bloodsugar:query')")
@GetMapping(value = "/{bloodsugarid}")
@ApiOperation("鑾峰彇鎮ｈ�呰绯栬褰曡缁嗕俊鎭�")
@ApiImplicitParam(name = "bloodsugarid", value = "涓婚敭ID", dataType = "long", dataTypeClass = Long.class)
@@ -71,7 +71,7 @@
/**
* 鏂板鎮ｈ�呰绯栬褰�
*/
- @PreAuthorize("@ss.hasPermi('system:bloodsugar:add')")
+ //@PreAuthorize("@ss.hasPermi('system:bloodsugar:add')")
@Log(title = "鏂板鎮ｈ�呰绯栬褰�", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ApiOperation("鏂板鎮ｈ�呰绯栬褰�")
@@ -82,7 +82,7 @@
/**
* 淇敼鎮ｈ�呰绯栬褰�
*/
- @PreAuthorize("@ss.hasPermi('system:bloodsugar:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:bloodsugar:edit')")
@Log(title = "鎮ｈ�呰绯栬褰�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ApiOperation("淇敼鎮ｈ�呰绯栬褰�")
@@ -94,7 +94,7 @@
* 鍒犻櫎鎮ｈ�呰绯栬褰�
*/
@ApiOperation("鍒犻櫎鎮ｈ�呰绯栬褰�")
- @PreAuthorize("@ss.hasPermi('system:bloodsugar:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:bloodsugar:remove')")
@Log(title = "鎮ｈ�呰绯栬褰�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{bloodsugarids}")
@ApiImplicitParam(name = "bloodsugarids", value = "涓婚敭ID闆嗗悎", dataType = "long", dataTypeClass = Array.class)
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 b57a610..f902833 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
@@ -19,7 +19,7 @@
/**
* 鎮ｈ�呯敤鑽褰旵ontroller
- *
+ *
* @author ruoyi
* @date 2023-06-16
*/
@@ -35,7 +35,7 @@
* 鏌ヨ鎮ｈ�呯敤鑽褰曞垪琛�
*/
@ApiOperation("鏌ヨ鎮ｈ�呯敤鑽褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('system:drug:list')")
+ //@PreAuthorize("@ss.hasPermi('system:drug:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody PatMedDrug patMedDrug)
{
@@ -48,7 +48,7 @@
* 瀵煎嚭鎮ｈ�呯敤鑽褰曞垪琛�
*/
@ApiOperation("瀵煎嚭鎮ｈ�呯敤鑽褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('system:drug:export')")
+ //@PreAuthorize("@ss.hasPermi('system:drug:export')")
@Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatMedDrug patMedDrug)
@@ -62,7 +62,7 @@
* 鑾峰彇鎮ｈ�呯敤鑽褰曡缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇鎮ｈ�呯敤鑽褰曡缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:drug:query')")
+ //@PreAuthorize("@ss.hasPermi('system:drug:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -73,7 +73,7 @@
* 鏂板鎮ｈ�呯敤鑽褰�
*/
@ApiOperation("鏂板鎮ｈ�呯敤鑽褰�")
- @PreAuthorize("@ss.hasPermi('system:drug:add')")
+ //@PreAuthorize("@ss.hasPermi('system:drug:add')")
@Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedDrug patMedDrug)
@@ -85,7 +85,7 @@
* 淇敼鎮ｈ�呯敤鑽褰�
*/
@ApiOperation("淇敼鎮ｈ�呯敤鑽褰�")
- @PreAuthorize("@ss.hasPermi('system:drug:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:drug:edit')")
@Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedDrug patMedDrug)
@@ -97,7 +97,7 @@
* 鍒犻櫎鎮ｈ�呯敤鑽褰�
*/
@ApiOperation("鍒犻櫎鎮ｈ�呯敤鑽褰�")
- @PreAuthorize("@ss.hasPermi('system:drug:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:drug:remove')")
@Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] 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 10d88b3..eedff2d 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
@@ -35,7 +35,7 @@
/**
* 鏌ヨ鎮ｈ�呴珮琛�鍘嬭褰曞垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:hypertension:list')")
+ //@PreAuthorize("@ss.hasPermi('system:hypertension:list')")
@PostMapping("/list")
@ApiOperation("鏌ヨ鎮ｈ�呴珮琛�鍘嬭褰曞垪琛�")
public TableDataInfo list(@RequestBody PatMedHypertension patMedHypertension) {
@@ -48,7 +48,7 @@
* 瀵煎嚭鎮ｈ�呴珮琛�鍘嬭褰曞垪琛�
*/
@ApiOperation("鎮ｈ�呴珮琛�鍘嬭褰�")
- @PreAuthorize("@ss.hasPermi('system:hypertension:export')")
+ //@PreAuthorize("@ss.hasPermi('system:hypertension:export')")
@Log(title = "鎮ｈ�呴珮琛�鍘嬭褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatMedHypertension patMedHypertension) {
@@ -62,7 +62,7 @@
*/
@ApiOperation("鑾峰彇鎮ｈ�呴珮琛�鍘嬭褰曡缁嗕俊鎭�")
@ApiImplicitParam(name = "getInfo", value = "涓婚敭ID", dataType = "long", dataTypeClass = Long.class)
- @PreAuthorize("@ss.hasPermi('system:hypertension:query')")
+ //@PreAuthorize("@ss.hasPermi('system:hypertension:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patMedHypertensionService.selectPatMedHypertensionById(id));
@@ -72,7 +72,7 @@
* 鏂板鎮ｈ�呴珮琛�鍘嬭褰�
*/
@ApiOperation("鎮ｈ�呴珮琛�鍘嬭褰�")
- @PreAuthorize("@ss.hasPermi('system:hypertension:add')")
+ //@PreAuthorize("@ss.hasPermi('system:hypertension:add')")
@Log(title = "鎮ｈ�呴珮琛�鍘嬭褰�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedHypertension patMedHypertension) {
@@ -83,7 +83,7 @@
* 淇敼鎮ｈ�呴珮琛�鍘嬭褰�
*/
@ApiOperation("鎮ｈ�呴珮琛�鍘嬭褰�")
- @PreAuthorize("@ss.hasPermi('system:hypertension:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:hypertension:edit')")
@Log(title = "鎮ｈ�呴珮琛�鍘嬭褰�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedHypertension patMedHypertension) {
@@ -94,7 +94,7 @@
* 鍒犻櫎鎮ｈ�呴珮琛�鍘嬭褰�
*/
@ApiOperation("鎮ｈ�呴珮琛�鍘嬭褰�")
- @PreAuthorize("@ss.hasPermi('system:hypertension:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:hypertension:remove')")
@Log(title = "鎮ｈ�呴珮琛�鍘嬭褰�", businessType = BusinessType.DELETE)
@ApiImplicitParam(name = "remove", value = "涓婚敭ID", dataType = "long", dataTypeClass = Array.class)
@GetMapping("/remove/{ids}")
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 9f1a04d..7b15428 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,22 +1,31 @@
package com.ruoyi.web.controller.smartor;
+import com.github.pagehelper.ISelect;
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.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.PatMedInhosp;
+import com.smartor.domain.PatMedInhospVO;
import com.smartor.domain.PatMedReq;
import com.smartor.service.IPatMedInhospService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 鎮ｈ�呬綇闄㈣褰旵ontroller
@@ -35,12 +44,40 @@
* 鏌ヨ鎮ｈ�呬綇闄㈣褰曞垪琛�
*/
@ApiOperation("鏌ヨ鎮ｈ�呬綇闄㈣褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')")
@PostMapping("/selectPatMedInhospList")
public TableDataInfo selectPatMedInhosplist(@RequestBody PatMedInhosp patMedInhosp) {
- startPage();
+ PageUtils.startPageByPost(patMedInhosp.getPageNum(), patMedInhosp.getPageSize());
List<PatMedInhosp> list = patMedInhospService.selectPatMedInhospList(patMedInhosp);
- return getDataTable(list);
+ long count = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ patMedInhospService.selectPatMedInhospList(patMedInhosp);
+ }
+ });
+ return getDataTable2(count, list);
+ }
+
+ /**
+ * 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
+ */
+ @ApiOperation("鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�")
+ @PostMapping("/selectPatMedInhospListByCondition")
+ public TableDataInfo selectPatMedInhospListByCondition(@RequestBody PatMedInhospVO patMedInhospVO) {
+ PageUtils.startPageByPost(patMedInhospVO.getPageNum(), patMedInhospVO.getPageSize());
+ List<PatMedInhosp> list = null;
+ if (!CollectionUtils.isEmpty(patMedInhospVO.getLeavehospitaldistrictcodes())) {
+ list = patMedInhospService.selectPatMedInhospListByCondition(patMedInhospVO);
+ } else if (!CollectionUtils.isEmpty(patMedInhospVO.getLeaveldeptcodes())) {
+ list = patMedInhospService.selectPatMedInhospListByCondition(patMedInhospVO);
+ }
+ long count = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ patMedInhospService.selectPatMedInhospListByCondition(patMedInhospVO);
+ }
+ });
+ return getDataTable2(count, list);
}
@PostMapping("/getDeptCodeByPatId")
@@ -59,7 +96,7 @@
* 瀵煎嚭鎮ｈ�呬綇闄㈣褰曞垪琛�
*/
@ApiOperation("瀵煎嚭鎮ｈ�呬綇闄㈣褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:patinhosp:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:export')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatMedInhosp patMedInhosp) {
@@ -72,7 +109,7 @@
* 鑾峰彇鎮ｈ�呬綇闄㈣褰曡缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇鎮ｈ�呬綇闄㈣褰曡缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('smartor:patinhosp:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:query')")
@GetMapping(value = "/{inhospid}")
public AjaxResult getInfo(@PathVariable("inhospid") Long inhospid) {
return success(patMedInhospService.selectPatMedInhospByInhospid(inhospid));
@@ -82,7 +119,7 @@
* 鏂板鎮ｈ�呬綇闄㈣褰�
*/
@ApiOperation("鏂板鎮ｈ�呬綇闄㈣褰�")
- @PreAuthorize("@ss.hasPermi('smartor:patinhosp:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:add')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedInhosp patMedInhosp) {
@@ -93,7 +130,7 @@
* 淇敼鎮ｈ�呬綇闄㈣褰�
*/
@ApiOperation("淇敼鎮ｈ�呬綇闄㈣褰�")
- @PreAuthorize("@ss.hasPermi('smartor:patinhosp:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:edit')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedInhosp patMedInhosp) {
@@ -104,7 +141,7 @@
* 鍒犻櫎鎮ｈ�呬綇闄㈣褰�
*/
@ApiOperation("鍒犻櫎鎮ｈ�呬綇闄㈣褰�")
- @PreAuthorize("@ss.hasPermi('smartor:patinhosp:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:remove')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{inhospids}")
public AjaxResult remove(@PathVariable Long[] inhospids) {
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 bde8d6d..1313205 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
@@ -34,7 +34,7 @@
* 鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞垪琛�
*/
@ApiOperation("鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('system:inspection:list')")
+ //@PreAuthorize("@ss.hasPermi('system:inspection:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody PatMedInspection patMedInspection) {
startPage();
@@ -46,7 +46,7 @@
* 瀵煎嚭鎮ｈ�呮鏌ユ楠岃褰曞垪琛�
*/
@ApiOperation("瀵煎嚭鎮ｈ�呮鏌ユ楠岃褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('system:inspection:export')")
+ //@PreAuthorize("@ss.hasPermi('system:inspection:export')")
@Log(title = "鎮ｈ�呮鏌ユ楠岃褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatMedInspection patMedInspection) {
@@ -59,7 +59,7 @@
* 鑾峰彇鎮ｈ�呮鏌ユ楠岃褰曡缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇鎮ｈ�呮鏌ユ楠岃褰曡缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:inspection:query')")
+ //@PreAuthorize("@ss.hasPermi('system:inspection:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patMedInspectionService.selectPatMedInspectionById(id));
@@ -68,7 +68,7 @@
/**
* 鏂板鎮ｈ�呮鏌ユ楠岃褰�
*/
- @PreAuthorize("@ss.hasPermi('system:inspection:add')")
+ //@PreAuthorize("@ss.hasPermi('system:inspection:add')")
@Log(title = "鏂板鎮ｈ�呮鏌ユ楠岃褰�", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鎮ｈ�呮鏌ユ楠岃褰�")
@PostMapping("/add")
@@ -79,7 +79,7 @@
/**
* 淇敼鎮ｈ�呮鏌ユ楠岃褰�
*/
- @PreAuthorize("@ss.hasPermi('system:inspection:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:inspection:edit')")
@Log(title = "淇敼鎮ｈ�呮鏌ユ楠岃褰�", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼鎮ｈ�呮鏌ユ楠岃褰�")
@PostMapping("/edit")
@@ -90,7 +90,7 @@
/**
* 鍒犻櫎鎮ｈ�呮鏌ユ楠岃褰�
*/
- @PreAuthorize("@ss.hasPermi('system:inspection:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:inspection:remove')")
@Log(title = "鎮ｈ�呮鏌ユ楠岃褰�", businessType = BusinessType.DELETE)
@ApiOperation("鎮ｈ�呮鏌ユ楠岃褰�")
@GetMapping("/remove/{ids}")
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 3ef5d40..fa30e22 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
@@ -43,7 +43,7 @@
* 鏌ヨ鎮ｈ�呮墜鏈褰曞垪琛�
*/
@ApiOperation("鏌ヨ鎮ｈ�呮墜鏈褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:operation:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:operation:list')")
@GetMapping("/list")
public TableDataInfo list(PatMedOperation patMedOperation) {
startPage();
@@ -55,7 +55,7 @@
* 瀵煎嚭鎮ｈ�呮墜鏈褰曞垪琛�
*/
@ApiOperation("瀵煎嚭鎮ｈ�呮墜鏈褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:operation:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:operation:export')")
@Log(title = "鎮ｈ�呮墜鏈褰�" , businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatMedOperation patMedOperation) {
@@ -68,7 +68,7 @@
* 鑾峰彇鎮ｈ�呮墜鏈褰曡缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇鎮ｈ�呮墜鏈褰曡缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('smartor:operation:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:operation:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patMedOperationService.selectPatMedOperationById(id));
@@ -77,7 +77,7 @@
/**
* 鏂板鎮ｈ�呮墜鏈褰�
*/
- @PreAuthorize("@ss.hasPermi('smartor:operation:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:operation:add')")
@Log(title = "鎮ｈ�呮墜鏈褰�" , businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedOperation patMedOperation) {
@@ -88,7 +88,7 @@
* 淇敼鎮ｈ�呮墜鏈褰�
*/
@ApiOperation("淇敼鎮ｈ�呮墜鏈褰�")
- @PreAuthorize("@ss.hasPermi('smartor:operation:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:operation:edit')")
@Log(title = "鎮ｈ�呮墜鏈褰�" , businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedOperation patMedOperation) {
@@ -99,7 +99,7 @@
* 鍒犻櫎鎮ｈ�呮墜鏈褰�
*/
@ApiOperation("鍒犻櫎鎮ｈ�呮墜鏈褰�")
- @PreAuthorize("@ss.hasPermi('smartor:operation:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:operation:remove')")
@Log(title = "鎮ｈ�呮墜鏈褰�" , businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] 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 5bd4ab6..8a75226 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
@@ -44,7 +44,7 @@
/**
* 鏌ヨ鎮ｈ�呴棬璇婅褰曞垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:patouthosp:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patouthosp:list')")
@PostMapping("/selectPatMedOuthospList")
@ApiOperation("鏌ヨ鎮ｈ�呴棬璇婅褰曞垪琛�")
public TableDataInfo selectPatMedOuthosplist(@RequestBody PatMedOuthosp patMedOuthosp) {
@@ -72,7 +72,7 @@
/**
* 瀵煎嚭鎮ｈ�呴棬璇婅褰曞垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:patouthosp:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patouthosp:export')")
@Log(title = "鎮ｈ�呴棬璇婅褰�", businessType = BusinessType.EXPORT)
@ApiOperation("鎮ｈ�呴棬璇婅褰�")
@PostMapping("/export")
@@ -87,7 +87,7 @@
*/
@ApiOperation("鑾峰彇鎮ｈ�呴棬璇婅褰曡缁嗕俊鎭�")
@ApiImplicitParam(name = "getInfo", value = "涓婚敭ID", dataType = "long", dataTypeClass = Long.class)
- @PreAuthorize("@ss.hasPermi('smartor:patouthosp:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patouthosp:query')")
@GetMapping(value = "getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patMedOuthospService.selectPatMedOuthospById(id));
@@ -97,7 +97,7 @@
* 鏂板鎮ｈ�呴棬璇婅褰�
*/
@ApiOperation("鏂板鎮ｈ�呴棬璇婅褰�")
- @PreAuthorize("@ss.hasPermi('smartor:patouthosp:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patouthosp:add')")
@Log(title = "鎮ｈ�呴棬璇婅褰�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedOuthosp patMedOuthosp) {
@@ -108,7 +108,7 @@
* 淇敼鎮ｈ�呴棬璇婅褰�
*/
@ApiOperation("淇敼鎮ｈ�呴棬璇婅褰�")
- @PreAuthorize("@ss.hasPermi('smartor:patouthosp:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patouthosp:edit')")
@Log(title = "鎮ｈ�呴棬璇婅褰�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedOuthosp patMedOuthosp) {
@@ -119,7 +119,7 @@
* 鍒犻櫎鎮ｈ�呴棬璇婅褰�
*/
@ApiOperation("鍒犻櫎鎮ｈ�呴棬璇婅褰�")
- @PreAuthorize("@ss.hasPermi('smartor:patouthosp:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patouthosp:remove')")
@ApiImplicitParam(name = "remove", value = "涓婚敭ID", dataType = "long", dataTypeClass = Array.class)
@Log(title = "鎮ｈ�呴棬璇婅褰�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{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 f8eaec2..c5f69a2 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
@@ -42,7 +42,7 @@
* 鏌ヨ鎮ｈ�呬綋妫�璁板綍鍒楄〃
*/
@ApiOperation("鏌ヨ鎮ｈ�呬綋妫�璁板綍鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:patphysical:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patphysical:list')")
@PostMapping("/selectPatMedPhysicalList")
public TableDataInfo selectPatMedPhysicallist(@RequestBody PatMedPhysical patMedPhysical)
{
@@ -55,7 +55,7 @@
* 瀵煎嚭鎮ｈ�呬綋妫�璁板綍鍒楄〃
*/
@ApiOperation("瀵煎嚭鎮ｈ�呬綋妫�璁板綍鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:patphysical:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patphysical:export')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatMedPhysical patMedPhysical)
@@ -69,7 +69,7 @@
* 鑾峰彇鎮ｈ�呬綋妫�璁板綍璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎮ｈ�呬綋妫�璁板綍璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:patphysical:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patphysical:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -80,7 +80,7 @@
* 鏂板鎮ｈ�呬綋妫�璁板綍
*/
@ApiOperation("鏂板鎮ｈ�呬綋妫�璁板綍")
- @PreAuthorize("@ss.hasPermi('smartor:patphysical:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patphysical:add')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedPhysical patMedPhysical)
@@ -92,7 +92,7 @@
* 淇敼鎮ｈ�呬綋妫�璁板綍
*/
@ApiOperation("淇敼鎮ｈ�呬綋妫�璁板綍")
- @PreAuthorize("@ss.hasPermi('smartor:patphysical:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patphysical:edit')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedPhysical patMedPhysical)
@@ -104,7 +104,7 @@
* 鍒犻櫎鎮ｈ�呬綋妫�璁板綍
*/
@ApiOperation("鍒犻櫎鎮ｈ�呬綋妫�璁板綍")
- @PreAuthorize("@ss.hasPermi('smartor:patphysical:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patphysical:remove')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] 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 887d19b..94afd1a 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
@@ -34,7 +34,7 @@
* 鏌ヨ鎮ｈ�呮寕鍙疯褰曞垪琛�
*/
@ApiOperation("鏌ヨ鎮ｈ�呮寕鍙疯褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('system:registration:list')")
+ //@PreAuthorize("@ss.hasPermi('system:registration:list')")
@GetMapping("/list")
public TableDataInfo list(PatMedRegistration patMedRegistration) {
startPage();
@@ -46,7 +46,7 @@
* 瀵煎嚭鎮ｈ�呮寕鍙疯褰曞垪琛�
*/
@ApiOperation("瀵煎嚭鎮ｈ�呮寕鍙疯褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('system:registration:export')")
+ //@PreAuthorize("@ss.hasPermi('system:registration:export')")
@Log(title = "鎮ｈ�呮寕鍙疯褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatMedRegistration patMedRegistration) {
@@ -59,7 +59,7 @@
* 鑾峰彇鎮ｈ�呮寕鍙疯褰曡缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇鎮ｈ�呮寕鍙疯褰曡缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:registration:query')")
+ //@PreAuthorize("@ss.hasPermi('system:registration:query')")
@GetMapping(value = "/getInfo/{registid}")
public AjaxResult getInfo(@PathVariable("registid") Long registid) {
return success(patMedRegistrationService.selectPatMedRegistrationByRegistid(registid));
@@ -69,7 +69,7 @@
* 鏂板鎮ｈ�呮寕鍙疯褰�
*/
@ApiOperation("鏂板鎮ｈ�呮寕鍙疯褰�")
- @PreAuthorize("@ss.hasPermi('system:registration:add')")
+ //@PreAuthorize("@ss.hasPermi('system:registration:add')")
@Log(title = "鎮ｈ�呮寕鍙疯褰�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedRegistration patMedRegistration) {
@@ -80,7 +80,7 @@
* 淇敼鎮ｈ�呮寕鍙疯褰�
*/
@ApiOperation("淇敼鎮ｈ�呮寕鍙疯褰�")
- @PreAuthorize("@ss.hasPermi('system:registration:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:registration:edit')")
@Log(title = "鎮ｈ�呮寕鍙疯褰�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedRegistration patMedRegistration) {
@@ -91,7 +91,7 @@
* 鍒犻櫎鎮ｈ�呮寕鍙疯褰�
*/
@ApiOperation("鍒犻櫎鎮ｈ�呮寕鍙疯褰�")
- @PreAuthorize("@ss.hasPermi('system:registration:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:registration:remove')")
@Log(title = "鎮ｈ�呮寕鍙疯褰�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{registids}")
public AjaxResult remove(@PathVariable Long[] registids) {
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 4b32eed..b109bb2 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
@@ -37,7 +37,7 @@
* 鏌ヨ鎮ｈ�呬綋閲嶈褰曞垪琛�
*/
@ApiOperation("鏌ヨ鎮ｈ�呬綋閲嶈褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('system:weight:list')")
+ //@PreAuthorize("@ss.hasPermi('system:weight:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody PatMedWeight patMedWeight)
{
@@ -50,7 +50,7 @@
* 瀵煎嚭鎮ｈ�呬綋閲嶈褰曞垪琛�
*/
@ApiOperation("瀵煎嚭鎮ｈ�呬綋閲嶈褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('system:weight:export')")
+ //@PreAuthorize("@ss.hasPermi('system:weight:export')")
@Log(title = "鎮ｈ�呬綋閲嶈褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatMedWeight patMedWeight)
@@ -64,7 +64,7 @@
* 鑾峰彇鎮ｈ�呬綋閲嶈褰曡缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇鎮ｈ�呬綋閲嶈褰曡缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:weight:query')")
+ //@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)
@@ -76,7 +76,7 @@
* 鏂板鎮ｈ�呬綋閲嶈褰�
*/
@ApiOperation("鏂板鎮ｈ�呬綋閲嶈褰�")
- @PreAuthorize("@ss.hasPermi('system:weight:add')")
+ //@PreAuthorize("@ss.hasPermi('system:weight:add')")
@Log(title = "鎮ｈ�呬綋閲嶈褰�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedWeight patMedWeight)
@@ -88,7 +88,7 @@
* 淇敼鎮ｈ�呬綋閲嶈褰�
*/
@ApiOperation("淇敼鎮ｈ�呬綋閲嶈褰�")
- @PreAuthorize("@ss.hasPermi('system:weight:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:weight:edit')")
@Log(title = "淇敼鎮ｈ�呬綋閲嶈褰�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedWeight patMedWeight)
@@ -100,7 +100,7 @@
* 鍒犻櫎鎮ｈ�呬綋閲嶈褰�
*/
@ApiOperation("鍒犻櫎鎮ｈ�呬綋閲嶈褰�")
- @PreAuthorize("@ss.hasPermi('system:weight:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:weight:remove')")
@Log(title = "鍒犻櫎鎮ｈ�呬綋閲嶈褰�", businessType = BusinessType.DELETE)
@ApiImplicitParam(name = "remove", value = "涓婚敭ID", dataType = "long", dataTypeClass = Array.class)
@GetMapping("/remove/{ids}")
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 309ad80..2b86fd4 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
@@ -35,7 +35,7 @@
* 鏌ヨ涓撶梾鎮ｈ�呭垎绫诲垪琛�
*/
@ApiOperation("鏌ヨ涓撶梾鎮ｈ�呭垎绫诲垪琛�")
- @PreAuthorize("@ss.hasPermi('system:category:list')")
+ //@PreAuthorize("@ss.hasPermi('system:category:list')")
@GetMapping("/list")
public TableDataInfo list(PatSpeciallistCategory patSpeciallistCategory)
{
@@ -48,7 +48,7 @@
* 瀵煎嚭涓撶梾鎮ｈ�呭垎绫诲垪琛�
*/
@ApiOperation("瀵煎嚭涓撶梾鎮ｈ�呭垎绫诲垪琛�")
- @PreAuthorize("@ss.hasPermi('system:category:export')")
+ //@PreAuthorize("@ss.hasPermi('system:category:export')")
@Log(title = "涓撶梾鎮ｈ�呭垎绫�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatSpeciallistCategory patSpeciallistCategory)
@@ -62,7 +62,7 @@
* 鑾峰彇涓撶梾鎮ｈ�呭垎绫昏缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇涓撶梾鎮ｈ�呭垎绫昏缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:category:query')")
+ //@PreAuthorize("@ss.hasPermi('system:category:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板涓撶梾鎮ｈ�呭垎绫�
*/
- @PreAuthorize("@ss.hasPermi('system:category:add')")
+ //@PreAuthorize("@ss.hasPermi('system:category:add')")
@Log(title = "涓撶梾鎮ｈ�呭垎绫�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody PatSpeciallistCategory patSpeciallistCategory)
@@ -84,7 +84,7 @@
* 淇敼涓撶梾鎮ｈ�呭垎绫�
*/
@ApiOperation("淇敼涓撶梾鎮ｈ�呭垎绫�")
- @PreAuthorize("@ss.hasPermi('system:category:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:category:edit')")
@Log(title = "涓撶梾鎮ｈ�呭垎绫�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatSpeciallistCategory patSpeciallistCategory)
@@ -96,7 +96,7 @@
* 鍒犻櫎涓撶梾鎮ｈ�呭垎绫�
*/
@ApiOperation("鍒犻櫎涓撶梾鎮ｈ�呭垎绫�")
- @PreAuthorize("@ss.hasPermi('system:category:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:category:remove')")
@Log(title = "涓撶梾鎮ｈ�呭垎绫�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] 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 e5b81c0..9805203 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
@@ -34,7 +34,7 @@
/**
* 鏌ヨ涓撶梾鎮ｈ�呭垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:speciallist:list')")
+ //@PreAuthorize("@ss.hasPermi('system:speciallist:list')")
@ApiOperation("鏌ヨ涓撶梾鎮ｈ�呭垪琛�")
@GetMapping("/list")
public TableDataInfo list(PatSpeciallist patSpeciallist)
@@ -47,7 +47,7 @@
/**
* 瀵煎嚭涓撶梾鎮ｈ�呭垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:speciallist:export')")
+ //@PreAuthorize("@ss.hasPermi('system:speciallist:export')")
@Log(title = "涓撶梾鎮ｈ��", businessType = BusinessType.EXPORT)
@ApiOperation("瀵煎嚭涓撶梾鎮ｈ�呭垪琛�")
@PostMapping("/export")
@@ -61,7 +61,7 @@
/**
* 鑾峰彇涓撶梾鎮ｈ�呰缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:speciallist:query')")
+ //@PreAuthorize("@ss.hasPermi('system:speciallist:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -71,7 +71,7 @@
/**
* 鏂板涓撶梾鎮ｈ��
*/
- @PreAuthorize("@ss.hasPermi('system:speciallist:add')")
+ //@PreAuthorize("@ss.hasPermi('system:speciallist:add')")
@Log(title = "涓撶梾鎮ｈ��", businessType = BusinessType.INSERT)
@ApiOperation("鏂板涓撶梾鎮ｈ��")
@PostMapping("/add")
@@ -83,7 +83,7 @@
/**
* 淇敼涓撶梾鎮ｈ��
*/
- @PreAuthorize("@ss.hasPermi('system:speciallist:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:speciallist:edit')")
@Log(title = "涓撶梾鎮ｈ��", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼涓撶梾鎮ｈ��")
@PostMapping("/edit")
@@ -95,7 +95,7 @@
/**
* 鍒犻櫎涓撶梾鎮ｈ��
*/
- @PreAuthorize("@ss.hasPermi('system:speciallist:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:speciallist:remove')")
@Log(title = "涓撶梾鎮ｈ��", businessType = BusinessType.DELETE)
@ApiOperation("鍒犻櫎涓撶梾鎮ｈ��")
@GetMapping("/remove/{ids}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatTaskRelevanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatTaskRelevanceController.java
index 63558bf..8b305b9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatTaskRelevanceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatTaskRelevanceController.java
@@ -18,7 +18,7 @@
/**
* 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈Controller
- *
+ *
* @author ruoyi
* @date 2024-01-07
*/
@@ -32,7 +32,7 @@
/**
* 鏌ヨ鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:relevance:list')")
+ //@PreAuthorize("@ss.hasPermi('system:relevance:list')")
@GetMapping("/list")
public TableDataInfo list(PatTaskRelevance PatTaskRelevance)
{
@@ -44,7 +44,7 @@
/**
* 瀵煎嚭鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:relevance:export')")
+ //@PreAuthorize("@ss.hasPermi('system:relevance:export')")
@Log(title = "鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatTaskRelevance PatTaskRelevance)
@@ -57,7 +57,7 @@
/**
* 鑾峰彇鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:relevance:query')")
+ //@PreAuthorize("@ss.hasPermi('system:relevance:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -67,7 +67,7 @@
/**
* 鏂板鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
*/
- @PreAuthorize("@ss.hasPermi('system:relevance:add')")
+ //@PreAuthorize("@ss.hasPermi('system:relevance:add')")
@Log(title = "鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody PatTaskRelevance PatTaskRelevance)
@@ -78,7 +78,7 @@
/**
* 淇敼鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
*/
- @PreAuthorize("@ss.hasPermi('system:relevance:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:relevance:edit')")
@Log(title = "鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody PatTaskRelevance PatTaskRelevance)
@@ -89,7 +89,7 @@
/**
* 鍒犻櫎鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
*/
- @PreAuthorize("@ss.hasPermi('system:relevance:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:relevance:remove')")
@Log(title = "鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatWildcardController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatWildcardController.java
index 0a8b6d6..97e3c95 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatWildcardController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatWildcardController.java
@@ -31,7 +31,7 @@
/**
* 鏌ヨ鎮ｈ�呬俊鎭�氶厤绗﹀垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:wildcard:list')")
+ //@PreAuthorize("@ss.hasPermi('system:wildcard:list')")
@GetMapping("/list")
public TableDataInfo list(PatWildcard patWildcard)
{
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭鎮ｈ�呬俊鎭�氶厤绗﹀垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:wildcard:export')")
+ //@PreAuthorize("@ss.hasPermi('system:wildcard:export')")
@Log(title = "鎮ｈ�呬俊鎭�氶厤绗�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatWildcard patWildcard)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇鎮ｈ�呬俊鎭�氶厤绗﹁缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:wildcard:query')")
+ //@PreAuthorize("@ss.hasPermi('system:wildcard:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -66,7 +66,7 @@
/**
* 鏂板鎮ｈ�呬俊鎭�氶厤绗�
*/
- @PreAuthorize("@ss.hasPermi('system:wildcard:add')")
+ //@PreAuthorize("@ss.hasPermi('system:wildcard:add')")
@Log(title = "鎮ｈ�呬俊鎭�氶厤绗�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody PatWildcard patWildcard)
@@ -77,7 +77,7 @@
/**
* 淇敼鎮ｈ�呬俊鎭�氶厤绗�
*/
- @PreAuthorize("@ss.hasPermi('system:wildcard:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:wildcard:edit')")
@Log(title = "鎮ｈ�呬俊鎭�氶厤绗�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody PatWildcard patWildcard)
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎鎮ｈ�呬俊鎭�氶厤绗�
*/
- @PreAuthorize("@ss.hasPermi('system:wildcard:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:wildcard:remove')")
@Log(title = "鎮ｈ�呬俊鎭�氶厤绗�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java
index f9bdc1c..61584b5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java
@@ -51,7 +51,7 @@
* 褰撳墠鐧诲綍鐢ㄦ埛鐨勯棬璇娿�佸湪闄€�佸嚭闄㈢梾浜虹殑缁熻鎯呭喌
*/
@ApiOperation("褰撳墠鐧诲綍鐢ㄦ埛鐨勯棬璇娿�佸湪闄€�佸嚭闄㈢梾浜虹殑缁熻鎯呭喌")
- @PreAuthorize("@ss.hasPermi('system:tag:list')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:list')")
@GetMapping("/getTaskInfo")
public TableDataInfo getTaskInfo(@RequestParam("deptIds") String detpIds, @RequestParam("dcCodes") String dcCodes) {
//鑾峰彇褰撳墠鐧婚檰浜�
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 c7c22ae..61238b2 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鏂规缁撴瑙勫垯鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SchemeAutofinshrule schemeAutofinshrule) {
startPage();
@@ -48,7 +48,7 @@
/**
* 瀵煎嚭鏂规缁撴瑙勫垯鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:export')")
@Log(title = "鏂规缁撴瑙勫垯", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchemeAutofinshrule schemeAutofinshrule) {
@@ -60,7 +60,7 @@
/**
* 鑾峰彇鏂规缁撴瑙勫垯璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(schemeAutofinshruleService.selectSchemeAutofinshruleById(id));
@@ -69,7 +69,7 @@
/**
* 鏂板鏂规缁撴瑙勫垯
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:add')")
@Log(title = "鏂规缁撴瑙勫垯", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeAutofinshrule schemeAutofinshrule) {
@@ -79,7 +79,7 @@
/**
* 淇敼鏂规缁撴瑙勫垯
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:edit')")
@Log(title = "鏂规缁撴瑙勫垯", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeAutofinshrule schemeAutofinshrule) {
@@ -89,7 +89,7 @@
/**
* 鍒犻櫎鏂规缁撴瑙勫垯
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:remove')")
@Log(title = "鏂规缁撴瑙勫垯", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 b2fef49..043550a 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鏂规鍒嗙被鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemecategory:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemecategory:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SchemeCategory schemeCategory)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭鏂规鍒嗙被鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemecategory:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemecategory:export')")
@Log(title = "鏂规鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchemeCategory schemeCategory)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇鏂规鍒嗙被璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemecategory:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemecategory:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板鏂规鍒嗙被
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemecategory:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemecategory:add')")
@Log(title = "鏂规鍒嗙被", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeCategory schemeCategory)
@@ -83,7 +83,7 @@
/**
* 淇敼鏂规鍒嗙被
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemecategory:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemecategory:edit')")
@Log(title = "鏂规鍒嗙被", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeCategory schemeCategory)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎鏂规鍒嗙被
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemecategory:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemecategory:remove')")
@Log(title = "鏂规鍒嗙被", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] 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 5701426..399f026 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鏈嶅姟鏂规搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemelibrary:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemelibrary:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SchemeLocallibrary schemeLocallibrary)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭鏈嶅姟鏂规搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemelibrary:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemelibrary:export')")
@Log(title = "鏈嶅姟鏂规搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchemeLocallibrary schemeLocallibrary)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇鏈嶅姟鏂规搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemelibrary:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemelibrary:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板鏈嶅姟鏂规搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemelibrary:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemelibrary:add')")
@Log(title = "鏈嶅姟鏂规搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeLocallibrary schemeLocallibrary)
@@ -83,7 +83,7 @@
/**
* 淇敼鏈嶅姟鏂规搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemelibrary:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemelibrary:edit')")
@Log(title = "鏈嶅姟鏂规搴�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeLocallibrary schemeLocallibrary)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎鏈嶅姟鏂规搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemelibrary:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemelibrary:remove')")
@Log(title = "鏈嶅姟鏂规搴�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
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 dc84c27..e8d84e3 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ绠＄悊璁″垝鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemeplan:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemeplan:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SchemePlan schemePlan)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭绠＄悊璁″垝鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemeplan:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemeplan:export')")
@Log(title = "绠＄悊璁″垝", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchemePlan schemePlan)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇绠＄悊璁″垝璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemeplan:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemeplan:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板绠＄悊璁″垝
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemeplan:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemeplan:add')")
@Log(title = "绠＄悊璁″垝", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SchemePlan schemePlan)
@@ -83,7 +83,7 @@
/**
* 淇敼绠＄悊璁″垝
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemeplan:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemeplan:edit')")
@Log(title = "绠＄悊璁″垝", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemePlan schemePlan)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎绠＄悊璁″垝
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemeplan:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemeplan:remove')")
@Log(title = "绠＄悊璁″垝", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
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 eb40509..571b197 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鏂规浠诲姟鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetask:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetask:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SchemeTask schemeTask)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭鏂规浠诲姟鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetask:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetask:export')")
@Log(title = "鏂规浠诲姟", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchemeTask schemeTask)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇鏂规浠诲姟璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetask:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetask:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板鏂规浠诲姟
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetask:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetask:add')")
@Log(title = "鏂规浠诲姟", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTask schemeTask)
@@ -83,7 +83,7 @@
/**
* 淇敼鏂规浠诲姟
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetask:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetask:edit')")
@Log(title = "鏂规浠诲姟", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTask schemeTask)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎鏂规浠诲姟
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetask:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetask:remove')")
@Log(title = "鏂规浠诲姟", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
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 076eec7..2b95b3c 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鏂规浠诲姟閰嶇疆鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SchemeTaskconfig schemeTaskconfig)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭鏂规浠诲姟閰嶇疆鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:export')")
@Log(title = "鏂规浠诲姟閰嶇疆", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchemeTaskconfig schemeTaskconfig)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇鏂规浠诲姟閰嶇疆璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板鏂规浠诲姟閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:add')")
@Log(title = "鏂规浠诲姟閰嶇疆", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTaskconfig schemeTaskconfig)
@@ -83,7 +83,7 @@
/**
* 淇敼鏂规浠诲姟閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:edit')")
@Log(title = "鏂规浠诲姟閰嶇疆", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTaskconfig schemeTaskconfig)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎鏂规浠诲姟閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:remove')")
@Log(title = "鏂规浠诲姟閰嶇疆", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
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 4bce45f..7ff933e 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
@@ -23,7 +23,7 @@
/**
* 鏂规AI澶栧懠浠诲姟璇︽儏Controller
- *
+ *
* @author smartor
* @date 2023-03-04
*/
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鏂规AI澶栧懠浠诲姟璇︽儏鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SchemeTaskrecordCalldetail schemeTaskrecordCalldetail)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭鏂规AI澶栧懠浠诲姟璇︽儏鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:export')")
@Log(title = "鏂规AI澶栧懠浠诲姟璇︽儏", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchemeTaskrecordCalldetail schemeTaskrecordCalldetail)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇鏂规AI澶栧懠浠诲姟璇︽儏璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板鏂规AI澶栧懠浠诲姟璇︽儏
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:add')")
@Log(title = "鏂规AI澶栧懠浠诲姟璇︽儏", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTaskrecordCalldetail schemeTaskrecordCalldetail)
@@ -83,7 +83,7 @@
/**
* 淇敼鏂规AI澶栧懠浠诲姟璇︽儏
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:edit')")
@Log(title = "鏂规AI澶栧懠浠诲姟璇︽儏", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTaskrecordCalldetail schemeTaskrecordCalldetail)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎鏂规AI澶栧懠浠诲姟璇︽儏
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:remove')")
@Log(title = "鏂规AI澶栧懠浠诲姟璇︽儏", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
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 307e4a0..16fb441 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鏂规浠诲姟澶勭悊璁板綍鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SchemeTaskrecord schemeTaskrecord)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭鏂规浠诲姟澶勭悊璁板綍鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:export')")
@Log(title = "鏂规浠诲姟澶勭悊璁板綍", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchemeTaskrecord schemeTaskrecord)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇鏂规浠诲姟澶勭悊璁板綍璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板鏂规浠诲姟澶勭悊璁板綍
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:add')")
@Log(title = "鏂规浠诲姟澶勭悊璁板綍", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTaskrecord schemeTaskrecord)
@@ -83,7 +83,7 @@
/**
* 淇敼鏂规浠诲姟澶勭悊璁板綍
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:edit')")
@Log(title = "鏂规浠诲姟澶勭悊璁板綍", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTaskrecord schemeTaskrecord)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎鏂规浠诲姟澶勭悊璁板綍
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:remove')")
@Log(title = "鏂规浠诲姟澶勭悊璁板綍", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
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 811b0f5..59af7f9 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鏂规浠诲姟閲嶅彂閰嶇疆鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SchemeTaskrepeatconfig schemeTaskrepeatconfig) {
startPage();
@@ -48,7 +48,7 @@
/**
* 瀵煎嚭鏂规浠诲姟閲嶅彂閰嶇疆鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:export')")
@Log(title = "鏂规浠诲姟閲嶅彂閰嶇疆", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchemeTaskrepeatconfig schemeTaskrepeatconfig) {
@@ -60,7 +60,7 @@
/**
* 鑾峰彇鏂规浠诲姟閲嶅彂閰嶇疆璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(schemeTaskrepeatconfigService.selectSchemeTaskrepeatconfigById(id));
@@ -69,7 +69,7 @@
/**
* 鏂板鏂规浠诲姟閲嶅彂閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:add')")
@Log(title = "鏂规浠诲姟閲嶅彂閰嶇疆", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTaskrepeatconfig schemeTaskrepeatconfig) {
@@ -79,7 +79,7 @@
/**
* 淇敼鏂规浠诲姟閲嶅彂閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:edit')")
@Log(title = "鏂规浠诲姟閲嶅彂閰嶇疆", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTaskrepeatconfig schemeTaskrepeatconfig) {
@@ -89,7 +89,7 @@
/**
* 鍒犻櫎鏂规浠诲姟閲嶅彂閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:remove')")
@Log(title = "鏂规浠诲姟閲嶅彂閰嶇疆", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 8f5430f..4839261 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
@@ -23,7 +23,7 @@
/**
* 鏂规瑙﹀彂鏉′欢瑙勫垯Controller
- *
+ *
* @author smartor
* @date 2023-03-04
*/
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鏂规瑙﹀彂鏉′欢瑙勫垯鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SchemeTriggerrule schemeTriggerrule)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭鏂规瑙﹀彂鏉′欢瑙勫垯鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:export')")
@Log(title = "鏂规瑙﹀彂鏉′欢瑙勫垯", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchemeTriggerrule schemeTriggerrule)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇鏂规瑙﹀彂鏉′欢瑙勫垯璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板鏂规瑙﹀彂鏉′欢瑙勫垯
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:add')")
@Log(title = "鏂规瑙﹀彂鏉′欢瑙勫垯", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTriggerrule schemeTriggerrule)
@@ -83,7 +83,7 @@
/**
* 淇敼鏂规瑙﹀彂鏉′欢瑙勫垯
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:edit')")
@Log(title = "鏂规瑙﹀彂鏉′欢瑙勫垯", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTriggerrule schemeTriggerrule)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎鏂规瑙﹀彂鏉′欢瑙勫垯
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:remove')")
@Log(title = "鏂规瑙﹀彂鏉′欢瑙勫垯", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
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 359cd39..cfbacc4 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鏂规瑙﹀彂鍦烘櫙鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SchemeTriggerscene schemeTriggerscene)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭鏂规瑙﹀彂鍦烘櫙鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:export')")
@Log(title = "鏂规瑙﹀彂鍦烘櫙", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchemeTriggerscene schemeTriggerscene)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇鏂规瑙﹀彂鍦烘櫙璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板鏂规瑙﹀彂鍦烘櫙
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:add')")
@Log(title = "鏂规瑙﹀彂鍦烘櫙", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTriggerscene schemeTriggerscene)
@@ -83,7 +83,7 @@
/**
* 淇敼鏂规瑙﹀彂鍦烘櫙
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:edit')")
@Log(title = "鏂规瑙﹀彂鍦烘櫙", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTriggerscene schemeTriggerscene)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎鏂规瑙﹀彂鍦烘櫙
*/
- @PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:remove')")
@Log(title = "鏂规瑙﹀彂鍦烘櫙", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
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 e9c70c4..678aac2 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
@@ -35,7 +35,7 @@
/**
* 鏌ヨ浠诲姟闂嵎闂閫夐」鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:answer:list')")
+ //@PreAuthorize("@ss.hasPermi('system:answer:list')")
@ApiOperation("鏌ヨ浠诲姟闂嵎闂閫夐」鍒楄〃")
@GetMapping("/list")
public TableDataInfo list(ServiceSubtaskAnswer serviceSubtaskAnswer) {
@@ -47,7 +47,7 @@
/**
* 瀵煎嚭浠诲姟闂嵎闂閫夐」鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:answer:export')")
+ //@PreAuthorize("@ss.hasPermi('system:answer:export')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.EXPORT)
@ApiOperation("浠诲姟闂嵎闂閫夐」")
@PostMapping("/export")
@@ -60,7 +60,7 @@
/**
* 鑾峰彇浠诲姟闂嵎闂閫夐」璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:answer:query')")
+ //@PreAuthorize("@ss.hasPermi('system:answer:query')")
@GetMapping(value = "/getInfo/{id}")
@ApiOperation("鑾峰彇浠诲姟闂嵎闂閫夐」璇︾粏淇℃伅")
public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -70,7 +70,7 @@
/**
* 鏂板浠诲姟闂嵎闂閫夐」
*/
- @PreAuthorize("@ss.hasPermi('system:answer:add')")
+ //@PreAuthorize("@ss.hasPermi('system:answer:add')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.INSERT)
@ApiOperation("鏂板浠诲姟闂嵎闂閫夐」")
@PostMapping("/add")
@@ -81,7 +81,7 @@
/**
* 淇敼浠诲姟闂嵎闂閫夐」
*/
- @PreAuthorize("@ss.hasPermi('system:answer:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:answer:edit')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼浠诲姟闂嵎闂閫夐」")
@PostMapping("/edit")
@@ -92,7 +92,7 @@
/**
* 鍒犻櫎浠诲姟闂嵎闂閫夐」
*/
- @PreAuthorize("@ss.hasPermi('system:answer:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:answer:remove')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.DELETE)
@ApiOperation("鍒犻櫎浠诲姟闂嵎闂閫夐」")
@DeleteMapping("/remove/{ids}")
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 4f5fad2..f1384a3 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
@@ -43,7 +43,7 @@
* 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
*/
@ApiOperation("鏌ヨ鎮ｈ�呴殢璁夸俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:taskcall:list')")
+ //@PreAuthorize("@ss.hasPermi('system:taskcall:list')")
@PostMapping("/patItem")
public TableDataInfo patItem(@RequestBody ServiceSubtask ivrTaskcall) {
PageUtils.startPageByPost(ivrTaskcall.getPageNum(), ivrTaskcall.getPageSize());
@@ -53,7 +53,7 @@
/**
* 瀵煎嚭鍗曚竴浠诲姟锛堥殢璁垮鏁欙級鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:taskcall:export')")
+ //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
@Log(title = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ServiceSubtask serviceSubtask) {
@@ -66,7 +66,7 @@
/**
* 鑾峰彇鍗曚竴浠诲姟锛堥殢璁匡級璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:taskcall:query')")
+ //@PreAuthorize("@ss.hasPermi('system:taskcall:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(serviceSubtaskService.selectServiceSubtaskById(id));
@@ -76,7 +76,7 @@
* 鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟
*/
@ApiOperation("鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟")
- @PreAuthorize("@ss.hasPermi('system:task:add')")
+ //@PreAuthorize("@ss.hasPermi('system:task:add')")
@Log(title = "鍗曚竴浠诲姟锛堥殢璁匡級", businessType = BusinessType.INSERT)
@PostMapping("/insertOrUpdateTask")
public AjaxResult insertOrUpdateHeTask(@RequestBody ServiceTaskVO ivrTaskVO) {
@@ -87,6 +87,12 @@
return toAjax(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
}
+ @ApiOperation("淇敼瀛愪换鍔�")
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody ServiceSubtask serviceSubtask) {
+ return toAjax(serviceSubtaskService.updateServiceSubtask(serviceSubtask));
+ }
+
/**
* 鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
index 7690163..a690aa4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
@@ -30,7 +30,7 @@
/**
* 鏌ヨ璇煶浠诲姟鍛煎彨鏄庣粏鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody ServiceSubtaskDetail serviceSubtaskDetail) {
startPage();
@@ -41,7 +41,7 @@
/**
* 瀵煎嚭璇煶浠诲姟鍛煎彨鏄庣粏鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:export')")
@Log(title = "璇煶浠诲姟鍛煎彨鏄庣粏", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ServiceSubtaskDetail serviceSubtaskDetail) {
@@ -53,7 +53,7 @@
/**
* 鑾峰彇璇煶浠诲姟鍛煎彨鏄庣粏璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:query')")
@GetMapping(value = "/{calldetailid}")
public AjaxResult getInfo(@PathVariable("calldetailid") String calldetailid) {
return success(ServiceSubtaskDetailService.selectServiceSubtaskDetailByCalldetailid(calldetailid));
@@ -62,7 +62,7 @@
/**
* 鏂板璇煶浠诲姟鍛煎彨鏄庣粏
*/
- @PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:add')")
@Log(title = "璇煶浠诲姟鍛煎彨鏄庣粏", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody ServiceSubtaskDetail serviceSubtaskDetail) {
@@ -72,7 +72,7 @@
/**
* 淇敼璇煶浠诲姟鍛煎彨鏄庣粏
*/
- @PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:edit')")
@Log(title = "璇煶浠诲姟鍛煎彨鏄庣粏", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody ServiceSubtaskDetail serviceSubtaskDetail) {
@@ -82,7 +82,7 @@
/**
* 鍒犻櫎璇煶浠诲姟鍛煎彨鏄庣粏
*/
- @PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:remove')")
@Log(title = "璇煶浠诲姟鍛煎彨鏄庣粏", businessType = BusinessType.DELETE)
@GetMapping("/remove/{calldetailids}")
public AjaxResult remove(@PathVariable String[] calldetailids) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskRecordController.java
index fc6a416..d53043d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskRecordController.java
@@ -30,7 +30,7 @@
/**
* 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:record:list')")
+ //@PreAuthorize("@ss.hasPermi('system:record:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceSubtaskRecord serviceSubtaskRecord) {
startPage();
@@ -41,7 +41,7 @@
/**
* 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:record:export')")
+ //@PreAuthorize("@ss.hasPermi('system:record:export')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ServiceSubtaskRecord serviceSubtaskRecord) {
@@ -53,7 +53,7 @@
/**
* 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:record:query')")
+ //@PreAuthorize("@ss.hasPermi('system:record:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(serviceSubtaskRecordService.selectServiceSubtaskRecordById(id));
@@ -62,7 +62,7 @@
/**
* 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
*/
- @PreAuthorize("@ss.hasPermi('system:record:add')")
+ //@PreAuthorize("@ss.hasPermi('system:record:add')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ServiceSubtaskRecord serviceSubtaskRecord) {
@@ -72,7 +72,7 @@
/**
* 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
*/
- @PreAuthorize("@ss.hasPermi('system:record:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:record:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ServiceSubtaskRecord serviceSubtaskRecord) {
@@ -82,7 +82,7 @@
/**
* 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
*/
- @PreAuthorize("@ss.hasPermi('system:record:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:record:remove')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] 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 f3b4d20..3e4d7dc 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
@@ -58,7 +58,7 @@
* 鏌ヨ璇煶浠诲姟鍒楄〃
*/
@ApiOperation("鏌ヨ浠诲姟鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody ServiceTask serviceTask) {
PageUtils.startPageByPost(serviceTask.getPageNum(), serviceTask.getPageSize());
@@ -99,7 +99,7 @@
* 瀵煎嚭浠诲姟鍒楄〃
*/
@ApiOperation("瀵煎嚭浠诲姟鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:export')")
@Log(title = "璇煶浠诲姟", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ServiceTask ServiceTask) {
@@ -112,7 +112,7 @@
* 鑾峰彇浠诲姟璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇浠诲姟璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:query')")
@GetMapping(value = "/{taskid}")
public AjaxResult getInfo(@PathVariable("taskid") Long taskid) {
return success(serviceTaskService.selectServiceTaskByTaskid(taskid));
@@ -122,7 +122,7 @@
* 鏂板浠诲姟
*/
@ApiOperation("鏂板浠诲姟")
- @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:add')")
@Log(title = "璇煶浠诲姟", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody ServiceTask ServiceTask) {
@@ -133,7 +133,7 @@
* 淇敼璇煶浠诲姟
*/
@ApiOperation("淇敼浠诲姟")
- @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:edit')")
@Log(title = "浠诲姟", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody ServiceTask ServiceTask) {
@@ -144,7 +144,7 @@
// * 鍒犻櫎璇煶浠诲姟
// */
// @ApiOperation("鍒犻櫎浠诲姟")
-// @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:remove')")
+// //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:remove')")
// @Log(title = "璇煶浠诲姟", businessType = BusinessType.DELETE)
// @GetMapping("/remove/{taskids}")
// public AjaxResult remove(@PathVariable Long[] taskids) {
@@ -156,7 +156,7 @@
* 鍒犻櫎浠诲姟(鍖呮嫭瀹冨搴旂殑鎮ｈ�呬俊鎭�)
*/
@ApiOperation("鍒犻櫎浠诲姟(鍖呮嫭瀹冨搴旂殑鎮ｈ�呬俊鎭�)")
- @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:remove')")
@Log(title = "璇煶浠诲姟", businessType = BusinessType.DELETE)
@GetMapping("/remove/{taskId}")
public AjaxResult removeTask(@PathVariable("taskId") String taskId) {
@@ -179,8 +179,6 @@
Long pid = null;
log.info("getScriptInfoByCondition鍏ュ弬涓猴細{}", serviceTaskScriptQues);
try {
-// tid = Long.valueOf(rsaPublicKeyExample.decryptedData(URLDecoder.decode(serviceTaskScriptQues.getParam1(), "UTF-8"), pri_key));
-// pid = Long.valueOf(rsaPublicKeyExample.decryptedData(URLDecoder.decode(serviceTaskScriptQues.getParam2(), "UTF-8"), pri_key));
tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam1(), pri_key));
pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam2(), pri_key));
} catch (Exception e) {
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 83db88a..6a48136 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鐭俊鍙傛暟鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsparam:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsparam:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SmsParam smsParam) {
startPage();
@@ -48,7 +48,7 @@
/**
* 瀵煎嚭鐭俊鍙傛暟鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsparam:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsparam:export')")
@Log(title = "鐭俊鍙傛暟", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SmsParam smsParam) {
@@ -60,7 +60,7 @@
/**
* 鑾峰彇鐭俊鍙傛暟璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsparam:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsparam:query')")
@GetMapping(value = "/{paramid}")
public AjaxResult getInfo(@PathVariable("paramid") Long paramid) {
return success(smsParamService.selectSmsParamByParamid(paramid));
@@ -69,7 +69,7 @@
/**
* 鏂板鐭俊鍙傛暟
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsparam:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsparam:add')")
@Log(title = "鐭俊鍙傛暟", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SmsParam smsParam) {
@@ -79,7 +79,7 @@
/**
* 淇敼鐭俊鍙傛暟
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsparam:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsparam:edit')")
@Log(title = "鐭俊鍙傛暟", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SmsParam smsParam) {
@@ -89,7 +89,7 @@
/**
* 鍒犻櫎鐭俊鍙傛暟
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsparam:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsparam:remove')")
@Log(title = "鐭俊鍙傛暟", businessType = BusinessType.DELETE)
@GetMapping("/remove/{paramids}")
public AjaxResult remove(@PathVariable Long[] paramids) {
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 b049f1e..2ec145d 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鐭俊璁板綍鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsrecords:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsrecords:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SmsRecords smsRecords) {
startPage();
@@ -48,7 +48,7 @@
/**
* 瀵煎嚭鐭俊璁板綍鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsrecords:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsrecords:export')")
@Log(title = "鐭俊璁板綍", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SmsRecords smsRecords) {
@@ -60,7 +60,7 @@
/**
* 鑾峰彇鐭俊璁板綍璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsrecords:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsrecords:query')")
@GetMapping(value = "/{recordid}")
public AjaxResult getInfo(@PathVariable("recordid") Long recordid) {
return success(smsRecordsService.selectSmsRecordsByRecordid(recordid));
@@ -69,7 +69,7 @@
/**
* 鏂板鐭俊璁板綍
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsrecords:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsrecords:add')")
@Log(title = "鐭俊璁板綍", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SmsRecords smsRecords) {
@@ -79,7 +79,7 @@
/**
* 淇敼鐭俊璁板綍
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsrecords:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsrecords:edit')")
@Log(title = "鐭俊璁板綍", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SmsRecords smsRecords) {
@@ -89,7 +89,7 @@
/**
* 鍒犻櫎鐭俊璁板綍
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsrecords:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsrecords:remove')")
@Log(title = "鐭俊璁板綍", businessType = BusinessType.DELETE)
@GetMapping("/remove/{recordids}")
public AjaxResult remove(@PathVariable Long[] recordids) {
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 ab0adff..fd3276f 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鐭俊妯℃澘鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:smstemplet:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smstemplet:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SmsTemplet smsTemplet)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭鐭俊妯℃澘鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:smstemplet:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smstemplet:export')")
@Log(title = "鐭俊妯℃澘", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SmsTemplet smsTemplet)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇鐭俊妯℃澘璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:smstemplet:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smstemplet:query')")
@GetMapping(value = "/{templetid}")
public AjaxResult getInfo(@PathVariable("templetid") Long templetid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板鐭俊妯℃澘
*/
- @PreAuthorize("@ss.hasPermi('smartor:smstemplet:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smstemplet:add')")
@Log(title = "鐭俊妯℃澘", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SmsTemplet smsTemplet)
@@ -83,7 +83,7 @@
/**
* 淇敼鐭俊妯℃澘
*/
- @PreAuthorize("@ss.hasPermi('smartor:smstemplet:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smstemplet:edit')")
@Log(title = "鐭俊妯℃澘", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SmsTemplet smsTemplet)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎鐭俊妯℃澘
*/
- @PreAuthorize("@ss.hasPermi('smartor:smstemplet:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smstemplet:remove')")
@Log(title = "鐭俊妯℃澘", businessType = BusinessType.DELETE)
@GetMapping("/remove/{templetids}")
public AjaxResult remove(@PathVariable Long[] 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 340cf00..54ce334 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ闂嵎鍒嗙被鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:svycategory:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svycategory:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyCategory svyCategory) {
// startPage();
@@ -48,7 +48,7 @@
/**
* 瀵煎嚭闂嵎鍒嗙被鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:svycategory:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svycategory:export')")
@Log(title = "闂嵎鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyCategory svyCategory) {
@@ -60,7 +60,7 @@
/**
* 鑾峰彇闂嵎鍒嗙被淇℃伅閫氳繃鍒嗙被鍚嶇О
*/
- // @PreAuthorize("@ss.hasPermi('smartor:svycategory:query')")
+ // //@PreAuthorize("@ss.hasPermi('smartor:svycategory:query')")
@ApiOperation("鑾峰彇闂嵎鍒嗙被璇︾粏淇℃伅锛堥棶鍗风被鍒級")
@PostMapping(value = "/getInfo")
public TableDataInfo getInfo(@RequestParam(required = false) String categoryname) {
@@ -70,7 +70,7 @@
/**
* 鏂板闂嵎鍒嗙被
*/
- @PreAuthorize("@ss.hasPermi('smartor:svycategory:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svycategory:add')")
@Log(title = "闂嵎鍒嗙被", businessType = BusinessType.INSERT)
@ApiOperation("鏂板闂嵎鍒嗙被")
@PostMapping("/add")
@@ -81,7 +81,7 @@
/**
* 鏂板闂嵎鍒嗙被鏍�
*/
- @PreAuthorize("@ss.hasPermi('system:assort:add')")
+ //@PreAuthorize("@ss.hasPermi('system:assort:add')")
@Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.INSERT)
@ApiOperation("鏂板闂嵎鍒嗙被鏍�")
@PostMapping("/addtree")
@@ -92,7 +92,7 @@
/**
* 淇敼闂嵎鍒嗙被
*/
- @PreAuthorize("@ss.hasPermi('smartor:svycategory:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svycategory:edit')")
@Log(title = "闂嵎鍒嗙被", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼闂嵎鍒嗙被")
@PostMapping("/edit")
@@ -103,7 +103,7 @@
/**
* 鍒犻櫎闂嵎鍒嗙被
*/
- @PreAuthorize("@ss.hasPermi('smartor:svycategory:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svycategory:remove')")
@Log(title = "闂嵎鍒嗙被", businessType = BusinessType.DELETE)
@ApiOperation("鍒犻櫎闂嵎鍒嗙被")
@GetMapping("/remove/{ids}")
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 34692af..f99a0aa 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ闂嵎鏈�缁堢粨鏋滃垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinish:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinish:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyFinish svyFinish)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭闂嵎鏈�缁堢粨鏋滃垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinish:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinish:export')")
@Log(title = "闂嵎鏈�缁堢粨鏋�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyFinish svyFinish)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇闂嵎鏈�缁堢粨鏋滆缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinish:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinish:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板闂嵎鏈�缁堢粨鏋�
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinish:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinish:add')")
@Log(title = "闂嵎鏈�缁堢粨鏋�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyFinish svyFinish)
@@ -83,7 +83,7 @@
/**
* 淇敼闂嵎鏈�缁堢粨鏋�
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinish:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinish:edit')")
@Log(title = "闂嵎鏈�缁堢粨鏋�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyFinish svyFinish)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎闂嵎鏈�缁堢粨鏋�
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinish:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinish:remove')")
@Log(title = "闂嵎鏈�缁堢粨鏋�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] 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 47ff503..f9fdf77 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyFinishoption svyFinishoption)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:export')")
@Log(title = "闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyFinishoption svyFinishoption)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:add')")
@Log(title = "闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyFinishoption svyFinishoption)
@@ -83,7 +83,7 @@
/**
* 淇敼闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:edit')")
@Log(title = "闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyFinishoption svyFinishoption)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:remove')")
@Log(title = "闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
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 3757fd9..51089a6 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ闂嵎璋冩煡缁撴灉璇︽儏鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyFinishtopic svyFinishtopic)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭闂嵎璋冩煡缁撴灉璇︽儏鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:export')")
@Log(title = "闂嵎璋冩煡缁撴灉璇︽儏", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyFinishtopic svyFinishtopic)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇闂嵎璋冩煡缁撴灉璇︽儏璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
/**
* 鏂板闂嵎璋冩煡缁撴灉璇︽儏
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:add')")
@Log(title = "闂嵎璋冩煡缁撴灉璇︽儏", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyFinishtopic svyFinishtopic)
@@ -83,7 +83,7 @@
/**
* 淇敼闂嵎璋冩煡缁撴灉璇︽儏
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:edit')")
@Log(title = "闂嵎璋冩煡缁撴灉璇︽儏", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyFinishtopic svyFinishtopic)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎闂嵎璋冩煡缁撴灉璇︽儏
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:remove')")
@Log(title = "闂嵎璋冩煡缁撴灉璇︽儏", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] 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 b49a8b8..d91ac64 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ闂嵎寮傚父鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyexception:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyexception:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyLibException svyLibException)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭闂嵎寮傚父鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyexception:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyexception:export')")
@Log(title = "闂嵎寮傚父", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyLibException svyLibException)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇闂嵎寮傚父璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyexception:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyexception:query')")
@GetMapping(value = "/{ecid}")
public AjaxResult getInfo(@PathVariable("ecid") Long ecid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板闂嵎寮傚父
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyexception:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyexception:add')")
@Log(title = "闂嵎寮傚父", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyLibException svyLibException)
@@ -83,7 +83,7 @@
/**
* 淇敼闂嵎寮傚父
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyexception:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyexception:edit')")
@Log(title = "闂嵎寮傚父", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibException svyLibException)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎闂嵎寮傚父
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyexception:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyexception:remove')")
@Log(title = "闂嵎寮傚父", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ecids}")
public AjaxResult remove(@PathVariable Long[] 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 f8f0330..262d2af 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
@@ -37,7 +37,7 @@
/**
* 鏌ヨ闂嵎缁撴灉鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyresult:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyresult:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyLibResult svyLibResult)
{
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭闂嵎缁撴灉鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyresult:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyresult:export')")
@Log(title = "闂嵎缁撴灉", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyLibResult svyLibResult)
@@ -62,7 +62,7 @@
/**
* 鑾峰彇闂嵎缁撴灉璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyresult:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyresult:query')")
@GetMapping(value = "/{resultid}")
public AjaxResult getInfo(@PathVariable("resultid") Long resultid)
{
@@ -72,7 +72,7 @@
/**
* 鏂板闂嵎缁撴灉
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyresult:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyresult:add')")
@Log(title = "闂嵎缁撴灉", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyLibResult svyLibResult)
@@ -83,7 +83,7 @@
/**
* 淇敼闂嵎缁撴灉
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyresult:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyresult:edit')")
@Log(title = "闂嵎缁撴灉", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibResult svyLibResult)
@@ -94,7 +94,7 @@
/**
* 鍒犻櫎闂嵎缁撴灉
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyresult:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyresult:remove')")
@Log(title = "闂嵎缁撴灉", businessType = BusinessType.DELETE)
@GetMapping("/remove/{resultids}")
public AjaxResult remove(@PathVariable Long[] 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 852fb13..76be8eb 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
@@ -37,7 +37,7 @@
* 鏌ヨ闂嵎棰樼洰鍒嗙被鍒楄〃
*/
@ApiOperation("鏌ヨ闂嵎棰樼洰鍒嗙被鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:category:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyLibScriptCategory svyLibScriptCategory) {
// startPage();
@@ -48,7 +48,7 @@
/**
* 瀵煎嚭闂嵎棰樼洰鍒嗙被鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:category:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:export')")
@Log(title = "闂嵎棰樼洰鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyLibScriptCategory svyLibScriptCategory) {
@@ -61,7 +61,7 @@
* 鑾峰彇闂嵎棰樼洰鍒嗙被璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇闂嵎棰樼洰鍒嗙被璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:category:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(svyLibScriptCategoryService.selectSvyLibScriptCategoryById(id));
@@ -70,7 +70,7 @@
// /**
// * 鏂板闂嵎棰樼洰鍒嗙被
// */
-// @PreAuthorize("@ss.hasPermi('smartor:category:add')")
+// //@PreAuthorize("@ss.hasPermi('smartor:category:add')")
// @Log(title = "闂嵎棰樼洰鍒嗙被", businessType = BusinessType.INSERT)
// @PostMapping("/add")
// public AjaxResult add(@RequestBody SvyLibScriptCategory svyLibScriptCategory) {
@@ -80,7 +80,7 @@
/**
* 淇敼闂嵎棰樼洰鍒嗙被
*/
- @PreAuthorize("@ss.hasPermi('smartor:category:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:edit')")
@Log(title = "闂嵎棰樼洰鍒嗙被", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibScriptCategory svyLibScriptCategory) {
@@ -91,7 +91,7 @@
* 鍒犻櫎闂嵎棰樼洰鍒嗙被
*/
@ApiOperation("鍒犻櫎闂嵎棰樼洰鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:category:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:remove')")
@Log(title = "闂嵎棰樼洰鍒嗙被", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable String ids) {
@@ -102,7 +102,7 @@
/**
* 闂嵎棰樼洰鍒嗙被鏍�
*/
- @PreAuthorize("@ss.hasPermi('smartor:assort:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:add')")
@Log(title = "闂嵎棰樼洰鍒嗙被鏍�", businessType = BusinessType.INSERT)
@ApiOperation("闂嵎棰樼洰鍒嗙被鏍�")
@PostMapping("/addtree")
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 b61aa07..fe89fee 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
@@ -42,7 +42,7 @@
* 鏌ヨ闂嵎棰樼洰鍒楄〃
*/
@ApiOperation("鏌ヨ闂嵎棰樼洰鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:svyScript:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyScript:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyLibScript svyLibScript) {
PageUtils.startPageByPost(svyLibScript.getPageNum(), svyLibScript.getPageSize());
@@ -53,7 +53,7 @@
/**
* 瀵煎嚭闂嵎棰樼洰鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:svyScript:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyScript:export')")
@Log(title = "闂嵎棰樼洰", businessType = BusinessType.EXPORT)
@ApiOperation("瀵煎嚭闂嵎棰樼洰鍒楄〃")
@PostMapping("/export")
@@ -67,7 +67,7 @@
// * 鑾峰彇闂嵎棰樼洰璇︾粏淇℃伅
// */
// @ApiOperation("鑾峰彇闂嵎棰樼洰璇︾粏淇℃伅")
-// @PreAuthorize("@ss.hasPermi('smartor:svyScript:query')")
+// //@PreAuthorize("@ss.hasPermi('smartor:svyScript:query')")
// @GetMapping(value = "/getInfo/{Scriptid}")
// public AjaxResult getInfo(@PathVariable("Scriptid") Long Scriptid) {
// return success(svyLibScriptService.selectSvyLibScriptByScriptid(Scriptid));
@@ -77,7 +77,7 @@
* 鏂板闂嵎棰樼洰
*/
@ApiOperation("鏂板闂嵎棰樼洰")
- @PreAuthorize("@ss.hasPermi('smartor:svyScript:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyScript:add')")
@Log(title = "闂嵎棰樼洰", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyLibScript svyLibScript) {
@@ -88,7 +88,7 @@
* 鏂板鎴栦慨鏀归棶鍗疯鎯呬俊鎭�
*/
@ApiOperation("鏂板鎴栦慨鏀归棶鍗疯鎯呬俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:script:list')")
+ //@PreAuthorize("@ss.hasPermi('system:script:list')")
@PostMapping("/saveOrUpdateScript")
public AjaxResult saveOrUpdateScript(@RequestBody SvyLibScript svyLibScript) {
if (ObjectUtils.isEmpty(svyLibScript)) {
@@ -101,7 +101,7 @@
* 淇敼闂嵎棰樼洰
*/
@ApiOperation("淇敼闂嵎棰樼洰")
- @PreAuthorize("@ss.hasPermi('smartor:svyScript:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyScript:edit')")
@Log(title = "闂嵎棰樼洰", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibScript svyLibScript) {
@@ -112,7 +112,7 @@
* 鍒犻櫎闂嵎棰樼洰
*/
@ApiOperation("鍒犻櫎闂嵎棰樼洰")
- @PreAuthorize("@ss.hasPermi('smartor:svyScript:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyScript:remove')")
@Log(title = "闂嵎棰樼洰", businessType = BusinessType.DELETE)
@GetMapping("/remove/{scriptids}")
public AjaxResult remove(@PathVariable Long[] scriptids) {
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 0e4a749..262fd74 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
@@ -35,7 +35,7 @@
/**
* 鏌ヨ闂嵎闂閫夐」鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:svytopicoption:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svytopicoption:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyLibScriptOption svyLibTopicoption)
{
@@ -47,7 +47,7 @@
/**
* 瀵煎嚭闂嵎闂閫夐」鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:svytopicoption:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svytopicoption:export')")
@Log(title = "闂嵎闂閫夐」", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyLibScriptOption svyLibTopicoption)
@@ -60,7 +60,7 @@
/**
* 鑾峰彇闂嵎闂閫夐」璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:svytopicoption:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svytopicoption:query')")
@GetMapping(value = "/{optionid}")
public AjaxResult getInfo(@PathVariable("optionid") Long optionid)
{
@@ -70,7 +70,7 @@
/**
* 鏂板闂嵎闂閫夐」
*/
- @PreAuthorize("@ss.hasPermi('smartor:svytopicoption:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svytopicoption:add')")
@Log(title = "闂嵎闂閫夐」", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyLibScriptOption svyLibTopicoption)
@@ -81,7 +81,7 @@
/**
* 淇敼闂嵎闂閫夐」
*/
- @PreAuthorize("@ss.hasPermi('smartor:svytopicoption:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svytopicoption:edit')")
@Log(title = "闂嵎闂閫夐」", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibScriptOption svyLibTopicoption)
@@ -92,7 +92,7 @@
/**
* 鍒犻櫎闂嵎闂閫夐」
*/
- @PreAuthorize("@ss.hasPermi('smartor:svytopicoption:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svytopicoption:remove')")
@Log(title = "闂嵎闂閫夐」", businessType = BusinessType.DELETE)
@GetMapping("/remove/{optionids}")
public AjaxResult remove(@PathVariable Long[] optionids)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptTagController.java
index b39f556..7e63d88 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptTagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptTagController.java
@@ -31,7 +31,7 @@
/**
* 鏌ヨ闂璇濇湳鏍囩搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:tag:list')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:list')")
@GetMapping("/list")
public TableDataInfo list(SvyLibScriptTag svyLibScriptTag)
{
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭闂璇濇湳鏍囩搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:tag:export')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:export')")
@Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyLibScriptTag svyLibScriptTag)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇闂璇濇湳鏍囩搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:tag:query')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -66,7 +66,7 @@
/**
* 鏂板闂璇濇湳鏍囩搴�
*/
- @PreAuthorize("@ss.hasPermi('system:tag:add')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:add')")
@Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SvyLibScriptTag svyLibScriptTag)
@@ -77,7 +77,7 @@
/**
* 淇敼闂璇濇湳鏍囩搴�
*/
- @PreAuthorize("@ss.hasPermi('system:tag:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SvyLibScriptTag svyLibScriptTag)
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎闂璇濇湳鏍囩搴�
*/
- @PreAuthorize("@ss.hasPermi('system:tag:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:remove')")
@Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
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 f306dad..ab3f474 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
@@ -35,7 +35,7 @@
* 鏌ヨ闂嵎妯℃澘鍒嗙被鍒楄〃
*/
@ApiOperation("鏌ヨ闂嵎妯℃澘鍒嗙被鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:category:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyLibTemplateCategory svyLibTemplateCategory) {
List<SvyLibTemplateCategoryVO> list = svyLibTemplateCategoryService.selectSvyLibTemplateCategoryList(svyLibTemplateCategory);
@@ -45,7 +45,7 @@
/**
* 瀵煎嚭闂嵎妯℃澘鍒嗙被鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:category:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:export')")
@Log(title = "闂嵎妯℃澘鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyLibTemplateCategory svyLibTemplateCategory) {
@@ -58,7 +58,7 @@
* 鑾峰彇闂嵎妯℃澘鍒嗙被璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇闂嵎妯℃澘鍒嗙被璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:category:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(svyLibTemplateCategoryService.selectSvyLibTemplateCategoryById(id));
@@ -68,7 +68,7 @@
// * 鏂板闂嵎妯℃澘鍒嗙被
// */
// @ApiOperation("鏂板闂嵎妯℃澘鍒嗙被")
-// @PreAuthorize("@ss.hasPermi('smartor:category:add')")
+// //@PreAuthorize("@ss.hasPermi('smartor:category:add')")
// @Log(Template = "闂嵎妯℃澘鍒嗙被", businessType = BusinessType.INSERT)
// @PostMapping("/add")
// public AjaxResult add(@RequestBody SvyLibTemplateCategory svyLibTemplateCategory) {
@@ -79,7 +79,7 @@
* 淇敼闂嵎妯℃澘鍒嗙被
*/
@ApiOperation("淇敼闂嵎妯℃澘鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:category:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:edit')")
@Log(title = "闂嵎妯℃澘鍒嗙被", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTemplateCategory svyLibTemplateCategory) {
@@ -90,7 +90,7 @@
* 鍒犻櫎闂嵎妯℃澘鍒嗙被
*/
@ApiOperation("鍒犻櫎闂嵎妯℃澘鍒嗙被")
- @PreAuthorize("@ss.hasPermi('smartor:category:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:category:remove')")
@Log(title = "闂嵎妯℃澘鍒嗙被", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -101,7 +101,7 @@
/**
* 闂嵎妯℃澘鍒嗙被鏍�
*/
- @PreAuthorize("@ss.hasPermi('smartor:assort:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:assort:add')")
@Log(title = "闂嵎妯℃澘鍒嗙被鏍�", businessType = BusinessType.INSERT)
@ApiOperation("闂嵎妯℃澘鍒嗙被鏍�")
@PostMapping("/addtree")
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 d6dd162..e23a3d9 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
@@ -77,7 +77,7 @@
// * 鑾峰彇闂嵎璇︾粏淇℃伅(鍗曡〃)
// */
// @ApiOperation("鑾峰彇闂嵎璇︾粏淇℃伅")
-// @PreAuthorize("@ss.hasPermi('smartor:svyTemplate:query')")
+// //@PreAuthorize("@ss.hasPermi('smartor:svyTemplate:query')")
// @GetMapping(value = "/{svyid}")
// public AjaxResult getInfo(@PathVariable("svyid") Long svyid) {
// return success(svyLibTemplateService.selectSvyLibTemplateBySvyid(svyid));
@@ -96,7 +96,7 @@
* 鏂板鎴栦慨鏀归棶鍗锋ā鏉夸俊鎭�
*/
@ApiOperation("鏂板鎴栦慨鏀归棶鍗锋ā鏉夸俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:script:list')")
+ //@PreAuthorize("@ss.hasPermi('system:script:list')")
@PostMapping("/saveOrUpdateTemplate")
public AjaxResult saveOrUpdateTemplate(@RequestBody SvyLibTemplateVO svyLibTemplateVO) {
if (ObjectUtils.isEmpty(svyLibTemplateVO)) {
@@ -109,7 +109,7 @@
* 淇敼闂嵎
*/
@ApiOperation("淇敼闂嵎")
- @PreAuthorize("@ss.hasPermi('smartor:svyTemplate:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyTemplate:edit')")
@Log(title = "闂嵎", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTemplate svyLibTemplate) {
@@ -120,7 +120,7 @@
* 鍒犻櫎闂嵎
*/
@ApiOperation("鍒犻櫎闂嵎")
- @PreAuthorize("@ss.hasPermi('smartor:svyTemplate:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyTemplate:remove')")
@Log(title = "闂嵎", businessType = BusinessType.DELETE)
@GetMapping("/remove/{svyids}")
public AjaxResult remove(@PathVariable Long[] svyids) {
@@ -131,7 +131,7 @@
* 鍙戦�佺煭淇�
*/
@ApiOperation("鍙戦�佺煭淇�")
- @PreAuthorize("@ss.hasPermi('smartor:svyTemplate:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyTemplate:remove')")
@Log(title = "闂嵎", businessType = BusinessType.DELETE)
@PostMapping("/sendMessage")
public AjaxResult sendMessage(@PathVariable Long[] svyids) {
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 430942d..c9ae014 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
@@ -31,7 +31,7 @@
/**
* 鏌ヨ妯℃澘闂嵎棰樼洰鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:script:list')")
+ //@PreAuthorize("@ss.hasPermi('system:script:list')")
@GetMapping("/list")
public TableDataInfo list(SvyLibTemplateScript svyLibTemplateScript)
{
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭妯℃澘闂嵎棰樼洰鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:script:export')")
+ //@PreAuthorize("@ss.hasPermi('system:script:export')")
@Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyLibTemplateScript svyLibTemplateScript)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇妯℃澘闂嵎棰樼洰璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:script:query')")
+ //@PreAuthorize("@ss.hasPermi('system:script:query')")
@GetMapping(value = "/{topicid}")
public AjaxResult getInfo(@PathVariable("topicid") Long topicid)
{
@@ -66,7 +66,7 @@
/**
* 鏂板妯℃澘闂嵎棰樼洰
*/
- @PreAuthorize("@ss.hasPermi('system:script:add')")
+ //@PreAuthorize("@ss.hasPermi('system:script:add')")
@Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SvyLibTemplateScript svyLibTemplateScript)
@@ -77,7 +77,7 @@
/**
* 淇敼妯℃澘闂嵎棰樼洰
*/
- @PreAuthorize("@ss.hasPermi('system:script:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:script:edit')")
@Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SvyLibTemplateScript svyLibTemplateScript)
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎妯℃澘闂嵎棰樼洰
*/
- @PreAuthorize("@ss.hasPermi('system:script:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:script:remove')")
@Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.DELETE)
@DeleteMapping("/{topicids}")
public AjaxResult remove(@PathVariable Long[] topicids)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptWjxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptWjxController.java
index 05c539f..ced0bdf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptWjxController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptWjxController.java
@@ -31,7 +31,7 @@
/**
* 鏌ヨ妯℃澘闂嵎棰樼洰鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:list')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:list')")
@GetMapping("/list")
public TableDataInfo list(SvyLibTemplateScriptWjx svyLibTemplateScriptWjx)
{
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭妯℃澘闂嵎棰樼洰鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:export')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:export')")
@Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyLibTemplateScriptWjx svyLibTemplateScriptWjx)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇妯℃澘闂嵎棰樼洰璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:query')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -66,7 +66,7 @@
/**
* 鏂板妯℃澘闂嵎棰樼洰
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:add')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:add')")
@Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SvyLibTemplateScriptWjx svyLibTemplateScriptWjx)
@@ -77,7 +77,7 @@
/**
* 淇敼妯℃澘闂嵎棰樼洰
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:edit')")
@Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SvyLibTemplateScriptWjx svyLibTemplateScriptWjx)
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎妯℃澘闂嵎棰樼洰
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:remove')")
@Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTagController.java
index 352a17a..c94491a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTagController.java
@@ -31,7 +31,7 @@
/**
* 鏌ヨ妯℃澘鏍囩鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:tag:list')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:list')")
@GetMapping("/list")
public TableDataInfo list(SvyLibTemplateTag svyLibTemplateTag)
{
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭妯℃澘鏍囩鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:tag:export')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:export')")
@Log(title = "妯℃澘鏍囩", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyLibTemplateTag svyLibTemplateTag)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇妯℃澘鏍囩璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:tag:query')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -66,7 +66,7 @@
/**
* 鏂板妯℃澘鏍囩
*/
- @PreAuthorize("@ss.hasPermi('system:tag:add')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:add')")
@Log(title = "妯℃澘鏍囩", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SvyLibTemplateTag svyLibTemplateTag)
@@ -77,7 +77,7 @@
/**
* 淇敼妯℃澘鏍囩
*/
- @PreAuthorize("@ss.hasPermi('system:tag:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "妯℃澘鏍囩", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SvyLibTemplateTag svyLibTemplateTag)
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎妯℃澘鏍囩
*/
- @PreAuthorize("@ss.hasPermi('system:tag:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:tag:remove')")
@Log(title = "妯℃澘鏍囩", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
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 96c425e..53787f4 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
@@ -31,7 +31,7 @@
/**
* 鏌ヨ闂嵎闂鎸囨爣閫夐」搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:list')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:list')")
@GetMapping("/list")
public TableDataInfo list(SvyLibTemplateTargetoption svyLibTemplateTargetoption)
{
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭闂嵎闂鎸囨爣閫夐」搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:export')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:export')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyLibTemplateTargetoption svyLibTemplateTargetoption)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇闂嵎闂鎸囨爣閫夐」搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:query')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -66,7 +66,7 @@
/**
* 鏂板闂嵎闂鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:add')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:add')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SvyLibTemplateTargetoption svyLibTemplateTargetoption)
@@ -77,7 +77,7 @@
/**
* 淇敼闂嵎闂鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SvyLibTemplateTargetoption svyLibTemplateTargetoption)
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎闂嵎闂鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] 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 a9f4cfc..19bd1fd 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
@@ -31,7 +31,7 @@
/**
* 鏌ヨ闂嵎闂鎸囨爣閫夐」搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:list')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:list')")
@GetMapping("/list")
public TableDataInfo list(SvyLibTemplateTargetoptionWjx svyLibTemplateTargetoptionWjx)
{
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭闂嵎闂鎸囨爣閫夐」搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:export')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:export')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyLibTemplateTargetoptionWjx svyLibTemplateTargetoptionWjx)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇闂嵎闂鎸囨爣閫夐」搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:query')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -66,7 +66,7 @@
/**
* 鏂板闂嵎闂鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:add')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:add')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SvyLibTemplateTargetoptionWjx svyLibTemplateTargetoptionWjx)
@@ -77,7 +77,7 @@
/**
* 淇敼闂嵎闂鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:edit')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SvyLibTemplateTargetoptionWjx svyLibTemplateTargetoptionWjx)
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎闂嵎闂鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:remove')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateWjxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateWjxController.java
index 2b38fc0..c3154a6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateWjxController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateWjxController.java
@@ -31,7 +31,7 @@
/**
* 鏌ヨ妯℃澘闂嵎鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:list')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:list')")
@GetMapping("/list")
public TableDataInfo list(SvyLibTemplateWjx svyLibTemplateWjx)
{
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭妯℃澘闂嵎鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:export')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:export')")
@Log(title = "妯℃澘闂嵎", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyLibTemplateWjx svyLibTemplateWjx)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇妯℃澘闂嵎璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:query')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:query')")
@GetMapping(value = "/{svyid}")
public AjaxResult getInfo(@PathVariable("svyid") Long svyid)
{
@@ -66,7 +66,7 @@
/**
* 鏂板妯℃澘闂嵎
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:add')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:add')")
@Log(title = "妯℃澘闂嵎", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SvyLibTemplateWjx svyLibTemplateWjx)
@@ -77,7 +77,7 @@
/**
* 淇敼妯℃澘闂嵎
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:edit')")
@Log(title = "妯℃澘闂嵎", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SvyLibTemplateWjx svyLibTemplateWjx)
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎妯℃澘闂嵎
*/
- @PreAuthorize("@ss.hasPermi('system:wjx:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:wjx:remove')")
@Log(title = "妯℃澘闂嵎", businessType = BusinessType.DELETE)
@DeleteMapping("/{svyids}")
public AjaxResult remove(@PathVariable Long[] svyids)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskAnswerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskAnswerController.java
index d37af2a..82625f4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskAnswerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskAnswerController.java
@@ -30,7 +30,7 @@
/**
* 鏌ヨ浠诲姟闂嵎闂閫夐」鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:answer:list')")
+ //@PreAuthorize("@ss.hasPermi('system:answer:list')")
@GetMapping("/list")
public TableDataInfo list(SvyTaskAnswer svyTaskAnswer) {
startPage();
@@ -41,7 +41,7 @@
/**
* 瀵煎嚭浠诲姟闂嵎闂閫夐」鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:answer:export')")
+ //@PreAuthorize("@ss.hasPermi('system:answer:export')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyTaskAnswer svyTaskAnswer) {
@@ -53,7 +53,7 @@
/**
* 鑾峰彇浠诲姟闂嵎闂閫夐」璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:answer:query')")
+ //@PreAuthorize("@ss.hasPermi('system:answer:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(svyTaskAnswerService.selectSvyTaskAnswerById(id));
@@ -62,7 +62,7 @@
/**
* 鏂板浠诲姟闂嵎闂閫夐」
*/
- @PreAuthorize("@ss.hasPermi('system:answer:add')")
+ //@PreAuthorize("@ss.hasPermi('system:answer:add')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SvyTaskAnswer svyTaskAnswer) {
@@ -72,7 +72,7 @@
/**
* 淇敼浠诲姟闂嵎闂閫夐」
*/
- @PreAuthorize("@ss.hasPermi('system:answer:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:answer:edit')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SvyTaskAnswer svyTaskAnswer) {
@@ -82,7 +82,7 @@
/**
* 鍒犻櫎浠诲姟闂嵎闂閫夐」
*/
- @PreAuthorize("@ss.hasPermi('system:answer:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:answer:remove')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 d7e5ec9..26729e4 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
@@ -59,7 +59,7 @@
* 鏌ヨ闂嵎浠诲姟锛堜换鍔★級鍒楄〃
*/
@ApiOperation("鏌ヨ闂嵎浠诲姟锛堜换鍔★級鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:task:list')")
+ //@PreAuthorize("@ss.hasPermi('system:task:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyTask svyTask) {
PageUtils.startPageByPost(svyTask.getPageNum(), svyTask.getPageSize());
@@ -101,7 +101,7 @@
* 瀵煎嚭闂嵎浠诲姟锛堜换鍔★級鍒楄〃
*/
@ApiOperation("瀵煎嚭闂嵎浠诲姟锛堜换鍔★級鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:task:export')")
+ //@PreAuthorize("@ss.hasPermi('system:task:export')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyTask svyTask) {
@@ -114,7 +114,7 @@
* 鑾峰彇闂嵎浠诲姟锛堜换鍔★級璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇闂嵎浠诲姟锛堜换鍔★級璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:task:query')")
+ //@PreAuthorize("@ss.hasPermi('system:task:query')")
@GetMapping(value = "/{taskid}")
public AjaxResult getInfo(@PathVariable("taskid") Long taskid) {
return success(svyTaskService.selectSvyTaskByTaskid(taskid));
@@ -124,7 +124,7 @@
* 鏂板闂嵎浠诲姟锛堜换鍔★級
*/
@ApiOperation("鏂板闂嵎浠诲姟锛堜换鍔★級")
- @PreAuthorize("@ss.hasPermi('system:task:add')")
+ //@PreAuthorize("@ss.hasPermi('system:task:add')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyTask svyTask) {
@@ -135,7 +135,7 @@
* 淇敼闂嵎浠诲姟锛堜换鍔★級
*/
@ApiOperation("淇敼闂嵎浠诲姟锛堜换鍔★級")
- @PreAuthorize("@ss.hasPermi('system:task:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:task:edit')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTask svyTask) {
@@ -146,7 +146,7 @@
* 鍒犻櫎闂嵎浠诲姟锛堜换鍔★級
*/
@ApiOperation("鍒犻櫎闂嵎浠诲姟锛堜换鍔★級")
- @PreAuthorize("@ss.hasPermi('system:task:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:task:remove')")
@Log(title = "闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.DELETE)
@GetMapping("/{taskids}")
public AjaxResult remove(@PathVariable Long[] taskids) {
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 d38671d..a7635bc 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
@@ -34,7 +34,7 @@
* 鏌ヨ浠诲姟闂嵎棰樼洰鍒楄〃
*/
@ApiOperation("鏌ヨ浠诲姟闂嵎棰樼洰鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:script:list')")
+ //@PreAuthorize("@ss.hasPermi('system:script:list')")
@GetMapping("/list")
public TableDataInfo list(SvyTaskScript svyTaskScript) {
startPage();
@@ -46,7 +46,7 @@
* 瀵煎嚭浠诲姟闂嵎棰樼洰鍒楄〃
*/
@ApiOperation("瀵煎嚭浠诲姟闂嵎棰樼洰鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:script:export')")
+ //@PreAuthorize("@ss.hasPermi('system:script:export')")
@Log(title = "浠诲姟闂嵎棰樼洰", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyTaskScript svyTaskScript) {
@@ -59,7 +59,7 @@
* 鑾峰彇浠诲姟闂嵎棰樼洰璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇浠诲姟闂嵎棰樼洰璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:script:query')")
+ //@PreAuthorize("@ss.hasPermi('system:script:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(svyTaskScriptService.selectSvyTaskScriptById(id));
@@ -69,7 +69,7 @@
* 鏂板浠诲姟闂嵎棰樼洰
*/
@ApiOperation("鏂板浠诲姟闂嵎棰樼洰")
- @PreAuthorize("@ss.hasPermi('system:script:add')")
+ //@PreAuthorize("@ss.hasPermi('system:script:add')")
@Log(title = "浠诲姟闂嵎棰樼洰", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyTaskScript svyTaskScript) {
@@ -80,7 +80,7 @@
* 淇敼浠诲姟闂嵎棰樼洰
*/
@ApiOperation("淇敼浠诲姟闂嵎棰樼洰")
- @PreAuthorize("@ss.hasPermi('system:script:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:script:edit')")
@Log(title = "浠诲姟闂嵎棰樼洰", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTaskScript svyTaskScript) {
@@ -91,7 +91,7 @@
* 鍒犻櫎浠诲姟闂嵎棰樼洰
*/
@ApiOperation("瀵煎嚭缁煎悎闂嵎浠诲姟锛堜换鍔★級鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:script:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:script:remove')")
@Log(title = "浠诲姟闂嵎棰樼洰", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptoptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptoptionController.java
index 151ab2d..a5838fb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptoptionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptoptionController.java
@@ -31,7 +31,7 @@
/**
* 鏌ヨ浠诲姟闂嵎闂閫夐」鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:scriptoption:list')")
+ //@PreAuthorize("@ss.hasPermi('system:scriptoption:list')")
@GetMapping("/list")
public TableDataInfo list(SvyTaskScriptoption svyTaskScriptoption)
{
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭浠诲姟闂嵎闂閫夐」鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:scriptoption:export')")
+ //@PreAuthorize("@ss.hasPermi('system:scriptoption:export')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyTaskScriptoption svyTaskScriptoption)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇浠诲姟闂嵎闂閫夐」璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:scriptoption:query')")
+ //@PreAuthorize("@ss.hasPermi('system:scriptoption:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -66,7 +66,7 @@
/**
* 鏂板浠诲姟闂嵎闂閫夐」
*/
- @PreAuthorize("@ss.hasPermi('system:scriptoption:add')")
+ //@PreAuthorize("@ss.hasPermi('system:scriptoption:add')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SvyTaskScriptoption svyTaskScriptoption)
@@ -77,7 +77,7 @@
/**
* 淇敼浠诲姟闂嵎闂閫夐」
*/
- @PreAuthorize("@ss.hasPermi('system:scriptoption:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:scriptoption:edit')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SvyTaskScriptoption svyTaskScriptoption)
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎浠诲姟闂嵎闂閫夐」
*/
- @PreAuthorize("@ss.hasPermi('system:scriptoption:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:scriptoption:remove')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
index 639975c..389e702 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
@@ -37,7 +37,7 @@
* 鏂板鎴栦慨鏀瑰垹闄ら棶鍗蜂换鍔�
*/
@ApiOperation("鏂板鎴栦慨鏀瑰垹闄ら棶鍗蜂换鍔�")
- @PreAuthorize("@ss.hasPermi('system:task:add')")
+ //@PreAuthorize("@ss.hasPermi('system:task:add')")
@PostMapping("/insertOrUpdateSvyTask")
public AjaxResult insertOrUpdateSvyTask(@RequestBody SvyTaskVO svyTaskVO) {
LoginUser loginUser = getLoginUser();
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 87ac99b..5fa9be2 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
@@ -35,7 +35,7 @@
/**
* 鏌ヨ浠诲姟闂嵎妯℃澘鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:template:list')")
+ //@PreAuthorize("@ss.hasPermi('system:template:list')")
@ApiOperation("鏌ヨ浠诲姟闂嵎妯℃澘鍒楄〃")
@GetMapping("/list")
public TableDataInfo list(SvyTaskTemplate svyTaskTemplate) {
@@ -48,7 +48,7 @@
* 瀵煎嚭浠诲姟闂嵎妯℃澘鍒楄〃
*/
@ApiOperation("瀵煎嚭浠诲姟闂嵎妯℃澘鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:template:export')")
+ //@PreAuthorize("@ss.hasPermi('system:template:export')")
@Log(title = "浠诲姟闂嵎妯℃澘", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyTaskTemplate svyTaskTemplate) {
@@ -61,7 +61,7 @@
* 鑾峰彇浠诲姟闂嵎妯℃澘璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇浠诲姟闂嵎妯℃澘璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:template:query')")
+ //@PreAuthorize("@ss.hasPermi('system:template:query')")
@GetMapping(value = "/{svyid}")
public AjaxResult getInfo(@PathVariable("svyid") Long svyid) {
return success(svyTaskTemplateService.selectSvyTaskTemplateBySvyid(svyid));
@@ -71,7 +71,7 @@
* 鏂板浠诲姟闂嵎妯℃澘
*/
@ApiOperation("鏂板浠诲姟闂嵎妯℃澘")
- @PreAuthorize("@ss.hasPermi('system:template:add')")
+ //@PreAuthorize("@ss.hasPermi('system:template:add')")
@Log(title = "浠诲姟闂嵎妯℃澘", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SvyTaskTemplate svyTaskTemplate) {
@@ -82,7 +82,7 @@
* 淇敼浠诲姟闂嵎妯℃澘
*/
@ApiOperation("淇敼浠诲姟闂嵎妯℃澘")
- @PreAuthorize("@ss.hasPermi('system:template:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:template:edit')")
@Log(title = "浠诲姟闂嵎妯℃澘", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTaskTemplate svyTaskTemplate) {
@@ -93,7 +93,7 @@
* 鍒犻櫎浠诲姟闂嵎妯℃澘
*/
@ApiOperation("鍒犻櫎浠诲姟闂嵎妯℃澘")
- @PreAuthorize("@ss.hasPermi('system:template:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:template:remove')")
@Log(title = "浠诲姟闂嵎妯℃澘", businessType = BusinessType.DELETE)
@GetMapping("/remove/{svyids}")
public AjaxResult remove(@PathVariable Long[] svyids) {
@@ -103,7 +103,7 @@
/**
* 鏂板鎴栦慨鏀归殢璁夸换鍔￠棶鍗锋ā鏉垮簱
*/
- @PreAuthorize("@ss.hasPermi('system:template:add')")
+ //@PreAuthorize("@ss.hasPermi('system:template:add')")
@ApiOperation("鏂板鎴栦慨鏀归殢璁夸换鍔￠棶鍗锋ā鏉垮簱")
@PostMapping("/saveOrUpdateTaskTemp")
public AjaxResult saveOrUpdateTaskTemp(@RequestBody SvyTaskTemplateVO svyTaskTemplateVO) {
@@ -116,7 +116,7 @@
* @param svyTaskTemplateVO
* @return
*/
- @PreAuthorize("@ss.hasPermi('system:template:add')")
+ //@PreAuthorize("@ss.hasPermi('system:template:add')")
@ApiOperation("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢")
@PostMapping("/selectInfoByCondition")
public AjaxResult selectInfoByCondition(@RequestBody SvyTaskTemplateVO 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 e8e1da3..85a3c5b 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
@@ -31,7 +31,7 @@
/**
* 鏌ヨ闂嵎浠诲姟妯＄増闂璇濇湳搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:script:list')")
+ //@PreAuthorize("@ss.hasPermi('system:script:list')")
@GetMapping("/list")
public TableDataInfo list(SvyTaskTemplateScript svyTaskTemplateScript)
{
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭闂嵎浠诲姟妯＄増闂璇濇湳搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:script:export')")
+ //@PreAuthorize("@ss.hasPermi('system:script:export')")
@Log(title = "闂嵎浠诲姟妯＄増闂璇濇湳搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyTaskTemplateScript svyTaskTemplateScript)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇闂嵎浠诲姟妯＄増闂璇濇湳搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:script:query')")
+ //@PreAuthorize("@ss.hasPermi('system:script:query')")
@GetMapping(value = "/{ID}")
public AjaxResult getInfo(@PathVariable("ID") Long ID)
{
@@ -66,7 +66,7 @@
/**
* 鏂板闂嵎浠诲姟妯＄増闂璇濇湳搴�
*/
- @PreAuthorize("@ss.hasPermi('system:script:add')")
+ //@PreAuthorize("@ss.hasPermi('system:script:add')")
@Log(title = "闂嵎浠诲姟妯＄増闂璇濇湳搴�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SvyTaskTemplateScript svyTaskTemplateScript)
@@ -77,7 +77,7 @@
/**
* 淇敼闂嵎浠诲姟妯＄増闂璇濇湳搴�
*/
- @PreAuthorize("@ss.hasPermi('system:script:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:script:edit')")
@Log(title = "闂嵎浠诲姟妯＄増闂璇濇湳搴�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SvyTaskTemplateScript svyTaskTemplateScript)
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎闂嵎浠诲姟妯＄増闂璇濇湳搴�
*/
- @PreAuthorize("@ss.hasPermi('system:script:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:script:remove')")
@Log(title = "闂嵎浠诲姟妯＄増闂璇濇湳搴�", businessType = BusinessType.DELETE)
@DeleteMapping("/{IDs}")
public AjaxResult remove(@PathVariable Long[] IDs)
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 78d8d0c..aa10dd8 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
@@ -30,7 +30,7 @@
/**
* 鏌ヨ闂嵎浠诲姟妯℃澘鎸囨爣閫夐」搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:list')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:list')")
@GetMapping("/list")
public TableDataInfo list(SvyTaskTemplateTargetoption svyTaskTemplateTargetoption) {
startPage();
@@ -41,7 +41,7 @@
/**
* 瀵煎嚭闂嵎浠诲姟妯℃澘鎸囨爣閫夐」搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:export')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:export')")
@Log(title = "闂嵎浠诲姟妯℃澘鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyTaskTemplateTargetoption svyTaskTemplateTargetoption) {
@@ -53,7 +53,7 @@
/**
* 鑾峰彇闂嵎浠诲姟妯℃澘鎸囨爣閫夐」搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:query')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(svyTaskTemplateTargetoptionService.selectSvyTaskTemplateTargetoptionById(id));
@@ -62,7 +62,7 @@
/**
* 鏂板闂嵎浠诲姟妯℃澘鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:add')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:add')")
@Log(title = "闂嵎浠诲姟妯℃澘鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SvyTaskTemplateTargetoption svyTaskTemplateTargetoption) {
@@ -72,7 +72,7 @@
/**
* 淇敼闂嵎浠诲姟妯℃澘鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
@Log(title = "闂嵎浠诲姟妯℃澘鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SvyTaskTemplateTargetoption svyTaskTemplateTargetoption) {
@@ -82,7 +82,7 @@
/**
* 鍒犻櫎闂嵎浠诲姟妯℃澘鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
@Log(title = "闂嵎浠诲姟妯℃澘鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
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 8689c8b..a59d760 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
@@ -39,7 +39,7 @@
/**
* 鏌ヨ棰樼洰鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:topic:list')")
+ //@PreAuthorize("@ss.hasPermi('system:topic:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyTopic svyTopic) {
startPage();
@@ -50,7 +50,7 @@
/**
* 瀵煎嚭棰樼洰鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:topic:export')")
+ //@PreAuthorize("@ss.hasPermi('system:topic:export')")
@Log(title = "棰樼洰", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyTopic svyTopic) {
@@ -62,7 +62,7 @@
/**
* 鑾峰彇棰樼洰璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:topic:query')")
+ //@PreAuthorize("@ss.hasPermi('system:topic:query')")
@GetMapping(value = "/{topicid}")
public AjaxResult getInfo(@PathVariable("topicid") Long topicid) {
return success(svyTopicService.selectSvyTopicByTopicid(topicid));
@@ -71,7 +71,7 @@
/**
* 鏂板棰樼洰
*/
- @PreAuthorize("@ss.hasPermi('system:topic:add')")
+ //@PreAuthorize("@ss.hasPermi('system:topic:add')")
@Log(title = "棰樼洰", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyTopic svyTopic) {
@@ -81,7 +81,7 @@
/**
* 淇敼棰樼洰
*/
- @PreAuthorize("@ss.hasPermi('system:topic:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:topic:edit')")
@Log(title = "棰樼洰", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTopic svyTopic) {
@@ -91,7 +91,7 @@
/**
* 鍒犻櫎棰樼洰
*/
- @PreAuthorize("@ss.hasPermi('system:topic:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:topic:remove')")
@Log(title = "棰樼洰", businessType = BusinessType.DELETE)
@GetMapping("/remove/{topicids}")
public AjaxResult remove(@PathVariable Long[] topicids) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TempDetpRelevanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TempDetpRelevanceController.java
index 43719df..5ea77dc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TempDetpRelevanceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TempDetpRelevanceController.java
@@ -31,7 +31,7 @@
/**
* 鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:relevance:list')")
+ //@PreAuthorize("@ss.hasPermi('system:relevance:list')")
@GetMapping("/list")
public TableDataInfo list(TempDetpRelevance tempDetpRelevance)
{
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭妯℃澘绉戝鍏宠仈鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:relevance:export')")
+ //@PreAuthorize("@ss.hasPermi('system:relevance:export')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, TempDetpRelevance tempDetpRelevance)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇妯℃澘绉戝鍏宠仈璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:relevance:query')")
+ //@PreAuthorize("@ss.hasPermi('system:relevance:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -66,7 +66,7 @@
/**
* 鏂板妯℃澘绉戝鍏宠仈
*/
- @PreAuthorize("@ss.hasPermi('system:relevance:add')")
+ //@PreAuthorize("@ss.hasPermi('system:relevance:add')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TempDetpRelevance tempDetpRelevance)
@@ -77,7 +77,7 @@
/**
* 淇敼妯℃澘绉戝鍏宠仈
*/
- @PreAuthorize("@ss.hasPermi('system:relevance:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:relevance:edit')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TempDetpRelevance tempDetpRelevance)
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎妯℃澘绉戝鍏宠仈
*/
- @PreAuthorize("@ss.hasPermi('system:relevance:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:relevance:remove')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
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 be8106a..d419716 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
@@ -38,7 +38,7 @@
/**
* 鏌ヨ鐭俊璐﹀彿鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsaccount:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsaccount:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody BaseSmsaccount baseSmsaccount) {
startPage();
@@ -49,7 +49,7 @@
/**
* 瀵煎嚭鐭俊璐﹀彿鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsaccount:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsaccount:export')")
@Log(title = "鐭俊璐﹀彿", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseSmsaccount baseSmsaccount) {
@@ -61,7 +61,7 @@
/**
* 鑾峰彇鐭俊璐﹀彿璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsaccount:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsaccount:query')")
@GetMapping(value = "/{smsacountid}")
public AjaxResult getInfo(@PathVariable("smsacountid") Long smsacountid) {
return success(baseSmsaccountService.selectBaseSmsaccountBySmsacountid(smsacountid));
@@ -70,7 +70,7 @@
/**
* 鏂板鐭俊璐﹀彿
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsaccount:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsaccount:add')")
@Log(title = "鐭俊璐﹀彿", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BaseSmsaccount baseSmsaccount) {
@@ -80,7 +80,7 @@
/**
* 淇敼鐭俊璐﹀彿
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsaccount:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsaccount:edit')")
@Log(title = "鐭俊璐﹀彿", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseSmsaccount baseSmsaccount) {
@@ -90,7 +90,7 @@
/**
* 鍒犻櫎鐭俊璐﹀彿
*/
- @PreAuthorize("@ss.hasPermi('smartor:smsaccount:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:smsaccount:remove')")
@Log(title = "鐭俊璐﹀彿", businessType = BusinessType.DELETE)
@GetMapping("/remove/{smsacountids}")
public AjaxResult remove(@PathVariable Long[] smsacountids) {
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 febed7a..d24f5ee 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
@@ -38,7 +38,7 @@
/**
* 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:config:list')")
+ //@PreAuthorize("@ss.hasPermi('system:config:list')")
@GetMapping("/list")
public TableDataInfo list(SysConfig config)
{
@@ -48,7 +48,7 @@
}
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:config:export')")
+ //@PreAuthorize("@ss.hasPermi('system:config:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, SysConfig config)
{
@@ -60,7 +60,7 @@
/**
* 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:config:query')")
+ //@PreAuthorize("@ss.hasPermi('system:config:query')")
@GetMapping(value = "/{configId}")
public AjaxResult getInfo(@PathVariable Long configId)
{
@@ -79,7 +79,7 @@
/**
* 鏂板鍙傛暟閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('system:config:add')")
+ //@PreAuthorize("@ss.hasPermi('system:config:add')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysConfig config)
@@ -95,7 +95,7 @@
/**
* 淇敼鍙傛暟閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('system:config:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:config:edit')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysConfig config)
@@ -111,7 +111,7 @@
/**
* 鍒犻櫎鍙傛暟閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('system:config:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:config:remove')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{configIds}")
public AjaxResult remove(@PathVariable Long[] configIds)
@@ -123,7 +123,7 @@
/**
* 鍒锋柊鍙傛暟缂撳瓨
*/
- @PreAuthorize("@ss.hasPermi('system:config:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:config:remove')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.CLEAN)
@GetMapping("/refreshCache")
public AjaxResult refreshCache()
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 677e095..5bfc05a 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
@@ -42,7 +42,7 @@
* 鑾峰彇閮ㄩ棬鍒楄〃
*/
@ApiOperation("鑾峰彇閮ㄩ棬鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:dept:list')")
+ //@PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list")
public AjaxResult list(SysDept dept)
{
@@ -54,7 +54,7 @@
* 鏌ヨ閮ㄩ棬鍒楄〃锛堟帓闄よ妭鐐癸級
*/
@ApiOperation("鏌ヨ閮ㄩ棬鍒楄〃锛堟帓闄よ妭鐐癸級")
- @PreAuthorize("@ss.hasPermi('system:dept:list')")
+ //@PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list/exclude/{deptId}")
public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
{
@@ -67,7 +67,7 @@
* 鏍规嵁閮ㄩ棬缂栧彿鑾峰彇璇︾粏淇℃伅
*/
@ApiOperation("鏍规嵁閮ㄩ棬缂栧彿鑾峰彇璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:dept:query')")
+ //@PreAuthorize("@ss.hasPermi('system:dept:query')")
@GetMapping("/getInfo/{deptId}")
public AjaxResult getInfo(@PathVariable Long deptId)
{
@@ -79,7 +79,7 @@
* 鏂板閮ㄩ棬
*/
@ApiOperation("鏂板閮ㄩ棬")
- @PreAuthorize("@ss.hasPermi('system:dept:add')")
+ //@PreAuthorize("@ss.hasPermi('system:dept:add')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysDept dept)
@@ -96,7 +96,7 @@
* 淇敼閮ㄩ棬
*/
@ApiOperation("淇敼閮ㄩ棬")
- @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:dept:edit')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysDept dept)
@@ -123,7 +123,7 @@
* 鍒犻櫎閮ㄩ棬
*/
@ApiOperation("鍒犻櫎閮ㄩ棬")
- @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:dept:remove')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{deptId}")
public AjaxResult remove(@PathVariable Long deptId)
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 29acb76..6b8e744 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
@@ -40,7 +40,7 @@
@Autowired
private ISysDictTypeService dictTypeService;
- @PreAuthorize("@ss.hasPermi('system:dict:list')")
+ //@PreAuthorize("@ss.hasPermi('system:dict:list')")
@GetMapping("/list")
public TableDataInfo list(SysDictData dictData)
{
@@ -50,7 +50,7 @@
}
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:dict:export')")
+ //@PreAuthorize("@ss.hasPermi('system:dict:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, SysDictData dictData)
{
@@ -62,7 +62,7 @@
/**
* 鏌ヨ瀛楀吀鏁版嵁璇︾粏
*/
- @PreAuthorize("@ss.hasPermi('system:dict:query')")
+ //@PreAuthorize("@ss.hasPermi('system:dict:query')")
@GetMapping(value = "/{dictCode}")
public AjaxResult getInfo(@PathVariable Long dictCode)
{
@@ -86,7 +86,7 @@
/**
* 鏂板瀛楀吀绫诲瀷
*/
- @PreAuthorize("@ss.hasPermi('system:dict:add')")
+ //@PreAuthorize("@ss.hasPermi('system:dict:add')")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysDictData dict)
@@ -98,7 +98,7 @@
/**
* 淇敼淇濆瓨瀛楀吀绫诲瀷
*/
- @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:dict:edit')")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysDictData dict)
@@ -110,7 +110,7 @@
/**
* 鍒犻櫎瀛楀吀绫诲瀷
*/
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:dict:remove')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@GetMapping("/remove/{dictCodes}")
public AjaxResult remove(@PathVariable Long[] dictCodes)
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 07bf575..67c2ba9 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
@@ -35,7 +35,7 @@
@Autowired
private ISysDictTypeService dictTypeService;
- @PreAuthorize("@ss.hasPermi('system:dict:list')")
+ //@PreAuthorize("@ss.hasPermi('system:dict:list')")
@GetMapping("/list")
public TableDataInfo list(SysDictType dictType)
{
@@ -45,7 +45,7 @@
}
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:dict:export')")
+ //@PreAuthorize("@ss.hasPermi('system:dict:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, SysDictType dictType)
{
@@ -57,7 +57,7 @@
/**
* 鏌ヨ瀛楀吀绫诲瀷璇︾粏
*/
- @PreAuthorize("@ss.hasPermi('system:dict:query')")
+ //@PreAuthorize("@ss.hasPermi('system:dict:query')")
@GetMapping(value = "/{dictId}")
public AjaxResult getInfo(@PathVariable Long dictId)
{
@@ -67,7 +67,7 @@
/**
* 鏂板瀛楀吀绫诲瀷
*/
- @PreAuthorize("@ss.hasPermi('system:dict:add')")
+ //@PreAuthorize("@ss.hasPermi('system:dict:add')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysDictType dict)
@@ -83,7 +83,7 @@
/**
* 淇敼瀛楀吀绫诲瀷
*/
- @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:dict:edit')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysDictType dict)
@@ -99,7 +99,7 @@
/**
* 鍒犻櫎瀛楀吀绫诲瀷
*/
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:dict:remove')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@GetMapping("/remove/{dictIds}")
public AjaxResult remove(@PathVariable Long[] dictIds)
@@ -111,7 +111,7 @@
/**
* 鍒锋柊瀛楀吀缂撳瓨
*/
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:dict:remove')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.CLEAN)
@GetMapping("/refreshCache")
public AjaxResult refreshCache()
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 8ebc55f..cf3e86e 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
@@ -36,7 +36,7 @@
/**
* 鑾峰彇鑿滃崟鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:menu:list')")
+ //@PreAuthorize("@ss.hasPermi('system:menu:list')")
@GetMapping("/list")
public AjaxResult list(SysMenu menu)
{
@@ -47,7 +47,7 @@
/**
* 鏍规嵁鑿滃崟缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:menu:query')")
+ //@PreAuthorize("@ss.hasPermi('system:menu:query')")
@GetMapping(value = "/{menuId}")
public AjaxResult getInfo(@PathVariable Long menuId)
{
@@ -80,7 +80,7 @@
/**
* 鏂板鑿滃崟
*/
- @PreAuthorize("@ss.hasPermi('system:menu:add')")
+ //@PreAuthorize("@ss.hasPermi('system:menu:add')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysMenu menu)
@@ -100,7 +100,7 @@
/**
* 淇敼鑿滃崟
*/
- @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:menu:edit')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysMenu menu)
@@ -124,7 +124,7 @@
/**
* 鍒犻櫎鑿滃崟
*/
- @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:menu:remove')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{menuId}")
public AjaxResult remove(@PathVariable("menuId") Long 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 c500880..bbeb900 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
@@ -35,7 +35,7 @@
/**
* 鑾峰彇閫氱煡鍏憡鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:notice:list')")
+ //@PreAuthorize("@ss.hasPermi('system:notice:list')")
@GetMapping("/list")
public TableDataInfo list(SysNotice notice)
{
@@ -47,7 +47,7 @@
/**
* 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:notice:query')")
+ //@PreAuthorize("@ss.hasPermi('system:notice:query')")
@GetMapping(value = "/{noticeId}")
public AjaxResult getInfo(@PathVariable Long noticeId)
{
@@ -57,7 +57,7 @@
/**
* 鏂板閫氱煡鍏憡
*/
- @PreAuthorize("@ss.hasPermi('system:notice:add')")
+ //@PreAuthorize("@ss.hasPermi('system:notice:add')")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysNotice notice)
@@ -69,7 +69,7 @@
/**
* 淇敼閫氱煡鍏憡
*/
- @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:notice:edit')")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysNotice notice)
@@ -81,7 +81,7 @@
/**
* 鍒犻櫎閫氱煡鍏憡
*/
- @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:notice:remove')")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.DELETE)
@GetMapping("/remove/{noticeIds}")
public AjaxResult remove(@PathVariable Long[] noticeIds)
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 ef6aff6..c9aa093 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
@@ -38,7 +38,7 @@
/**
* 鑾峰彇宀椾綅鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:post:list')")
+ //@PreAuthorize("@ss.hasPermi('system:post:list')")
@GetMapping("/list")
public TableDataInfo list(SysPost post)
{
@@ -48,7 +48,7 @@
}
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:post:export')")
+ //@PreAuthorize("@ss.hasPermi('system:post:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, SysPost post)
{
@@ -60,7 +60,7 @@
/**
* 鏍规嵁宀椾綅缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:post:query')")
+ //@PreAuthorize("@ss.hasPermi('system:post:query')")
@GetMapping(value = "/{postId}")
public AjaxResult getInfo(@PathVariable Long postId)
{
@@ -70,7 +70,7 @@
/**
* 鏂板宀椾綅
*/
- @PreAuthorize("@ss.hasPermi('system:post:add')")
+ //@PreAuthorize("@ss.hasPermi('system:post:add')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysPost post)
@@ -90,7 +90,7 @@
/**
* 淇敼宀椾綅
*/
- @PreAuthorize("@ss.hasPermi('system:post:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:post:edit')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysPost post)
@@ -110,7 +110,7 @@
/**
* 鍒犻櫎宀椾綅
*/
- @PreAuthorize("@ss.hasPermi('system:post:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:post:remove')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{postIds}")
public AjaxResult remove(@PathVariable Long[] postIds)
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 6593999..cf14cf6 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
@@ -56,7 +56,7 @@
@Autowired
private ISysDeptService deptService;
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+ //@PreAuthorize("@ss.hasPermi('system:role:list')")
@GetMapping("/list")
public TableDataInfo list(SysRole role)
{
@@ -66,7 +66,7 @@
}
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:role:export')")
+ //@PreAuthorize("@ss.hasPermi('system:role:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, SysRole role)
{
@@ -78,7 +78,7 @@
/**
* 鏍规嵁瑙掕壊缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:role:query')")
+ //@PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping(value = "/{roleId}")
public AjaxResult getInfo(@PathVariable Long roleId)
{
@@ -89,7 +89,7 @@
/**
* 鏂板瑙掕壊
*/
- @PreAuthorize("@ss.hasPermi('system:role:add')")
+ //@PreAuthorize("@ss.hasPermi('system:role:add')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysRole role)
@@ -110,7 +110,7 @@
/**
* 淇敼淇濆瓨瑙掕壊
*/
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysRole role)
@@ -145,7 +145,7 @@
/**
* 淇敼淇濆瓨鏁版嵁鏉冮檺
*/
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/dataScope")
public AjaxResult dataScope(@RequestBody SysRole role)
@@ -158,7 +158,7 @@
/**
* 鐘舵�佷慨鏀�
*/
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysRole role)
@@ -172,7 +172,7 @@
/**
* 鍒犻櫎瑙掕壊
*/
- @PreAuthorize("@ss.hasPermi('system:role:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:role:remove')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{roleIds}")
public AjaxResult remove(@PathVariable Long[] roleIds)
@@ -183,7 +183,7 @@
/**
* 鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:role:query')")
+ //@PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping("/optionselect")
public AjaxResult optionselect()
{
@@ -193,7 +193,7 @@
/**
* 鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+ //@PreAuthorize("@ss.hasPermi('system:role:list')")
@GetMapping("/authUser/allocatedList")
public TableDataInfo allocatedList(SysUser user)
{
@@ -205,7 +205,7 @@
/**
* 鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+ //@PreAuthorize("@ss.hasPermi('system:role:list')")
@GetMapping("/authUser/unallocatedList")
public TableDataInfo unallocatedList(SysUser user)
{
@@ -217,7 +217,7 @@
/**
* 鍙栨秷鎺堟潈鐢ㄦ埛
*/
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PostMapping("/authUser/cancel")
public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
@@ -228,7 +228,7 @@
/**
* 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛
*/
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PostMapping("/authUser/cancelAll")
public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
@@ -239,7 +239,7 @@
/**
* 鎵归噺閫夋嫨鐢ㄦ埛鎺堟潈
*/
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PostMapping("/authUser/selectAll")
public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
@@ -251,7 +251,7 @@
/**
* 鑾峰彇瀵瑰簲瑙掕壊閮ㄩ棬鏍戝垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:role:query')")
+ //@PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping(value = "/deptTree/{roleId}")
public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
{
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 0d69de3..ae88b63 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
@@ -50,7 +50,7 @@
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:user:list')")
+ //@PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/list")
public TableDataInfo list(SysUser user) {
startPage();
@@ -59,7 +59,7 @@
}
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:user:export')")
+ //@PreAuthorize("@ss.hasPermi('system:user:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, SysUser user) {
List<SysUser> list = userService.selectUserList(user);
@@ -68,7 +68,7 @@
}
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
- @PreAuthorize("@ss.hasPermi('system:user:import')")
+ //@PreAuthorize("@ss.hasPermi('system:user:import')")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
@@ -87,7 +87,7 @@
/**
* 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:user:query')")
+ //@PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping("/getInfo/{userId}")
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
userService.checkUserDataScope(userId);
@@ -107,7 +107,7 @@
/**
* 鏂板鐢ㄦ埛
*/
- @PreAuthorize("@ss.hasPermi('system:user:add')")
+ //@PreAuthorize("@ss.hasPermi('system:user:add')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysUser user) {
@@ -126,7 +126,7 @@
/**
* 淇敼鐢ㄦ埛
*/
- @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysUser user) {
@@ -146,7 +146,7 @@
/**
* 鍒犻櫎鐢ㄦ埛
*/
- @PreAuthorize("@ss.hasPermi('system:user:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:user:remove')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{userIds}")
public AjaxResult remove(@PathVariable Long[] userIds) {
@@ -159,7 +159,7 @@
/**
* 閲嶇疆瀵嗙爜
*/
- @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+ //@PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/resetPwd")
public AjaxResult resetPwd(@RequestBody SysUser user) {
@@ -173,7 +173,7 @@
/**
* 鐘舵�佷慨鏀�
*/
- @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysUser user) {
@@ -186,7 +186,7 @@
/**
* 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鎺堟潈瑙掕壊
*/
- @PreAuthorize("@ss.hasPermi('system:user:query')")
+ //@PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping("/authRole/{userId}")
public AjaxResult authRole(@PathVariable("userId") Long userId) {
AjaxResult ajax = AjaxResult.success();
@@ -200,7 +200,7 @@
/**
* 鐢ㄦ埛鎺堟潈瑙掕壊
*/
- @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.GRANT)
@PostMapping("/authRole")
public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
@@ -212,7 +212,7 @@
/**
* 鑾峰彇閮ㄩ棬鏍戝垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:user:list')")
+ //@PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/deptTree")
public AjaxResult deptTree(SysDept dept) {
return success(deptService.selectDeptTreeList(dept));
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 938619b..036b1c9 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
@@ -35,7 +35,7 @@
* 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
@ApiOperation("鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:dept:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:dept:list')")
@GetMapping("/list")
public TableDataInfo list(SysUserDept sysUserDept)
{
@@ -48,7 +48,7 @@
* 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
@ApiOperation("瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:dept:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:dept:export')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SysUserDept sysUserDept)
@@ -62,7 +62,7 @@
* 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('smartor:dept:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:dept:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,8 @@
/**
* 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
*/
- @PreAuthorize("@ss.hasPermi('smartor:dept:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:dept:add')")
+ @ApiOperation("瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SysUserDept sysUserDept)
@@ -84,7 +85,7 @@
* 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
*/
@ApiOperation("淇敼銆愯濉啓鍔熻兘鍚嶇О銆�")
- @PreAuthorize("@ss.hasPermi('smartor:dept:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:dept:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SysUserDept sysUserDept)
@@ -96,7 +97,7 @@
* 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
*/
@ApiOperation("鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�")
- @PreAuthorize("@ss.hasPermi('smartor:dept:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:dept:remove')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java
index d9d78bd..5ab7fc7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java
@@ -1,173 +1,55 @@
package com.ruoyi.web.test;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.smartor.domain.ThiedInhospInfo;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import io.swagger.models.auth.In;
import org.junit.Test;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
-import java.lang.reflect.Type;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
+import java.io.*;
+import java.nio.file.Files;
+import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+import static org.eclipse.jetty.http.HttpGenerator.CHUNK_SIZE;
//@SpringBootTest
//@RunWith(SpringRunner.class)
public class MQTest {
-
- String result="{\n" +
- " \"code\": \"0\",\n" +
- " \"message\": \"success\",\n" +
- " \"data\": {\n" +
- " \"result\": ["+
- " {\n" +
- " \"admissDeptName\": \"娴嬭瘯绉戝\",\n" +
- " \"patiTypeId\": \"22\",\n" +
- " \"companyTelNum\": \"\",\n" +
- " \"currDeptCode\": \"1024\",\n" +
- " \"currWardCode\": \"1331\",\n" +
- " \"patiIdCardNo\": \"\",\n" +
- " \"PatiHomeAddr\": \"娴欐睙鐪佹澀宸炲競鎷卞鍖篭",\n" +
- " \"patiMediaId\": \"69674\",\n" +
- " \"admissBedNo\": \"\",\n" +
- " \"patiBirthday\": \"2009-03-03 00:00:00\",\n" +
- " \"Education\": null,\n" +
- " \"nationalityAddr\": \"\",\n" +
- " \"admissWardCode\": \"1331\",\n" +
- " \"doctId\": \"6af3708533e645edb10a655cabead79f\",\n" +
- " \"inpatientId\": \"2403000055\",\n" +
- " \"ProfessionId\": \"\",\n" +
- " \"admissWardId\": \"7f95c670151746bca580c866ae56cfeb\",\n" +
- " \"doctName\": \"娴嬭瘯鍖荤敓\",\n" +
- " \"currBedId\": \"7aeeb24077b1434d8f2b6ccb204f9159\",\n" +
- " \"diagName\": \"鍍礬",\n" +
- " \"currWardName\": \"娴嬭瘯鐥呭尯\",\n" +
- " \"totalAmount\": 0.00,\n" +
- " \"admissWardName\": \"娴嬭瘯鐥呭尯\",\n" +
- " \"contactPersonName\": null,\n" +
- " \"patiMediaNo\": \"024000070\",\n" +
- " \"patiIndex\": \"024000070\",\n" +
- " \"diagIcd10\": \"M20.200\",\n" +
- " \"admissDeptCode\": \"1024\",\n" +
- " \"patiRecordGender\": \"濂砛",\n" +
- " \"patiNatureId\": \"22\",\n" +
- " \"treateAge\": 15,\n" +
- " \"suggestAmount\": \"\",\n" +
- " \"contactPersonAddr\": null,\n" +
- " \"contactPersonPhone\": null,\n" +
- " \"admissBedId\": \"\",\n" +
- " \"treatAgeunit\": \"宀乗",\n" +
- " \"currBedNo\": \"T-003\",\n" +
- " \"PatiNation\": \"姹夋棌\",\n" +
- " \"patiRecordName\": \"鏃㈠線3-5\",\n" +
- " \"currDeptId\": \"416a047536b411e7bff40242ac103005\",\n" +
- " \"outWayName\": null,\n" +
- " \"RelationShip\": \"\",\n" +
- " \"admitFormId\": null,\n" +
- " \"patiNatureName\": \"闈炶璐﹀尰淇漒",\n" +
- " \"PatiNationality\": \"涓浗\",\n" +
- " \"outDate\": null,\n" +
- " \"admissDeptId\": \"416a047536b411e7bff40242ac103005\",\n" +
- " \"admissDate\": \"2024-03-05 14:33:00\",\n" +
- " \"currStatus\": 2,\n" +
- " \"DocName\": \"\",\n" +
- " \"patiTypeName\": \"闈炶璐﹀尰淇漒",\n" +
- " \"currDeptName\": \"娴嬭瘯绉戝\",\n" +
- " \"currWardId\": \"7f95c670151746bca580c866ae56cfeb\",\n" +
- " \"areaId\": \"\",\n" +
- " \"PatiMaritalStatus\": null,\n" +
- " \"PatiHomePhone\": \"\",\n" +
- " \"preoutDate\": null,\n" +
- " \"outWayId\": null,\n" +
- " \"inhospitalTimes\": 3,\n" +
- " \"patiRecordId\": \"69409\",\n" +
- " \"age\": \"15宀乗",\n" +
- " \"diagId\": \"314216\"\n" +
- " },\n" +
- " {\n" +
- " \"admissDeptName\": \"娴嬭瘯绉戝\",\n" +
- " \"patiTypeId\": \"22\",\n" +
- " \"companyTelNum\": \"\",\n" +
- " \"currDeptCode\": \"1024\",\n" +
- " \"currWardCode\": \"1331\",\n" +
- " \"patiIdCardNo\": \"330106198001030057\",\n" +
- " \"PatiHomeAddr\": \"娴欐睙鐪佹澀宸炲競瑗挎箹鍖篭",\n" +
- " \"patiMediaId\": \"69675\",\n" +
- " \"admissBedNo\": \"\",\n" +
- " \"patiBirthday\": \"1980-01-03 00:00:00\",\n" +
- " \"Education\": null,\n" +
- " \"nationalityAddr\": \"\",\n" +
- " \"admissWardCode\": \"1331\",\n" +
- " \"doctId\": \"7d3f0eaaec304bbfad8a8471998e38e4\",\n" +
- " \"inpatientId\": \"2403000056\",\n" +
- " \"ProfessionId\": \"\",\n" +
- " \"admissWardId\": \"7f95c670151746bca580c866ae56cfeb\",\n" +
- " \"doctName\": \"浣忛櫌鐥呭巻\",\n" +
- " \"currBedId\": \"377f94ca047e4786aef56a1ac22678b7\",\n" +
- " \"diagName\": \"鐦熺梾\",\n" +
- " \"currWardName\": \"娴嬭瘯鐥呭尯\",\n" +
- " \"totalAmount\": 0.00,\n" +
- " \"admissWardName\": \"娴嬭瘯鐥呭尯\",\n" +
- " \"contactPersonName\": \"\",\n" +
- " \"patiMediaNo\": \"024000071\",\n" +
- " \"patiIndex\": \"024000071\",\n" +
- " \"diagIcd10\": \"A01.03.01.\",\n" +
- " \"admissDeptCode\": \"1024\",\n" +
- " \"patiRecordGender\": \"鐢穃",\n" +
- " \"patiNatureId\": \"22\",\n" +
- " \"treateAge\": 44,\n" +
- " \"suggestAmount\": \"\",\n" +
- " \"contactPersonAddr\": \"\",\n" +
- " \"contactPersonPhone\": \"\",\n" +
- " \"admissBedId\": \"\",\n" +
- " \"treatAgeunit\": \"宀乗",\n" +
- " \"currBedNo\": \"T-006\",\n" +
- " \"PatiNation\": \"姹夋棌\",\n" +
- " \"patiRecordName\": \"鎷呬繚閲戦01\",\n" +
- " \"currDeptId\": \"416a047536b411e7bff40242ac103005\",\n" +
- " \"outWayName\": null,\n" +
- " \"RelationShip\": \"\",\n" +
- " \"admitFormId\": null,\n" +
- " \"patiNatureName\": \"闈炶璐﹀尰淇漒",\n" +
- " \"PatiNationality\": \"涓浗\",\n" +
- " \"outDate\": null,\n" +
- " \"admissDeptId\": \"416a047536b411e7bff40242ac103005\",\n" +
- " \"admissDate\": \"2024-03-07 14:04:00\",\n" +
- " \"currStatus\": 2,\n" +
- " \"DocName\": \"\",\n" +
- " \"patiTypeName\": \"闈炶璐﹀尰淇漒",\n" +
- " \"currDeptName\": \"娴嬭瘯绉戝\",\n" +
- " \"currWardId\": \"7f95c670151746bca580c866ae56cfeb\",\n" +
- " \"areaId\": \"\",\n" +
- " \"PatiMaritalStatus\": null,\n" +
- " \"PatiHomePhone\": \"\",\n" +
- " \"preoutDate\": null,\n" +
- " \"outWayId\": null,\n" +
- " \"inhospitalTimes\": 1,\n" +
- " \"patiRecordId\": \"69410\",\n" +
- " \"age\": \"44宀乗",\n" +
- " \"diagId\": \"1000040\"\n" +
- " }\n" +
- " ],\n" +
- " \"hasNext\": false\n" +
- " }\n" +
- "}";
@Test
public void testSend22() {
- Gson gson = new Gson();
- JsonObject jsonObject = gson.fromJson(result, JsonObject.class);
- JsonArray resultArray = jsonObject.getAsJsonObject("data").getAsJsonArray("result");
+// uploadFileInChunks(new File("C:\\Users\\86176\\Desktop\\19-鍥捐Вes鍐呴儴鍩轰簬_version涔愯閿佹帶鍒�.mp4"));
+ File file = new File("C:\\Users\\86176\\Desktop\\19-鍥捐Вes鍐呴儴鍩轰簬_version涔愯閿佹帶鍒�.mp4");
- // 瀹氫箟 ResultItem 鐨勭被鍨�
- Type resultType = new TypeToken<List<ThiedInhospInfo>>() {}.getType();
- List<ThiedInhospInfo> resultList = gson.fromJson(resultArray, resultType);
- System.out.println(resultList);
+
+ FileInputStream input = null;
+ try {
+ input = new FileInputStream(new File("C:\\Users\\86176\\Desktop\\19-鍥捐Вes鍐呴儴鍩轰簬_version涔愯閿佹帶鍒�.mp4"));
+ MultipartFile multipartFile = new MockMultipartFile(file.getName(), file.getName(), "application/octet-stream", input);
+ aa(multipartFile);
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ public void aa(MultipartFile file) throws IOException {
+ System.out.println("寮�濮婣a锛�" + System.currentTimeMillis());
+ String filePath = "D:\\test\\Ab";
+ // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
+ String fileName = FileUploadUtils.upload(filePath, file);
+ System.out.println("缁撴潫Aa锛�" + System.currentTimeMillis());
+
}
}
+
+
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 1919a44..ef8d07c 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -10,11 +10,10 @@
# url: jdbc:mysql://127.0.0.1:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: 123456
- #192.168.1.16:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# 鍏徃
# url: jdbc:mysql://450scrp46939.vicp.fun:59876/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# url: jdbc:mysql://192.168.1.16:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- url: jdbc:mysql://127.0.0.1:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: smartor
password: Smartor.2023
driverClassName: com.mysql.cj.jdbc.Driver
@@ -26,6 +25,7 @@
username: sa
password: Hxerp2000
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴(涔変箤浜岄櫌)
# enabled: true
@@ -138,9 +138,16 @@
#浜岀淮鐮佽矾寰�
qrpath: D:\qrcode
-#澶栭摼璇锋眰IP鍜岀鍙ｅ彿
-req_path: 8096
-localIP: 192.168.1.10
+##鍏徃鍐呭閾捐姹侷P鍜岀鍙ｅ彿
+#req_path: 8096
+#localIP: 192.168.1.10
+
+#鏂板崕鍖婚櫌澶栭摼璇锋眰IP鍜岀鍙ｅ彿
+req_path: 8093
+localIP: 218.108.11.22
#鑾峰彇鎮ｈ�呬俊鎭疷RL(鍗庡崜鎻愪緵)
hosp_info_url: http://esb-core-rest.wowjoy.cn/esb/exchange
+
+# 0浠ｈ〃璧伴粯璁ょ殑涓婁紶 1 浠ｇ爜璧版柊鍗庡尰闄㈢殑涓婁紶
+uploadSwitch: 1
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 9299be2..5f95e8f 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -197,7 +197,11 @@
<version>1.2.41</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
index bd835db..a82dcb7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
@@ -9,7 +9,7 @@
/**
* Treeselect鏍戠粨鏋勫疄浣撶被
- *
+ *
* @author ruoyi
*/
public class TreeSelect implements Serializable
@@ -21,6 +21,9 @@
/** 鑺傜偣鍚嶇О */
private String label;
+
+ /** 鑺傜偣鍚嶇О */
+ private String deptCode;
/** 瀛愯妭鐐� */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -35,6 +38,7 @@
{
this.id = dept.getDeptId();
this.label = dept.getDeptName();
+ this.deptCode = dept.getDeptCode();
this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
}
@@ -45,6 +49,14 @@
this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
}
+ public String getDeptCode() {
+ return deptCode;
+ }
+
+ public void setDeptCode(String deptCode) {
+ this.deptCode = deptCode;
+ }
+
public Long getId()
{
return id;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index 8d7b63b..c0f36b8 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -16,206 +16,204 @@
/**
* 閮ㄩ棬琛� sys_dept
- *
+ *
* @author ruoyi
*/
@Data
@ApiModel(value = "SysDept", description = "閮ㄩ棬琛�")
-public class SysDept extends BaseEntity
-{
+public class SysDept extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 閮ㄩ棬ID */
+ /**
+ * 閮ㄩ棬ID
+ */
@ApiModelProperty("閮ㄩ棬ID")
private Long deptId;
- /** 鐖堕儴闂↖D */
+ /**
+ * 鐖堕儴闂↖D
+ */
@ApiModelProperty("鐖堕儴闂↖D")
private Long parentId;
- /** 绁栫骇鍒楄〃 */
+ /**
+ * 绁栫骇鍒楄〃
+ */
@ApiModelProperty("绁栫骇鍒楄〃")
private String ancestors;
- /** 閮ㄩ棬鍚嶇О */
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
@ApiModelProperty("閮ㄩ棬鍚嶇О")
private String deptName;
- /** 鏄剧ず椤哄簭 */
+ /**
+ * 鏄剧ず椤哄簭
+ */
@ApiModelProperty("鏄剧ず椤哄簭")
private Integer orderNum;
- /** 璐熻矗浜� */
+ /**
+ * 璐熻矗浜�
+ */
@ApiModelProperty("璐熻矗浜�")
private String leader;
- /** 鑱旂郴鐢佃瘽 */
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
@ApiModelProperty("鑱旂郴鐢佃瘽")
private String phone;
- /** 閭 */
+ /**
+ * 閭
+ */
@ApiModelProperty("閭")
private String email;
- /** 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤 */
+ /**
+ * 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤
+ */
@ApiModelProperty("閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤")
private String status;
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ /**
+ * 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
+ */
@ApiModelProperty("鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
private String delFlag;
- /** 鐖堕儴闂ㄥ悕绉� */
+ /**
+ * 鐖堕儴闂ㄥ悕绉�
+ */
@ApiModelProperty("鐖堕儴闂ㄥ悕绉�")
private String parentName;
-
- /** 瀛愰儴闂� */
+
+ /**
+ * 瀛愰儴闂�
+ */
@ApiModelProperty("瀛愰儴闂�")
private List<SysDept> children = new ArrayList<SysDept>();
- public Long getDeptId()
- {
+ /**
+ * 閮ㄩ棬缂栫爜
+ */
+ @ApiModelProperty("閮ㄩ棬缂栫爜")
+ private String deptCode;
+
+ public String getDeptCode() {
+ return deptCode;
+ }
+
+ public void setDeptCode(String deptCode) {
+ this.deptCode = deptCode;
+ }
+
+ public Long getDeptId() {
return deptId;
}
- public void setDeptId(Long deptId)
- {
+ public void setDeptId(Long deptId) {
this.deptId = deptId;
}
- public Long getParentId()
- {
+ public Long getParentId() {
return parentId;
}
- public void setParentId(Long parentId)
- {
+ public void setParentId(Long parentId) {
this.parentId = parentId;
}
- public String getAncestors()
- {
+ public String getAncestors() {
return ancestors;
}
- public void setAncestors(String ancestors)
- {
+ public void setAncestors(String ancestors) {
this.ancestors = ancestors;
}
@NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- public String getDeptName()
- {
+ public String getDeptName() {
return deptName;
}
- public void setDeptName(String deptName)
- {
+ public void setDeptName(String deptName) {
this.deptName = deptName;
}
@NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- public Integer getOrderNum()
- {
+ public Integer getOrderNum() {
return orderNum;
}
- public void setOrderNum(Integer orderNum)
- {
+ public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
- public String getLeader()
- {
+ public String getLeader() {
return leader;
}
- public void setLeader(String leader)
- {
+ public void setLeader(String leader) {
this.leader = leader;
}
@Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
- public String getPhone()
- {
+ public String getPhone() {
return phone;
}
- public void setPhone(String phone)
- {
+ public void setPhone(String phone) {
this.phone = phone;
}
@Email(message = "閭鏍煎紡涓嶆纭�")
@Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- public String getEmail()
- {
+ public String getEmail() {
return email;
}
- public void setEmail(String email)
- {
+ public void setEmail(String email) {
this.email = email;
}
- public String getStatus()
- {
+ public String getStatus() {
return status;
}
- public void setStatus(String status)
- {
+ public void setStatus(String status) {
this.status = status;
}
- public String getDelFlag()
- {
+ public String getDelFlag() {
return delFlag;
}
- public void setDelFlag(String delFlag)
- {
+ public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
- public String getParentName()
- {
+ public String getParentName() {
return parentName;
}
- public void setParentName(String parentName)
- {
+ public void setParentName(String parentName) {
this.parentName = parentName;
}
- public List<SysDept> getChildren()
- {
+ public List<SysDept> getChildren() {
return children;
}
- public void setChildren(List<SysDept> children)
- {
+ public void setChildren(List<SysDept> children) {
this.children = children;
}
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("deptId", getDeptId())
- .append("parentId", getParentId())
- .append("ancestors", getAncestors())
- .append("deptName", getDeptName())
- .append("orderNum", getOrderNum())
- .append("leader", getLeader())
- .append("phone", getPhone())
- .append("email", getEmail())
- .append("status", getStatus())
- .append("delFlag", getDelFlag())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("deptId", getDeptId()).append("parentId", getParentId()).append("ancestors", getAncestors()).append("deptName", getDeptName()).append("orderNum", getOrderNum()).append("leader", getLeader()).append("phone", getPhone()).append("email", getEmail()).append("status", getStatus()).append("delFlag", getDelFlag()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).toString();
}
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 44bd409..38d4755 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -1,5 +1,6 @@
package com.ruoyi.common.core.domain.entity;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
@@ -47,6 +48,13 @@
private String userName;
/**
+ * 鎮ｈ�呰寖鍥达細0:鍏ㄩ儴锛�1锛氱瀹�2锛氱梾鍖猴紱
+ */
+ @ApiModelProperty(value = "鎮ｈ�呰寖鍥达細0:鍏ㄩ儴锛�1锛氱瀹�2锛氱梾鍖猴紱")
+ @Excel(name = "鎮ｈ�呰寖鍥达細0:鍏ㄩ儴锛�1锛氱瀹�2锛氱梾鍖猴紱")
+ private String searchscope;
+
+ /**
* 鐢ㄦ埛鏄电О
*/
@ApiModelProperty(value = "鐢ㄦ埛鏄电О")
@@ -59,6 +67,13 @@
@ApiModelProperty(value = "鐢ㄦ埛閭")
@Excel(name = "鐢ㄦ埛閭")
private String email;
+
+ /**
+ * 鐢ㄦ埛绫诲瀷锛�00绯荤粺鐢ㄦ埛锛�
+ */
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�00绯荤粺鐢ㄦ埛锛�")
+ @Excel(name = "鐢ㄦ埛绫诲瀷锛�00绯荤粺鐢ㄦ埛锛�")
+ private String userType;
/**
* 鎵嬫満鍙风爜
@@ -114,6 +129,17 @@
private Date loginDate;
/**
+ * 闄㈠尯淇℃伅
+ */
+ @ApiModelProperty(value = "闄㈠尯淇℃伅")
+ private String hospInfo;
+ /**
+ * 绉戝淇℃伅
+ */
+ @ApiModelProperty(value = "绉戝淇℃伅")
+ private String deptInfo;
+
+ /**
* 閮ㄩ棬瀵硅薄
*/
@ApiModelProperty(value = "閮ㄩ棬瀵硅薄")
@@ -147,8 +173,62 @@
@ApiModelProperty(value = "瑙掕壊ID")
private Long roleId;
+
+ /**
+ * 鐥呭尯缂栫爜
+ */
+ @ApiModelProperty("鐥呭尯缂栫爜")
+ private List<String> leavehospitaldistrictcodes = new ArrayList<String>();
+
+ /**
+ * 绉戝缂栫爜
+ */
+ @ApiModelProperty("绉戝缂栫爜")
+ private List<String> leaveldeptcodes = new ArrayList<String>();
+
+
public SysUser() {
+ }
+
+ public List<String> getLeavehospitaldistrictcodes() {
+ return leavehospitaldistrictcodes;
+ }
+
+ public void setLeavehospitaldistrictcodes(List<String> leavehospitaldistrictcodes) {
+ this.leavehospitaldistrictcodes = leavehospitaldistrictcodes;
+ }
+
+ public List<String> getLeaveldeptcodes() {
+ return leaveldeptcodes;
+ }
+
+ public void setLeaveldeptcodes(List<String> leaveldeptcodes) {
+ this.leaveldeptcodes = leaveldeptcodes;
+ }
+
+ public String getSearchscope() {
+ return searchscope;
+ }
+
+ public void setSearchscope(String searchscope) {
+ this.searchscope = searchscope;
+ }
+
+ public String getHospInfo() {
+ return hospInfo;
+ }
+
+ public void setHospInfo(String hospInfo) {
+ this.hospInfo = hospInfo;
+ }
+
+ public String getDeptInfo() {
+ return deptInfo;
+ }
+
+ public void setDeptInfo(String deptInfo) {
+ this.deptInfo = deptInfo;
}
public SysUser(Long userId) {
@@ -206,6 +286,14 @@
return email;
}
+ public void setUserType(String userType) {
+ this.userType = userType;
+ }
+
+ public String getUserType() {
+ return userType;
+ }
+
public void setEmail(String email) {
this.email = email;
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java
index c168ce4..3f5dbdf 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java
@@ -32,13 +32,29 @@
private Long userId;
/**
+ * 閮ㄩ棬绫诲瀷
+ */
+ @ApiModelProperty("閮ㄩ棬绫诲瀷")
+ @Excel(name = "閮ㄩ棬绫诲瀷")
+ private String deptType;
+
+ /**
+ * 閮ㄩ棬缂栫爜
+ */
+ @ApiModelProperty("閮ㄩ棬缂栫爜")
+ @Excel(name = "閮ㄩ棬缂栫爜")
+ private String deptCode;
+
+ /**
* 閮ㄩ棬ID
*/
@ApiModelProperty("閮ㄩ棬ID")
@Excel(name = "閮ㄩ棬ID")
private Long deptId;
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ /**
+ * 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
+ */
@ApiModelProperty("鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�")
private Long delFlag;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index 7e5a9ea..2db0d81 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -25,7 +25,7 @@
/**
* 榛樿澶у皬 50M
*/
- public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+ public static final long DEFAULT_MAX_SIZE = 200 * 1024 * 1024;
/**
* 榛樿鐨勬枃浠跺悕鏈�澶ч暱搴� 100
@@ -108,7 +108,6 @@
*
* @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍
* @param file 涓婁紶鐨勬枃浠�
- * @param allowedExtension 涓婁紶鏂囦欢绫诲瀷
* @return 杩斿洖涓婁紶鎴愬姛鐨勬枃浠跺悕
* @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈�澶уぇ灏�
* @throws FileNameLengthLimitExceededException 鏂囦欢鍚嶅お闀�
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index ca9d650..41c677b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -1,10 +1,6 @@
package com.ruoyi.common.utils.http;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
+import java.io.*;
import java.net.ConnectException;
import java.net.SocketTimeoutException;
import java.net.URL;
@@ -119,10 +115,10 @@
conn.setRequestProperty("connection", "Keep-Alive");
conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
conn.setRequestProperty("Accept-Charset", "utf-8");
- conn.setRequestProperty("contentType", "utf-8");
+ conn.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
conn.setDoOutput(true);
conn.setDoInput(true);
- out = new PrintWriter(conn.getOutputStream());
+ out = new PrintWriter(new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8));
out.print(param);
out.flush();
in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
@@ -174,7 +170,7 @@
conn.setRequestProperty(entry.getKey(), entry.getValue());
}
}
- out = new PrintWriter(conn.getOutputStream());
+ out = new PrintWriter(new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8));
out.print(param);
out.flush();
in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index efa3665..b37fc98 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -24,6 +24,7 @@
import java.util.UUID;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.RegExUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
@@ -34,27 +35,7 @@
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ooxml.POIXMLDocumentPart;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.PictureData;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellRangeAddressList;
import org.apache.poi.util.IOUtils;
@@ -87,16 +68,15 @@
/**
* Excel鐩稿叧澶勭悊
- *
+ *
* @author ruoyi
*/
-public class ExcelUtil<T>
-{
+public class ExcelUtil<T> {
private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
public static final String FORMULA_REGEX_STR = "=|-|\\+|@";
- public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
+ public static final String[] FORMULA_STR = {"=", "-", "+", "@"};
/**
* Excel sheet鏈�澶ц鏁帮紝榛樿65536
@@ -193,8 +173,7 @@
*/
public String[] excludeFields;
- public ExcelUtil(Class<T> clazz)
- {
+ public ExcelUtil(Class<T> clazz) {
this.clazz = clazz;
}
@@ -204,15 +183,12 @@
* @param fields 鍒楀睘鎬у悕 绀轰緥[鍗曚釜"name"/澶氫釜"id","name"]
* @throws Exception
*/
- public void hideColumn(String... fields)
- {
+ public void hideColumn(String... fields) {
this.excludeFields = fields;
}
- public void init(List<T> list, String sheetName, String title, Type type)
- {
- if (list == null)
- {
+ public void init(List<T> list, String sheetName, String title, Type type) {
+ if (list == null) {
list = new ArrayList<T>();
}
this.list = list;
@@ -228,15 +204,12 @@
/**
* 鍒涘缓excel绗竴琛屾爣棰�
*/
- public void createTitle()
- {
- if (StringUtils.isNotEmpty(title))
- {
+ public void createTitle() {
+ if (StringUtils.isNotEmpty(title)) {
subMergedFirstRowNum++;
subMergedLastRowNum++;
int titleLastCol = this.fields.size() - 1;
- if (isSubList())
- {
+ if (isSubList()) {
titleLastCol = titleLastCol + subFields.size() - 1;
}
Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
@@ -251,16 +224,13 @@
/**
* 鍒涘缓瀵硅薄鐨勫瓙鍒楄〃鍚嶇О
*/
- public void createSubHead()
- {
- if (isSubList())
- {
+ public void createSubHead() {
+ if (isSubList()) {
subMergedFirstRowNum++;
subMergedLastRowNum++;
Row subRow = sheet.createRow(rownum);
int excelNum = 0;
- for (Object[] objects : fields)
- {
+ for (Object[] objects : fields) {
Excel attr = (Excel) objects[1];
Cell headCell1 = subRow.createCell(excelNum);
headCell1.setCellValue(attr.name());
@@ -269,8 +239,7 @@
}
int headFirstRow = excelNum - 1;
int headLastRow = headFirstRow + subFields.size() - 1;
- if (headLastRow > headFirstRow)
- {
+ if (headLastRow > headFirstRow) {
sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow));
}
rownum++;
@@ -279,102 +248,85 @@
/**
* 瀵筫xcel琛ㄥ崟榛樿绗竴涓储寮曞悕杞崲鎴恖ist
- *
+ *
* @param is 杈撳叆娴�
* @return 杞崲鍚庨泦鍚�
*/
- public List<T> importExcel(InputStream is) throws Exception
- {
+ public List<T> importExcel(InputStream is) throws Exception {
return importExcel(is, 0);
}
/**
* 瀵筫xcel琛ㄥ崟榛樿绗竴涓储寮曞悕杞崲鎴恖ist
- *
- * @param is 杈撳叆娴�
+ *
+ * @param is 杈撳叆娴�
* @param titleNum 鏍囬鍗犵敤琛屾暟
* @return 杞崲鍚庨泦鍚�
*/
- public List<T> importExcel(InputStream is, int titleNum) throws Exception
- {
+ public List<T> importExcel(InputStream is, int titleNum) throws Exception {
return importExcel(StringUtils.EMPTY, is, titleNum);
}
/**
* 瀵筫xcel琛ㄥ崟鎸囧畾琛ㄦ牸绱㈠紩鍚嶈浆鎹㈡垚list
- *
+ *
* @param sheetName 琛ㄦ牸绱㈠紩鍚�
- * @param titleNum 鏍囬鍗犵敤琛屾暟
- * @param is 杈撳叆娴�
+ * @param titleNum 鏍囬鍗犵敤琛屾暟
+ * @param is 杈撳叆娴�
* @return 杞崲鍚庨泦鍚�
*/
- public List<T> importExcel(String sheetName, InputStream is, int titleNum) throws Exception
- {
+ public List<T> importExcel(String sheetName, InputStream is, int titleNum) throws Exception {
this.type = Type.IMPORT;
this.wb = WorkbookFactory.create(is);
List<T> list = new ArrayList<T>();
// 濡傛灉鎸囧畾sheet鍚�,鍒欏彇鎸囧畾sheet涓殑鍐呭 鍚﹀垯榛樿鎸囧悜绗�1涓猻heet
Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0);
- if (sheet == null)
- {
+ if (sheet == null) {
throw new IOException("鏂囦欢sheet涓嶅瓨鍦�");
}
boolean isXSSFWorkbook = !(wb instanceof HSSFWorkbook);
Map<String, PictureData> pictures;
- if (isXSSFWorkbook)
- {
+ if (isXSSFWorkbook) {
pictures = getSheetPictures07((XSSFSheet) sheet, (XSSFWorkbook) wb);
- }
- else
- {
+ } else {
pictures = getSheetPictures03((HSSFSheet) sheet, (HSSFWorkbook) wb);
}
// 鑾峰彇鏈�鍚庝竴涓潪绌鸿鐨勮涓嬫爣锛屾瘮濡傛�昏鏁颁负n锛屽垯杩斿洖鐨勪负n-1
int rows = sheet.getLastRowNum();
- if (rows > 0)
- {
+ if (rows > 0) {
// 瀹氫箟涓�涓猰ap鐢ㄤ簬瀛樻斁excel鍒楃殑搴忓彿鍜宖ield.
Map<String, Integer> cellMap = new HashMap<String, Integer>();
// 鑾峰彇琛ㄥご
Row heard = sheet.getRow(titleNum);
- for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
- {
+ for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
Cell cell = heard.getCell(i);
- if (StringUtils.isNotNull(cell))
- {
+ if (StringUtils.isNotNull(cell)) {
String value = this.getCellValue(heard, i).toString();
cellMap.put(value, i);
- }
- else
- {
+ } else {
cellMap.put(null, i);
}
}
// 鏈夋暟鎹椂鎵嶅鐞� 寰楀埌绫荤殑鎵�鏈塮ield.
List<Object[]> fields = this.getFields();
Map<Integer, Object[]> fieldsMap = new HashMap<Integer, Object[]>();
- for (Object[] objects : fields)
- {
+ for (Object[] objects : fields) {
Excel attr = (Excel) objects[1];
Integer column = cellMap.get(attr.name());
- if (column != null)
- {
+ if (column != null) {
fieldsMap.put(column, objects);
}
}
- for (int i = titleNum + 1; i <= rows; i++)
- {
+ for (int i = titleNum + 1; i <= rows; i++) {
// 浠庣2琛屽紑濮嬪彇鏁版嵁,榛樿绗竴琛屾槸琛ㄥご.
Row row = sheet.getRow(i);
// 鍒ゆ柇褰撳墠琛屾槸鍚︽槸绌鸿
- if (isRowEmpty(row))
- {
+ if (isRowEmpty(row)) {
continue;
}
T entity = null;
- for (Map.Entry<Integer, Object[]> entry : fieldsMap.entrySet())
- {
+ for (Map.Entry<Integer, Object[]> entry : fieldsMap.entrySet()) {
Object val = this.getCellValue(row, entry.getKey());
// 濡傛灉涓嶅瓨鍦ㄥ疄渚嬪垯鏂板缓.
@@ -384,89 +336,52 @@
Excel attr = (Excel) entry.getValue()[1];
// 鍙栧緱绫诲瀷,骞舵牴鎹璞＄被鍨嬭缃��.
Class<?> fieldType = field.getType();
- if (String.class == fieldType)
- {
+ if (String.class == fieldType) {
String s = Convert.toStr(val);
- if (StringUtils.endsWith(s, ".0"))
- {
+ if (StringUtils.endsWith(s, ".0")) {
val = StringUtils.substringBefore(s, ".0");
- }
- else
- {
+ } else {
String dateFormat = field.getAnnotation(Excel.class).dateFormat();
- if (StringUtils.isNotEmpty(dateFormat))
- {
+ if (StringUtils.isNotEmpty(dateFormat)) {
val = parseDateToStr(dateFormat, val);
- }
- else
- {
+ } else {
val = Convert.toStr(val);
}
}
- }
- else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
- {
+ } else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) {
val = Convert.toInt(val);
- }
- else if ((Long.TYPE == fieldType || Long.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
- {
+ } else if ((Long.TYPE == fieldType || Long.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) {
val = Convert.toLong(val);
- }
- else if (Double.TYPE == fieldType || Double.class == fieldType)
- {
+ } else if (Double.TYPE == fieldType || Double.class == fieldType) {
val = Convert.toDouble(val);
- }
- else if (Float.TYPE == fieldType || Float.class == fieldType)
- {
+ } else if (Float.TYPE == fieldType || Float.class == fieldType) {
val = Convert.toFloat(val);
- }
- else if (BigDecimal.class == fieldType)
- {
+ } else if (BigDecimal.class == fieldType) {
val = Convert.toBigDecimal(val);
- }
- else if (Date.class == fieldType)
- {
- if (val instanceof String)
- {
+ } else if (Date.class == fieldType) {
+ if (val instanceof String) {
val = DateUtils.parseDate(val);
- }
- else if (val instanceof Double)
- {
+ } else if (val instanceof Double) {
val = DateUtil.getJavaDate((Double) val);
}
- }
- else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
- {
+ } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {
val = Convert.toBool(val, false);
}
- if (StringUtils.isNotNull(fieldType))
- {
+ if (StringUtils.isNotNull(fieldType)) {
String propertyName = field.getName();
- if (StringUtils.isNotEmpty(attr.targetAttr()))
- {
+ if (StringUtils.isNotEmpty(attr.targetAttr())) {
propertyName = field.getName() + "." + attr.targetAttr();
- }
- else if (StringUtils.isNotEmpty(attr.readConverterExp()))
- {
+ } else if (StringUtils.isNotEmpty(attr.readConverterExp())) {
val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
- }
- else if (StringUtils.isNotEmpty(attr.dictType()))
- {
+ } else if (StringUtils.isNotEmpty(attr.dictType())) {
val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());
- }
- else if (!attr.handler().equals(ExcelHandlerAdapter.class))
- {
+ } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
val = dataFormatHandlerAdapter(val, attr);
- }
- else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures))
- {
+ } else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures)) {
PictureData image = pictures.get(row.getRowNum() + "_" + entry.getKey());
- if (image == null)
- {
+ if (image == null) {
val = "";
- }
- else
- {
+ } else {
byte[] data = image.getData();
val = FileUtils.writeImportBytes(data);
}
@@ -482,54 +397,50 @@
/**
* 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
- * @param list 瀵煎嚭鏁版嵁闆嗗悎
+ *
+ * @param list 瀵煎嚭鏁版嵁闆嗗悎
* @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
* @return 缁撴灉
*/
- public AjaxResult exportExcel(List<T> list, String sheetName)
- {
+ public AjaxResult exportExcel(List<T> list, String sheetName) {
return exportExcel(list, sheetName, StringUtils.EMPTY);
}
/**
* 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
- * @param list 瀵煎嚭鏁版嵁闆嗗悎
+ *
+ * @param list 瀵煎嚭鏁版嵁闆嗗悎
* @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
- * @param title 鏍囬
+ * @param title 鏍囬
* @return 缁撴灉
*/
- public AjaxResult exportExcel(List<T> list, String sheetName, String title)
- {
+ public AjaxResult exportExcel(List<T> list, String sheetName, String title) {
this.init(list, sheetName, title, Type.EXPORT);
return exportExcel();
}
/**
* 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
- * @param response 杩斿洖鏁版嵁
- * @param list 瀵煎嚭鏁版嵁闆嗗悎
+ *
+ * @param response 杩斿洖鏁版嵁
+ * @param list 瀵煎嚭鏁版嵁闆嗗悎
* @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
* @return 缁撴灉
*/
- public void exportExcel(HttpServletResponse response, List<T> list, String sheetName)
- {
+ public void exportExcel(HttpServletResponse response, List<T> list, String sheetName) {
exportExcel(response, list, sheetName, StringUtils.EMPTY);
}
/**
* 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
- * @param response 杩斿洖鏁版嵁
- * @param list 瀵煎嚭鏁版嵁闆嗗悎
+ *
+ * @param response 杩斿洖鏁版嵁
+ * @param list 瀵煎嚭鏁版嵁闆嗗悎
* @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
- * @param title 鏍囬
+ * @param title 鏍囬
* @return 缁撴灉
*/
- public void exportExcel(HttpServletResponse response, List<T> list, String sheetName, String title)
- {
+ public void exportExcel(HttpServletResponse response, List<T> list, String sheetName, String title) {
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
this.init(list, sheetName, title, Type.EXPORT);
@@ -538,48 +449,44 @@
/**
* 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
+ *
* @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
* @return 缁撴灉
*/
- public AjaxResult importTemplateExcel(String sheetName)
- {
+ public AjaxResult importTemplateExcel(String sheetName) {
return importTemplateExcel(sheetName, StringUtils.EMPTY);
}
/**
* 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
+ *
* @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
- * @param title 鏍囬
+ * @param title 鏍囬
* @return 缁撴灉
*/
- public AjaxResult importTemplateExcel(String sheetName, String title)
- {
+ public AjaxResult importTemplateExcel(String sheetName, String title) {
this.init(null, sheetName, title, Type.IMPORT);
return exportExcel();
}
/**
* 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
+ *
* @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
* @return 缁撴灉
*/
- public void importTemplateExcel(HttpServletResponse response, String sheetName)
- {
+ public void importTemplateExcel(HttpServletResponse response, String sheetName) {
importTemplateExcel(response, sheetName, StringUtils.EMPTY);
}
/**
* 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
+ *
* @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
- * @param title 鏍囬
+ * @param title 鏍囬
* @return 缁撴灉
*/
- public void importTemplateExcel(HttpServletResponse response, String sheetName, String title)
- {
+ public void importTemplateExcel(HttpServletResponse response, String sheetName, String title) {
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
this.init(null, sheetName, title, Type.IMPORT);
@@ -588,49 +495,37 @@
/**
* 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
+ *
* @return 缁撴灉
*/
- public void exportExcel(HttpServletResponse response)
- {
- try
- {
+ public void exportExcel(HttpServletResponse response) {
+ try {
writeSheet();
wb.write(response.getOutputStream());
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
log.error("瀵煎嚭Excel寮傚父{}", e.getMessage());
- }
- finally
- {
+ } finally {
IOUtils.closeQuietly(wb);
}
}
/**
* 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
+ *
* @return 缁撴灉
*/
- public AjaxResult exportExcel()
- {
+ public AjaxResult exportExcel() {
OutputStream out = null;
- try
- {
+ try {
writeSheet();
String filename = encodingFilename(sheetName);
out = new FileOutputStream(getAbsoluteFile(filename));
wb.write(out);
return AjaxResult.success(filename);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
log.error("瀵煎嚭Excel寮傚父{}", e.getMessage());
throw new UtilException("瀵煎嚭Excel澶辫触锛岃鑱旂郴缃戠珯绠＄悊鍛橈紒");
- }
- finally
- {
+ } finally {
IOUtils.closeQuietly(wb);
IOUtils.closeQuietly(out);
}
@@ -639,37 +534,29 @@
/**
* 鍒涘缓鍐欏叆鏁版嵁鍒癝heet
*/
- public void writeSheet()
- {
+ public void writeSheet() {
// 鍙栧嚭涓�鍏辨湁澶氬皯涓猻heet.
int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize));
- for (int index = 0; index < sheetNo; index++)
- {
+ for (int index = 0; index < sheetNo; index++) {
createSheet(sheetNo, index);
// 浜х敓涓�琛�
Row row = sheet.createRow(rownum);
int column = 0;
// 鍐欏叆鍚勪釜瀛楁鐨勫垪澶村悕绉�
- for (Object[] os : fields)
- {
+ for (Object[] os : fields) {
Field field = (Field) os[0];
Excel excel = (Excel) os[1];
- if (Collection.class.isAssignableFrom(field.getType()))
- {
- for (Field subField : subFields)
- {
+ if (Collection.class.isAssignableFrom(field.getType())) {
+ for (Field subField : subFields) {
Excel subExcel = subField.getAnnotation(Excel.class);
this.createHeadCell(subExcel, row, column++);
}
- }
- else
- {
+ } else {
this.createHeadCell(excel, row, column++);
}
}
- if (Type.EXPORT.equals(type))
- {
+ if (Type.EXPORT.equals(type)) {
fillExcelData(index, row);
addStatisticsRow();
}
@@ -678,57 +565,45 @@
/**
* 濉厖excel鏁版嵁
- *
+ *
* @param index 搴忓彿
- * @param row 鍗曞厓鏍艰
+ * @param row 鍗曞厓鏍艰
*/
@SuppressWarnings("unchecked")
- public void fillExcelData(int index, Row row)
- {
+ public void fillExcelData(int index, Row row) {
int startNo = index * sheetSize;
int endNo = Math.min(startNo + sheetSize, list.size());
int rowNo = (1 + rownum) - startNo;
- for (int i = startNo; i < endNo; i++)
- {
+ for (int i = startNo; i < endNo; i++) {
rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;
row = sheet.createRow(rowNo);
// 寰楀埌瀵煎嚭瀵硅薄.
T vo = (T) list.get(i);
Collection<?> subList = null;
- if (isSubList())
- {
- if (isSubListValue(vo))
- {
+ if (isSubList()) {
+ if (isSubListValue(vo)) {
subList = getListCellValue(vo);
subMergedLastRowNum = subMergedLastRowNum + subList.size();
- }
- else
- {
+ } else {
subMergedFirstRowNum++;
subMergedLastRowNum++;
}
}
int column = 0;
- for (Object[] os : fields)
- {
+ for (Object[] os : fields) {
Field field = (Field) os[0];
Excel excel = (Excel) os[1];
- if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList))
- {
+ if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList)) {
boolean subFirst = false;
- for (Object obj : subList)
- {
- if (subFirst)
- {
+ for (Object obj : subList) {
+ if (subFirst) {
rowNo++;
row = sheet.createRow(rowNo);
}
List<Field> subFields = FieldUtils.getFieldsListWithAnnotation(obj.getClass(), Excel.class);
int subIndex = 0;
- for (Field subField : subFields)
- {
- if (subField.isAnnotationPresent(Excel.class))
- {
+ for (Field subField : subFields) {
+ if (subField.isAnnotationPresent(Excel.class)) {
subField.setAccessible(true);
Excel attr = subField.getAnnotation(Excel.class);
this.addCell(attr, row, (T) obj, subField, column + subIndex);
@@ -738,9 +613,7 @@
subFirst = true;
}
this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size();
- }
- else
- {
+ } else {
this.addCell(excel, row, vo, field, column++);
}
}
@@ -749,12 +622,11 @@
/**
* 鍒涘缓琛ㄦ牸鏍峰紡
- *
+ *
* @param wb 宸ヤ綔钖勫璞�
* @return 鏍峰紡鍒楄〃
*/
- private Map<String, CellStyle> createStyles(Workbook wb)
- {
+ private Map<String, CellStyle> createStyles(Workbook wb) {
// 鍐欏叆鍚勬潯璁板綍,姣忔潯璁板綍瀵瑰簲excel琛ㄤ腑鐨勪竴琛�
Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
CellStyle style = wb.createCellStyle();
@@ -782,6 +654,8 @@
dataFont.setFontName("Arial");
dataFont.setFontHeightInPoints((short) 10);
style.setFont(dataFont);
+ DataFormat format = wb.createDataFormat();
+ style.setDataFormat(format.getFormat("@"));//璁剧疆鏂囨湰鏍煎紡
styles.put("data", style);
style = wb.createCellStyle();
@@ -802,19 +676,16 @@
/**
* 鏍规嵁Excel娉ㄨВ鍒涘缓琛ㄦ牸澶存牱寮�
- *
+ *
* @param wb 宸ヤ綔钖勫璞�
* @return 鑷畾涔夋牱寮忓垪琛�
*/
- private Map<String, CellStyle> annotationHeaderStyles(Workbook wb, Map<String, CellStyle> styles)
- {
+ private Map<String, CellStyle> annotationHeaderStyles(Workbook wb, Map<String, CellStyle> styles) {
Map<String, CellStyle> headerStyles = new HashMap<String, CellStyle>();
- for (Object[] os : fields)
- {
+ for (Object[] os : fields) {
Excel excel = (Excel) os[1];
String key = StringUtils.format("header_{}_{}", excel.headerColor(), excel.headerBackgroundColor());
- if (!headerStyles.containsKey(key))
- {
+ if (!headerStyles.containsKey(key)) {
CellStyle style = wb.createCellStyle();
style.cloneStyleFrom(styles.get("data"));
style.setAlignment(HorizontalAlignment.CENTER);
@@ -835,19 +706,16 @@
/**
* 鏍规嵁Excel娉ㄨВ鍒涘缓琛ㄦ牸鍒楁牱寮�
- *
+ *
* @param wb 宸ヤ綔钖勫璞�
* @return 鑷畾涔夋牱寮忓垪琛�
*/
- private Map<String, CellStyle> annotationDataStyles(Workbook wb)
- {
+ private Map<String, CellStyle> annotationDataStyles(Workbook wb) {
Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
- for (Object[] os : fields)
- {
+ for (Object[] os : fields) {
Excel excel = (Excel) os[1];
String key = StringUtils.format("data_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor());
- if (!styles.containsKey(key))
- {
+ if (!styles.containsKey(key)) {
CellStyle style = wb.createCellStyle();
style.setAlignment(excel.align());
style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -875,20 +743,17 @@
/**
* 鍒涘缓鍗曞厓鏍�
*/
- public Cell createHeadCell(Excel attr, Row row, int column)
- {
+ public Cell createHeadCell(Excel attr, Row row, int column) {
// 鍒涘缓鍒�
Cell cell = row.createCell(column);
// 鍐欏叆鍒椾俊鎭�
cell.setCellValue(attr.name());
setDataValidation(attr, row, column);
cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
- if (isSubList())
- {
+ if (isSubList()) {
// 濉厖榛樿鏍峰紡锛岄槻姝㈠悎骞跺崟鍏冩牸鏍峰紡澶辨晥
sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor())));
- if (attr.needMerge())
- {
+ if (attr.needMerge()) {
sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column));
}
}
@@ -897,43 +762,32 @@
/**
* 璁剧疆鍗曞厓鏍间俊鎭�
- *
+ *
* @param value 鍗曞厓鏍煎��
- * @param attr 娉ㄨВ鐩稿叧
- * @param cell 鍗曞厓鏍间俊鎭�
+ * @param attr 娉ㄨВ鐩稿叧
+ * @param cell 鍗曞厓鏍间俊鎭�
*/
- public void setCellVo(Object value, Excel attr, Cell cell)
- {
- if (ColumnType.STRING == attr.cellType())
- {
+ public void setCellVo(Object value, Excel attr, Cell cell) {
+ if (ColumnType.STRING == attr.cellType()) {
String cellValue = Convert.toStr(value);
// 瀵逛簬浠讳綍浠ヨ〃杈惧紡瑙﹀彂瀛楃 =-+@寮�澶寸殑鍗曞厓鏍硷紝鐩存帴浣跨敤tab瀛楃浣滀负鍓嶇紑锛岄槻姝SV娉ㄥ叆銆�
- if (StringUtils.startsWithAny(cellValue, FORMULA_STR))
- {
+ if (StringUtils.startsWithAny(cellValue, FORMULA_STR)) {
cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0");
}
- if (value instanceof Collection && StringUtils.equals("[]", cellValue))
- {
+ if (value instanceof Collection && StringUtils.equals("[]", cellValue)) {
cellValue = StringUtils.EMPTY;
}
cell.setCellValue(StringUtils.isNull(cellValue) ? attr.defaultValue() : cellValue + attr.suffix());
- }
- else if (ColumnType.NUMERIC == attr.cellType())
- {
- if (StringUtils.isNotNull(value))
- {
+ } else if (ColumnType.NUMERIC == attr.cellType()) {
+ if (StringUtils.isNotNull(value)) {
cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
}
- }
- else if (ColumnType.IMAGE == attr.cellType())
- {
+ } else if (ColumnType.IMAGE == attr.cellType()) {
ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), cell.getRow().getRowNum() + 1);
String imagePath = Convert.toStr(value);
- if (StringUtils.isNotEmpty(imagePath))
- {
+ if (StringUtils.isNotEmpty(imagePath)) {
byte[] data = ImageUtils.getImage(imagePath);
- getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
- cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
+ getDrawingPatriarch(cell.getSheet()).createPicture(anchor, cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
}
}
}
@@ -941,10 +795,8 @@
/**
* 鑾峰彇鐢诲竷
*/
- public static Drawing<?> getDrawingPatriarch(Sheet sheet)
- {
- if (sheet.getDrawingPatriarch() == null)
- {
+ public static Drawing<?> getDrawingPatriarch(Sheet sheet) {
+ if (sheet.getDrawingPatriarch() == null) {
sheet.createDrawingPatriarch();
}
return sheet.getDrawingPatriarch();
@@ -953,15 +805,11 @@
/**
* 鑾峰彇鍥剧墖绫诲瀷,璁剧疆鍥剧墖鎻掑叆绫诲瀷
*/
- public int getImageType(byte[] value)
- {
+ public int getImageType(byte[] value) {
String type = FileTypeUtils.getFileExtendName(value);
- if ("JPG".equalsIgnoreCase(type))
- {
+ if ("JPG".equalsIgnoreCase(type)) {
return Workbook.PICTURE_TYPE_JPEG;
- }
- else if ("PNG".equalsIgnoreCase(type))
- {
+ } else if ("PNG".equalsIgnoreCase(type)) {
return Workbook.PICTURE_TYPE_PNG;
}
return Workbook.PICTURE_TYPE_JPEG;
@@ -970,26 +818,18 @@
/**
* 鍒涘缓琛ㄦ牸鏍峰紡
*/
- public void setDataValidation(Excel attr, Row row, int column)
- {
- if (attr.name().indexOf("娉細") >= 0)
- {
+ public void setDataValidation(Excel attr, Row row, int column) {
+ if (attr.name().indexOf("娉細") >= 0) {
sheet.setColumnWidth(column, 6000);
- }
- else
- {
+ } else {
// 璁剧疆鍒楀
sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
}
- if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0)
- {
- if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255)
- {
+ if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0) {
+ if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255) {
// 濡傛灉涓嬫媺鏁板ぇ浜�15鎴栧瓧绗︿覆闀垮害澶т簬255锛屽垯浣跨敤涓�涓柊sheet瀛樺偍锛岄伩鍏嶇敓鎴愮殑妯℃澘涓嬫媺鍊艰幏鍙栦笉鍒�
setXSSFValidationWithHidden(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
- }
- else
- {
+ } else {
// 鎻愮ず淇℃伅鎴栧彧鑳介�夋嫨涓嶈兘杈撳叆鐨勫垪鍐呭.
setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
}
@@ -999,20 +839,16 @@
/**
* 娣诲姞鍗曞厓鏍�
*/
- public Cell addCell(Excel attr, Row row, T vo, Field field, int column)
- {
+ public Cell addCell(Excel attr, Row row, T vo, Field field, int column) {
Cell cell = null;
- try
- {
+ try {
// 璁剧疆琛岄珮
row.setHeight(maxHeight);
// 鏍规嵁Excel涓缃儏鍐靛喅瀹氭槸鍚﹀鍑�,鏈変簺鎯呭喌闇�瑕佷繚鎸佷负绌�,甯屾湜鐢ㄦ埛濉啓杩欎竴鍒�.
- if (attr.isExport())
- {
+ if (attr.isExport()) {
// 鍒涘缓cell
cell = row.createCell(column);
- if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
- {
+ if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge()) {
CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);
sheet.addMergedRegion(cellAddress);
}
@@ -1024,36 +860,23 @@
String readConverterExp = attr.readConverterExp();
String separator = attr.separator();
String dictType = attr.dictType();
- if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
- {
+ if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) {
cell.setCellValue(parseDateToStr(dateFormat, value));
- }
- else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
- {
+ } else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) {
cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
- }
- else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value))
- {
+ } else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value)) {
cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator));
- }
- else if (value instanceof BigDecimal && -1 != attr.scale())
- {
+ } else if (value instanceof BigDecimal && -1 != attr.scale()) {
cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).doubleValue());
- }
- else if (!attr.handler().equals(ExcelHandlerAdapter.class))
- {
+ } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
cell.setCellValue(dataFormatHandlerAdapter(value, attr));
- }
- else
- {
+ } else {
// 璁剧疆鍒楃被鍨�
setCellVo(value, attr, cell);
}
addStatisticsData(column, Convert.toStr(value), attr);
}
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
log.error("瀵煎嚭Excel澶辫触{}", e);
}
return cell;
@@ -1061,36 +884,30 @@
/**
* 璁剧疆 POI XSSFSheet 鍗曞厓鏍兼彁绀烘垨閫夋嫨妗�
- *
- * @param sheet 琛ㄥ崟
- * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭
+ *
+ * @param sheet 琛ㄥ崟
+ * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭
* @param promptContent 鎻愮ず鍐呭
- * @param firstRow 寮�濮嬭
- * @param endRow 缁撴潫琛�
- * @param firstCol 寮�濮嬪垪
- * @param endCol 缁撴潫鍒�
+ * @param firstRow 寮�濮嬭
+ * @param endRow 缁撴潫琛�
+ * @param firstCol 寮�濮嬪垪
+ * @param endCol 缁撴潫鍒�
*/
- public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow,
- int firstCol, int endCol)
- {
+ public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol) {
DataValidationHelper helper = sheet.getDataValidationHelper();
DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1");
CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
DataValidation dataValidation = helper.createValidation(constraint, regions);
- if (StringUtils.isNotEmpty(promptContent))
- {
+ if (StringUtils.isNotEmpty(promptContent)) {
// 濡傛灉璁剧疆浜嗘彁绀轰俊鎭垯榧犳爣鏀句笂鍘绘彁绀�
dataValidation.createPromptBox("", promptContent);
dataValidation.setShowPromptBox(true);
}
// 澶勭悊Excel鍏煎鎬ч棶棰�
- if (dataValidation instanceof XSSFDataValidation)
- {
+ if (dataValidation instanceof XSSFDataValidation) {
dataValidation.setSuppressDropDownArrow(true);
dataValidation.setShowErrorBox(true);
- }
- else
- {
+ } else {
dataValidation.setSuppressDropDownArrow(false);
}
sheet.addValidationData(dataValidation);
@@ -1098,21 +915,19 @@
/**
* 璁剧疆鏌愪簺鍒楃殑鍊煎彧鑳借緭鍏ラ鍒剁殑鏁版嵁,鏄剧ず涓嬫媺妗嗭紙鍏煎瓒呭嚭涓�瀹氭暟閲忕殑涓嬫媺妗嗭級.
- *
- * @param sheet 瑕佽缃殑sheet.
- * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭
+ *
+ * @param sheet 瑕佽缃殑sheet.
+ * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭
* @param promptContent 鎻愮ず鍐呭
- * @param firstRow 寮�濮嬭
- * @param endRow 缁撴潫琛�
- * @param firstCol 寮�濮嬪垪
- * @param endCol 缁撴潫鍒�
+ * @param firstRow 寮�濮嬭
+ * @param endRow 缁撴潫琛�
+ * @param firstCol 寮�濮嬪垪
+ * @param endCol 缁撴潫鍒�
*/
- public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol)
- {
+ public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol) {
String hideSheetName = "combo_" + firstCol + "_" + endCol;
Sheet hideSheet = wb.createSheet(hideSheetName); // 鐢ㄤ簬瀛樺偍 涓嬫媺鑿滃崟鏁版嵁
- for (int i = 0; i < textlist.length; i++)
- {
+ for (int i = 0; i < textlist.length; i++) {
hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]);
}
// 鍒涘缓鍚嶇О锛屽彲琚叾浠栧崟鍏冩牸寮曠敤
@@ -1126,20 +941,16 @@
CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
// 鏁版嵁鏈夋晥鎬у璞�
DataValidation dataValidation = helper.createValidation(constraint, regions);
- if (StringUtils.isNotEmpty(promptContent))
- {
+ if (StringUtils.isNotEmpty(promptContent)) {
// 濡傛灉璁剧疆浜嗘彁绀轰俊鎭垯榧犳爣鏀句笂鍘绘彁绀�
dataValidation.createPromptBox("", promptContent);
dataValidation.setShowPromptBox(true);
}
// 澶勭悊Excel鍏煎鎬ч棶棰�
- if (dataValidation instanceof XSSFDataValidation)
- {
+ if (dataValidation instanceof XSSFDataValidation) {
dataValidation.setSuppressDropDownArrow(true);
dataValidation.setShowErrorBox(true);
- }
- else
- {
+ } else {
dataValidation.setSuppressDropDownArrow(false);
}
@@ -1150,34 +961,26 @@
/**
* 瑙ｆ瀽瀵煎嚭鍊� 0=鐢�,1=濂�,2=鏈煡
- *
+ *
* @param propertyValue 鍙傛暟鍊�
- * @param converterExp 缈昏瘧娉ㄨВ
- * @param separator 鍒嗛殧绗�
+ * @param converterExp 缈昏瘧娉ㄨВ
+ * @param separator 鍒嗛殧绗�
* @return 瑙ｆ瀽鍚庡��
*/
- public static String convertByExp(String propertyValue, String converterExp, String separator)
- {
+ public static String convertByExp(String propertyValue, String converterExp, String separator) {
StringBuilder propertyString = new StringBuilder();
String[] convertSource = converterExp.split(",");
- for (String item : convertSource)
- {
+ for (String item : convertSource) {
String[] itemArray = item.split("=");
- if (StringUtils.containsAny(propertyValue, separator))
- {
- for (String value : propertyValue.split(separator))
- {
- if (itemArray[0].equals(value))
- {
+ if (StringUtils.containsAny(propertyValue, separator)) {
+ for (String value : propertyValue.split(separator)) {
+ if (itemArray[0].equals(value)) {
propertyString.append(itemArray[1] + separator);
break;
}
}
- }
- else
- {
- if (itemArray[0].equals(propertyValue))
- {
+ } else {
+ if (itemArray[0].equals(propertyValue)) {
return itemArray[1];
}
}
@@ -1187,34 +990,26 @@
/**
* 鍙嶅悜瑙ｆ瀽鍊� 鐢�=0,濂�=1,鏈煡=2
- *
+ *
* @param propertyValue 鍙傛暟鍊�
- * @param converterExp 缈昏瘧娉ㄨВ
- * @param separator 鍒嗛殧绗�
+ * @param converterExp 缈昏瘧娉ㄨВ
+ * @param separator 鍒嗛殧绗�
* @return 瑙ｆ瀽鍚庡��
*/
- public static String reverseByExp(String propertyValue, String converterExp, String separator)
- {
+ public static String reverseByExp(String propertyValue, String converterExp, String separator) {
StringBuilder propertyString = new StringBuilder();
String[] convertSource = converterExp.split(",");
- for (String item : convertSource)
- {
+ for (String item : convertSource) {
String[] itemArray = item.split("=");
- if (StringUtils.containsAny(propertyValue, separator))
- {
- for (String value : propertyValue.split(separator))
- {
- if (itemArray[1].equals(value))
- {
+ if (StringUtils.containsAny(propertyValue, separator)) {
+ for (String value : propertyValue.split(separator)) {
+ if (itemArray[1].equals(value)) {
propertyString.append(itemArray[0] + separator);
break;
}
}
- }
- else
- {
- if (itemArray[1].equals(propertyValue))
- {
+ } else {
+ if (itemArray[1].equals(propertyValue)) {
return itemArray[0];
}
}
@@ -1224,47 +1019,41 @@
/**
* 瑙ｆ瀽瀛楀吀鍊�
- *
+ *
* @param dictValue 瀛楀吀鍊�
- * @param dictType 瀛楀吀绫诲瀷
+ * @param dictType 瀛楀吀绫诲瀷
* @param separator 鍒嗛殧绗�
* @return 瀛楀吀鏍囩
*/
- public static String convertDictByExp(String dictValue, String dictType, String separator)
- {
+ public static String convertDictByExp(String dictValue, String dictType, String separator) {
return DictUtils.getDictLabel(dictType, dictValue, separator);
}
/**
* 鍙嶅悜瑙ｆ瀽鍊煎瓧鍏稿��
- *
+ *
* @param dictLabel 瀛楀吀鏍囩
- * @param dictType 瀛楀吀绫诲瀷
+ * @param dictType 瀛楀吀绫诲瀷
* @param separator 鍒嗛殧绗�
* @return 瀛楀吀鍊�
*/
- public static String reverseDictByExp(String dictLabel, String dictType, String separator)
- {
+ public static String reverseDictByExp(String dictLabel, String dictType, String separator) {
return DictUtils.getDictValue(dictType, dictLabel, separator);
}
/**
* 鏁版嵁澶勭悊鍣�
- *
+ *
* @param value 鏁版嵁鍊�
* @param excel 鏁版嵁娉ㄨВ
* @return
*/
- public String dataFormatHandlerAdapter(Object value, Excel excel)
- {
- try
- {
+ public String dataFormatHandlerAdapter(Object value, Excel excel) {
+ try {
Object instance = excel.handler().newInstance();
- Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class });
+ Method formatMethod = excel.handler().getMethod("format", new Class[]{Object.class, String[].class});
value = formatMethod.invoke(instance, value, excel.args());
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
log.error("涓嶈兘鏍煎紡鍖栨暟鎹� " + excel.handler(), e.getMessage());
}
return Convert.toStr(value);
@@ -1273,21 +1062,15 @@
/**
* 鍚堣缁熻淇℃伅
*/
- private void addStatisticsData(Integer index, String text, Excel entity)
- {
- if (entity != null && entity.isStatistics())
- {
+ private void addStatisticsData(Integer index, String text, Excel entity) {
+ if (entity != null && entity.isStatistics()) {
Double temp = 0D;
- if (!statistics.containsKey(index))
- {
+ if (!statistics.containsKey(index)) {
statistics.put(index, temp);
}
- try
- {
+ try {
temp = Double.valueOf(text);
- }
- catch (NumberFormatException e)
- {
+ } catch (NumberFormatException e) {
}
statistics.put(index, statistics.get(index) + temp);
}
@@ -1296,18 +1079,15 @@
/**
* 鍒涘缓缁熻琛�
*/
- public void addStatisticsRow()
- {
- if (statistics.size() > 0)
- {
+ public void addStatisticsRow() {
+ if (statistics.size() > 0) {
Row row = sheet.createRow(sheet.getLastRowNum() + 1);
Set<Integer> keys = statistics.keySet();
Cell cell = row.createCell(0);
cell.setCellStyle(styles.get("total"));
cell.setCellValue("鍚堣");
- for (Integer key : keys)
- {
+ for (Integer key : keys) {
cell = row.createCell(key);
cell.setCellStyle(styles.get("total"));
cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
@@ -1319,23 +1099,20 @@
/**
* 缂栫爜鏂囦欢鍚�
*/
- public String encodingFilename(String filename)
- {
+ public String encodingFilename(String filename) {
filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
return filename;
}
/**
* 鑾峰彇涓嬭浇璺緞
- *
+ *
* @param filename 鏂囦欢鍚嶇О
*/
- public String getAbsoluteFile(String filename)
- {
+ public String getAbsoluteFile(String filename) {
String downloadPath = RuoYiConfig.getDownloadPath() + filename;
File desc = new File(downloadPath);
- if (!desc.getParentFile().exists())
- {
+ if (!desc.getParentFile().exists()) {
desc.getParentFile().mkdirs();
}
return downloadPath;
@@ -1343,29 +1120,23 @@
/**
* 鑾峰彇bean涓殑灞炴�у��
- *
- * @param vo 瀹炰綋瀵硅薄
+ *
+ * @param vo 瀹炰綋瀵硅薄
* @param field 瀛楁
* @param excel 娉ㄨВ
* @return 鏈�缁堢殑灞炴�у��
* @throws Exception
*/
- private Object getTargetValue(T vo, Field field, Excel excel) throws Exception
- {
+ private Object getTargetValue(T vo, Field field, Excel excel) throws Exception {
Object o = field.get(vo);
- if (StringUtils.isNotEmpty(excel.targetAttr()))
- {
+ if (StringUtils.isNotEmpty(excel.targetAttr())) {
String target = excel.targetAttr();
- if (target.contains("."))
- {
+ if (target.contains(".")) {
String[] targets = target.split("[.]");
- for (String name : targets)
- {
+ for (String name : targets) {
o = getValue(o, name);
}
- }
- else
- {
+ } else {
o = getValue(o, target);
}
}
@@ -1374,16 +1145,14 @@
/**
* 浠ョ被鐨勫睘鎬х殑get鏂规硶鏂规硶褰㈠紡鑾峰彇鍊�
- *
+ *
* @param o
* @param name
* @return value
* @throws Exception
*/
- private Object getValue(Object o, String name) throws Exception
- {
- if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name))
- {
+ private Object getValue(Object o, String name) throws Exception {
+ if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) {
Class<?> clazz = o.getClass();
Field field = clazz.getDeclaredField(name);
field.setAccessible(true);
@@ -1395,8 +1164,7 @@
/**
* 寰楀埌鎵�鏈夊畾涔夊瓧娈�
*/
- private void createExcelField()
- {
+ private void createExcelField() {
this.fields = getFields();
this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
this.maxHeight = getRowHeight();
@@ -1405,27 +1173,21 @@
/**
* 鑾峰彇瀛楁娉ㄨВ淇℃伅
*/
- public List<Object[]> getFields()
- {
+ public List<Object[]> getFields() {
List<Object[]> fields = new ArrayList<Object[]>();
List<Field> tempFields = new ArrayList<>();
tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
- for (Field field : tempFields)
- {
- if (!ArrayUtils.contains(this.excludeFields, field.getName()))
- {
+ for (Field field : tempFields) {
+ if (!ArrayUtils.contains(this.excludeFields, field.getName())) {
// 鍗曟敞瑙�
- if (field.isAnnotationPresent(Excel.class))
- {
+ if (field.isAnnotationPresent(Excel.class)) {
Excel attr = field.getAnnotation(Excel.class);
- if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
- {
+ if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) {
field.setAccessible(true);
- fields.add(new Object[] { field, attr });
+ fields.add(new Object[]{field, attr});
}
- if (Collection.class.isAssignableFrom(field.getType()))
- {
+ if (Collection.class.isAssignableFrom(field.getType())) {
subMethod = getSubMethod(field.getName(), clazz);
ParameterizedType pt = (ParameterizedType) field.getGenericType();
Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
@@ -1434,16 +1196,13 @@
}
// 澶氭敞瑙�
- if (field.isAnnotationPresent(Excels.class))
- {
+ if (field.isAnnotationPresent(Excels.class)) {
Excels attrs = field.getAnnotation(Excels.class);
Excel[] excels = attrs.value();
- for (Excel attr : excels)
- {
- if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
- {
+ for (Excel attr : excels) {
+ if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) {
field.setAccessible(true);
- fields.add(new Object[] { field, attr });
+ fields.add(new Object[]{field, attr});
}
}
}
@@ -1455,11 +1214,9 @@
/**
* 鏍规嵁娉ㄨВ鑾峰彇鏈�澶ц楂�
*/
- public short getRowHeight()
- {
+ public short getRowHeight() {
double maxHeight = 0;
- for (Object[] os : this.fields)
- {
+ for (Object[] os : this.fields) {
Excel excel = (Excel) os[1];
maxHeight = Math.max(maxHeight, excel.height());
}
@@ -1469,8 +1226,7 @@
/**
* 鍒涘缓涓�涓伐浣滅翱
*/
- public void createWorkbook()
- {
+ public void createWorkbook() {
this.wb = new SXSSFWorkbook(500);
this.sheet = wb.createSheet();
wb.setSheetName(0, sheetName);
@@ -1479,15 +1235,13 @@
/**
* 鍒涘缓宸ヤ綔琛�
- *
+ *
* @param sheetNo sheet鏁伴噺
- * @param index 搴忓彿
+ * @param index 搴忓彿
*/
- public void createSheet(int sheetNo, int index)
- {
+ public void createSheet(int sheetNo, int index) {
// 璁剧疆宸ヤ綔琛ㄧ殑鍚嶇О.
- if (sheetNo > 1 && index > 0)
- {
+ if (sheetNo > 1 && index > 0) {
this.sheet = wb.createSheet();
this.createTitle();
wb.setSheetName(index, sheetName + index);
@@ -1496,59 +1250,40 @@
/**
* 鑾峰彇鍗曞厓鏍煎��
- *
- * @param row 鑾峰彇鐨勮
+ *
+ * @param row 鑾峰彇鐨勮
* @param column 鑾峰彇鍗曞厓鏍煎垪鍙�
* @return 鍗曞厓鏍煎��
*/
- public Object getCellValue(Row row, int column)
- {
- if (row == null)
- {
+ public Object getCellValue(Row row, int column) {
+ if (row == null) {
return row;
}
Object val = "";
- try
- {
+ try {
Cell cell = row.getCell(column);
- if (StringUtils.isNotNull(cell))
- {
- if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA)
- {
+ if (StringUtils.isNotNull(cell)) {
+ if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) {
val = cell.getNumericCellValue();
- if (DateUtil.isCellDateFormatted(cell))
- {
+ if (DateUtil.isCellDateFormatted(cell)) {
val = DateUtil.getJavaDate((Double) val); // POI Excel 鏃ユ湡鏍煎紡杞崲
- }
- else
- {
- if ((Double) val % 1 != 0)
- {
+ } else {
+ if ((Double) val % 1 != 0) {
val = new BigDecimal(val.toString());
- }
- else
- {
+ } else {
val = new DecimalFormat("0").format(val);
}
}
- }
- else if (cell.getCellType() == CellType.STRING)
- {
+ } else if (cell.getCellType() == CellType.STRING) {
val = cell.getStringCellValue();
- }
- else if (cell.getCellType() == CellType.BOOLEAN)
- {
+ } else if (cell.getCellType() == CellType.BOOLEAN) {
val = cell.getBooleanCellValue();
- }
- else if (cell.getCellType() == CellType.ERROR)
- {
+ } else if (cell.getCellType() == CellType.ERROR) {
val = cell.getErrorCellValue();
}
}
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return val;
}
return val;
@@ -1556,21 +1291,17 @@
/**
* 鍒ゆ柇鏄惁鏄┖琛�
- *
+ *
* @param row 鍒ゆ柇鐨勮
* @return
*/
- private boolean isRowEmpty(Row row)
- {
- if (row == null)
- {
+ private boolean isRowEmpty(Row row) {
+ if (row == null) {
return true;
}
- for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++)
- {
+ for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
Cell cell = row.getCell(i);
- if (cell != null && cell.getCellType() != CellType.BLANK)
- {
+ if (cell != null && cell.getCellType() != CellType.BLANK) {
return false;
}
}
@@ -1580,21 +1311,17 @@
/**
* 鑾峰彇Excel2003鍥剧墖
*
- * @param sheet 褰撳墠sheet瀵硅薄
+ * @param sheet 褰撳墠sheet瀵硅薄
* @param workbook 宸ヤ綔绨垮璞�
* @return Map key:鍥剧墖鍗曞厓鏍肩储寮曪紙1_1锛塖tring锛寁alue:鍥剧墖娴丳ictureData
*/
- public static Map<String, PictureData> getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook)
- {
+ public static Map<String, PictureData> getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook) {
Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
List<HSSFPictureData> pictures = workbook.getAllPictures();
- if (!pictures.isEmpty())
- {
- for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren())
- {
+ if (!pictures.isEmpty()) {
+ for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren()) {
HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor();
- if (shape instanceof HSSFPicture)
- {
+ if (shape instanceof HSSFPicture) {
HSSFPicture pic = (HSSFPicture) shape;
int pictureIndex = pic.getPictureIndex() - 1;
HSSFPictureData picData = pictures.get(pictureIndex);
@@ -1603,9 +1330,7 @@
}
}
return sheetIndexPicMap;
- }
- else
- {
+ } else {
return sheetIndexPicMap;
}
}
@@ -1613,23 +1338,18 @@
/**
* 鑾峰彇Excel2007鍥剧墖
*
- * @param sheet 褰撳墠sheet瀵硅薄
+ * @param sheet 褰撳墠sheet瀵硅薄
* @param workbook 宸ヤ綔绨垮璞�
* @return Map key:鍥剧墖鍗曞厓鏍肩储寮曪紙1_1锛塖tring锛寁alue:鍥剧墖娴丳ictureData
*/
- public static Map<String, PictureData> getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook)
- {
+ public static Map<String, PictureData> getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook) {
Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
- for (POIXMLDocumentPart dr : sheet.getRelations())
- {
- if (dr instanceof XSSFDrawing)
- {
+ for (POIXMLDocumentPart dr : sheet.getRelations()) {
+ if (dr instanceof XSSFDrawing) {
XSSFDrawing drawing = (XSSFDrawing) dr;
List<XSSFShape> shapes = drawing.getShapes();
- for (XSSFShape shape : shapes)
- {
- if (shape instanceof XSSFPicture)
- {
+ for (XSSFShape shape : shapes) {
+ if (shape instanceof XSSFPicture) {
XSSFPicture pic = (XSSFPicture) shape;
XSSFClientAnchor anchor = pic.getPreferredSize();
CTMarker ctMarker = anchor.getFrom();
@@ -1644,32 +1364,23 @@
/**
* 鏍煎紡鍖栦笉鍚岀被鍨嬬殑鏃ユ湡瀵硅薄
- *
+ *
* @param dateFormat 鏃ユ湡鏍煎紡
- * @param val 琚牸寮忓寲鐨勬棩鏈熷璞�
+ * @param val 琚牸寮忓寲鐨勬棩鏈熷璞�
* @return 鏍煎紡鍖栧悗鐨勬棩鏈熷瓧绗�
*/
- public String parseDateToStr(String dateFormat, Object val)
- {
- if (val == null)
- {
+ public String parseDateToStr(String dateFormat, Object val) {
+ if (val == null) {
return "";
}
String str;
- if (val instanceof Date)
- {
+ if (val instanceof Date) {
str = DateUtils.parseDateToStr(dateFormat, (Date) val);
- }
- else if (val instanceof LocalDateTime)
- {
+ } else if (val instanceof LocalDateTime) {
str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDateTime) val));
- }
- else if (val instanceof LocalDate)
- {
+ } else if (val instanceof LocalDate) {
str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDate) val));
- }
- else
- {
+ } else {
str = val.toString();
}
return str;
@@ -1678,31 +1389,25 @@
/**
* 鏄惁鏈夊璞＄殑瀛愬垪琛�
*/
- public boolean isSubList()
- {
+ public boolean isSubList() {
return StringUtils.isNotNull(subFields) && subFields.size() > 0;
}
/**
* 鏄惁鏈夊璞＄殑瀛愬垪琛紝闆嗗悎涓嶄负绌�
*/
- public boolean isSubListValue(T vo)
- {
+ public boolean isSubListValue(T vo) {
return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0;
}
/**
* 鑾峰彇闆嗗悎鐨勫��
*/
- public Collection<?> getListCellValue(Object obj)
- {
+ public Collection<?> getListCellValue(Object obj) {
Object value;
- try
- {
- value = subMethod.invoke(obj, new Object[] {});
- }
- catch (Exception e)
- {
+ try {
+ value = subMethod.invoke(obj, new Object[]{});
+ } catch (Exception e) {
return new ArrayList<Object>();
}
return (Collection<?>) value;
@@ -1710,23 +1415,19 @@
/**
* 鑾峰彇瀵硅薄鐨勫瓙鍒楄〃鏂规硶
- *
- * @param name 鍚嶇О
+ *
+ * @param name 鍚嶇О
* @param pojoClass 绫诲璞�
* @return 瀛愬垪琛ㄦ柟娉�
*/
- public Method getSubMethod(String name, Class<?> pojoClass)
- {
+ public Method getSubMethod(String name, Class<?> pojoClass) {
StringBuffer getMethodName = new StringBuffer("get");
getMethodName.append(name.substring(0, 1).toUpperCase());
getMethodName.append(name.substring(1));
Method method = null;
- try
- {
- method = pojoClass.getMethod(getMethodName.toString(), new Class[] {});
- }
- catch (Exception e)
- {
+ try {
+ method = pojoClass.getMethod(getMethodName.toString(), new Class[]{});
+ } catch (Exception e) {
log.error("鑾峰彇瀵硅薄寮傚父{}", e.getMessage());
}
return method;
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 0af0508..38c4b6e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -108,7 +108,7 @@
// 杩囨护璇锋眰
.authorizeRequests()
// 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
- .antMatchers("/login", "/register", "/captchaImage", "/qrcode/generateStaticHtml", "/qrcode/getQRcode", "/qrcode/getFormDate", "/chat", "/system/file/admin/uploadFile", "/smartor/dingtalk/sendNotification", "/patient/read/patientInfo", "/socket", "/API_ESB_Service", "/API_ESB_Service/Run", "/magic/web/**", "/smartor/serviceSubtask/phoneCallBack", "/smartor/serviceSubtask/taskPull", "/smartor/serviceSubtask//phoneCallBackYQ", "/smartor/robot/callstatus", "/smartor/robot/aidialog", "/smartor/robot/cdrinfo", "/getToken", "/smartor/subtaskAnswer/getQuestionCache", "/smartor/subtaskAnswer/saveQuestionCache", "/smartor/servicetask/getScriptInfoByCondition", "/smartor/serviceSubtask/saveQuestionAnswer").permitAll()
+ .antMatchers("/login", "/register", "/captchaImage", "/qrcode/generateStaticHtml", "/qrcode/getQRcode", "/qrcode/getFormDate", "/chat", "/system/file/admin/uploadFile", "/smartor/dingtalk/sendNotification", "/patient/read/patientInfo", "/socket", "/API_ESB_Service", "/API_ESB_Service/Run", "/magic/web/**", "/smartor/serviceSubtask/phoneCallBack", "/smartor/serviceSubtask/taskPull", "/smartor/serviceSubtask/phoneCallBackYQ", "/smartor/robot/callstatus", "/smartor/robot/aidialog", "/smartor/robot/cdrinfo", "/getToken", "/smartor/subtaskAnswer/getQuestionCache", "/smartor/subtaskAnswer/saveQuestionCache", "/smartor/servicetask/getScriptInfoByCondition", "/smartor/subtaskAnswer/saveQuestionAnswer","/smartor/import/download").permitAll()
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll().antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
// 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇�
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
index 23b1a21..17cafd3 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -30,7 +30,7 @@
/**
* 浠ｇ爜鐢熸垚 鎿嶄綔澶勭悊
- *
+ *
* @author ruoyi
*/
@RestController
@@ -46,7 +46,7 @@
/**
* 鏌ヨ浠ｇ爜鐢熸垚鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ //@PreAuthorize("@ss.hasPermi('tool:gen:list')")
@GetMapping("/list")
public TableDataInfo genList(GenTable genTable)
{
@@ -58,7 +58,7 @@
/**
* 淇敼浠ｇ爜鐢熸垚涓氬姟
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:query')")
+ //@PreAuthorize("@ss.hasPermi('tool:gen:query')")
@GetMapping(value = "/{tableId}")
public AjaxResult getInfo(@PathVariable Long tableId)
{
@@ -75,7 +75,7 @@
/**
* 鏌ヨ鏁版嵁搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ //@PreAuthorize("@ss.hasPermi('tool:gen:list')")
@GetMapping("/db/list")
public TableDataInfo dataList(GenTable genTable)
{
@@ -87,7 +87,7 @@
/**
* 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ //@PreAuthorize("@ss.hasPermi('tool:gen:list')")
@GetMapping(value = "/column/{tableId}")
public TableDataInfo columnList(Long tableId)
{
@@ -101,7 +101,7 @@
/**
* 瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:import')")
+ //@PreAuthorize("@ss.hasPermi('tool:gen:import')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.IMPORT)
@PostMapping("/importTable")
public AjaxResult importTableSave(String tables)
@@ -116,7 +116,7 @@
/**
* 淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+ //@PreAuthorize("@ss.hasPermi('tool:gen:edit')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@PostMapping
public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
@@ -129,7 +129,7 @@
/**
* 鍒犻櫎浠ｇ爜鐢熸垚
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:remove')")
+ //@PreAuthorize("@ss.hasPermi('tool:gen:remove')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.DELETE)
@GetMapping("/remove/{tableIds}")
public AjaxResult remove(@PathVariable Long[] tableIds)
@@ -141,7 +141,7 @@
/**
* 棰勮浠ｇ爜
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:preview')")
+ //@PreAuthorize("@ss.hasPermi('tool:gen:preview')")
@GetMapping("/preview/{tableId}")
public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
{
@@ -152,7 +152,7 @@
/**
* 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ //@PreAuthorize("@ss.hasPermi('tool:gen:code')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/download/{tableName}")
public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
@@ -164,7 +164,7 @@
/**
* 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ //@PreAuthorize("@ss.hasPermi('tool:gen:code')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}")
public AjaxResult genCode(@PathVariable("tableName") String tableName)
@@ -176,7 +176,7 @@
/**
* 鍚屾鏁版嵁搴�
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+ //@PreAuthorize("@ss.hasPermi('tool:gen:edit')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@GetMapping("/synchDb/{tableName}")
public AjaxResult synchDb(@PathVariable("tableName") String tableName)
@@ -188,7 +188,7 @@
/**
* 鎵归噺鐢熸垚浠ｇ爜
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ //@PreAuthorize("@ss.hasPermi('tool:gen:code')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/batchGenCode")
public void batchGenCode(HttpServletResponse response, String tables) throws IOException
@@ -211,4 +211,4 @@
response.setContentType("application/octet-stream; charset=UTF-8");
IOUtils.write(data, response.getOutputStream());
}
-}
\ No newline at end of file
+}
diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index 2d6166f..90a4dec 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -44,7 +44,7 @@
* 鏌ヨ${functionName}鍒楄〃
*/
@ApiOperation("鏌ヨ${functionName}鍒楄〃")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+ //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
@GetMapping("/list")
#if($table.crud || $table.sub)
public TableDataInfo list(${ClassName} ${className})
@@ -65,7 +65,7 @@
* 瀵煎嚭${functionName}鍒楄〃
*/
@ApiOperation("瀵煎嚭${functionName}鍒楄〃")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
+ //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
@Log(title = "${functionName}", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ${ClassName} ${className})
@@ -79,7 +79,7 @@
* 鑾峰彇${functionName}璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇${functionName}璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
+ //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
@GetMapping(value = "/getInfo/{${pkColumn.javaField}}")
public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
{
@@ -89,7 +89,7 @@
/**
* 鏂板${functionName}
*/
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
+ //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
@Log(title = "${functionName}", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody ${ClassName} ${className})
@@ -101,7 +101,7 @@
* 淇敼${functionName}
*/
@ApiOperation("淇敼${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
+ //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
@Log(title = "${functionName}", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody ${ClassName} ${className})
@@ -113,7 +113,7 @@
* 鍒犻櫎${functionName}
*/
@ApiOperation("鍒犻櫎${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
+ //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
@Log(title = "${functionName}", businessType = BusinessType.DELETE)
@GetMapping("/remove/{${pkColumn.javaField}s}")
public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
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 a4c600b..b21433d 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
@@ -42,7 +42,7 @@
/**
* 鏌ヨ瀹氭椂浠诲姟鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:list')")
+ //@PreAuthorize("@ss.hasPermi('monitor:job:list')")
@GetMapping("/list")
public TableDataInfo list(SysJob sysJob) {
startPage();
@@ -53,7 +53,7 @@
/**
* 瀵煎嚭瀹氭椂浠诲姟鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:export')")
+ //@PreAuthorize("@ss.hasPermi('monitor:job:export')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SysJob sysJob) {
@@ -65,7 +65,7 @@
/**
* 鑾峰彇瀹氭椂浠诲姟璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:query')")
+ //@PreAuthorize("@ss.hasPermi('monitor:job:query')")
@GetMapping(value = "/{jobId}")
public AjaxResult getInfo(@PathVariable("jobId") Long jobId) {
return success(jobService.selectJobById(jobId));
@@ -74,7 +74,7 @@
/**
* 鏂板瀹氭椂浠诲姟
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:add')")
+ //@PreAuthorize("@ss.hasPermi('monitor:job:add')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException {
@@ -98,7 +98,7 @@
/**
* 淇敼瀹氭椂浠诲姟
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:edit')")
+ //@PreAuthorize("@ss.hasPermi('monitor:job:edit')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException {
@@ -122,7 +122,7 @@
/**
* 瀹氭椂浠诲姟鐘舵�佷慨鏀�
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
+ //@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PostMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException {
@@ -134,7 +134,7 @@
/**
* 瀹氭椂浠诲姟绔嬪嵆鎵ц涓�娆�
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
+ //@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PostMapping("/run")
public AjaxResult run(@RequestBody SysJob job) throws SchedulerException {
@@ -145,7 +145,7 @@
/**
* 鍒犻櫎瀹氭椂浠诲姟
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+ //@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
@GetMapping("/remove/{jobIds}")
public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException {
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
index 62ecbab..5695f47 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
@@ -34,7 +34,7 @@
/**
* 鏌ヨ瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:list')")
+ //@PreAuthorize("@ss.hasPermi('monitor:job:list')")
@GetMapping("/list")
public TableDataInfo list(SysJobLog sysJobLog)
{
@@ -46,7 +46,7 @@
/**
* 瀵煎嚭瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:export')")
+ //@PreAuthorize("@ss.hasPermi('monitor:job:export')")
@Log(title = "浠诲姟璋冨害鏃ュ織", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SysJobLog sysJobLog)
@@ -59,7 +59,7 @@
/**
* 鏍规嵁璋冨害缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:query')")
+ //@PreAuthorize("@ss.hasPermi('monitor:job:query')")
@GetMapping(value = "/{jobLogId}")
public AjaxResult getInfo(@PathVariable Long jobLogId)
{
@@ -70,7 +70,7 @@
/**
* 鍒犻櫎瀹氭椂浠诲姟璋冨害鏃ュ織
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+ //@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobLogIds}")
public AjaxResult remove(@PathVariable Long[] jobLogIds)
@@ -81,7 +81,7 @@
/**
* 娓呯┖瀹氭椂浠诲姟璋冨害鏃ュ織
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+ //@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
public AjaxResult clean()
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index b5cd718..89d4236 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -1,15 +1,14 @@
package com.ruoyi.quartz.task;
import com.alibaba.fastjson2.JSON;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.alibaba.fastjson2.JSONObject;
import com.google.common.reflect.TypeToken;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonArray;
import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.ServiceFromEnum;
+import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
@@ -19,14 +18,19 @@
import com.smartor.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.UnsupportedEncodingException;
import java.lang.reflect.Type;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -51,6 +55,8 @@
@Autowired
private IServiceSubtaskService iServiceSubtaskService;
+ @Autowired
+ private PlatformTransactionManager transactionManager;
@Value("${localIP}")
private String localIP;
@@ -58,6 +64,8 @@
@Value("${pub_key}")
private String pub_key;
+ @Value("${thirdWXUrl}")
+ private String thirdWXUrl;
@Value("${req_path}")
private String req_path;
@@ -85,6 +93,9 @@
@Autowired
IPatMedOuthospService patMedOuthospService;
+
+ @Autowired
+ ISvyTaskTemplateService svyTaskTemplateService;
@Value("${hosp_info_url}")
private String hospInfoUrl;
@@ -125,15 +136,43 @@
*/
public void dealHisData() {
//灏嗘偅鑰呬俊鎭�佸嚭闄€�侀棬璇婃暟鎹叏閮ㄩ噰闆�
- getInHospInfo("0");
- getInHospInfo("1");
+ // 鑾峰彇褰撳墠鏃ユ湡鍜屾椂闂�
+ LocalDateTime endTime = LocalDateTime.now();
+ // 鑾峰彇鍓嶄竴澶╃殑鏃ユ湡鍜屾椂闂�
+ LocalDateTime startTime = endTime.minusDays(1);
+ getInHospInfo("0", startTime, endTime);
+ getInHospInfo("1", startTime, endTime);
//璋冪敤dealOupHospInfo鏁版嵁澶勭悊鏂规硶锛屽鐞嗗畬鍚庯紝灏嗏�滃嚭闄㈣〃鐨刢heck_flag=1鈥�
//鑾峰彇褰撳墠鏃ユ湡 锛堢簿纭埌澶╋級寰�鍓嶆帹鐩稿簲澶╂暟锛堝湪鎸囧畾鐨勫熀纭�妯℃澘涓壘瀵瑰簲鐨勫ぉ鏁帮級锛�
//寰幆鎮ｈ�呬俊鎭紝鏍规嵁鎮ｈ��"鍑洪櫌璇婃柇ICD鍊尖�濊幏鍙栧埌鐩稿綋鐨勬ā鏉匡紙鑾峰彇鍙栫浉搴旂殑澶╂暟锛�;
//鏍规嵁鏌ヨ鍑烘潵鐨勬ā鏉匡紝鍘诲浐瀹氫换鍔★紙鍥哄畾浠诲姟锛屽凡缁忓皢妯℃澘涔熷浐瀹氫簡锛夊幓鍖归厤妯℃澘
//鏍规嵁鍖归厤鍑烘潵鐨勬ā鏉垮拰浠诲姟涓庢偅鑰呬俊鎭紝灏嗘暟鎹彃鍏ュ埌瀛愪换鍔¤〃涓�
- iPatMedInhospService.dealOupHospInfo();
+ }
+
+ public void dealHisData2() {
+ //灏嗘偅鑰呬俊鎭�佸嚭闄€�侀棬璇婃暟鎹叏閮ㄩ噰闆�
+ // 鎸囧畾鐨勫紑濮嬫棩鏈�
+ LocalDate endDate = LocalDate.of(2024, 9, 1);
+ // 褰撳墠鏃ユ湡
+ LocalDate currentDate = LocalDate.now();
+ // 瀹氫箟鏃ユ湡鏍煎紡
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd ");
+
+ // 浠庡紑濮嬫棩鏈熷埌褰撳墠鏃ユ湡閫愬ぉ鎵撳嵃
+ for (LocalDate date = endDate; !date.isAfter(currentDate); date = date.plusDays(1)) {
+ System.out.println(date.format(formatter));
+ getInHospInfo("0", date.minusDays(1).atStartOfDay(), date.atStartOfDay());
+ getInHospInfo("1", date.minusDays(1).atStartOfDay(), date.atStartOfDay());
+ }
+
+ }
+
+ /**
+ * 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃
+ */
+ public void dealOutHospInfo() {
+ iPatMedInhospService.dealOutHospInfo();
}
/**
@@ -145,24 +184,58 @@
st.setDelFlag("0");
st.setLongTask(1);
List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
+ log.error("serviceTasks杩涙潵浜嗗悧锛焮}", serviceTasks);
for (ServiceTask serviceTask : serviceTasks) {
+
//閫氳繃taskId,鑾峰彇鏈墽琛岀殑瀛愪换鍔′俊鎭�
ServiceSubtaskVO serviceSubtask = new ServiceSubtaskVO();
serviceSubtask.setTaskid(serviceTask.getTaskid());
serviceSubtask.setSendstate(2L);
List<ServiceSubtask> selectServiceSubtaskList = iServiceSubtaskService.selectServiceSubtaskList(serviceSubtask);
+ log.error("selectServiceSubtaskList杩涙潵浜嗗悧锛焮}", selectServiceSubtaskList);
if (CollectionUtils.isNotEmpty(selectServiceSubtaskList)) {
for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
//濡傛灉鎮ｈ�呯殑鍙戦�佹棩鏈熸槸浠婂ぉ锛屽垯杩涜鍙戦��
- boolean dateToday = isDateToday(serviceSubtask1.getLongSendTime());
- if (dateToday) {
- CommonTaskcallMQ commonTaskcallMQ = new CommonTaskcallMQ();
- commonTaskcallMQ.setTaskid(serviceTask.getTaskid());
- commonTaskcallMQ.setPreachform(serviceSubtask1.getServiceform());
- sfHandle(commonTaskcallMQ, localIP);
- //鍙戦�佸畬鎴愬悗锛屼慨鏀圭姸鎬�
- serviceSubtask1.setSendstate(3L);
- iServiceSubtaskService.updateServiceSubtask(serviceSubtask1);
+ try {
+ boolean dateToday = isDateToday(serviceSubtask1.getLongSendTime());
+ if (dateToday) {
+ //鍏堝垽鏂偅鑰呮槸涓嶆槸杩樿鍙戦��
+ PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(serviceSubtask1.getPatid());
+ if (!Objects.isNull(patArchive) && patArchive.getNotrequiredFlag() == "1") {
+ //涓嶉渶瑕佸彂閫�
+ serviceSubtask1.setResult("error");
+ serviceSubtask1.setRemark(patArchive.getNotrequiredreason());
+ serviceSubtask1.setSendstate(4L);
+ serviceSubtask1.setFinishtime(new Date());
+ iServiceSubtaskService.insertServiceSubtask(serviceSubtask1);
+ continue;
+ }
+
+ log.error("dateToday杩涙潵浜嗗悧锛焮}", dateToday);
+ CommonTaskcallMQ commonTaskcallMQ = new CommonTaskcallMQ();
+ commonTaskcallMQ.setTaskid(serviceTask.getTaskid());
+ commonTaskcallMQ.setPreachform(serviceSubtask1.getServiceform());
+ commonTaskcallMQ.setSendType("2");
+ Map<String, Object> map = sfHandlle(commonTaskcallMQ, localIP);
+ //鍙戦�佸畬鎴愬悗锛屼慨鏀圭姸鎬�
+ serviceSubtask1.setSendstate(3L);
+ if ((Boolean) map.get("succ") == false) {
+ serviceSubtask1.setResult("success");
+ } else {
+ serviceSubtask1.setResult("error");
+ serviceSubtask1.setRemark(map.get("msg").toString());
+ }
+ iServiceSubtaskService.updateServiceSubtask(serviceSubtask1);
+ }
+ } catch (Exception e) {
+ String guid = UUID.randomUUID().toString();
+ log.error("闀挎湡浠诲姟锛屽彂閫佸け璐ュ師鍥狅細{},{}", e.getMessage(), guid);
+ serviceSubtask1.setResult("error");
+ serviceSubtask1.setRemark("绯荤粺閿欒");
+ serviceSubtask1.setSendstate(5L);
+ serviceSubtask1.setFinishtime(new Date());
+ serviceSubtask1.setGuid(guid);
+ iServiceSubtaskService.insertServiceSubtask(serviceSubtask1);
}
}
}
@@ -191,14 +264,15 @@
return (calendarToCheck.get(Calendar.YEAR) == todayYear && calendarToCheck.get(Calendar.MONTH) == todayMonth && calendarToCheck.get(Calendar.DAY_OF_MONTH) == todayDay);
}
- public void sfHandle(CommonTaskcallMQ commonTaskcallMQ, String ip) {
+ public Map<String, Object> sfHandlle(CommonTaskcallMQ commonTaskcallMQ, String ip) {
+ log.error("sfHandlle杩涙潵浜嗗悧锛焮}", commonTaskcallMQ);
//鍒ゆ柇涓�涓媍ommonTaskcallMQ涓殑stopstate鏄惁涓巌vr_task涓殑涓�鑷达紝涓嶄竴鑷达紝鍒欒鏄庢槸鏆傚仠浜�
ServiceTask ivrTask1 = serviceTaskMapper.selectServiceTaskByTaskid(commonTaskcallMQ.getTaskid());
if (StringUtils.isNotEmpty(commonTaskcallMQ.getPreachform())) {
//濡備綍浠诲姟鍙戦�佹柟寮忎笉涓虹┖
String[] split = commonTaskcallMQ.getPreachform().split(",");
- System.out.println("split鐨勫�间负锛�" + split);
+ log.error("split杩涙潵浜嗗悧锛焮}", split);
for (String serviceFrom : split) {
String descByCode = ServiceFromEnum.getDescByCode(Integer.valueOf(serviceFrom));
//杩欓噷鍙互鑰冭檻鐢ㄧ瓥鐣ユā寮忎紭鍖栦竴涓嬶紝涓嶇劧澶毦鐪嬩簡
@@ -259,10 +333,10 @@
}
} else if (descByCode.equals("澶氬獟浣�")) {
//澶氬獟浣�
- return;
+ return null;
} else if (descByCode.equals("绾歌川")) {
//绾歌川
- return;
+ return null;
} else if (descByCode.equals("鐭俊")) {
//鐭俊
// http://localhost:8099/followvisit/particty?param1=3¶m2=348
@@ -278,7 +352,6 @@
sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "¶m2=" + patid + "¶m5=false");
Boolean aBoolean = sendService.sendMsg(sendMagParam);
-
//浠诲姟鍙戦�佽褰�
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
@@ -288,24 +361,24 @@
serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
serviceSubtaskRecord.setResult(aBoolean == true ? "鎴愬姛" : "澶辫触");
serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
+ return null;
}
} else if (descByCode.equals("鍏紬鍙�")) {
+ log.error("鍏紬鍙疯繘鏉ヤ簡鍚楋紵{}", descByCode);
//鍏紬鍙�
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
+ log.error("serviceSubtask---------杩涙潵浜嗗悧锛焮}", serviceSubtask);
String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
- SendMagParam sendMagParam = new SendMagParam();
- sendMagParam.setType("5");
- sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + ivrTask1.getTaskName() + "¶m5=false");
- log.info("閾炬帴瀹屾暣璺緞锛歿}", ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + ivrTask1.getTaskName() + "¶m5=false");
- //杩欎釜妯℃澘ID鍏堝啓姝伙紝鍚庨潰鍋氭垚鍙��
- sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4");
- Map map = new HashMap();
- map.put("first", ivrTask1.getTaskName());
- sendMagParam.setContent(JSON.toJSONString(map));
- sendMagParam.setOpenid(serviceSubtask.getOpenid());
- Boolean aBoolean = sendService.sendMsg(sendMagParam);
+ String url = null;
+ try {
+ url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), "鏃�");
+ Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
//浠诲姟鍙戦�佽褰�
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
@@ -314,20 +387,26 @@
serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
serviceSubtaskRecord.setPreachform("4");
serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setResult(aBoolean == true ? "鎴愬姛" : "澶辫触");
+ serviceSubtaskRecord.setResult("success");
+ if (!map.isEmpty() && (Boolean) map.get("succ") == false)
+ serviceSubtaskRecord.setResult("error");
serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
+ return map;
}
}
//閫氱煡 MQ 娑堟伅宸茶鎺ユ敹,鍙互ACK(浠庨槦鍒椾腑鍒犻櫎)浜� 锛堣繖涓渶瑕佹牴鎹笟鍔″啀鍘诲鐞咥CK锛�
}
}
+ return null;
}
+
/**
* 鑾峰嚭闄㈡偅鑰呬俊鎭�
* cry 鍑哄叆闄細 0 鍏ラ櫌 1 鍑洪櫌
*/
- private void getInHospInfo(String cry) {
+ @Transactional
+ public void getInHospInfo(String cry, LocalDateTime startTime, LocalDateTime endTime) {
// 鑾峰彇褰撳墠鏃ユ湡鍜屾椂闂�
LocalDateTime currentDateTime = LocalDateTime.now();
// 鑾峰彇鍓嶄竴澶╃殑鏃ユ湡鍜屾椂闂�
@@ -336,12 +415,12 @@
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S");
Map<String, String> req = new HashMap<>();
if (cry.equals("1")) {
- req.put("startTime", previousDateTime.format(formatter));
- req.put("endTime", currentDateTime.format(formatter));
+ req.put("startTime", startTime.format(formatter));
+ req.put("endTime", endTime.format(formatter));
req.put("currStatus", "4");
} else if (cry.equals("0")) {
- req.put("admissStartDate", previousDateTime.format(formatter));
- req.put("admissEndDate", currentDateTime.format(formatter));
+ req.put("admissStartDate", startTime.format(formatter));
+ req.put("admissEndDate", endTime.format(formatter));
req.put("currStatus", "2");
}
Map<String, String> header = new HashMap<>();
@@ -362,12 +441,23 @@
for (ThiedInhospInfo thiedInhospInfo : thiedInhospInfoList) {
//閫氳繃韬唤璇佸彿鏌ヨ璇ユ偅鑰呭湪鎮ｈ�呰〃鏄惁瀛樺湪
PatArchive patArchive = new PatArchive();
- patArchive.setIdcardno(thiedInhospInfo.getPatiIdCardNo());
- List<PatArchive> patArchives = patArchiveService.selectPatArchiveList(patArchive);
- if (CollectionUtils.isEmpty(patArchives)) {
+ List<PatArchive> patArchives = null;
+ patArchive.setIdcardno(thiedInhospInfo.getPatiIdCardNo().trim());
+ if (StringUtils.isNotEmpty(thiedInhospInfo.getPatiIdCardNo().trim())) {
+ patArchives = patArchiveService.selectPatArchiveList(patArchive);
+ } else {
+ //鎮ｈ�呬俊鎭负绌猴紝鐩存帴 涓嬩竴涓�
+ continue;
+ }
+ if (CollectionUtils.isEmpty(patArchives) || patArchives.size() == 0) {
patArchive.setPatientno(thiedInhospInfo.getPatiMediaNo());
patArchive.setSourcefrom(2);
patArchive.setPattype("2");
+ if (thiedInhospInfo.getOutWayId().equals("4")) {
+ //濡傛灉涓�4灏辨槸姝讳骸
+ patArchive.setNotrequiredFlag("1");
+ patArchive.setNotrequiredreason(thiedInhospInfo.getOutWayName());
+ }
patArchive.setSex(thiedInhospInfo.getPatiRecordGender().equals("鐢�") ? 1L : 2L);
patArchive.setNation(thiedInhospInfo.getPatiNation());
patArchive.setNativePlace(thiedInhospInfo.getPatiNationality());
@@ -378,9 +468,8 @@
} catch (ParseException e) {
e.printStackTrace();
}
- String age = thiedInhospInfo.getAge().replaceAll("宀�", "");
- boolean creatable = NumberUtils.isCreatable(age);
- if (creatable) patArchive.setAge(StringUtils.isNotEmpty(age) ? Long.valueOf(age) : null);
+ patArchive.setAge(Long.valueOf(thiedInhospInfo.getTreateAge()));
+ patArchive.setAgeUnit(thiedInhospInfo.getTreatAgeunit());
patArchive.setTelcode(thiedInhospInfo.getCompanyTelNum());
patArchive.setRelativetelcode(thiedInhospInfo.getContactPersonPhone());
patArchive.setDelFlag("0");
@@ -388,11 +477,16 @@
patArchive.setUpdateTime(new Date());
patArchive.setName(thiedInhospInfo.getPatiRecordName());
patArchiveService.insertPatArchive(patArchive);
+ } else {
+ patArchive = patArchives.get(0);
}
+ log.error("鍏ュ弬鐨刾atArchive锛歿}", patArchive);
PatMedInhosp patMedInhosp = new PatMedInhosp();
patMedInhosp.setPatid(patArchive.getId());
patMedInhosp.setPatno(patArchive.getPatientno());
patMedInhosp.setPatname(patArchive.getName());
+ patMedInhosp.setNurseId(thiedInhospInfo.getNurseId());
+ patMedInhosp.setNurseName(thiedInhospInfo.getNurseName());
patMedInhosp.setSerialnum(thiedInhospInfo.getInpatientId());
if (cry.equals("0")) {
patMedInhosp.setInhospstate("0");
@@ -419,20 +513,24 @@
patMedInhosp.setDeptname(thiedInhospInfo.getAdmissDeptName());
patMedInhosp.setBedNo(thiedInhospInfo.getAdmissBedNo());
patMedInhosp.setDelFlag("0");
- patMedInhosp.setLeaveldeptcode(thiedInhospInfo.getCurrWardId());
- patMedInhosp.setLeaveldeptname(thiedInhospInfo.getCurrWardName());
+// patMedInhosp.setLeaveldeptcode(thiedInhospInfo.getCurrDeptCode());
+ patMedInhosp.setLeaveldeptcode(thiedInhospInfo.getCurrDeptId());
+ patMedInhosp.setLeaveldeptname(thiedInhospInfo.getCurrDeptName());
patMedInhosp.setLeavediagname(thiedInhospInfo.getDiagName());
patMedInhosp.setLeaveicd10code(thiedInhospInfo.getDiagIcd10());
patMedInhosp.setDrname(thiedInhospInfo.getDoctName());
+ patMedInhosp.setDrcode(thiedInhospInfo.getDoctId());
+ patMedInhosp.setOutWayId(thiedInhospInfo.getOutWayId());
+ patMedInhosp.setOutWayName(thiedInhospInfo.getOutWayName());
if (cry.equals("0")) {
patMedInhosp.setSchemestatus(1L);
} else if (cry.equals("1")) {
patMedInhosp.setSchemestatus(2L);
}
+ patMedInhosp.setLeavehospitaldistrictid(thiedInhospInfo.getCurrWardCode());
patMedInhosp.setLeavehospitaldistrictcode(thiedInhospInfo.getCurrWardId());
- patMedInhosp.setLeavehospitaldistrictid(thiedInhospInfo.getCurrWardId());
patMedInhosp.setLeavehospitaldistrictname(thiedInhospInfo.getCurrWardName());
- patMedInhosp.setLeaveldeptid(thiedInhospInfo.getCurrDeptId());
+ patMedInhosp.setLeaveldeptid(thiedInhospInfo.getCurrDeptCode());
patMedInhospService.insertPatMedInhosp(patMedInhosp);
}
@@ -467,4 +565,19 @@
}
return key;
}
+
+ private String getWXCode(String idcard, String url, String taskName, String taskDesc, String submitprompt) {
+ XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
+ xinHuaWXReq.setIdcard(idcard);
+ xinHuaWXReq.setUrl(url);
+ xinHuaWXReq.setKeyword1("娴欎腑鍖诲ぇ浜岄櫌鍑洪櫌闅忚");
+ xinHuaWXReq.setKeyword2(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ xinHuaWXReq.setKeyword3(taskName);
+ xinHuaWXReq.setKeyword4("鐤剧梾搴峰娉ㄦ剰浜嬮」");
+
+ String result = HttpUtils.sendPost(thirdWXUrl, new Gson().toJson(xinHuaWXReq));
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ String code = (String) jsonObject.get("code");
+ return code;
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptServiceImpl.java
index f1a1655..8fdb299 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptServiceImpl.java
@@ -6,6 +6,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
/**
@@ -15,8 +16,7 @@
* @date 2024-08-29
*/
@Service
-public class SysUserDeptServiceImpl implements ISysUserDeptService
-{
+public class SysUserDeptServiceImpl implements ISysUserDeptService {
@Autowired
private SysUserDeptMapper sysUserDeptMapper;
@@ -27,8 +27,7 @@
* @return 銆愯濉啓鍔熻兘鍚嶇О銆�
*/
@Override
- public SysUserDept selectSysUserDeptById(Long id)
- {
+ public SysUserDept selectSysUserDeptById(Long id) {
return sysUserDeptMapper.selectSysUserDeptById(id);
}
@@ -39,8 +38,7 @@
* @return 銆愯濉啓鍔熻兘鍚嶇О銆�
*/
@Override
- public List<SysUserDept> selectSysUserDeptList(SysUserDept sysUserDept)
- {
+ public List<SysUserDept> selectSysUserDeptList(SysUserDept sysUserDept) {
return sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
}
@@ -51,8 +49,9 @@
* @return 缁撴灉
*/
@Override
- public int insertSysUserDept(SysUserDept sysUserDept)
- {
+ public int insertSysUserDept(SysUserDept sysUserDept) {
+ sysUserDept.setCreateTime(new Date());
+ sysUserDept.setUpdateTime(new Date());
return sysUserDeptMapper.insertSysUserDept(sysUserDept);
}
@@ -63,8 +62,8 @@
* @return 缁撴灉
*/
@Override
- public int updateSysUserDept(SysUserDept sysUserDept)
- {
+ public int updateSysUserDept(SysUserDept sysUserDept) {
+ sysUserDept.setUpdateTime(new Date());
return sysUserDeptMapper.updateSysUserDept(sysUserDept);
}
@@ -75,8 +74,7 @@
* @return 缁撴灉
*/
@Override
- public int deleteSysUserDeptByIds(Long[] ids)
- {
+ public int deleteSysUserDeptByIds(Long[] ids) {
return sysUserDeptMapper.deleteSysUserDeptByIds(ids);
}
@@ -87,8 +85,7 @@
* @return 缁撴灉
*/
@Override
- public int deleteSysUserDeptById(Long id)
- {
+ public int deleteSysUserDeptById(Long id) {
return sysUserDeptMapper.deleteSysUserDeptById(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 79df621..4d3edcd 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
@@ -113,8 +113,31 @@
for (SysDept sysDept : sysDepts) {
deptIds.add(sysDept.getDeptId());
}
+ SysUserDept sysUserDept = new SysUserDept();
+ sysUserDept.setUserId(sysUser.getUserId());
+ sysUserDept.setDeptType(sysUser.getSearchscope());
+ List<SysUserDept> sysUserDeptKSs = null;
+ List<SysUserDept> sysUserDeptBQs = null;
+ if (StringUtils.isNotEmpty(sysUser.getSearchscope()) && sysUser.getSearchscope().equals("0")) {
+ sysUserDept.setDeptType("1");
+ sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ sysUserDept.setDeptType("2");
+ sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ } else if (StringUtils.isNotEmpty(sysUser.getSearchscope()) && sysUser.getSearchscope().equals("1")) {
+ sysUserDept.setDeptType("1");
+ sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ } else if (StringUtils.isNotEmpty(sysUser.getSearchscope()) && sysUser.getSearchscope().equals("2")) {
+ sysUserDept.setDeptType("2");
+ sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ }
+
sysUser.setDepts(deptIds);
- return userMapper.selectUserByUserName(userName);
+ if (!CollectionUtils.isEmpty(sysUserDeptBQs))
+ sysUser.setLeavehospitaldistrictcodes(sysUserDeptBQs.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList()));
+ if (!CollectionUtils.isEmpty(sysUserDeptKSs))
+ sysUser.setLeaveldeptcodes(sysUserDeptKSs.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList()));
+
+ return sysUser;
}
/**
@@ -305,7 +328,7 @@
//鏂板鐢ㄦ埛涓庨儴闂ㄥ叧鑱�
sysUserDeptMapper.deleteSysUserDeptByIds(ids);
if (!CollectionUtils.isEmpty(user.getDepts())) {
- for ( Long deptId: user.getDepts()) {
+ for (Long deptId : user.getDepts()) {
SysUserDept sysUserDep = new SysUserDept();
sysUserDep.setUserId(user.getUserId());
sysUserDep.setDeptId(deptId);
@@ -321,7 +344,7 @@
sysUserDep.setUpdateTime(new Date());
sysUserDeptMapper.insertSysUserDept(sysUserDep);
}
- }else {
+ } else {
}
return userMapper.updateUser(user);
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 83da4b4..5ef2b50 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -1,159 +1,201 @@
<?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">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
- <resultMap type="com.ruoyi.common.core.domain.entity.SysDept" id="SysDeptResult">
- <id property="deptId" column="dept_id" />
- <result property="parentId" column="parent_id" />
- <result property="ancestors" column="ancestors" />
- <result property="deptName" column="dept_name" />
- <result property="orderNum" column="order_num" />
- <result property="leader" column="leader" />
- <result property="phone" column="phone" />
- <result property="email" column="email" />
- <result property="status" column="status" />
- <result property="delFlag" column="del_flag" />
- <result property="parentName" column="parent_name" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectDeptVo">
- select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
+ <resultMap type="com.ruoyi.common.core.domain.entity.SysDept" id="SysDeptResult">
+ <id property="deptId" column="dept_id"/>
+ <result property="parentId" column="parent_id"/>
+ <result property="ancestors" column="ancestors"/>
+ <result property="deptName" column="dept_name"/>
+ <result property="orderNum" column="order_num"/>
+ <result property="leader" column="leader"/>
+ <result property="phone" column="phone"/>
+ <result property="email" column="email"/>
+ <result property="status" column="status"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="parentName" column="parent_name"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="deptCode" column="dept_code"/>
+ </resultMap>
+
+ <sql id="selectDeptVo">
+ select d.dept_id,
+ d.dept_code,
+ d.parent_id,
+ d.ancestors,
+ d.dept_name,
+ d.order_num,
+ d.leader,
+ d.phone,
+ d.email,
+ d.status,
+ d.del_flag,
+ d.create_by,
+ d.create_time
from sys_dept d
</sql>
-
- <select id="selectDeptList" parameterType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="SysDeptResult">
+
+ <select id="selectDeptList" parameterType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where d.del_flag = '0'
- <if test="deptId != null and deptId != 0">
- AND dept_id = #{deptId}
- </if>
+ <if test="deptId != null and deptId != 0">
+ AND dept_id = #{deptId}
+ </if>
<if test="parentId != null and parentId != 0">
- AND parent_id = #{parentId}
- </if>
- <if test="deptName != null and deptName != ''">
- AND dept_name like concat('%', #{deptName}, '%')
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- order by d.parent_id, d.order_num
+ AND parent_id = #{parentId}
+ </if>
+ <if test="deptName != null and deptName != ''">
+ AND dept_name like concat('%', #{deptName}, '%')
+ </if>
+ <if test="status != null and status != ''">
+ AND status = #{status}
+ </if>
+ <if test="deptCode != null and deptCode != ''">
+ AND dept_code = #{deptCode}
+ </if>
+ <!-- 鏁版嵁鑼冨洿杩囨护 -->
+ ${params.dataScope}
+ order by d.parent_id, d.order_num
</select>
-
- <select id="selectDeptListByRoleId" resultType="Long">
- select d.dept_id
- from sys_dept d
- left join sys_role_dept rd on d.dept_id = rd.dept_id
- where rd.role_id = #{roleId}
- <if test="deptCheckStrictly">
- and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
- </if>
- order by d.parent_id, d.order_num
- </select>
-
- <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
- select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
- (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
- from sys_dept d
- where d.dept_id = #{deptId}
- </select>
-
- <select id="checkDeptExistUser" parameterType="Long" resultType="int">
- select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
- </select>
-
- <select id="hasChildByDeptId" parameterType="Long" resultType="int">
- select count(1) from sys_dept
- where del_flag = '0' and parent_id = #{deptId} limit 1
- </select>
-
- <select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
- select * from sys_dept where find_in_set(#{deptId}, ancestors)
- </select>
-
- <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
- select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
- </select>
-
- <select id="checkDeptNameUnique" resultMap="SysDeptResult">
- <include refid="selectDeptVo"/>
- where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
- </select>
-
- <insert id="insertDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept">
- insert into sys_dept(
- <if test="deptId != null and deptId != 0">dept_id,</if>
- <if test="parentId != null and parentId != 0">parent_id,</if>
- <if test="deptName != null and deptName != ''">dept_name,</if>
- <if test="ancestors != null and ancestors != ''">ancestors,</if>
- <if test="orderNum != null">order_num,</if>
- <if test="leader != null and leader != ''">leader,</if>
- <if test="phone != null and phone != ''">phone,</if>
- <if test="email != null and email != ''">email,</if>
- <if test="status != null">status,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="deptId != null and deptId != 0">#{deptId},</if>
- <if test="parentId != null and parentId != 0">#{parentId},</if>
- <if test="deptName != null and deptName != ''">#{deptName},</if>
- <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
- <if test="orderNum != null">#{orderNum},</if>
- <if test="leader != null and leader != ''">#{leader},</if>
- <if test="phone != null and phone != ''">#{phone},</if>
- <if test="email != null and email != ''">#{email},</if>
- <if test="status != null">#{status},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept">
- update sys_dept
- <set>
- <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
- <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
- <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
- <if test="orderNum != null">order_num = #{orderNum},</if>
- <if test="leader != null">leader = #{leader},</if>
- <if test="phone != null">phone = #{phone},</if>
- <if test="email != null">email = #{email},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where dept_id = #{deptId}
- </update>
-
- <update id="updateDeptChildren" parameterType="java.util.List">
- update sys_dept set ancestors =
- <foreach collection="depts" item="item" index="index"
- separator=" " open="case dept_id" close="end">
- when #{item.deptId} then #{item.ancestors}
- </foreach>
- where dept_id in
- <foreach collection="depts" item="item" index="index"
- separator="," open="(" close=")">
- #{item.deptId}
- </foreach>
- </update>
-
- <update id="updateDeptStatusNormal" parameterType="Long">
- update sys_dept set status = '0' where dept_id in
- <foreach collection="array" item="deptId" open="(" separator="," close=")">
- #{deptId}
- </foreach>
- </update>
-
- <delete id="deleteDeptById" parameterType="Long">
- update sys_dept set del_flag = '2' where dept_id = #{deptId}
- </delete>
-</mapper>
\ No newline at end of file
+ <select id="selectDeptListByRoleId" resultType="Long">
+ select d.dept_id
+ from sys_dept d
+ left join sys_role_dept rd on d.dept_id = rd.dept_id
+ where rd.role_id = #{roleId}
+ <if test="deptCheckStrictly">
+ and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id =
+ rd.dept_id and rd.role_id = #{roleId})
+ </if>
+ order by d.parent_id, d.order_num
+ </select>
+
+ <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
+ select d.dept_id,
+ d.parent_id,
+ d.dept_code,
+ d.ancestors,
+ d.dept_name,
+ d.order_num,
+ d.leader,
+ d.phone,
+ d.email,
+ d.status,
+ (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
+ from sys_dept d
+ where d.dept_id = #{deptId}
+ </select>
+
+ <select id="checkDeptExistUser" parameterType="Long" resultType="int">
+ select count(1)
+ from sys_user
+ where dept_id = #{deptId}
+ and del_flag = '0'
+ </select>
+
+ <select id="hasChildByDeptId" parameterType="Long" resultType="int">
+ select count(1)
+ from sys_dept
+ where del_flag = '0'
+ and parent_id = #{deptId} limit 1
+ </select>
+
+ <select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
+ select *
+ from sys_dept
+ where find_in_set(#{deptId}, ancestors)
+ </select>
+
+ <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
+ select count(*)
+ from sys_dept
+ where status = 0
+ and del_flag = '0'
+ and find_in_set(#{deptId}, ancestors)
+ </select>
+
+ <select id="checkDeptNameUnique" resultMap="SysDeptResult">
+ <include refid="selectDeptVo"/>
+ where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
+ </select>
+
+ <insert id="insertDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept">
+ insert into sys_dept(
+ <if test="deptId != null and deptId != 0">dept_id,</if>
+ <if test="parentId != null and parentId != 0">parent_id,</if>
+ <if test="deptName != null and deptName != ''">dept_name,</if>
+ <if test="ancestors != null and ancestors != ''">ancestors,</if>
+ <if test="orderNum != null">order_num,</if>
+ <if test="leader != null and leader != ''">leader,</if>
+ <if test="phone != null and phone != ''">phone,</if>
+ <if test="email != null and email != ''">email,</if>
+ <if test="status != null">status,</if>
+ <if test="deptCode != null">dept_code,</if>
+ <if test="createBy != null and createBy != ''">create_by,</if>
+ create_time
+ )values(
+ <if test="deptId != null and deptId != 0">#{deptId},</if>
+ <if test="parentId != null and parentId != 0">#{parentId},</if>
+ <if test="deptName != null and deptName != ''">#{deptName},</if>
+ <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
+ <if test="orderNum != null">#{orderNum},</if>
+ <if test="leader != null and leader != ''">#{leader},</if>
+ <if test="phone != null and phone != ''">#{phone},</if>
+ <if test="email != null and email != ''">#{email},</if>
+ <if test="status != null">#{status},</if>
+ <if test="deptCode != null">#{deptCode},</if>
+ <if test="createBy != null and createBy != ''">#{createBy},</if>
+ sysdate()
+ )
+ </insert>
+
+ <update id="updateDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept">
+ update sys_dept
+ <set>
+ <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
+ <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+ <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
+ <if test="orderNum != null">order_num = #{orderNum},</if>
+ <if test="leader != null">leader = #{leader},</if>
+ <if test="phone != null">phone = #{phone},</if>
+ <if test="email != null">email = #{email},</if>
+ <if test="status != null and status != ''">status = #{status},</if>
+ <if test="deptCode != null">dept_code=#{deptCode},</if>
+ <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ update_time = sysdate()
+ </set>
+ where dept_id = #{deptId}
+ </update>
+
+ <update id="updateDeptChildren" parameterType="java.util.List">
+ update sys_dept set ancestors =
+ <foreach collection="depts" item="item" index="index"
+ separator=" " open="case dept_id" close="end">
+ when #{item.deptId} then #{item.ancestors}
+ </foreach>
+ where dept_id in
+ <foreach collection="depts" item="item" index="index"
+ separator="," open="(" close=")">
+ #{item.deptId}
+ </foreach>
+ </update>
+
+ <update id="updateDeptStatusNormal" parameterType="Long">
+ update sys_dept set status = '0' where dept_id in
+ <foreach collection="array" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </update>
+
+ <delete id="deleteDeptById" parameterType="Long">
+ update sys_dept
+ set del_flag = '2'
+ where dept_id = #{deptId}
+ </delete>
+
+</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 78496be..89fc648 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -1,221 +1,303 @@
<?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">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
<resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
- <id property="userId" column="user_id" />
- <result property="deptId" column="dept_id" />
- <result property="userName" column="user_name" />
- <result property="nickName" column="nick_name" />
- <result property="email" column="email" />
- <result property="phonenumber" column="phonenumber" />
- <result property="sex" column="sex" />
- <result property="avatar" column="avatar" />
- <result property="password" column="password" />
- <result property="status" column="status" />
- <result property="delFlag" column="del_flag" />
- <result property="loginIp" column="login_ip" />
- <result property="loginDate" column="login_date" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" />
- <collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
+ <id property="userId" column="user_id"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="hospInfo" column="hosp_info"/>
+ <result property="deptInfo" column="dept_info"/>
+ <result property="userName" column="user_name"/>
+ <result property="nickName" column="nick_name"/>
+ <result property="email" column="email"/>
+ <result property="phonenumber" column="phonenumber"/>
+ <result property="sex" column="sex"/>
+ <result property="avatar" column="avatar"/>
+ <result property="password" column="password"/>
+ <result property="status" column="status"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="loginIp" column="login_ip"/>
+ <result property="loginDate" column="login_date"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="remark" column="remark"/>
+ <result property="userType" column="user_type"/>
+ <result property="searchscope" column="searchscope"/>
+ <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"/>
</resultMap>
<resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
- <id property="deptId" column="dept_id" />
- <result property="parentId" column="parent_id" />
- <result property="deptName" column="dept_name" />
- <result property="ancestors" column="ancestors" />
- <result property="orderNum" column="order_num" />
- <result property="leader" column="leader" />
- <result property="status" column="dept_status" />
+ <id property="deptId" column="dept_id"/>
+ <result property="parentId" column="parent_id"/>
+ <result property="deptName" column="dept_name"/>
+ <result property="ancestors" column="ancestors"/>
+ <result property="orderNum" column="order_num"/>
+ <result property="leader" column="leader"/>
+ <result property="status" column="dept_status"/>
</resultMap>
<resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
- <id property="roleId" column="role_id" />
- <result property="roleName" column="role_name" />
- <result property="roleKey" column="role_key" />
- <result property="roleSort" column="role_sort" />
- <result property="dataScope" column="data_scope" />
- <result property="status" column="role_status" />
+ <id property="roleId" column="role_id"/>
+ <result property="roleName" column="role_name"/>
+ <result property="roleKey" column="role_key"/>
+ <result property="roleSort" column="role_sort"/>
+ <result property="dataScope" column="data_scope"/>
+ <result property="status" column="role_status"/>
</resultMap>
- <sql id="selectUserVo">
- select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
- d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
- r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+ <sql id="selectUserVo">
+ select u.user_id,
+ u.dept_id,
+ u.hosp_info,
+ u.dept_info,
+ u.searchscope,
+ u.user_name,
+ u.user_type,
+ u.nick_name,
+ u.email,
+ u.avatar,
+ u.phonenumber,
+ u.password,
+ u.sex,
+ u.status,
+ u.del_flag,
+ u.login_ip,
+ u.login_date,
+ u.create_by,
+ u.create_time,
+ u.remark,
+ d.dept_id,
+ d.parent_id,
+ d.ancestors,
+ d.dept_name,
+ d.order_num,
+ d.leader,
+ d.status as dept_status,
+ r.role_id,
+ r.role_name,
+ r.role_key,
+ r.role_sort,
+ r.data_scope,
+ r.status as role_status
from sys_user u
- 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
+ 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
</sql>
- <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, 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 u
- left join sys_dept d on u.dept_id = d.dept_id
- where u.del_flag = '0'
- <if test="userId != null and userId != 0">
- AND u.user_id = #{userId}
- </if>
- <if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
- </if>
- <if test="status != null and status != ''">
- AND u.status = #{status}
- </if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- AND date_format(u.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
- </if>
- <if test="deptId != null and deptId != 0">
- AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- </select>
+ <select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
+ select u.user_id,u.hosp_info,u.dept_info, u.searchscope, u.dept_id, u.user_type, u.nick_name, u.user_name, u.email,
+ u.avatar,
+ 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
+ u
+ left join sys_dept d on u.dept_id = d.dept_id
+ where u.del_flag = '0'
+ <if test="userId != null and userId != 0">
+ AND u.user_id = #{userId}
+ </if>
+ <if test="userName != null and userName != ''">
+ AND u.user_name like concat('%', #{userName}, '%')
+ </if>
+ <if test="nickName != null and nickName != ''">
+ AND u.nick_name like concat('%', #{nickName}, '%')
+ </if>
+ <if test="status != null and status != ''">
+ AND u.status = #{status}
+ </if>
+ <if test="phonenumber != null and phonenumber != ''">
+ AND u.phonenumber like concat('%', #{phonenumber}, '%')
+ </if>
+ <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
+ AND date_format(u.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
+ </if>
+ <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
+ AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
+ </if>
+ <if test="deptId != null and deptId != 0">
+ AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
+ ancestors) ))
+ </if>
+ <!-- 鏁版嵁鑼冨洿杩囨护 -->
+ ${params.dataScope}
+ </select>
- <select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
- from sys_user u
- 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
- where u.del_flag = '0' and r.role_id = #{roleId}
- <if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
- </if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- </select>
+ <select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"
+ resultMap="SysUserResult">
+ select distinct u.user_id,u.hosp_info,u.dept_info, u.searchscope, u.dept_id, u.user_name, u.user_type, u.nick_name,
+ u.email,
+ u.phonenumber, u.status,
+ u.create_time
+ from sys_user u
+ 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
+ where u.del_flag = '0' and r.role_id = #{roleId}
+ <if test="userName != null and userName != ''">
+ AND u.user_name like concat('%', #{userName}, '%')
+ </if>
+ <if test="phonenumber != null and phonenumber != ''">
+ AND u.phonenumber like concat('%', #{phonenumber}, '%')
+ </if>
+ <!-- 鏁版嵁鑼冨洿杩囨护 -->
+ ${params.dataScope}
+ </select>
- <select id="selectUnallocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
- from sys_user u
- 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
- where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
- and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
- <if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
- </if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- </select>
+ <select id="selectUnallocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"
+ 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.email,
+ u.phonenumber, u.status,
+ u.create_time
+ from sys_user u
+ 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
+ where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
+ and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and
+ ur.role_id = #{roleId})
+ <if test="userName != null and userName != ''">
+ AND u.user_name like concat('%', #{userName}, '%')
+ </if>
+ <if test="phonenumber != null and phonenumber != ''">
+ AND u.phonenumber like concat('%', #{phonenumber}, '%')
+ </if>
+ <!-- 鏁版嵁鑼冨洿杩囨护 -->
+ ${params.dataScope}
+ </select>
- <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
- <include refid="selectUserVo"/>
- where u.user_name = #{userName} and u.del_flag = '0'
- </select>
+ <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
+ <include refid="selectUserVo"/>
+ where u.user_name = #{userName} and u.del_flag = '0'
+ </select>
- <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
- <include refid="selectUserVo"/>
- where u.user_id = #{userId}
- </select>
+ <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
+ <include refid="selectUserVo"/>
+ where u.user_id = #{userId}
+ </select>
- <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
- </select>
+ <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
+ select user_id, user_name
+ from sys_user
+ where user_name = #{userName}
+ and del_flag = '0' limit 1
+ </select>
- <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
- </select>
+ <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
+ select user_id, phonenumber
+ from sys_user
+ where phonenumber = #{phonenumber}
+ and del_flag = '0' limit 1
+ </select>
- <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
- </select>
+ <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
+ select user_id, email
+ from sys_user
+ where email = #{email}
+ and del_flag = '0' limit 1
+ </select>
- <insert id="insertUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser" useGeneratedKeys="true" keyProperty="userId">
- insert into sys_user(
- <if test="userId != null and userId != 0">user_id,</if>
- <if test="deptId != null and deptId != 0">dept_id,</if>
- <if test="userName != null and userName != ''">user_name,</if>
- <if test="nickName != null and nickName != ''">nick_name,</if>
- <if test="email != null and email != ''">email,</if>
- <if test="avatar != null and avatar != ''">avatar,</if>
- <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
- <if test="sex != null and sex != ''">sex,</if>
- <if test="password != null and password != ''">password,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- <if test="remark != null and remark != ''">remark,</if>
- create_time
- )values(
- <if test="userId != null and userId != ''">#{userId},</if>
- <if test="deptId != null and deptId != ''">#{deptId},</if>
- <if test="userName != null and userName != ''">#{userName},</if>
- <if test="nickName != null and nickName != ''">#{nickName},</if>
- <if test="email != null and email != ''">#{email},</if>
- <if test="avatar != null and avatar != ''">#{avatar},</if>
- <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
- <if test="sex != null and sex != ''">#{sex},</if>
- <if test="password != null and password != ''">#{password},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- sysdate()
- )
- </insert>
+ <insert id="insertUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser" useGeneratedKeys="true"
+ keyProperty="userId">
+ insert into sys_user(
+ <if test="userId != null and userId != 0">user_id,</if>
+ <if test="deptId != null and deptId != 0">dept_id,</if>
+ <if test="userName != null and userName != ''">user_name,</if>
+ <if test="nickName != null and nickName != ''">nick_name,</if>
+ <if test="email != null and email != ''">email,</if>
+ <if test="avatar != null and avatar != ''">avatar,</if>
+ <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
+ <if test="sex != null and sex != ''">sex,</if>
+ <if test="password != null and password != ''">password,</if>
+ <if test="status != null and status != ''">status,</if>
+ <if test="createBy != null and createBy != ''">create_by,</if>
+ <if test="remark != null and remark != ''">remark,</if>
+ <if test="userType != null and userType != ''">user_type,</if>
+ <if test="deptInfo != null and deptInfo != ''">dept_info,</if>
+ <if test="hospInfo != null and hospInfo != ''">hosp_info,</if>
+ <if test="searchscope != null and searchscope != ''">searchscope,</if>
+ create_time
+ )values(
+ <if test="userId != null and userId != ''">#{userId},</if>
+ <if test="deptId != null and deptId != ''">#{deptId},</if>
+ <if test="userName != null and userName != ''">#{userName},</if>
+ <if test="nickName != null and nickName != ''">#{nickName},</if>
+ <if test="email != null and email != ''">#{email},</if>
+ <if test="avatar != null and avatar != ''">#{avatar},</if>
+ <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
+ <if test="sex != null and sex != ''">#{sex},</if>
+ <if test="password != null and password != ''">#{password},</if>
+ <if test="status != null and status != ''">#{status},</if>
+ <if test="createBy != null and createBy != ''">#{createBy},</if>
+ <if test="remark != null and remark != ''">#{remark},</if>
+ <if test="userType != null and userType != ''">#{userType},</if>
+ <if test="deptInfo != null and deptInfo != ''">#{deptInfo},</if>
+ <if test="hospInfo != null and hospInfo != ''">#{hospInfo},</if>
+ <if test="searchscope != null and searchscope != ''">#{searchscope},</if>
+ sysdate()
+ )
+ </insert>
- <update id="updateUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
- update sys_user
- <set>
- <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
- <if test="userName != null and userName != ''">user_name = #{userName},</if>
- <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
- <if test="email != null ">email = #{email},</if>
- <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
- <if test="sex != null and sex != ''">sex = #{sex},</if>
- <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
- <if test="password != null and password != ''">password = #{password},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
- <if test="loginDate != null">login_date = #{loginDate},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- <if test="remark != null">remark = #{remark},</if>
- update_time = sysdate()
- </set>
- where user_id = #{userId}
- </update>
+ <update id="updateUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
+ update sys_user
+ <set>
+ <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
+ <if test="userName != null and userName != ''">user_name = #{userName},</if>
+ <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+ <if test="email != null ">email = #{email},</if>
+ <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
+ <if test="sex != null and sex != ''">sex = #{sex},</if>
+ <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
+ <if test="password != null and password != ''">password = #{password},</if>
+ <if test="status != null and status != ''">status = #{status},</if>
+ <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
+ <if test="loginDate != null">login_date = #{loginDate},</if>
+ <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ <if test="remark != null">remark = #{remark},</if>
+ <if test="userType != null">user_type = #{userType},</if>
+ <if test="searchscope != null">searchscope = #{searchscope},</if>
+ <if test="deptInfo != null and deptInfo != ''">dept_info=#{deptInfo},</if>
+ <if test="hospInfo != null and hospInfo != ''">hosp_info=#{hospInfo},</if>
+ update_time = sysdate()
+ </set>
+ where user_id = #{userId}
+ </update>
- <update id="updateUserStatus" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
- update sys_user set status = #{status} where user_id = #{userId}
- </update>
+ <update id="updateUserStatus" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
+ update sys_user
+ set status = #{status}
+ where user_id = #{userId}
+ </update>
- <update id="updateUserAvatar" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
- update sys_user set avatar = #{avatar} where user_name = #{userName}
- </update>
+ <update id="updateUserAvatar" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
+ update sys_user
+ set avatar = #{avatar}
+ where user_name = #{userName}
+ </update>
- <update id="resetUserPwd" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
- update sys_user set password = #{password} where user_name = #{userName}
- </update>
+ <update id="resetUserPwd" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
+ update sys_user
+ set password = #{password}
+ where user_name = #{userName}
+ </update>
- <delete id="deleteUserById" parameterType="Long">
- update sys_user set del_flag = '2' where user_id = #{userId}
- </delete>
+ <delete id="deleteUserById" parameterType="Long">
+ update sys_user
+ set del_flag = '2'
+ where user_id = #{userId}
+ </delete>
- <delete id="deleteUserByIds" parameterType="Long">
- update sys_user set del_flag = '2' where user_id in
- <foreach collection="array" item="userId" open="(" separator="," close=")">
- #{userId}
+ <delete id="deleteUserByIds" parameterType="Long">
+ update sys_user set del_flag = '2' where user_id in
+ <foreach collection="array" item="userId" open="(" separator="," close=")">
+ #{userId}
</foreach>
- </delete>
+ </delete>
</mapper>
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index 57b56e5..d9b8d8a 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -77,7 +77,7 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button
+ <el-button
size="mini"
type="text"
icon="el-icon-edit"
@@ -198,7 +198,7 @@
<el-form-item prop="perms">
<el-input v-model="form.perms" placeholder="璇疯緭鍏ユ潈闄愭爣璇�" maxlength="100" />
<span slot="label">
- <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
+ <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細//@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
鏉冮檺瀛楃
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index fb3b5ef..fcedf25 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -163,7 +163,7 @@
</el-form-item>
<el-form-item prop="roleKey">
<span slot="label">
- <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
+ <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細//@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
鏉冮檺瀛楃
@@ -602,4 +602,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
diff --git a/smartor/src/main/java/com/smartor/domain/HeLibrary.java b/smartor/src/main/java/com/smartor/domain/HeLibrary.java
index bf4f204..9a09666 100644
--- a/smartor/src/main/java/com/smartor/domain/HeLibrary.java
+++ b/smartor/src/main/java/com/smartor/domain/HeLibrary.java
@@ -229,4 +229,9 @@
@ApiModelProperty("瀵屾枃鏈�")
private String richText = "";
+ /**
+ * html瀵屾枃鏈�
+ */
+ @ApiModelProperty("html瀵屾枃鏈�")
+ private String htmlRichText;
}
diff --git a/smartor/src/main/java/com/smartor/domain/HeLibraryVO.java b/smartor/src/main/java/com/smartor/domain/HeLibraryVO.java
index 3267596..2eb9961 100644
--- a/smartor/src/main/java/com/smartor/domain/HeLibraryVO.java
+++ b/smartor/src/main/java/com/smartor/domain/HeLibraryVO.java
@@ -242,4 +242,10 @@
*/
@ApiModelProperty("绫诲瀷锛�1瀹ｆ暀 2閫氱煡")
private String hetype;
+
+ /**
+ * html瀵屾枃鏈�
+ */
+ @ApiModelProperty("html瀵屾枃鏈�")
+ private String htmlRichText;
}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java
index 89252ea..0715d3f 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java
@@ -354,6 +354,12 @@
private Integer longTemp;
/**
+ * 閮ㄩ棬缂栫爜
+ */
+ @ApiModelProperty(value = "閮ㄩ棬缂栫爜")
+ private String deptCode;
+
+ /**
* pageNum
*/
@ApiModelProperty(value = "pageNum")
diff --git a/smartor/src/main/java/com/smartor/domain/IvrTaskTemplate.java b/smartor/src/main/java/com/smartor/domain/IvrTaskTemplate.java
index 322a3c1..50a6bfb 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrTaskTemplate.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrTaskTemplate.java
@@ -377,6 +377,13 @@
@ApiModelProperty(value = "鎸囧璇�")
private String instruction;
+ /**
+ * 閮ㄩ棬缂栫爜
+ */
+ @ApiModelProperty(value = "閮ㄩ棬缂栫爜")
+ private String deptCode;
+
+
/**
* 鍑洪櫌澶╂暟锛堥暱鏈熶换鍔★紝鍑哄畨闄㈠悗锛岀鍑犲ぉ鍙戦�佷俊鎭級
diff --git a/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateVO.java b/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateVO.java
index 85b8180..7260322 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateVO.java
@@ -386,6 +386,19 @@
private String instruction;
/**
+ * 鍑洪櫌澶╂暟锛堥暱鏈熶换鍔★紝鍑哄畨闄㈠悗锛岀鍑犲ぉ鍙戦�佷俊鎭級
+ */
+ @ApiModelProperty(value = "鍑洪櫌澶╂暟锛堥暱鏈熶换鍔★紝鍑哄畨闄㈠悗锛岀鍑犲ぉ鍙戦�佷俊鎭級")
+ private Integer sendDay;
+
+ /**
+ * 閮ㄩ棬缂栫爜
+ */
+ @ApiModelProperty(value = "閮ㄩ棬缂栫爜")
+ private String deptCode;
+
+
+ /**
* 鍏佽閲嶆嫧娆℃暟
*/
@Excel(name = "鍏佽閲嶆嫧娆℃暟")
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchive.java b/smartor/src/main/java/com/smartor/domain/PatArchive.java
index c981a65..20725ab 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -40,7 +40,7 @@
* GUID
*/
@ApiModelProperty("GUID")
- private Long guid;
+ private String guid;
/**
* 濮撳悕
@@ -50,18 +50,32 @@
private String patientno;
/**
+ * 鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕�
+ */
+ @ApiModelProperty("鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕�")
+ @Excel(name = " 鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕� ")
+ private String notrequiredFlag;
+
+ /**
+ * 涓嶈鏈嶅姟鐨勫師鍥�
+ */
+ @ApiModelProperty("涓嶈鏈嶅姟鐨勫師鍥�")
+ @Excel(name = " 涓嶈鏈嶅姟鐨勫師鍥� ")
+ private String notrequiredreason;
+
+ /**
* 鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級
*/
@ApiModelProperty("鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級")
@Excel(name = " 鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級 ")
- private int sourcefrom;
+ private Integer sourcefrom;
/**
* his绯荤粺鐨勬偅鑰卛d
*/
@ApiModelProperty("his绯荤粺鐨勬偅鑰卛d")
@Excel(name = "his绯荤粺鐨勬偅鑰卛d")
- private int patidHis;
+ private Integer patidHis;
/**
* his绯荤粺鐨勬偅鑰卛d
@@ -98,6 +112,12 @@
@ApiModelProperty("绫嶈疮")
@Excel(name = " 绫嶈疮 ")
private String nativePlace;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty(value = "浣忛櫌鍙�")
+ private String inhospno;
/**
* 璇佷欢鍙风爜
@@ -142,6 +162,12 @@
@ApiModelProperty("骞撮緞")
@Excel(name = " 骞撮緞 ")
private Long age;
+ /**
+ * 骞撮緞
+ */
+ @ApiModelProperty("骞撮緞鍗曚綅")
+ @Excel(name = " 骞撮緞鍗曚綅 ")
+ private String ageUnit;
/**
* 寤烘。鏃堕棿
@@ -250,6 +276,25 @@
@Excel(name = " 绉戝 ")
private String dept;
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("绉戝")
+ @Excel(name = " 绉戝 ")
+ private String deptcode;
+ /**
+ * 鍖荤敓濮撳悕
+ */
+ @ApiModelProperty("鍖荤敓濮撳悕")
+ @Excel(name = " 鍖荤敓濮撳悕 ")
+ private String drname;
+
+ /**
+ * 鍖荤敓缂栫爜
+ */
+ @ApiModelProperty("鍖荤敓缂栫爜")
+ @Excel(name = " 鍖荤敓缂栫爜 ")
+ private String drcode;
/**
* 閽夐拤鍙�
@@ -265,4 +310,10 @@
@Excel(name = " 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳 ")
private String viptype;
+ @ApiModelProperty("鍑洪櫌鐥呭尯鍚嶇О")
+ private String leavehospitaldistrictname;
+
+ @ApiModelProperty("鍑洪櫌鐥呭尯缂栧彿")
+ private String leavehospitaldistrictcode;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveImport.java b/smartor/src/main/java/com/smartor/domain/PatArchiveImport.java
new file mode 100644
index 0000000..2e4d0a2
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveImport.java
@@ -0,0 +1,107 @@
+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;
+
+/**
+ * Excel瀵煎叆鎮ｈ�呮。妗堝璞� pat_archive_import
+ *
+ * @author lihu
+ * @date 2024-09-05
+ */
+@Data
+@ApiModel("Excel瀵煎叆鎮ｈ�呮。妗�")
+public class PatArchiveImport extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鑷ID
+ */
+ @ApiModelProperty("鑷ID")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕锛堝繀濉級")
+ private String name;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ @Excel(name = "璇佷欢鍙风爜(蹇呭～)",cellType = Excel.ColumnType.NUMERIC)
+ private String idcardno;
+
+ /**
+ * 鎵嬫満鍙风爜
+ */
+ @ApiModelProperty("鎵嬫満鍙风爜")
+ @Excel(name = "鎵嬫満鍙风爜(蹇呭～)",cellType = Excel.ColumnType.STRING)
+ private String telcode;
+
+ /**
+ * 鎵规鍚嶇О
+ */
+ @ApiModelProperty("鎵规鍚嶇О")
+ @Excel(name = "鎵规鍚嶇О锛堝繀濉級",cellType = Excel.ColumnType.STRING)
+ private String batchName;
+
+
+ /**
+ * 鎮ｈ�呯紪鍙�
+ */
+ @ApiModelProperty("鎮ｈ�呯紪鍙�")
+ @Excel(name = "鎮ｈ�呯紪鍙�",cellType = Excel.ColumnType.STRING)
+ private String patientno;
+
+ /**
+ * 鎮ｈ�呯被鍨嬶細1銆侀棬璇娿��2銆佷綇闄€��3銆佷綋妫�
+ */
+ @ApiModelProperty("鎮ｈ�呯被鍨嬶細1銆侀棬璇娿��2銆佷綇闄€��3銆佷綋妫�")
+ @Excel(name = "鎮ｈ�呯被鍨嬶細1銆侀棬璇娿��2銆佷綇闄€��3銆佷綋妫�", width = 25.00)
+ private String pattype;
+
+
+ /**
+ * 鎬у埆 1:鐢� 2:濂�
+ */
+ @ApiModelProperty("鎬у埆 1:鐢� 2:濂�")
+ @Excel(name = "鎬у埆 1:鐢� 2:濂�")
+ private Long sex;
+
+
+ /**
+ * 骞撮緞
+ */
+ @ApiModelProperty("骞撮緞")
+ @Excel(name = "骞撮緞")
+ private Long age;
+
+
+ /**
+ * 寰俊openid
+ */
+ @ApiModelProperty("寰俊openid ")
+ private String openid;
+
+ /**
+ * 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�
+ */
+ @ApiModelProperty("鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
+ private String delFlag;
+
+
+ /**
+ * 鎵规鍙�
+ */
+ @ApiModelProperty("鎵规鍙�")
+ private String batchNo;
+
+}
+
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java b/smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java
new file mode 100644
index 0000000..3a11ebe
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java
@@ -0,0 +1,351 @@
+package com.smartor.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鎮ｈ�呭嚭鍏ラ櫌銆侀棬璇婁俊鎭� PatArchiveOthreInfo
+ *
+ * @author smartor
+ * @date 2023-03-04
+ */
+@ApiModel(value = "PatArchiveOthreInfo", description = "鎮ｈ�呭嚭鍏ラ櫌銆侀棬璇婁俊鎭�")
+@Data
+public class PatArchiveOthreInfo extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鑷ID
+ */
+ @ApiModelProperty("鑷ID")
+ private Long id;
+
+
+ /**
+ * 鏈嶅姟鏍囪瘑锛�1锛岄渶瑕侊紝0锛屼笉闇�瑕�
+ */
+ @ApiModelProperty("鏈嶅姟鏍囪瘑锛�1锛岄渶瑕侊紝0锛屼笉闇�瑕�")
+ @Excel(name = " 鏈嶅姟鏍囪瘑锛�1锛岄渶瑕侊紝0锛屼笉闇�瑕� ")
+ private String notrequiredFlag;
+
+ /**
+ * 涓嶈鏈嶅姟鐨勫師鍥�
+ */
+ @ApiModelProperty("涓嶈鏈嶅姟鐨勫師鍥�")
+ @Excel(name = " 涓嶈鏈嶅姟鐨勫師鍥� ")
+ private String notrequiredreason;
+
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty(value = "浣忛櫌鍙�")
+ private String inhospno;
+
+ /**
+ * 鍑洪櫌鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ private Date endtime;
+
+ /**
+ * 璐ｄ换鎶ゅ＋缂栫爜
+ */
+ @ApiModelProperty(value = "璐ｄ换鎶ゅ＋缂栫爜")
+ private String nurseId;
+
+ /**
+ * 璐ｄ换鎶ゅ＋
+ */
+ @ApiModelProperty(value = "璐ｄ换鎶ゅ＋")
+ private String nurseName;
+
+
+ /**
+ * 鐖禝D
+ */
+ @ApiModelProperty("鐖禝D")
+ private Long pid;
+
+ /**
+ * GUID
+ */
+ @ApiModelProperty("GUID")
+ private Long guid;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("鎮ｈ�呯紪鍙�")
+ @Excel(name = " 鎮ｈ�呯紪鍙� ")
+ private String patientno;
+
+ /**
+ * 鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級
+ */
+ @ApiModelProperty("鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級")
+ @Excel(name = " 鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級 ")
+ private Integer sourcefrom;
+
+ /**
+ * his绯荤粺鐨勬偅鑰卛d
+ */
+ @ApiModelProperty("his绯荤粺鐨勬偅鑰卛d")
+ @Excel(name = "his绯荤粺鐨勬偅鑰卛d")
+ private Integer patidHis;
+
+ /**
+ * his绯荤粺鐨勬偅鑰卛d
+ */
+ @ApiModelProperty("his绯荤粺鐨勬偅鑰卛d")
+ @Excel(name = "his绯荤粺鐨勬偅鑰卛d")
+ private String sdFlag;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = " 濮撳悕 ")
+ private String name;
+
+ /**
+ * 鎬у埆 1:鐢� 2:濂�
+ */
+ @ApiModelProperty("鎬у埆")
+ @Excel(name = " 鎬у埆 ")
+ private Long sex;
+
+ /**
+ * 璇佷欢绫诲瀷
+ */
+ @ApiModelProperty("璇佷欢绫诲瀷")
+ @Excel(name = " 璇佷欢绫诲瀷 ")
+ private String idcardtype;
+
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("绫嶈疮")
+ @Excel(name = " 绫嶈疮 ")
+ private String nativePlace;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("灞呬綇鍦�")
+ @Excel(name = " 灞呬綇鍦� ")
+ private String placeOfResidence;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("鍑虹敓鍦�")
+ @Excel(name = " 鍑虹敓鍦� ")
+ private String birthplace;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ @Excel(name = " 璇佷欢鍙风爜 ")
+ private String idcardno;
+
+ /**
+ * 鐢熸棩
+ */
+ @ApiModelProperty("鐢熸棩")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鐢熸棩 ", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date birthdate;
+
+ /**
+ * 鍏ラ櫌鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鍏ラ櫌鏃堕棿")
+ private Date starttime;
+
+ /**
+ * 骞撮緞
+ */
+ @ApiModelProperty("骞撮緞")
+ @Excel(name = " 骞撮緞 ")
+ private Long age;
+ /**
+ * 骞撮緞
+ */
+ @ApiModelProperty("骞撮緞鍗曚綅")
+ @Excel(name = " 骞撮緞鍗曚綅 ")
+ private String ageUnit;
+
+ /**
+ * 寤烘。鏃堕棿
+ */
+ @ApiModelProperty("寤烘。鏃堕棿")
+ @Excel(name = " 寤烘。鏃堕棿 ")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date archivetime;
+
+ /**
+ * 寤烘。浜�
+ */
+ @ApiModelProperty("寤烘。浜�")
+ @Excel(name = " 寤烘。浜� ")
+ private String archiveby;
+
+ /**
+ * 鎵嬫満鍙风爜
+ */
+ @ApiModelProperty("鎵嬫満鍙风爜")
+ @Excel(name = " 鎵嬫満鍙风爜 ")
+ private String telcode;
+
+
+ /**
+ * 浜插睘鍙风爜
+ */
+ @ApiModelProperty("浜插睘鍙风爜")
+ @Excel(name = " 浜插睘鍙风爜 ")
+ private String relativetelcode;
+
+ /**
+ * 姘戞棌
+ */
+ @ApiModelProperty("姘戞棌")
+ @Excel(name = " 姘戞棌 ")
+ private String nation;
+
+ /**
+ * 鏈烘瀯ID
+ */
+ @ApiModelProperty("鏈烘瀯ID")
+ @Excel(name = " 鏈烘瀯ID ")
+ private String orgid;
+
+ /**
+ * 寰俊openid
+ */
+ @ApiModelProperty("寰俊openid")
+ @Excel(name = " 寰俊openid ")
+ private String openid;
+
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty("鍒犻櫎鏍囪")
+ private String delFlag;
+
+ /**
+ * 涓婁紶鏍囪
+ */
+ @ApiModelProperty("涓婁紶鏍囪")
+ private Long isupload;
+
+ /**
+ * 涓婁紶鏃堕棿
+ */
+ @ApiModelProperty("涓婁紶鏃堕棿")
+ private Date uploadTime;
+
+ /**
+ * 鏍囩
+ */
+ @ApiModelProperty("鏍囩")
+ @Excel(name = " 鏍囩 ", cellType = Excel.ColumnType.STRING)
+ private String tag;
+
+ /**
+ * 鏍囩
+ */
+ @ApiModelProperty("鏍囩id")
+ @Excel(name = " 鏍囩id ", cellType = Excel.ColumnType.STRING)
+ private Long tagid;
+
+ @ApiModelProperty("鏍囩闆嗗悎")
+ private List<PatArchivetag> tagList;
+
+ /**
+ * 鏍囩
+ */
+ @ApiModelProperty("鎮ｈ�呯被鍨�")
+ @Excel(name = " 鎮ｈ�呯被鍨� ", cellType = Excel.ColumnType.STRING)
+ private String pattype;
+
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("閽夐拤鍙�")
+ @Excel(name = " 閽夐拤鍙� ")
+ private String dduserid;
+
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("绉戝")
+ @Excel(name = " 绉戝 ")
+ private String dept;
+
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("绉戝")
+ @Excel(name = " 绉戝 ")
+ private String deptcode;
+ /**
+ * 绉戝鍚嶇О
+ */
+ @ApiModelProperty("绉戝鍚嶇О")
+ @Excel(name = " 绉戝鍚嶇О ")
+ private String deptname;
+
+ /**
+ * 鎵嬫満鍙�
+ */
+ @ApiModelProperty("鎵嬫満鍙�")
+ @Excel(name = " 鎵嬫満鍙� ")
+ private String phone;
+ /**
+ * 鍖荤敓濮撳悕
+ */
+ @ApiModelProperty("鍖荤敓濮撳悕")
+ @Excel(name = " 鍖荤敓濮撳悕 ")
+ private String drname;
+
+ /**
+ * 鍖荤敓缂栫爜
+ */
+ @ApiModelProperty("鍖荤敓缂栫爜")
+ @Excel(name = " 鍖荤敓缂栫爜 ")
+ private String drcode;
+
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("绉戝")
+ @Excel(name = " 绉戝 ")
+ private String bedNo;
+
+ /**
+ * 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳
+ */
+ @ApiModelProperty("浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳")
+ @Excel(name = " 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳 ")
+ private String viptype;
+
+ @ApiModelProperty("鍑洪櫌鐥呭尯鍚嶇О")
+ private String leavehospitaldistrictname;
+
+ @ApiModelProperty("鍑洪櫌鐥呭尯缂栧彿")
+ private String leavehospitaldistrictcode;
+
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
index 61d49a7..86846e6 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
@@ -144,4 +144,29 @@
private boolean isFilter = false;
+ /**
+ * 鍑洪櫌鐥呭尯缂栧彿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
+ private String leavehospitaldistrictcode;
+
+ /**
+ * 鍑洪櫌鐥呭尯鍚嶇О
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+ @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+ private String leavehospitaldistrictname;
+
+ /**
+ * 鐥呭尯缂栧彿
+ */
+ @ApiModelProperty(value = "鐥呭尯缂栧彿")
+ private List<String> leavehospitaldistrictcodes;
+
+ /**
+ * 绉戝缂栫爜
+ */
+ @ApiModelProperty(value = "绉戝缂栫爜")
+ @Excel(name = " 绉戝缂栫爜 ")
+ private List<String> leaveldeptcodes;
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
index dd4fa9d..660766a 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
@@ -29,9 +29,9 @@
private Long inhospid;
/**
- * 鑷ID
+ * 浣忛櫌鍙�
*/
- @ApiModelProperty(value = "鑷ID")
+ @ApiModelProperty(value = "浣忛櫌鍙�")
private String inhospno;
/**
@@ -39,6 +39,18 @@
*/
@ApiModelProperty(value = "娴佹按鍙�")
private String serialnum;
+
+ /**
+ * 鎶ゅ＋ID
+ */
+ @ApiModelProperty(value = "鎶ゅ＋ID")
+ private String nurseId;
+
+ /**
+ * 鎶ゅ＋濮撳悕
+ */
+ @ApiModelProperty(value = "鎶ゅ＋濮撳悕")
+ private String nurseName;
/**
* 鍖婚櫌鍚嶇О
@@ -265,7 +277,49 @@
/**
* 闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
*/
- @ApiModelProperty(value = "闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊")
+ @ApiModelProperty(value = "闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触")
private String checkFlag;
+ /**
+ * 骞撮緞
+ */
+ @ApiModelProperty(value = "骞撮緞")
+ private String age;
+
+ /**
+ * 鎵嬫満鍙�
+ */
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String telcode;
+ /**
+ * 鎵嬫満鍙�
+ */
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String longTaskReason;
+
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty("pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty("pageSize")
+ private Integer pageSize;
+ /**
+ * 鍑洪櫌鏂瑰紡搴忓彿
+ */
+ @ApiModelProperty("鍑洪櫌鏂瑰紡搴忓彿")
+ @Excel(name = "鍑洪櫌鏂瑰紡搴忓彿")
+ private String outWayId;
+
+ /**
+ * 鍑洪櫌鏂瑰紡鍚嶇О
+ */
+ @ApiModelProperty("鍑洪櫌鏂瑰紡鍚嶇О")
+ @Excel(name = "鍑洪櫌鏂瑰紡鍚嶇О")
+ private String outWayName;
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedInhospVO.java b/smartor/src/main/java/com/smartor/domain/PatMedInhospVO.java
new file mode 100644
index 0000000..746f835
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatMedInhospVO.java
@@ -0,0 +1,308 @@
+package com.smartor.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鎮ｈ�呬綇闄㈣褰曞璞� pat_med_inhosp
+ *
+ * @author smartor
+ * @date 2023-03-04
+ */
+@ApiModel(value = "PatMedInhosp", description = "鎮ｈ�呬綇闄㈣褰曞璞�")
+@Data
+public class PatMedInhospVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鑷ID
+ */
+ @ApiModelProperty(value = "鑷ID")
+ private Long inhospid;
+
+ /**
+ * 鑷ID
+ */
+ @ApiModelProperty(value = "鑷ID")
+ private String inhospno;
+
+ /**
+ * 鎶ゅ＋ID
+ */
+ @ApiModelProperty(value = "鎶ゅ＋ID")
+ private String nurseId;
+
+ /**
+ * 鎶ゅ＋濮撳悕
+ */
+ @ApiModelProperty(value = "鎶ゅ＋濮撳悕")
+ private String nurseName;
+
+ /**
+ * 娴佹按鍙�
+ */
+ @ApiModelProperty(value = "娴佹按鍙�")
+ private String serialnum;
+
+ /**
+ * 鍖婚櫌鍚嶇О
+ */
+ @ApiModelProperty(value = "鍖婚櫌鍚嶇О")
+ @Excel(name = " 鍖婚櫌鍚嶇О ")
+ private String hospitalname;
+
+ /**
+ * 鍖婚櫌缂栧彿
+ */
+ @ApiModelProperty(value = "鍖婚櫌缂栧彿")
+ private String hospitalcode;
+
+ /**
+ * 闄㈠尯缂栧彿
+ */
+ @ApiModelProperty(value = "闄㈠尯缂栧彿")
+ private String hospitaldistrictcode;
+
+ /**
+ * 闄㈠尯鍚嶇О
+ */
+ @ApiModelProperty(value = "闄㈠尯鍚嶇О")
+ @Excel(name = " 闄㈠尯鍚嶇О ")
+ private String hospitaldistrictname;
+
+ /**
+ * 鍏ラ櫌璇婃柇ICD鍊�
+ */
+ @ApiModelProperty(value = "鍏ラ櫌璇婃柇ICD鍊�")
+ private String icd10code;
+
+ /**
+ * 鍏ラ櫌璇婃柇鍚嶇О
+ */
+ @ApiModelProperty(value = "鍏ラ櫌璇婃柇鍚嶇О")
+ private String diagname;
+
+ /**
+ * 鍏ラ櫌鏃堕棿
+ */
+ @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鍏ラ櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date starttime;
+
+ /**
+ * 鍑洪櫌鏃堕棿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鍑洪櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date endtime;
+
+ /**
+ * 鍏ラ櫌绉戝浠ｇ爜
+ */
+ @ApiModelProperty(value = "鍏ラ櫌绉戝浠ｇ爜")
+ private String deptcode;
+
+ /**
+ * 鍏ラ櫌绉戝鍚嶇О
+ */
+ @ApiModelProperty(value = "鍏ラ櫌绉戝鍚嶇О")
+ private String deptname;
+
+ /**
+ * 鎴块棿鍙�
+ */
+ @ApiModelProperty(value = "鎴块棿鍙�")
+ private String roomno;
+
+ /**
+ * 搴婁綅鍙�
+ */
+ @ApiModelProperty(value = "搴婁綅鍙�")
+ @Excel(name = " 搴婁綅鍙� ")
+ private String bedNo;
+
+ /**
+ * 鏈烘瀯ID
+ */
+ @ApiModelProperty(value = "鏈烘瀯ID")
+ @Excel(name = " 鏈烘瀯ID ")
+ private String orgid;
+
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private String delFlag;
+
+ /**
+ * 涓婁紶鏍囪
+ */
+ @ApiModelProperty(value = "涓婁紶鏍囪")
+ private Long isupload;
+
+ /**
+ * 涓婁紶鏃堕棿
+ */
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
+ private Date uploadTime;
+
+ /**
+ * 妗ｆID
+ */
+ @ApiModelProperty(value = "妗ｆID")
+ private Long patid;
+
+ /**
+ * 鍑洪櫌璇婃柇
+ */
+ @ApiModelProperty(value = "鍑洪櫌璇婃柇")
+ @Excel(name = " 鍑洪櫌璇婃柇 ")
+ private String leavediagname;
+
+ /**
+ * 鍑洪櫌璇婃柇ICD鍊�
+ */
+ @ApiModelProperty(value = "鍑洪櫌璇婃柇ICD鍊�")
+ private String leaveicd10code;
+
+ /**
+ * 鍖荤敓宸ュ彿
+ */
+ @ApiModelProperty(value = "鍖荤敓宸ュ彿")
+ private String drcode;
+
+ /**
+ * 鍖荤敓鍚嶇О
+ */
+ @ApiModelProperty(value = "鍖荤敓鍚嶇О")
+ @Excel(name = " 鍖荤敓鍚嶇О ")
+ private String drname;
+
+ /**
+ * 鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗�
+ */
+ @ApiModelProperty(value = "鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗�")
+ private Long schemestatus;
+
+ /**
+ * 鏄惁鐢熸垚閫氱敤鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚 9鏃犲尮閰嶆柟妗�
+ */
+ @ApiModelProperty(value = "鏄惁鐢熸垚閫氱敤鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚 9鏃犲尮閰嶆柟妗�")
+ private Long generalschemestatus;
+
+ /**
+ * 鍑洪櫌绉戝浠ｇ爜闆嗗悎
+ */
+ @ApiModelProperty(value = "鍑洪櫌绉戝浠ｇ爜闆嗗悎")
+ private List<String> leaveldeptcodes;
+
+ /**
+ * 鍑洪櫌绉戝鍚嶇О
+ */
+ @ApiModelProperty(value = "鍑洪櫌绉戝鍚嶇О")
+ @Excel(name = " 鍑洪櫌绉戝鍚嶇О ")
+ private String leaveldeptname;
+
+ /**
+ * 鐥呭尯ID
+ */
+ @ApiModelProperty(value = "鐥呭尯ID")
+ private String hospitaldistrictid;
+
+
+ /**
+ * 鍑洪櫌鐥呭尯缂栧彿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿闆嗗悎")
+ private List<String> leavehospitaldistrictcodes;
+
+ /**
+ * 鍑洪櫌鐥呭尯鍚嶇О
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+ @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+ private String leavehospitaldistrictname;
+
+ /**
+ * 鍑洪櫌鐥呭尯ID
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯ID")
+ private String leavehospitaldistrictid;
+
+ /**
+ * 鍏ラ櫌绉戝ID
+ */
+ @ApiModelProperty(value = "鍏ラ櫌绉戝ID")
+ private String deptid;
+
+ /**
+ * 鍑洪櫌绉戝ID
+ */
+ @ApiModelProperty(value = "鍑洪櫌绉戝ID")
+ private String leaveldeptid;
+
+ /**
+ * 鏂规鐘舵�佹搷浣滄椂闂�
+ */
+ @ApiModelProperty(value = "鏂规鐘舵�佹搷浣滄椂闂�")
+ private Date schemetime;
+
+ /**
+ * 鎮ｈ�呭鍚�
+ */
+ @ApiModelProperty(value = "鎮ｈ�呭鍚�")
+ private String patname;
+
+ /**
+ * 鎮ｈ�呯紪鍙�
+ */
+ @ApiModelProperty(value = "鎮ｈ�呯紪鍙�")
+ private String patno;
+
+ /**
+ * 浣忛櫌鏍囪瘑锛� 0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉�
+ */
+ @ApiModelProperty(value = "浣忛櫌鏍囪瘑锛� 0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉�")
+ private String inhospstate;
+
+ /**
+ * 闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
+ */
+ @ApiModelProperty(value = "闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊")
+ private String checkFlag;
+
+ /**
+ * 骞撮緞
+ */
+ @ApiModelProperty(value = "骞撮緞")
+ private String age;
+
+ /**
+ * 鎵嬫満鍙�
+ */
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String telcode;
+
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty("pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty("pageSize")
+ private Integer pageSize;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
index 6a5d515..06a8c93 100644
--- a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
+++ b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
@@ -1,5 +1,6 @@
package com.smartor.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
@@ -61,11 +62,53 @@
private String name;
/**
+ * 濮撳悕
+ */
+ @Excel(name = "鍖荤敓缂栫爜")
+ @ApiModelProperty("鍖荤敓缂栫爜")
+ private String drcode;
+
+ /**
+ * 濮撳悕
+ */
+ @Excel(name = "鍖荤敓濮撳悕")
+ @ApiModelProperty("鍖荤敓濮撳悕")
+ private String drname;
+
+ /**
+ * 璐ｄ换鎶ゅ＋缂栫爜
+ */
+ @Excel(name = "璐ｄ换鎶ゅ＋缂栫爜")
+ @ApiModelProperty("璐ｄ换鎶ゅ＋缂栫爜")
+ private String nurseId;
+
+ /**
+ * 璐ｄ换鎶ゅ＋濮撳悕
+ */
+ @Excel(name = "璐ｄ换鎶ゅ＋濮撳悕")
+ @ApiModelProperty("璐ｄ换鎶ゅ＋濮撳悕")
+ private String nurseName;
+
+
+ /**
* 韬唤璇佸彿
*/
@Excel(name = "韬唤璇佸彿")
@ApiModelProperty("韬唤璇佸彿")
private String sfzh;
+
+ /**
+ * 韬唤璇佸彿
+ */
+ @Excel(name = "韬唤璇佸彿")
+ @ApiModelProperty("韬唤璇佸彿")
+ private String idcardno;
+ /**
+ * 韬唤璇佸彿
+ */
+ @Excel(name = "韬唤璇佸彿")
+ @ApiModelProperty("韬唤璇佸彿")
+ private String idcardtype;
/**
* 骞撮緞
@@ -142,6 +185,7 @@
* 鍙戦�佹椂闂�
*/
@Excel(name = "鍙戦�佹椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鍙戦�佹椂闂�")
private Date sendTime;
@@ -149,6 +193,7 @@
* 鍏ラ櫌鏃堕棿
*/
@Excel(name = "鍏ラ櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鍏ラ櫌鏃堕棿")
private Date inhosptime;
@@ -156,6 +201,7 @@
* 鍙戦�佹椂闂�
*/
@Excel(name = "灏辫瘖鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("灏辫瘖鏃堕棿")
private Date visitTime;
@@ -209,4 +255,41 @@
@ApiModelProperty(value = "鏂囨湰鍙橀噺鍙傛暟")
private String textParam;
+ /**
+ * 鍑洪櫌鐥呭尯缂栧彿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
+ private String leavehospitaldistrictcode;
+
+ /**
+ * 鍑洪櫌鐥呭尯鍚嶇О
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+ @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+ private String leavehospitaldistrictname;
+
+
+ /**
+ * 鍑洪櫌鏃堕棿
+ */
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ private Date endtime;
+
+ /**
+ * 鍏ラ櫌鏃堕棿
+ */
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
+ private Date starttime;
+
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿")
+ private Date finishtime;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/SendTaskVO.java b/smartor/src/main/java/com/smartor/domain/SendTaskVO.java
index 5a85730..6931d84 100644
--- a/smartor/src/main/java/com/smartor/domain/SendTaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SendTaskVO.java
@@ -24,7 +24,7 @@
*/
@Excel(name = " 鍙戦�佺姸鎬侊細 1鍒涘缓 2鎵ц涓� 3 鏆傚仠 4缁堟 5瀹屾垚 ")
@ApiModelProperty(value = "鍙戦�佺姸鎬侊細 1鍒涘缓 2鎵ц涓� 3 鏆傚仠 4缁堟 5瀹屾垚 ")
- private Integer sendState;
+ private Long sendState;
/**
* 浠诲姟绫诲瀷锛� 1 闅忚 2 闂嵎 3 瀹ｆ暀
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubTaskAnswerReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubTaskAnswerReq.java
index 6737d88..4bbe534 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubTaskAnswerReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubTaskAnswerReq.java
@@ -22,6 +22,9 @@
@ApiModelProperty(value = "鎮ｈ�匢D")
private String param2;
+ @ApiModelProperty(value = "寮傚父鏍囪瘑")
+ private String excep;
+
// @ApiModelProperty(value = "璇曞嵎绫诲瀷:1 闅忚 2 闂嵎")
// private Integer type;
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 44cdaaf..1646337 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -22,16 +22,53 @@
private static final long serialVersionUID = 1L;
/**
- *
+ * 涓婚敭
*/
@ApiModelProperty(value = "涓婚敭")
private Long id;
/**
- *
+ * 浠诲姟ID
*/
@ApiModelProperty(value = "浠诲姟ID")
private Long taskid;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String guid;
+
+ /**
+ * 寮傚父鏍囪瘑
+ */
+ @ApiModelProperty(value = "寮傚父鏍囪瘑")
+ @Excel(name = " 寮傚父鏍囪瘑 ")
+ private String excep;
+
+ /**
+ * 鍑洪櫌鏃堕棿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ private Date endtime;
+
+ /**
+ * 鍏ラ櫌鏃堕棿
+ */
+ @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
+ private Date starttime;
+
+ /**
+ * 鏄惁鎻愪氦
+ */
+ @ApiModelProperty(value = "鏄惁鎻愪氦锛�0鏈彁浜� 1宸叉彁浜�")
+ private Long submit;
/**
* 鍙戦�佷汉
@@ -118,6 +155,13 @@
private String templatename;
/**
+ * 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID
+ */
+ @Excel(name = " 澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫 ")
+ @ApiModelProperty(value = "澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫")
+ private String suggest;
+
+ /**
* 鍙戦�佹棩鏈�
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -171,8 +215,15 @@
* 鍙戦�佺姸鎬�
*/
@Excel(name = " 鍙戦�佺姸鎬� ")
- @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐�")
private Long sendstate;
+
+ /**
+ * 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1
+ */
+ @Excel(name = " 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1 ")
+ @ApiModelProperty(value = "鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1")
+ private Long stopState;
/**
* 鍙戦�乁UID
@@ -191,8 +242,7 @@
/**
* 瀹屾垚鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " 瀹屾垚鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
private Date finishtime;
@@ -224,6 +274,20 @@
@Excel(name = " 閮ㄩ棬code")
@ApiModelProperty(value = "閮ㄩ棬code")
private String deptcode;
+
+ /**
+ * 鍖荤敓缂栫爜
+ */
+ @Excel(name = " 鍖荤敓缂栫爜")
+ @ApiModelProperty(value = "鍖荤敓缂栫爜")
+ private String drcode;
+
+ /**
+ * 鍖荤敓濮撳悕
+ */
+ @Excel(name = " 鍖荤敓濮撳悕")
+ @ApiModelProperty(value = "鍖荤敓濮撳悕")
+ private String drname;
/**
* 鏍囩鐘舵��
@@ -417,4 +481,31 @@
@ApiModelProperty(value = "闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
private Date longSendTime;
+ /**
+ * 璐ｄ换鎶ゅ＋缂栫爜
+ */
+ @Excel(name = "璐ｄ换鎶ゅ＋缂栫爜")
+ @ApiModelProperty("璐ｄ换鎶ゅ＋缂栫爜")
+ private String nurseId;
+
+ /**
+ * 璐ｄ换鎶ゅ＋濮撳悕
+ */
+ @Excel(name = "璐ｄ换鎶ゅ＋濮撳悕")
+ @ApiModelProperty("璐ｄ换鎶ゅ＋濮撳悕")
+ private String nurseName;
+
+ /**
+ * 鍑洪櫌鐥呭尯缂栧彿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
+ private String leavehospitaldistrictcode;
+
+ /**
+ * 鍑洪櫌鐥呭尯鍚嶇О
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+ @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+ private String leavehospitaldistrictname;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
index 278e250..8029215 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
@@ -43,6 +43,13 @@
private String senduuid;
/**
+ * 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID
+ */
+ @Excel(name = " 澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫 ")
+ @ApiModelProperty(value = "澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫")
+ private String suggest;
+
+ /**
* 鎵嬫満鍙�
*/
@Excel(name = " 鎵嬫満鍙� ")
@@ -138,6 +145,27 @@
*/
@ApiModelProperty(value = "鍙戦�佺被鍨�: 1 鏃堕棿娈� 2 鍗冲埢鍙戦��")
private String sendType;
+
+ /**
+ * 鍑洪櫌鏃堕棿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ private Date inhosptime;
+
+ /**
+ * 鍖荤敓缂栫爜
+ */
+ @Excel(name = " 鍖荤敓缂栫爜")
+ @ApiModelProperty(value = "鍖荤敓缂栫爜")
+ private String drcode;
+
+ /**
+ * 鍖荤敓濮撳悕
+ */
+ @Excel(name = " 鍖荤敓濮撳悕")
+ @ApiModelProperty(value = "鍖荤敓濮撳悕")
+ private String drname;
+
/**
* 鍙戦�佹棩鏈�
@@ -434,13 +462,13 @@
@Excel(name = " 璇婃柇鍚嶇О")
@ApiModelProperty(value = "璇婃柇鍚嶇О")
private String diagname;
-//
-// /**
-// * 绉戝鍚嶇О
-// */
-// @Excel(name = "绉戝鍚嶇О")
-// @ApiModelProperty(value = "绉戝鍚嶇О")
-// private String deptname;
+
+ /**
+ * 绉戝鍚嶇О
+ */
+ @Excel(name = "绉戝鍚嶇О")
+ @ApiModelProperty(value = "绉戝鍚嶇О")
+ private String deptname;
//
// /**
// * 灏辫瘖鏃ユ湡
@@ -463,4 +491,67 @@
@ApiModelProperty(value = "鎬诲垎")
private Long score;
+
+ /**
+ * 鏄惁鎻愪氦
+ */
+ @ApiModelProperty(value = "鏄惁鎻愪氦锛�0鏈彁浜� 1宸叉彁浜�")
+ private Long submit;
+
+
+ /**
+ * 鍑洪櫌鐥呭尯缂栧彿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
+ private String leavehospitaldistrictcode;
+
+ /**
+ * 鍑洪櫌鐥呭尯鍚嶇О
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+ @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+ private String leavehospitaldistrictname;
+
+
+ /**
+ * 璐ｄ换鎶ゅ＋缂栫爜
+ */
+ @Excel(name = "璐ｄ换鎶ゅ＋缂栫爜")
+ @ApiModelProperty("璐ｄ换鎶ゅ＋缂栫爜")
+ private String nurseId;
+
+ /**
+ * 璐ｄ换鎶ゅ＋濮撳悕
+ */
+ @Excel(name = "璐ｄ换鎶ゅ＋濮撳悕")
+ @ApiModelProperty("璐ｄ换鎶ゅ＋濮撳悕")
+ private String nurseName;
+
+ /**
+ * 寮傚父鏍囪瘑
+ */
+ @ApiModelProperty(value = "寮傚父鏍囪瘑")
+ @Excel(name = " 寮傚父鏍囪瘑 ")
+ private String excep;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+
+ /**
+ * 鍑洪櫌鏃堕棿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ private Date endtime;
+
+ /**
+ * 鍏ラ櫌鏃堕棿
+ */
+ @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
+ private Date starttime;
+
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTask.java b/smartor/src/main/java/com/smartor/domain/ServiceTask.java
index fc7665e..4fdb5fd 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTask.java
@@ -8,6 +8,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* 璇煶浠诲姟瀵硅薄 ivr_task
@@ -15,7 +16,7 @@
* @author smartor
* @date 2023-03-24
*/
-@ApiModel(value = "ServiceTask" , description = "浠诲姟瀵硅薄")
+@ApiModel(value = "ServiceTask", description = "浠诲姟瀵硅薄")
@Data
public class ServiceTask extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -119,18 +120,18 @@
*
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " " , width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "娣诲姞鏃堕棿")
private Date addtime;
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " " , width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "寮�濮嬫椂闂�")
private Date beginTime;
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " " , width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "缁撴潫鏃堕棿")
private Date endTime;
@@ -152,7 +153,7 @@
* 瀹℃牳浜烘椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " " , width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "瀹℃牳浜烘椂闂�")
private Date checktime;
@@ -213,6 +214,13 @@
private String deptcode;
/**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+ private String deptname;
+
+ /**
* 鍒犻櫎
*/
@ApiModelProperty(value = "鍒犻櫎")
@@ -229,7 +237,7 @@
* 涓婁紶鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " 涓婁紶鏃堕棿 " , width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "涓婁紶鏃堕棿")
private Date uploadTime;
@@ -273,7 +281,7 @@
*/
@Excel(name = " 鍙戦�佺姸鎬侊細 1鍒涘缓 2鎵ц涓� 3 鏆傚仠 4缁堟 5瀹屾垚 ")
@ApiModelProperty(value = "鍙戦�佺姸鎬侊細 1鍒涘缓 2鎵ц涓� 3 鏆傚仠 4缁堟 5瀹屾垚 ")
- private Integer sendState;
+ private Long sendState;
// /**
// * 鏂囨湰鍙橀噺鍙傛暟
@@ -339,4 +347,23 @@
@ApiModelProperty(value = "灞曠ず鏃ユ湡")
private String showDate;
+
+ @ApiModelProperty(value = "寮�鍦虹櫧")
+ private String kcb;
+
+ @ApiModelProperty(value = "缁撴潫璇�")
+ private String jsy;
+
+ /**
+ * 鍑洪櫌鐥呭尯缂栧彿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿闆嗗悎")
+ private String leavehospitaldistrictcode;
+
+ /**
+ * 鍑洪櫌鐥呭尯鍚嶇О
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+ @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+ private String leavehospitaldistrictname;
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
index 5d9191c..855b737 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
@@ -48,7 +48,7 @@
*
*/
@Excel(name = " ")
- private Long libtemplateid;
+ private String libtemplateid;
/**
*
*/
@@ -176,8 +176,14 @@
/**
*
*/
- @Excel(name = " ")
+ @Excel(name = "绉戝缂栫爜")
private String deptcode;
+
+ /**
+ *
+ */
+ @Excel(name = "绉戝鍚�")
+ private String deptname;
/**
* 鍒犻櫎鏍囪
@@ -240,7 +246,7 @@
*/
@Excel(name = " 鍙戦�佺姸鎬侊細 1鍒涘缓 2鎵ц涓� 3 鏆傚仠 4缁堟 5瀹屾垚 ")
@ApiModelProperty(value = "鍙戦�佺姸鎬侊細 1鍒涘缓 2鎵ц涓� 3 鏆傚仠 4缁堟 5瀹屾垚 ")
- private Integer sendState;
+ private Long sendState;
/**
@@ -289,5 +295,23 @@
@ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
private String serviceType;
+ @ApiModelProperty(value = "寮�鍦虹櫧")
+ private String kcb;
+ @ApiModelProperty(value = "缁撴潫璇�")
+ private String jsy;
+
+
+ /**
+ * 鍑洪櫌鐥呭尯缂栧彿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿闆嗗悎")
+ private String leavehospitaldistrictcode;
+
+ /**
+ * 鍑洪櫌鐥呭尯鍚嶇О
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+ @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+ private String leavehospitaldistrictname;
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java
index c8b98d8..3d2077d 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java
@@ -43,10 +43,10 @@
private String svycode;
/**
- * 闂嵎鍚嶇О
+ * 闂嵎妯℃澘鍚嶇О
*/
- @ApiModelProperty(value = "闂嵎鍚嶇О", required = true)
- @Excel(name = " 闂嵎鍚嶇О ")
+ @ApiModelProperty(value = "闂嵎妯℃澘鍚嶇О", required = true)
+ @Excel(name = " 闂嵎妯℃澘鍚嶇О ")
private String svyname;
/**
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateVO.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateVO.java
index cc6954e..44c2f88 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateVO.java
@@ -42,10 +42,10 @@
private String svycode;
/**
- * 闂嵎鍚嶇О
+ * 闂嵎妯℃澘鍚嶇О
*/
- @ApiModelProperty(value = "闂嵎鍚嶇О", required = true)
- @Excel(name = " 闂嵎鍚嶇О ")
+ @ApiModelProperty(value = "闂嵎妯℃澘鍚嶇О", required = true)
+ @Excel(name = " 闂嵎妯℃澘鍚嶇О ")
private String svyname;
/**
@@ -241,6 +241,15 @@
@ApiModelProperty(value = "缁撴潫璇�")
private String conclusion;
+ @ApiModelProperty(value = "鏄惁鏄暱鏈熸ā鏉匡細 0锛氫笉鏄� 1锛氭槸")
+ private Integer longTemp;
+
+ @ApiModelProperty(value = "鍑洪櫌澶╂暟锛堥暱鏈熶换鍔★紝鍑哄畨闄㈠悗锛岀鍑犲ぉ鍙戦�佷俊鎭級")
+ private Integer sendDay;
+
+ @ApiModelProperty(value = "閮ㄩ棬缂栫爜")
+ private String deptCode;
+
public SvyLibTemplateVO() {
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplate.java b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplate.java
index 0a4a76f..f605944 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplate.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplate.java
@@ -51,8 +51,8 @@
/**
* 闂嵎鍚嶇О
*/
- @Excel(name = " 闂嵎鍚嶇О ")
- @ApiModelProperty(value = "闂嵎鍚嶇О")
+ @Excel(name = " 闂嵎妯℃澘鍚嶇О ")
+ @ApiModelProperty(value = "闂嵎妯℃澘鍚嶇О")
private String svyname;
/**
@@ -232,5 +232,12 @@
@ApiModelProperty(value = "缁撴潫璇�")
private String conclusion;
+ @ApiModelProperty(value = "鏄惁鏄暱鏈熸ā鏉匡細 0锛氫笉鏄� 1锛氭槸")
+ private Integer longTemp;
+ @ApiModelProperty(value = "鍑洪櫌澶╂暟锛堥暱鏈熶换鍔★紝鍑哄畨闄㈠悗锛岀鍑犲ぉ鍙戦�佷俊鎭級")
+ private Integer sendDay;
+
+ @ApiModelProperty(value = "閮ㄩ棬缂栫爜")
+ private String deptCode;
}
diff --git a/smartor/src/main/java/com/smartor/domain/ThiedInhospInfo.java b/smartor/src/main/java/com/smartor/domain/ThiedInhospInfo.java
index 72b6765..8987dd5 100644
--- a/smartor/src/main/java/com/smartor/domain/ThiedInhospInfo.java
+++ b/smartor/src/main/java/com/smartor/domain/ThiedInhospInfo.java
@@ -40,6 +40,19 @@
private List Education;
+
+ /**
+ * 鎶ゅ＋ID
+ */
+ @ApiModelProperty(value = "鎶ゅ＋ID")
+ private String nurseId;
+
+ /**
+ * 鎶ゅ＋濮撳悕
+ */
+ @ApiModelProperty(value = "鎶ゅ＋濮撳悕")
+ private String nurseName;
+
/**
* 鎮ｈ�呭鍚�
*/
@@ -341,7 +354,9 @@
private String patiNatureId;
+ //骞撮緞
private String treateAge;
+ //骞撮緞鍗曚綅
private String treatAgeunit;
private String patiNatureName;
@@ -409,7 +424,7 @@
* 鍑洪櫌鏂瑰紡搴忓彿
*/
@ApiModelProperty("鍑洪櫌鏂瑰紡搴忓彿")
- @Excel(name = "鍑洪櫌鏂瑰紡搴忓彿")
+ @Excel(name = "鍑洪櫌鏂瑰紡搴忓彿 1.娌绘剤 2.濂借浆 3.鏈剤 4.姝讳骸 5.鍏跺畠")
private String outWayId;
/**
diff --git a/smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java b/smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java
index 4269e8c..75ea276 100644
--- a/smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java
+++ b/smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java
@@ -22,6 +22,8 @@
@ApiModelProperty(value = "鎺ュ彛鏈嶅姟鍚嶏紝鍥哄畾鍊�")
private String service = "smarthos.yygh.ApiService.push";
+ private String spid = "1001";
+
/**
* 璇佷欢鍙�
*/
diff --git a/smartor/src/main/java/com/smartor/mapper/PatArchiveImportMapper.java b/smartor/src/main/java/com/smartor/mapper/PatArchiveImportMapper.java
new file mode 100644
index 0000000..66df000
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/PatArchiveImportMapper.java
@@ -0,0 +1,63 @@
+package com.smartor.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import com.smartor.domain.PatArchiveImport;
+
+/**
+ * Excel瀵煎叆鎮ｈ�呮。妗圡apper鎺ュ彛
+ *
+ * @author lihu
+ * @date 2024-09-05
+ */
+@Mapper
+public interface PatArchiveImportMapper
+{
+ /**
+ * 鏌ヨExcel瀵煎叆鎮ｈ�呮。妗�
+ *
+ * @param id Excel瀵煎叆鎮ｈ�呮。妗堜富閿�
+ * @return Excel瀵煎叆鎮ｈ�呮。妗�
+ */
+ public PatArchiveImport selectPatArchiveImportById(Long id);
+
+ /**
+ * 鏌ヨExcel瀵煎叆鎮ｈ�呮。妗堝垪琛�
+ *
+ * @param patArchiveImport Excel瀵煎叆鎮ｈ�呮。妗�
+ * @return Excel瀵煎叆鎮ｈ�呮。妗堥泦鍚�
+ */
+ public List<PatArchiveImport> selectPatArchiveImportList(PatArchiveImport patArchiveImport);
+
+ /**
+ * 鏂板Excel瀵煎叆鎮ｈ�呮。妗�
+ *
+ * @param patArchiveImport Excel瀵煎叆鎮ｈ�呮。妗�
+ * @return 缁撴灉
+ */
+ public int insertPatArchiveImport(PatArchiveImport patArchiveImport);
+
+ /**
+ * 淇敼Excel瀵煎叆鎮ｈ�呮。妗�
+ *
+ * @param patArchiveImport Excel瀵煎叆鎮ｈ�呮。妗�
+ * @return 缁撴灉
+ */
+ public int updatePatArchiveImport(PatArchiveImport patArchiveImport);
+
+ /**
+ * 鍒犻櫎Excel瀵煎叆鎮ｈ�呮。妗�
+ *
+ * @param id Excel瀵煎叆鎮ｈ�呮。妗堜富閿�
+ * @return 缁撴灉
+ */
+ public int deletePatArchiveImportById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎Excel瀵煎叆鎮ｈ�呮。妗�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deletePatArchiveImportByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatArchiveMapper.java b/smartor/src/main/java/com/smartor/mapper/PatArchiveMapper.java
index d7cf1ab..968b280 100644
--- a/smartor/src/main/java/com/smartor/mapper/PatArchiveMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/PatArchiveMapper.java
@@ -1,6 +1,7 @@
package com.smartor.mapper;
import com.smartor.domain.PatArchive;
+import com.smartor.domain.PatArchiveOthreInfo;
import com.smartor.domain.PatArchiveReq;
import org.apache.ibatis.annotations.Mapper;
@@ -68,13 +69,13 @@
public int deletePatArchiveByPatids(Long[] patids);
- public List<PatArchive> selectPatArchiveInfoByAllhosp(PatArchiveReq patArchive);
+ public List<PatArchiveOthreInfo> selectPatArchiveInfoByAllhosp(PatArchiveReq patArchive);
- public List<PatArchive> selectPatArchiveInfoByInhosp(PatArchiveReq patArchive);
+ public List<PatArchiveOthreInfo> selectPatArchiveInfoByInhosp(PatArchiveReq patArchive);
- public List<PatArchive> selectPatArchiveInfoByOuthosp(PatArchiveReq patArchive);
+ public List<PatArchiveOthreInfo> selectPatArchiveInfoByOuthosp(PatArchiveReq patArchive);
- public List<PatArchive> selectPatArchiveInfoByPhysical(PatArchiveReq patArchive);
+ public List<PatArchiveOthreInfo> selectPatArchiveInfoByPhysical(PatArchiveReq patArchive);
}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatMedInhospMapper.java b/smartor/src/main/java/com/smartor/mapper/PatMedInhospMapper.java
index 3179610..e41221d 100644
--- a/smartor/src/main/java/com/smartor/mapper/PatMedInhospMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/PatMedInhospMapper.java
@@ -3,6 +3,7 @@
import java.util.List;
import com.smartor.domain.PatMedInhosp;
+import com.smartor.domain.PatMedInhospVO;
import com.smartor.domain.PatMedReq;
import com.smartor.domain.PatMedRes;
import org.apache.ibatis.annotations.Mapper;
@@ -31,6 +32,8 @@
*/
public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp);
+ public List<PatMedInhosp> selectPatMedInhospListByCondition(PatMedInhospVO patMedInhospVO);
+
/**
* 鏂板鎮ｈ�呬綇闄㈣褰�
*
diff --git a/smartor/src/main/java/com/smartor/service/IPatArchiveImportService.java b/smartor/src/main/java/com/smartor/service/IPatArchiveImportService.java
new file mode 100644
index 0000000..e34fffd
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IPatArchiveImportService.java
@@ -0,0 +1,64 @@
+package com.smartor.service;
+
+import java.util.List;
+
+import com.smartor.domain.PatArchiveImport;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * Excel瀵煎叆鎮ｈ�呮。妗圫ervice鎺ュ彛
+ *
+ * @author lihu
+ * @date 2024-09-05
+ */
+public interface IPatArchiveImportService {
+ /**
+ * 鏌ヨExcel瀵煎叆鎮ｈ�呮。妗�
+ *
+ * @param id Excel瀵煎叆鎮ｈ�呮。妗堜富閿�
+ * @return Excel瀵煎叆鎮ｈ�呮。妗�
+ */
+ public PatArchiveImport selectPatArchiveImportById(Long id);
+
+ /**
+ * 鏌ヨExcel瀵煎叆鎮ｈ�呮。妗堝垪琛�
+ *
+ * @param patArchiveImport Excel瀵煎叆鎮ｈ�呮。妗�
+ * @return Excel瀵煎叆鎮ｈ�呮。妗堥泦鍚�
+ */
+ public List<PatArchiveImport> selectPatArchiveImportList(PatArchiveImport patArchiveImport);
+
+ /**
+ * 鏂板Excel瀵煎叆鎮ｈ�呮。妗�
+ *
+ * @param patArchiveImport Excel瀵煎叆鎮ｈ�呮。妗�
+ * @return 缁撴灉
+ */
+ public int insertPatArchiveImport(PatArchiveImport patArchiveImport);
+
+ /**
+ * 淇敼Excel瀵煎叆鎮ｈ�呮。妗�
+ *
+ * @param patArchiveImport Excel瀵煎叆鎮ｈ�呮。妗�
+ * @return 缁撴灉
+ */
+ public int updatePatArchiveImport(PatArchiveImport patArchiveImport);
+
+ /**
+ * 鎵归噺鍒犻櫎Excel瀵煎叆鎮ｈ�呮。妗�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑Excel瀵煎叆鎮ｈ�呮。妗堜富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deletePatArchiveImportByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎Excel瀵煎叆鎮ｈ�呮。妗堜俊鎭�
+ *
+ * @param id Excel瀵煎叆鎮ｈ�呮。妗堜富閿�
+ * @return 缁撴灉
+ */
+ public int deletePatArchiveImportById(Long id);
+
+ public List<PatArchiveImport> importPatInfo(MultipartFile multipartFile);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IPatArchiveService.java b/smartor/src/main/java/com/smartor/service/IPatArchiveService.java
index 5a047d1..1548f82 100644
--- a/smartor/src/main/java/com/smartor/service/IPatArchiveService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatArchiveService.java
@@ -93,5 +93,5 @@
public List<Object> getUserTreatmentInfo(String pid, String type);
- public List<ServiceSubtask> getPatientInfo(PatArchiveReq patArchiveReq);
+ public List<PatArchiveOthreInfo> getPatientInfo(PatArchiveReq patArchiveReq);
}
diff --git a/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java b/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
index c63c734..6486d78 100644
--- a/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.smartor.domain.PatMedInhosp;
+import com.smartor.domain.PatMedInhospVO;
import com.smartor.domain.PatMedReq;
import com.smartor.domain.PatMedRes;
@@ -30,6 +31,13 @@
* @return 鎮ｈ�呬綇闄㈣褰曢泦鍚�
*/
public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp);
+
+ /**
+ * 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
+ * @param patMedInhospVO
+ * @return
+ */
+ public List<PatMedInhosp> selectPatMedInhospListByCondition(PatMedInhospVO patMedInhospVO);
public PatMedInhosp getDeptCodeByPatId(PatMedInhosp patMedInhosp);
@@ -73,7 +81,7 @@
* @param
* @return 缁撴灉
*/
- public int dealOupHospInfo();
+ public int dealOutHospInfo();
/**
* 鑾峰彇鍑洪櫌锛屼綇闄紝闂ㄨ瘖鏈嶅姟浜烘
diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskAnswerService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskAnswerService.java
index 68ee4ea..52dc9d2 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskAnswerService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskAnswerService.java
@@ -78,7 +78,7 @@
*/
public Integer saveQuestionCache(ServiceSubTaskCacheReq serviceSubTaskCacheReq);
- public List<SvyLibTemplateScriptVO> getQuestionCache(ServiceSubTaskCacheReq serviceSubTaskCacheReq);
+ public Map<String,Object> getQuestionCache(ServiceSubTaskCacheReq serviceSubTaskCacheReq);
public Map<String, Object> selectPatQuestionResult(ServiceSubTaskQueryReq serviceSubTaskQueryReq);
diff --git a/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
index f0d46aa..22ce775 100644
--- a/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
@@ -44,20 +44,20 @@
@Override
public Integer taskSend(SendTaskVO sendTaskVO) {
- synchronized (CommonTaskServiceImpl.class) {
- if (sendTaskVO.getTaskId() == null || sendTaskVO.getTaskType() == null)
- throw new BaseException("浠诲姟ID鎴栬�呬换鍔＄被鍨嬩笉鑳戒负绌猴紝璇锋鏌ュ悗锛屽啀杩涜鎵ц");
- if (sendTaskVO.getTaskType() == 1) {
- //闅忚
- return sfSend(sendTaskVO);
- } else if (sendTaskVO.getTaskType() == 2) {
- //闂嵎
- return wjSend(sendTaskVO);
- } else if (sendTaskVO.getTaskType() == 3) {
- //瀹ｆ暀
- return xjSend(sendTaskVO);
- }
+
+ if (sendTaskVO.getTaskId() == null || sendTaskVO.getTaskType() == null)
+ throw new BaseException("浠诲姟ID鎴栬�呬换鍔＄被鍨嬩笉鑳戒负绌猴紝璇锋鏌ュ悗锛屽啀杩涜鎵ц");
+ if (sendTaskVO.getTaskType() == 1) {
+ //闅忚
+ return sfSend(sendTaskVO);
+ } else if (sendTaskVO.getTaskType() == 2) {
+ //闂嵎
+ return wjSend(sendTaskVO);
+ } else if (sendTaskVO.getTaskType() == 3) {
+ //瀹ｆ暀
+ return xjSend(sendTaskVO);
}
+ log.error("璧板埌杩欓噷浜嗗槢");
return null;
}
@@ -85,8 +85,10 @@
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(ivrTask.getTaskid());
- serviceTask.setSendState(2);
- serviceTask.setStopState(ivrTask.getStopState());
+ serviceTask.setSendState(2L);
+ //涓嶇煡涓哄暐杩欐牱鍐欙紝鍏堝皢stopstate缃负null
+// serviceTask.setStopState(ivrTask.getStopState());
+ serviceTask.setStopState(null);
ivrTaskService.updateServiceTask(serviceTask);
log.error("娑堟伅鍙戦�佹垚鍔�");
} else if (StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("1") || StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("3")) {
@@ -126,7 +128,8 @@
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(ivrTask.getTaskid());
- serviceTask.setSendState(2);
+ serviceTask.setSendState(2L);
+ serviceTask.setStopState(null);
ivrTaskService.updateServiceTask(serviceTask);
}
}
@@ -141,8 +144,8 @@
serviceTask.setTaskid(sendTaskVO.getTaskId());
serviceTask.setStopState(serviceTask1.getStopState() + 1);
serviceTask.setSendState(sendTaskVO.getSendState());
- iServiceTaskService.updateServiceTask(serviceTask);
- return 0;
+ int i = iServiceTaskService.updateServiceTask(serviceTask);
+ return i;
}
//鍒ゆ柇鍙戦�佺姸鎬佹槸鍚︿负绌�
@@ -159,7 +162,8 @@
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(serviceTask1.getTaskid());
- serviceTask.setSendState(2);
+ serviceTask.setSendState(2L);
+ serviceTask.setStopState(null);
iServiceTaskService.updateServiceTask(serviceTask);
} else if (StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("1") || StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("3")) {
//鏃堕棿娈靛彂閫�
@@ -201,7 +205,8 @@
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(serviceTask1.getTaskid());
- serviceTask.setSendState(2);
+ serviceTask.setSendState(2L);
+ serviceTask.setStopState(null);
iServiceTaskService.updateServiceTask(serviceTask);
}
}
@@ -234,7 +239,9 @@
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(serviceTask1.getTaskid());
- serviceTask.setSendState(2);
+ serviceTask.setSendState(2L);
+ serviceTask.setSendType(1L);
+ serviceTask.setStopState(null);
iServiceTaskService.updateServiceTask(serviceTask);
} else if (StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("1") || StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("3")) {
//鏃堕棿娈靛彂閫�
@@ -273,7 +280,8 @@
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(serviceTask1.getTaskid());
- serviceTask.setSendState(2);
+ serviceTask.setSendState(2L);
+ serviceTask.setStopState(null);
iServiceTaskService.updateServiceTask(serviceTask);
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchiveImportServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchiveImportServiceImpl.java
new file mode 100644
index 0000000..c5ea8c6
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveImportServiceImpl.java
@@ -0,0 +1,163 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.smartor.domain.PatArchiveImport;
+import com.smartor.mapper.PatArchiveImportMapper;
+import com.smartor.service.IPatArchiveImportService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Excel瀵煎叆鎮ｈ�呮。妗圫ervice涓氬姟灞傚鐞�
+ *
+ * @author lihu
+ * @date 2024-09-05
+ */
+@Service
+public class PatArchiveImportServiceImpl implements IPatArchiveImportService {
+ @Autowired
+ private PatArchiveImportMapper patArchiveImportMapper;
+
+ /**
+ * 鏌ヨExcel瀵煎叆鎮ｈ�呮。妗�
+ *
+ * @param id Excel瀵煎叆鎮ｈ�呮。妗堜富閿�
+ * @return Excel瀵煎叆鎮ｈ�呮。妗�
+ */
+ @Override
+ public PatArchiveImport selectPatArchiveImportById(Long id) {
+ return patArchiveImportMapper.selectPatArchiveImportById(id);
+ }
+
+ /**
+ * 鏌ヨExcel瀵煎叆鎮ｈ�呮。妗堝垪琛�
+ *
+ * @param patArchiveImport Excel瀵煎叆鎮ｈ�呮。妗�
+ * @return Excel瀵煎叆鎮ｈ�呮。妗�
+ */
+ @Override
+ public List<PatArchiveImport> selectPatArchiveImportList(PatArchiveImport patArchiveImport) {
+ return patArchiveImportMapper.selectPatArchiveImportList(patArchiveImport);
+ }
+
+ /**
+ * 鏂板Excel瀵煎叆鎮ｈ�呮。妗�
+ *
+ * @param patArchiveImport Excel瀵煎叆鎮ｈ�呮。妗�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertPatArchiveImport(PatArchiveImport patArchiveImport) {
+ patArchiveImport.setCreateTime(DateUtils.getNowDate());
+ return patArchiveImportMapper.insertPatArchiveImport(patArchiveImport);
+ }
+
+ /**
+ * 淇敼Excel瀵煎叆鎮ｈ�呮。妗�
+ *
+ * @param patArchiveImport Excel瀵煎叆鎮ｈ�呮。妗�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updatePatArchiveImport(PatArchiveImport patArchiveImport) {
+ patArchiveImport.setUpdateTime(DateUtils.getNowDate());
+ return patArchiveImportMapper.updatePatArchiveImport(patArchiveImport);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎Excel瀵煎叆鎮ｈ�呮。妗�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑Excel瀵煎叆鎮ｈ�呮。妗堜富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatArchiveImportByIds(Long[] ids) {
+ return patArchiveImportMapper.deletePatArchiveImportByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎Excel瀵煎叆鎮ｈ�呮。妗堜俊鎭�
+ *
+ * @param id Excel瀵煎叆鎮ｈ�呮。妗堜富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatArchiveImportById(Long id) {
+ return patArchiveImportMapper.deletePatArchiveImportById(id);
+ }
+
+ @Override
+ public List<PatArchiveImport> importPatInfo(MultipartFile multipartFile) {
+ //鐢ㄤ簬杩斿洖
+ List<PatArchiveImport> patArchiveImports = new ArrayList<>();
+ try {
+ Workbook workbook = new XSSFWorkbook(multipartFile.getInputStream());
+ Sheet sheet = workbook.getSheetAt(0);
+
+ for (int i = sheet.getFirstRowNum() + 1; i < sheet.getLastRowNum(); i++) {
+ //瀵煎叆鎮ｈ�呭璞�
+ PatArchiveImport patArchiveImport = new PatArchiveImport();
+ Row row = sheet.getRow(i);
+ //濡傛灉琛屼负绌猴紝杩涜涓嬩竴娆″惊鐜�
+ if (ObjectUtils.isEmpty(row.getCell(0)) && ObjectUtils.isEmpty(row.getCell(1)) && ObjectUtils.isEmpty(row.getCell(2))) {
+ continue;
+ }
+ //鍒ゆ柇鏁版嵁鏄惁鏈夐棶棰�
+
+
+ if (ObjectUtils.isNotEmpty(row.getCell(0).toString())) {
+ patArchiveImport.setName(row.getCell(0).toString());
+ }
+ if (ObjectUtils.isNotEmpty(row.getCell(1))) {
+ patArchiveImport.setIdcardno(row.getCell(1).toString());
+ }
+
+ if (ObjectUtils.isNotEmpty(row.getCell(2))) {
+ patArchiveImport.setTelcode(row.getCell(2).toString());
+ }
+ if (ObjectUtils.isNotEmpty(row.getCell(3))) {
+ patArchiveImport.setBatchName(row.getCell(3).toString());
+ }
+ if (ObjectUtils.isNotEmpty(row.getCell(4))) {
+ patArchiveImport.setPatientno(row.getCell(4).toString());
+ }
+
+ if (ObjectUtils.isNotEmpty(row.getCell(5))) {
+ patArchiveImport.setPattype(row.getCell(5).toString());
+ }
+ if (ObjectUtils.isNotEmpty(row.getCell(6))) {
+ patArchiveImport.setSex(Long.valueOf(row.getCell(6).toString()));
+ }
+ if (ObjectUtils.isNotEmpty(row.getCell(7))) {
+ patArchiveImport.setAge(Long.valueOf(row.getCell(7).toString()));
+ }
+
+ patArchiveImports.add(patArchiveImport);
+
+ patArchiveImport.setCreateTime(new Date());
+ patArchiveImport.setUpdateTime(new Date());
+ //鎵归噺鍙凤紙褰撳墠鏃堕棿锛�
+ patArchiveImport.setBatchNo(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
+ insertPatArchiveImport(patArchiveImport);
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return patArchiveImports;
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
index eae0749..871e4d3 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -185,39 +185,36 @@
* @return
*/
@Override
- public List<ServiceSubtask> getPatientInfo(PatArchiveReq patArchiveReq) {
- List<ServiceSubtask> serviceSubtaskList = new ArrayList<>();
+ public List<PatArchiveOthreInfo> getPatientInfo(PatArchiveReq patArchiveReq) {
+ if (CollectionUtils.isEmpty(patArchiveReq.getLeavehospitaldistrictcodes()) || patArchiveReq.getLeavehospitaldistrictcodes().size() == 0) {
+ patArchiveReq.setLeavehospitaldistrictcodes(null);
+ }
+ if (CollectionUtils.isEmpty(patArchiveReq.getLeaveldeptcodes()) || patArchiveReq.getLeaveldeptcodes().size() == 0) {
+ patArchiveReq.setLeaveldeptcodes(null);
+ }
- List<PatArchive> patArchiveList = new ArrayList<>();
+ List<PatArchiveOthreInfo> patArchiveList = new ArrayList<>();
if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 1) {
// 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
- List<PatArchive> patArchives1 = patArchiveMapper.selectPatArchiveInfoByInhosp(patArchiveReq);
+ List<PatArchiveOthreInfo> patArchives1 = patArchiveMapper.selectPatArchiveInfoByInhosp(patArchiveReq);
if (CollectionUtils.isNotEmpty(patArchives1)) {
patArchiveList.addAll(patArchives1);
}
} else if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 2) {
// 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
- List<PatArchive> patArchives2 = patArchiveMapper.selectPatArchiveInfoByOuthosp(patArchiveReq);
+ List<PatArchiveOthreInfo> patArchives2 = patArchiveMapper.selectPatArchiveInfoByOuthosp(patArchiveReq);
if (CollectionUtils.isNotEmpty(patArchives2)) {
patArchiveList.addAll(patArchives2);
}
} else if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 3) {
// 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
- List<PatArchive> patArchives3 = patArchiveMapper.selectPatArchiveInfoByPhysical(patArchiveReq);
+ List<PatArchiveOthreInfo> patArchives3 = patArchiveMapper.selectPatArchiveInfoByPhysical(patArchiveReq);
if (CollectionUtils.isNotEmpty(patArchives3)) {
patArchiveList.addAll(patArchives3);
}
}
- for (PatArchive patArchive : patArchiveList) {
- ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(patArchive, ServiceSubtask.class);
- serviceSubtask.setCreateTime(patArchive.getCreateTime());
- serviceSubtask.setCreateBy(patArchive.getCreateBy());
- serviceSubtask.setDeptname(patArchive.getDept());
- serviceSubtask.setPhone(patArchive.getTelcode());
- serviceSubtaskList.add(serviceSubtask);
- }
- return serviceSubtaskList;
+ return patArchiveList;
}
@@ -495,7 +492,7 @@
//鏍规嵁鏉′欢鑾峰彇鎮ｈ�呬俊鎭�
// List<PatArchive> patArchiveList = patArchiveMapper.patInfoByContion(patArchive);
- List<PatArchive> patArchiveList = new ArrayList<>();
+ List<PatArchiveOthreInfo> patArchiveList = new ArrayList<>();
if (patArchive.getEndtime() != null) {
//鍑洪櫌鏃堕棿鍙湁浣忛櫌鎵嶆湁
@@ -503,32 +500,32 @@
}
if (patArchive.getAllhosp() != null && patArchive.getAllhosp() == 0) {
- List<PatArchive> patArchives0 = patArchiveMapper.selectPatArchiveInfoByAllhosp(patArchive);
+ List<PatArchiveOthreInfo> patArchives0 = patArchiveMapper.selectPatArchiveInfoByAllhosp(patArchive);
if (CollectionUtils.isNotEmpty(patArchives0)) {
patArchiveList.addAll(patArchives0);
}
} else if (patArchive.getAllhosp() != null && patArchive.getAllhosp() == 1) {
- List<PatArchive> patArchives1 = patArchiveMapper.selectPatArchiveInfoByInhosp(patArchive);
+ List<PatArchiveOthreInfo> patArchives1 = patArchiveMapper.selectPatArchiveInfoByInhosp(patArchive);
if (CollectionUtils.isNotEmpty(patArchives1)) {
patArchiveList.addAll(patArchives1);
}
} else if (patArchive.getAllhosp() != null && patArchive.getAllhosp() == 2) {
- List<PatArchive> patArchives2 = patArchiveMapper.selectPatArchiveInfoByOuthosp(patArchive);
+ List<PatArchiveOthreInfo> patArchives2 = patArchiveMapper.selectPatArchiveInfoByOuthosp(patArchive);
if (CollectionUtils.isNotEmpty(patArchives2)) {
patArchiveList.addAll(patArchives2);
}
} else if (patArchive.getAllhosp() != null && patArchive.getAllhosp() == 3) {
- List<PatArchive> patArchives3 = patArchiveMapper.selectPatArchiveInfoByPhysical(patArchive);
+ List<PatArchiveOthreInfo> patArchives3 = patArchiveMapper.selectPatArchiveInfoByPhysical(patArchive);
if (CollectionUtils.isNotEmpty(patArchives3)) {
patArchiveList.addAll(patArchives3);
}
}
//鏍规嵁鎮ｈ�匢D杩涜鍒嗙粍
- Map<Long, List<PatArchive>> listMap = patArchiveList.stream().collect(Collectors.groupingBy(PatArchive::getId));
+ Map<Long, List<PatArchiveOthreInfo>> listMap = patArchiveList.stream().collect(Collectors.groupingBy(PatArchiveOthreInfo::getId));
//瀵规暟鎹繘琛屽皝瑁�
- for (List<PatArchive> list : listMap.values()) {
+ for (List<PatArchiveOthreInfo> list : listMap.values()) {
PatArchive patArchive1 = new PatArchive();
Set<PatArchivetag> stringList = new HashSet<>();
for (int i = 0; i < list.size(); i++) {
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index f3aa58c..38616f5 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -5,6 +5,8 @@
import java.util.*;
import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -41,6 +43,12 @@
private IvrTaskTemplateMapper ivrTaskTemplateMapper;
@Autowired
+ private Icd10AssociationMapper icd10AssociationMapper;
+
+ @Autowired
+ private SvyTaskTemplateMapper svyTaskTemplateMapper;
+
+ @Autowired
private ServiceTaskMapper serviceTaskMapper;
@Autowired
@@ -73,6 +81,16 @@
@Override
public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp) {
return patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+ }
+
+ /**
+ * 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
+ *
+ * @param patMedInhospVO
+ * @return
+ */
+ public List<PatMedInhosp> selectPatMedInhospListByCondition(PatMedInhospVO patMedInhospVO) {
+ return patMedInhospMapper.selectPatMedInhospListByCondition(patMedInhospVO);
}
@@ -165,85 +183,143 @@
return patMedInhospMapper.deletePatMedInhospByInhospid(inhospid);
}
- @Transactional(rollbackFor = Exception.class)
+
@Override
- public int dealOupHospInfo() {
- //鑾峰彇闀挎湡妯℃澘
- IvrLibaTemplate ivrTemp = new IvrLibaTemplate();
- ivrTemp.setDelFlag("0");
- ivrTemp.setLongTemp(1);
- List<IvrLibaTemplate> ivrLibaTemplates = ivrLibaTemplateMapper.selectIvrLibaTemplateList(ivrTemp);
-
- if (CollectionUtils.isNotEmpty(ivrLibaTemplates)) {
- for (IvrLibaTemplate ivrLibaTemplate : ivrLibaTemplates) {
- //鑾峰彇鍒颁换鍔℃ā鏉夸俊鎭�
- IvrTaskTemplate ivrTaskTemplate = new IvrTaskTemplate();
- ivrTaskTemplate.setLibtemplateid(ivrLibaTemplate.getId().toString());
- List<IvrTaskTemplate> ivrTaskTemplates = ivrTaskTemplateMapper.selectIvrTaskTemplateList(ivrTaskTemplate);
- if (CollectionUtils.isNotEmpty(ivrTaskTemplates)) {
- IvrTaskTemplate ivrTaskTemplate1 = ivrTaskTemplates.get(0);
- //閫氳繃浠诲姟妯℃澘ID鑾峰彇浠诲姟
- ServiceTask ServiceTask = new ServiceTask();
- ServiceTask.setTemplateid(ivrTaskTemplate1.getId());
- List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(ServiceTask);
- if (CollectionUtils.isNotEmpty(serviceTasks)) {
- serviceTaskList.add(serviceTasks.get(0));
- }
- ivrTaskTemplates.add(ivrTaskTemplate1);
- }
- libaTemplates.add(ivrLibaTemplate);
- }
- }
-
+ public int dealOutHospInfo() {
PatMedInhosp patMedInhosp = new PatMedInhosp();
//鑾峰彇鏈鐞嗙殑鏁版嵁
patMedInhosp.setCheckFlag("0");
patMedInhosp.setInhospstate("1");
List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+
for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
+ //鏍规嵁鎮ｈ�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟妯℃澘
+ Long taskid = null;
+ SvyTaskTemplate svyTaskTemplate = new SvyTaskTemplate();
+ svyTaskTemplate.setDeptCode(patMedInhosp1.getLeaveldeptcode());
+ svyTaskTemplate.setLongTemp(1);
+ List<SvyTaskTemplate> svyTaskTemplates = svyTaskTemplateMapper.selectSvyTaskTemplateList(svyTaskTemplate);
+ //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堟殏瀹氾紝灏嗗嚭鍏ラ櫌琛ㄧ殑check_flag璁剧疆涓�2 锛宭ong_task_reason 璁板綍鍘熷洜锛�
+ if (CollectionUtils.isEmpty(svyTaskTemplates) || svyTaskTemplates.size() == 0) {
+ patMedInhosp1.setCheckFlag("2");
+ patMedInhosp1.setLongTaskReason("璇ユ偅鑰呮墍鍦ㄧ瀹わ紝鏈厤缃换鍔℃ā鏉�");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ continue;
+ }
+
+ //鑾峰彇鎮ｈ�呬俊鎭�
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
- //閫氳繃icd10code鍘昏幏鍙栫浉搴旂殑ivr_liba_template_id
- if (StringUtils.isNotEmpty(patMedInhosp1.getIcd10code())) {
- for (IvrLibaTemplate ivrLibaTemplate : libaTemplates) {
- String icdCode = patMedInhosp1.getIcd10code().split(",")[0];
- if (ivrLibaTemplate.getIcd10code().equals(icdCode)) {
- //閫氳繃妯℃澘ID鑾峰彇浠诲姟妯℃澘
- for (IvrTaskTemplate ivrTaskTemplate : ivrTaskTemplates) {
- if (ivrTaskTemplate.getLibtemplateid().equals(ivrLibaTemplate.getId().toString())) {
- for (ServiceTask serviceTask : serviceTaskList) {
- if (serviceTask.getTemplateid() == ivrTaskTemplate.getId()) {
- //灏嗚鎮ｈ�咃紝鎻掑叆鍒板瓙浠诲姟琛ㄤ腑
- ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
- serviceSubtask.setId(null);
- serviceSubtask.setTaskid(serviceTask.getTaskid());
- serviceSubtask.setLibtemplateid(ivrLibaTemplate.getId());
- serviceSubtask.setTemplateid(ivrTaskTemplate.getId());
- serviceSubtask.setTemplatename(ivrLibaTemplate.getTemplateName());
- serviceSubtask.setPatid(patMedInhosp1.getPatid());
- serviceSubtask.setSendname(patMedInhosp1.getPatname());
- serviceSubtask.setPhone(patArchive.getTelcode());
- serviceSubtask.setSex(patArchive.getSex());
- serviceSubtask.setAge(patArchive.getAge());
- serviceSubtask.setSendstate(2L);
- serviceSubtask.setServiceform(serviceTask.getPreachform());
- serviceSubtask.setHospType("2");
- //鎮ｈ�呭彂閫佹椂闂�
- LocalDate currentDate = LocalDate.now();
- LocalDate newDate = currentDate.plusDays(ivrTaskTemplate.getSendDay());
- serviceSubtask.setLongSendTime(Date.from(newDate.atStartOfDay(ZoneOffset.ofHours(8)).toInstant()));
- serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
- //灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
- PatMedInhosp patMedInhosp2 = new PatMedInhosp();
- patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
- patMedInhosp2.setCheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
- }
+ //缁欎釜remark(鐢ㄦ潵鍋氭槸鍚﹁缁欏彂閫佹椂闂存爣璇�)
+ String remark = null;
+ //瀹氫箟涓�涓ā鏉垮彉閲忥紝鐢ㄤ笌涓存椂淇濆瓨涓�涓嬫壘鍑烘潵鐨勬ā鏉�
+ SvyTaskTemplate stt = null;
+ if (CollectionUtils.isNotEmpty(svyTaskTemplates) && svyTaskTemplates.size() == 1) {
+ stt = svyTaskTemplates.get(0);
+ taskid = svyTaskTemplates.get(0).getTaskid();
+
+ } else if (CollectionUtils.isNotEmpty(svyTaskTemplates) && svyTaskTemplates.size() > 1) {
+ //閫氳繃鎮ｈ�呯殑鐤剧梾鍘绘壘妯℃澘
+ if (StringUtils.isNotEmpty(patMedInhosp1.getIcd10code())) {
+ aa:
+ for (SvyTaskTemplate svyTaskTemplate1 : svyTaskTemplates) {
+ //閫氳繃鍩虹妯℃澘ID鑾峰彇鍏宠仈鐨勭柧鐥卌ode
+ Icd10Association icd10Association = new Icd10Association();
+ icd10Association.setType(5L);
+ icd10Association.setOutid(svyTaskTemplate1.getTemplateid());
+ List<Icd10Association> icd10Associations = icd10AssociationMapper.selectIcd10AssociationList(icd10Association);
+ if (CollectionUtils.isEmpty(icd10Associations)) {
+ //濡傝兘妯℃澘鐨勭柧鐥呬负绌猴紝鍒欐槸鏈瀹ょ殑閫氱敤榛樿妯℃澘
+ stt = svyTaskTemplate1;
+ taskid = stt.getTaskid();
+ continue;
+ } else {
+ //濡傝兘妯℃澘鐨勭柧鐥呬笉涓虹┖锛屽垯鏄敤鍖归厤鍒扮柧鐥呯殑妯℃澘锛堝鏋滃尮閰嶅嚭鏉ュ涓ā鏉匡紝鍙敤绗竴涓級
+ for (Icd10Association icd10Association1 : icd10Associations) {
+ if (patMedInhosp1.getIcd10code().equals(icd10Association1.getIcd10code())) {
+ stt = svyTaskTemplate1;
+ taskid = stt.getTaskid();
+ break aa;
}
}
}
}
+ //濡傛灉寰幆瀹岋紝stt杩樻槸涓虹┖锛屽垯璇ョ瀹ゆ病鏈夐粯璁ゆā鏉�
+ if (Objects.isNull(stt)) {
+ //鍦ㄥ嚭鍏ラ櫌琛ㄨ褰曚竴涓嬭鎮ｈ�呯姸鎬侊紙璇ョ瀹ゆ病鏈夋ā鏉匡紝鎵�浠ユ棤娉曞湪瀛愪换鍔￠噷鐢熸垚浠诲姟锛屾墍浠ヤ换鍔℃槸澶辫触鏄殑锛宑hect_flag=2锛�
+ patMedInhosp1.setCheckFlag("2");
+ patMedInhosp1.setLongTaskReason("鏃犳硶鍖归厤鍒拌绉戝妯℃澘锛岃绉戝涔熸棤榛樿妯℃澘");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ continue;
+ }
+ } else {
+ //涓虹┖鐨勮瘽锛岀洿鎺ョ敤绉戝鐨勯�氱敤妯℃澘鐨勪换鍔D锛岃鎮ｈ�呯洿鎺ュ線瀛愪换鍔¤〃閲屾彃鍏ワ紝浣嗕笉瑕佹墽琛岋紝闇�瑕佷汉宸ュ共锛堝皢涓嶈兘鎵ц鐨勫師鍥犲娉ㄥソ锛�
+ for (SvyTaskTemplate svyTaskTemplate1 : svyTaskTemplates) {
+ //閫氳繃鍩虹妯℃澘ID鑾峰彇鍏宠仈鐨勭柧鐥卌ode
+ Icd10Association icd10Association = new Icd10Association();
+ icd10Association.setType(5L);
+ icd10Association.setOutid(svyTaskTemplate1.getTemplateid());
+ //鎵惧嚭璇ョ瀹ょ殑閫氱敤妯℃澘
+ List<Icd10Association> icd10Associations = icd10AssociationMapper.selectIcd10AssociationList(icd10Association);
+ if (CollectionUtils.isEmpty(icd10Associations)) {
+ stt = svyTaskTemplate1;
+ //涓嶉厤缃彂閫佹椂闂�
+ remark = "鎮ｈ�呭叆闄㈢柧鐥呬负绌�";
+ //鍦ㄥ嚭鍏ラ櫌琛ㄨ褰曚竴涓嬭鎮ｈ�呯姸鎬侊紙璇ョ瀹ゆ槸鏈夌柧鐥呬负绌虹殑妯℃澘锛屾墍浠ュ彲浠ュ湪瀛愪换鍔￠噷鐢熸垚浠诲姟锛屾墍浠ヤ换鍔℃槸鎴愬姛鐨勶紝chect_flag=1锛�
+ patMedInhosp1.setCheckFlag("1");
+ patMedInhosp1.setLongTaskReason("鎮ｈ�呭叆闄㈢柧鐥呬负绌猴紝宸叉壘鍒扮瀹ゆā鏉�");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ continue;
+ }
+ }
+ if (Objects.isNull(stt)) {
+ //鍦ㄥ嚭鍏ラ櫌琛ㄨ褰曚竴涓嬭鎮ｈ�呯姸鎬侊紙璇ョ瀹ゆ病鏈夋ā鏉匡紝鎵�浠ユ棤娉曞湪瀛愪换鍔￠噷鐢熸垚浠诲姟锛屾墍浠ヤ换鍔℃槸澶辫触鏄殑锛宑hect_flag=2锛�
+ patMedInhosp1.setCheckFlag("2");
+ patMedInhosp1.setLongTaskReason("鎮ｈ�呭叆闄㈢柧鐥呬负绌猴紝鏈壘鍒扮瀹ゆā鏉�");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ continue;
+ }
}
}
+
+ ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(taskid);
+ ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
+ serviceSubtask.setTaskid(serviceTask.getTaskid());
+ serviceSubtask.setLibtemplateid(stt.getTemplateid());
+ serviceSubtask.setTemplateid(stt.getId());
+ serviceSubtask.setTemplatename(stt.getSvyname());
+ serviceSubtask.setPatid(patArchive.getId());
+ serviceSubtask.setSendname(patArchive.getName());
+ serviceSubtask.setPhone(patArchive.getTelcode());
+ serviceSubtask.setSex(patArchive.getSex());
+ serviceSubtask.setAge(patArchive.getAge());
+ serviceSubtask.setSendstate(2L);
+ serviceSubtask.setServiceType("2");
+ serviceSubtask.setServiceform(serviceTask.getPreachform());
+ serviceSubtask.setHospType("2");
+ //璁剧疆鍙戦�佹椂闂�
+ Date newDate = addDays(patMedInhosp1.getEndtime(), stt.getSendDay());
+ serviceSubtask.setLongSendTime(newDate);
+ //鎮ｈ�呭彂閫佹椂闂�
+ if (StringUtils.isNotEmpty(remark)) {
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setRemark(remark);
+ serviceSubtask.setResult("error");
+ serviceSubtask.setFinishtime(new Date());
+ //涓嶆墽琛�
+ serviceSubtask.setSendstate(4L);
+ } else if (patArchive.getNotrequiredFlag().equals("4")) {
+ //浜轰笉鍦ㄤ簡锛屾垨鑰呭叾瀹冨師鍥狅紝涔熶笉鑳介殢璁�
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setRemark(patArchive.getNotrequiredreason());
+ serviceSubtask.setResult("error");
+ serviceSubtask.setFinishtime(new Date());
+ }
+ serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ //灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
+ PatMedInhosp patMedInhosp2 = new PatMedInhosp();
+ patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
+ patMedInhosp2.setCheckFlag("1");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
}
return 1;
}
@@ -260,5 +336,14 @@
return patMedInhospMapper.getDeptRanking(patMedReq);
}
+ private Date addDays(Date date, Integer days) {
+ if (days == null) {
+ days = 1;
+ }
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.add(Calendar.DAY_OF_MONTH, days);
+ return calendar.getTime();
+ }
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index ef20484..08cec1f 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -1,5 +1,6 @@
package com.smartor.service.impl;
+import afu.org.checkerframework.checker.oigj.qual.O;
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
@@ -142,12 +143,13 @@
String[] split = key.split("-");
if (key.contains("-WJscriptCache")) {
List<SvyLibTemplateScriptVO> cacheList = redisCache.getCacheList(key);
-
+ cacheList.sort(Comparator.comparingLong(SvyLibTemplateScriptVO::getSort));
+ log.error("闂嵎鍥炵瓟缁撴灉锛歿}", cacheList);
for (int i = 0; i < cacheList.size(); i++) {
if (i == 0) {
//杩欎釜鏃堕棿瑕佹壘鍒扮涓�棰�
for (SvyLibTemplateScriptVO svyLibTemplateScriptVO : cacheList) {
- if (svyLibTemplateScriptVO.getSort() == 1) {
+ if (svyLibTemplateScriptVO.getSort() == 1L) {
//璇存槑鏄涓�棰�
SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(cacheList.get(0), SvyTaskTemplateScriptVO.class);
List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = cacheList.get(0).getSvyLibTemplateTargetoptions();
@@ -170,6 +172,7 @@
if (svyTaskTemplateScriptVO.getSort() == nextScriptno) {
Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]));
+ log.error("map鐨勪俊鎭负锛歿}", map);
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
if (score == null) {
score = Double.valueOf(map.get("score"));
@@ -185,6 +188,8 @@
ServiceSubtask serviceSubtask = new ServiceSubtask();
serviceSubtask.setTaskid(tid);
serviceSubtask.setPatid(pid);
+ serviceSubtask.setSubmit(1L);
+ serviceSubtask.setExcep(serviceSubTaskAnswerReq.getExcep());
serviceSubtask.setFinishtime(new Date());
if (score != null) serviceSubtask.setScore(BigDecimal.valueOf(score));
serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
@@ -213,13 +218,27 @@
}
@Override
- public List<SvyLibTemplateScriptVO> getQuestionCache(ServiceSubTaskCacheReq serviceSubTaskCacheReq) {
+ public Map<String, Object> getQuestionCache(ServiceSubTaskCacheReq serviceSubTaskCacheReq) {
+ Map<String, Object> map = new HashMap<>();
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam1(), pri_key));
Long pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam2(), pri_key));
+ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ serviceSubtaskVO.setTaskid(tid);
+ serviceSubtaskVO.setPatid(pid);
+ List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+ if (CollectionUtils.isEmpty(selectServiceSubtaskList) || selectServiceSubtaskList.size() == 0) {
+ map.put("submit", 0);
+ } else {
+ map.put("submit", selectServiceSubtaskList.get(0).getSubmit());
+ if (selectServiceSubtaskList.get(0).getSubmit() == 1) {
+ return map;
+ }
+ }
//闂嵎
List<SvyLibTemplateScriptVO> svyTaskTemplateScriptVOList = redisCache.getCacheList(pid + "-" + tid + "-WJscriptCache");
- return svyTaskTemplateScriptVOList;
+ map.put("result", svyTaskTemplateScriptVOList);
+ return map;
}
@Override
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
index 774987e..baf4338 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -34,19 +34,22 @@
private ServiceSubtaskMapper serviceSubtaskMapper;
@Autowired
+ private IvrTaskTemplateMapper ivrTaskTemplateMapper;
+
+ @Autowired
+ private SvyTaskTemplateMapper svyTaskTemplateMapper;
+
+ @Autowired
+ private HeLibraryMapper heLibraryMapper;
+
+ @Autowired
private IvrLibaTemplateScriptMapper ivrLibaTemplateScriptMapper;
@Autowired
private SvyLibTemplateScriptMapper svyLibTemplateScriptMapper;
@Autowired
- private SvyTaskTemplateMapper svyTaskTemplateMapper;
-
- @Autowired
private PatArchiveMapper patArchiveMapper;
-
- @Autowired
- private HeLibraryMapper heLibraryMapper;
@Autowired
@@ -140,6 +143,19 @@
@Override
public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid) {
+ Map<String, Object> map = new HashMap<>();
+ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ serviceSubtaskVO.setPatid(patid);
+ serviceSubtaskVO.setTaskid(taskid);
+ List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+ //鏌ヨ鎮ｈ�呮槸鍚﹂噸瑕嗗仛棰�
+ if (CollectionUtils.isEmpty(selectServiceSubtaskList)) {
+ Long submit = selectServiceSubtaskList.get(0).getSubmit();
+ if (submit == 1L) {
+ map.put("submit", "1");
+ return map;
+ }
+ }
//閫氳繃浠诲姟ID鑾峰彇妯℃澘ID
ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
List info = new ArrayList();
@@ -151,7 +167,7 @@
info = wjInfo(serviceTask, patid);
} else {
//瀹ｆ暀
- info = xjInfo(Long.valueOf(serviceTask.getLibtemplateid()));
+ info = xjInfo(Long.valueOf(serviceTask.getLibtemplateid()), taskid, patid);
}
//鍙鎵撳紑浜嗛〉闈紝灏辩畻鎴愬姛
@@ -162,11 +178,12 @@
ServiceTaskSingle.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtaskByCondition(ServiceTaskSingle);
SvyTaskTemplate svyTaskTemplate = svyTaskTemplateMapper.selectSvyTaskTemplateBySvyid(serviceTask.getTemplateid());
- Map<String, Object> map = new HashMap<>();
+ if (StringUtils.isNotEmpty(serviceTask.getKcb())) map.put("kcb", serviceTask.getKcb());
map.put("script", info);
- map.put("revisitAfter", svyTaskTemplate.getConclusion());
+ if (StringUtils.isNotEmpty(serviceTask.getJsy())) map.put("jsy", serviceTask.getJsy());
map.put("type", serviceTask.getType());
- map.put("taskName",serviceTask.getTaskName());
+ map.put("taskName", serviceTask.getTaskName());
+ map.put("submit", "0");
return map;
}
@@ -228,6 +245,8 @@
ivrLibaTemplateScriptVO.setIvrLibaScriptTargetoptionList(ivrLibaTemplateTargetoptions);
}
}
+ Collections.sort(ivrLibaTemplateScriptVOS, Comparator.comparingInt(IvrLibaTemplateScriptVO::getSort));
+
return ivrLibaTemplateScriptVOS;
}
@@ -277,10 +296,12 @@
}
}
//鏇挎崲鎮ｈ�呬釜浜轰俊鎭暟鎹�
- svyLibTemplateScriptVO.setScriptContent(svyLibTemplateScriptVO.getScriptContent().replace("${name}", StringUtils.isNotEmpty(patArchive.getName()) ? patArchive.getName() : ""));
- svyLibTemplateScriptVO.setScriptContent(svyLibTemplateScriptVO.getScriptContent().replace("${dzz}", StringUtils.isNotEmpty(patArchive.getPlaceOfResidence()) ? patArchive.getPlaceOfResidence() : ""));
- svyLibTemplateScriptVO.setScriptContent(svyLibTemplateScriptVO.getScriptContent().replace("${dhh}", StringUtils.isNotEmpty(patArchive.getTelcode()) ? patArchive.getTelcode() : ""));
-
+ log.error("闂id锛歿}, 闂鍐呭锛歿}", svyLibTemplateScriptVO.getId(), svyLibTemplateScriptVO.getScriptContent());
+ if (StringUtils.isNotEmpty(svyLibTemplateScriptVO.getScriptContent())) {
+ svyLibTemplateScriptVO.setScriptContent(svyLibTemplateScriptVO.getScriptContent().replace("${name}", StringUtils.isNotEmpty(patArchive.getName()) ? patArchive.getName() : ""));
+ svyLibTemplateScriptVO.setScriptContent(svyLibTemplateScriptVO.getScriptContent().replace("${dzz}", StringUtils.isNotEmpty(patArchive.getPlaceOfResidence()) ? patArchive.getPlaceOfResidence() : ""));
+ svyLibTemplateScriptVO.setScriptContent(svyLibTemplateScriptVO.getScriptContent().replace("${dhh}", StringUtils.isNotEmpty(patArchive.getTelcode()) ? patArchive.getTelcode() : ""));
+ }
//鑾峰彇闂閫夐」
SvyLibTemplateTargetoption svyLibTemplateTargetoption = new SvyLibTemplateTargetoption();
svyLibTemplateTargetoption.setScriptid(svyLibTemplateScriptVO.getId());
@@ -288,10 +309,17 @@
svyLibTemplateScriptVO.setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions);
}
}
+ Collections.sort(svyLibTemplateScriptVOS, Comparator.comparingLong(SvyLibTemplateScriptVO::getSort));
return svyLibTemplateScriptVOS;
}
- private List xjInfo(Long templateId) {
+ private List xjInfo(Long templateId, Long taskid, Long patid) {
+ ServiceSubtask serviceSubtask = new ServiceSubtask();
+ serviceSubtask.setTaskid(taskid);
+ serviceSubtask.setPatid(patid);
+ serviceSubtask.setResult("瀹屾垚");
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(Long.valueOf(templateId));
List list = new ArrayList();
list.add(heLibrary);
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
index 41bb49b..338576d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -55,8 +55,8 @@
//寰�浠诲姟琛ㄤ腑锛屾柊澧炰换鍔�
if (ObjectUtils.isNotEmpty(serviceTaskVO.getSendTimeslot()))
serviceTask.setSendTimeSlot(JSON.toJSONString(serviceTaskVO.getSendTimeslot()));
- if (serviceTask.getSendState() == null) serviceTask.setSendState(1);
- serviceTask.setTemplateid(serviceTaskVO.getLibtemplateid());
+ if (serviceTask.getSendState() == null) serviceTask.setSendState(1L);
+ serviceTask.setTemplateid(Long.valueOf(serviceTaskVO.getLibtemplateid()));
iServiceTaskService.insertServiceTask(serviceTask);
//灏嗕换鍔′俊鎭斁鍒版湇鍔¤〃涓�
@@ -87,7 +87,7 @@
//淇敼鎿嶄綔锛岄渶瑕佸皢stopState鐘舵��+1
ServiceTask serviceTask2 = iServiceTaskService.selectServiceTaskByTaskid(serviceTaskVO.getTaskid());
serviceTask2.setStopState(serviceTask.getStopState() + 1);
- serviceTask2.setTemplateid(serviceTaskVO.getLibtemplateid());
+ serviceTask2.setTemplateid(Long.valueOf(serviceTaskVO.getLibtemplateid()));
iServiceTaskService.updateServiceTask(serviceTask2);
if (CollectionUtils.isNotEmpty(serviceTaskVO.getPatTaskRelevances())) {
diff --git a/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml b/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
index 69f4dec..7d8f875 100644
--- a/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
@@ -39,12 +39,14 @@
<result property="otherdata" column="otherdata"/>
<result property="richText" column="rich_text"/>
<result property="hetype" column="hetype"/>
+ <result property="htmlRichText" column="html_rich_text"/>
</resultMap>
<sql id="selectHeLibraryVo">
select id,
classification,
hetype,
+ html_rich_text,
assortid,
preachname,
version,
@@ -115,6 +117,7 @@
<if test="campus != null and campus != ''">and campus = #{campus}</if>
<if test="richText != null and richText != ''">and rich_text = #{richText}</if>
<if test="hetype != null and hetype != ''">and hetype = #{hetype}</if>
+ <if test="htmlRichText != null and htmlRichText != ''">and html_rich_text = #{htmlRichText}</if>
</where>
</select>
@@ -159,6 +162,7 @@
<if test="otherdata != null">otherdata,</if>
<if test="richText != null and richText != ''">rich_text,</if>
<if test="hetype != null and hetype != ''">hetype,</if>
+ <if test="htmlRichText != null and htmlRichText != ''">html_rich_text,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="classification != null">#{classification},</if>
@@ -194,6 +198,7 @@
<if test="otherdata != null">#{otherdata},</if>
<if test="richText != null and richText != ''">#{richText},</if>
<if test="hetype != null and hetype != ''">#{hetype},</if>
+ <if test="htmlRichText != null and htmlRichText != ''">#{htmlRichText},</if>
</trim>
</insert>
@@ -233,6 +238,7 @@
<if test="otherdata != null">otherdata = #{otherdata},</if>
<if test="richText != null and richText != ''">rich_text = #{richText},</if>
<if test="hetype != null and hetype != ''">hetype = #{hetype},</if>
+ <if test="htmlRichText != null and htmlRichText != ''">html_rich_text = #{htmlRichText},</if>
</trim>
where id = #{id}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml
index 65c41ef..1f82054 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml
@@ -43,6 +43,7 @@
<result property="silencetime" column="silencetime"/>
<result property="sendDay" column="send_day"/>
<result property="longTemp" column="long_temp"/>
+ <result property="deptCode" column="dept_code"/>
</resultMap>
<sql id="selectIvrLibaTemplateVo">
@@ -50,6 +51,7 @@
revisit_before,
revisit_after,
send_day,
+ dept_code,
long_temp,
templateName,
firstQuestionNum,
@@ -109,6 +111,7 @@
<if test="tag != null and tag != ''">and tag = #{tag}</if>
<if test="noVoiceNum != null and noVoiceNum > 0">and no_voice_num = #{noVoiceNum}</if>
<if test="silencetime != null">and silencetime = #{silencetime}</if>
+ <if test="deptCode != null">and dept_code = #{deptCode}</if>
</where>
</select>
@@ -158,6 +161,7 @@
<if test="silencetime != null ">silencetime,</if>
<if test="sendDay != null ">send_day,</if>
<if test="longTemp != null ">long_temp,</if>
+ <if test="deptCode != null">dept_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="templateName != null and templateName != ''">#{templateName},</if>
@@ -197,6 +201,7 @@
<if test="silencetime != null ">#{silencetime},</if>
<if test="sendDay != null ">#{sendDay},</if>
<if test="longTemp != null ">#{longTemp},</if>
+ <if test="deptCode != null">#{deptCode},</if>
</trim>
</insert>
@@ -241,6 +246,7 @@
<if test="silencetime != null">silencetime = #{silencetime},</if>
<if test="sendDay != null ">send_day = #{sendDay},</if>
<if test="longTemp != null ">long_temp = #{longTemp},</if>
+ <if test="deptCode != null">dept_code = #{deptCode},</if>
</trim>
where id = #{id}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml
index e70c55c..860682a 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml
@@ -61,6 +61,7 @@
<result property="recallcount" column="recallcount"/>
<result property="instruction" column="instruction"/>
<result property="sendDay" column="send_day"/>
+ <result property="deptCode" column="dept_code"/>
</resultMap>
@@ -73,6 +74,7 @@
libtemplateid,
libtemplatename,
taskname,
+ dept_code,
targetid,
targetname,
templateName,
@@ -143,6 +145,7 @@
<if test="revisitAfter != null and revisitAfter != ''">and revisit_after = #{revisitAfter}</if>
<if test="noVoiceNum != null ">and no_voice_num = #{noVoiceNum}</if>
<if test="recallcount != null">and recallcount = #{prologrecallcountue}</if>
+ <if test="deptCode != null">and dept_code = #{deptCode}</if>
</where>
</select>
@@ -210,6 +213,7 @@
<if test="libtemplatename != null ">libtemplatename,</if>
<if test="instruction != null ">instruction,</if>
<if test="sendDay != null ">send_day,</if>
+ <if test="deptCode != null">dept_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskid != null">#{taskid},</if>
@@ -267,6 +271,7 @@
<if test="libtemplatename != null ">#{libtemplatename},</if>
<if test="instruction != null ">#{instruction},</if>
<if test="sendDay != null ">#{sendDay},</if>
+ <if test="deptCode != null">#{deptCode},</if>
</trim>
</insert>
@@ -328,6 +333,7 @@
<if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
<if test="instruction != null ">instruction = #{instruction},</if>
<if test="sendDay != null ">send_day = #{sendDay},</if>
+ <if test="deptCode != null">dept_code = #{deptCode},</if>
</trim>
where id = #{id}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml
new file mode 100644
index 0000000..4acaa9c
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml
@@ -0,0 +1,216 @@
+<?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.PatArchiveImportMapper">
+
+ <resultMap type="com.smartor.domain.PatArchiveImport" id="PatArchiveImportResult">
+ <result property="id" column="id"/>
+ <result property="patientno" column="patientno"/>
+ <result property="pattype" column="pattype"/>
+ <result property="name" column="name"/>
+ <result property="sex" column="sex"/>
+ <result property="idcardno" column="idcardno"/>
+ <result property="age" column="age"/>
+ <result property="telcode" column="telcode"/>
+ <result property="openid" column="openid"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="batchName" column="batch_name"/>
+ <result property="batchNo" column="batch_no"/>
+ </resultMap>
+
+ <sql id="selectPatArchiveImportVo">
+ select id, patientno, pattype, name, sex, idcardno, age, telcode, openid, del_flag, update_by, update_time, create_by, create_time, batch_name, batch_no
+ from pat_archive_import
+ </sql>
+
+ <select id="selectPatArchiveImportList" parameterType="com.smartor.domain.PatArchiveImport"
+ resultMap="PatArchiveImportResult">
+ <include refid="selectPatArchiveImportVo"/>
+ <where>
+ <if test="patientno != null and patientno != ''">
+ and patientno = #{patientno}
+ </if>
+ <if test="pattype != null and pattype != ''">
+ and pattype = #{pattype}
+ </if>
+ <if test="name != null and name != ''">
+ and name like concat('%', #{name}, '%')
+ </if>
+ <if test="sex != null ">
+ and sex = #{sex}
+ </if>
+ <if test="idcardno != null and idcardno != ''">
+ and idcardno = #{idcardno}
+ </if>
+ <if test="age != null ">
+ and age = #{age}
+ </if>
+ <if test="telcode != null and telcode != ''">
+ and telcode = #{telcode}
+ </if>
+ <if test="openid != null and openid != ''">
+ and openid = #{openid}
+ </if>
+ <if test="batchName != null and batchName != ''">
+ and batch_name like concat('%', #{batchName}, '%')
+ </if>
+ <if test="batchNo != null and batchNo != ''">
+ and batch_no = #{batchNo}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectPatArchiveImportById" parameterType="Long"
+ resultMap="PatArchiveImportResult">
+ <include refid="selectPatArchiveImportVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertPatArchiveImport" parameterType="com.smartor.domain.PatArchiveImport" useGeneratedKeys="true" keyProperty="id">
+ insert into pat_archive_import
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="patientno != null">patientno,
+ </if>
+ <if test="pattype != null">pattype,
+ </if>
+ <if test="name != null">name,
+ </if>
+ <if test="sex != null">sex,
+ </if>
+ <if test="idcardno != null">idcardno,
+ </if>
+ <if test="age != null">age,
+ </if>
+ <if test="telcode != null">telcode,
+ </if>
+ <if test="openid != null">openid,
+ </if>
+ <if test="delFlag != null">del_flag,
+ </if>
+ <if test="updateBy != null">update_by,
+ </if>
+ <if test="updateTime != null">update_time,
+ </if>
+ <if test="createBy != null">create_by,
+ </if>
+ <if test="createTime != null">create_time,
+ </if>
+ <if test="batchName != null">batch_name,
+ </if>
+ <if test="batchNo != null">batch_no,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="patientno != null">#{patientno},
+ </if>
+ <if test="pattype != null">#{pattype},
+ </if>
+ <if test="name != null">#{name},
+ </if>
+ <if test="sex != null">#{sex},
+ </if>
+ <if test="idcardno != null">#{idcardno},
+ </if>
+ <if test="age != null">#{age},
+ </if>
+ <if test="telcode != null">#{telcode},
+ </if>
+ <if test="openid != null">#{openid},
+ </if>
+ <if test="delFlag != null">#{delFlag},
+ </if>
+ <if test="updateBy != null">#{updateBy},
+ </if>
+ <if test="updateTime != null">#{updateTime},
+ </if>
+ <if test="createBy != null">#{createBy},
+ </if>
+ <if test="createTime != null">#{createTime},
+ </if>
+ <if test="batchName != null">#{batchName},
+ </if>
+ <if test="batchNo != null">#{batchNo},
+ </if>
+ </trim>
+ </insert>
+
+ <update id="updatePatArchiveImport" parameterType="com.smartor.domain.PatArchiveImport">
+ update pat_archive_import
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="patientno != null">patientno =
+ #{patientno},
+ </if>
+ <if test="pattype != null">pattype =
+ #{pattype},
+ </if>
+ <if test="name != null">name =
+ #{name},
+ </if>
+ <if test="sex != null">sex =
+ #{sex},
+ </if>
+ <if test="idcardno != null">idcardno =
+ #{idcardno},
+ </if>
+ <if test="age != null">age =
+ #{age},
+ </if>
+ <if test="telcode != null">telcode =
+ #{telcode},
+ </if>
+ <if test="openid != null">openid =
+ #{openid},
+ </if>
+ <if test="delFlag != null">del_flag =
+ #{delFlag},
+ </if>
+ <if test="updateBy != null">update_by =
+ #{updateBy},
+ </if>
+ <if test="updateTime != null">update_time =
+ #{updateTime},
+ </if>
+ <if test="createBy != null">create_by =
+ #{createBy},
+ </if>
+ <if test="createTime != null">create_time =
+ #{createTime},
+ </if>
+ <if test="batchName != null">batch_name =
+ #{batchName},
+ </if>
+ <if test="batchNo != null">batch_no =
+ #{batchNo},
+ </if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <update id="deletePatArchiveImportById" parameterType="Long">
+ update pat_archive_import
+ <trim prefix="SET" suffixOverrides=",">
+ del_flag =1
+ </trim>
+ where id = #{id}
+ </update>
+
+ <update id="deletePatArchiveImportByIds" parameterType="String">
+ update pat_archive_import
+ <trim prefix="SET" suffixOverrides=",">
+ del_flag =1
+ </trim>
+ where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </update>
+
+
+
+
+</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 8018494..6787df2 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -8,6 +8,8 @@
<result property="id" column="id"/>
<result property="patientno" column="patientno"/>
<result property="sourcefrom" column="sourcefrom"/>
+ <result property="notrequiredFlag" column="notrequired_flag"/>
+ <result property="notrequiredreason" column="notrequiredreason"/>
<result property="patidHis" column="patid_his"/>
<result property="sdFlag" column="sd_flag"/>
<result property="pattype" column="pattype"/>
@@ -31,6 +33,9 @@
<result property="openid" column="openid"/>
<result property="delFlag" column="del_flag"/>
<result property="dept" column="deptname"/>
+ <result property="deptcode" column="deptcode"/>
+ <result property="drcode" column="drcode"/>
+ <result property="drname" column="drname"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
@@ -41,12 +46,70 @@
<result property="pattype" column="pattype"/>
<result property="bedNo" column="bedno"/>
<result property="inhosptime" column="inhosptime"/>
+ <result property="ageUnit" column="age_unit"/>
+ <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
+ <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
+ </resultMap>
+
+
+ <resultMap type="com.smartor.domain.PatArchiveOthreInfo" id="PatArchiveOthreInfoResult">
+ <result property="id" column="id"/>
+ <result property="notrequiredFlag" column="notrequired_flag"/>
+ <result property="notrequiredreason" column="notrequiredreason"/>
+ <result property="patientno" column="patientno"/>
+ <result property="sourcefrom" column="sourcefrom"/>
+ <result property="patidHis" column="patid_his"/>
+ <result property="sdFlag" column="sd_flag"/>
+ <result property="pattype" column="pattype"/>
+ <result property="viptype" column="viptype"/>
+ <result property="name" column="name"/>
+ <result property="sex" column="sex"/>
+ <result property="nation" column="nation"/>
+ <result property="nativePlace" column="native_place"/>
+ <result property="placeOfResidence" column="place_of_residence"/>
+ <result property="birthplace" column="birthplace"/>
+ <result property="idcardno" column="idcardno"/>
+ <result property="birthdate" column="birthdate"/>
+ <result property="age" column="age"/>
+ <result property="sourcefrom" column="sourcefrom"/>
+ <result property="archivetime" column="archivetime"/>
+ <result property="archiveby" column="archiveby"/>
+ <result property="telcode" column="telcode"/>
+ <result property="relativetelcode" column="relativetelcode"/>
+ <result property="idcardtype" column="idcardtype"/>
+ <result property="orgid" column="orgid"/>
+ <result property="openid" column="openid"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="dept" column="deptname"/>
+ <result property="deptcode" column="deptcode"/>
+ <result property="drcode" column="drcode"/>
+ <result property="drname" column="drname"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="isupload" column="isupload"/>
+ <result property="uploadTime" column="upload_time"/>
+ <result property="tag" column="tag"/>
+ <result property="pattype" column="pattype"/>
+ <result property="bedNo" column="bedno"/>
+ <result property="starttime" column="starttime"/>
+ <result property="endtime" column="endtime"/>
+ <result property="ageUnit" column="age_unit"/>
+ <result property="inhospno" column="inhospno"/>
+ <result property="nurseId" column="nurse_id"/>
+ <result property="nurseName" column="nurse_name"/>
+ <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
+ <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
</resultMap>
<sql id="selectPatArchiveVo">
select id,
+ notrequired_flag,
+ notrequiredreason,
patientno,
patid_his,
+ age_unit,
sd_flag,
name,
sex,
@@ -80,6 +143,7 @@
<select id="selectPatArchiveList" parameterType="com.smartor.domain.PatArchive" resultMap="PatArchiveResult">
<include refid="selectPatArchiveVo"/>
<where>
+ del_flag=0
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
<if test="sourcefrom != null ">and sourcefrom = #{sourcefrom}</if>
@@ -93,6 +157,9 @@
<if test="patientno != null ">and patientno = #{patientno}</if>
<if test="patidHis != null ">and patid_his = #{patidHis}</if>
<if test="sdFlag != null ">and sd_flag = #{sdFlag}</if>
+ <if test="ageUnit != null ">and age_unit = #{ageUnit}</if>
+ <if test="notrequiredFlag != null ">and notrequired_flag = #{notrequiredFlag}</if>
+ <if test="notrequiredreason != null ">and notrequiredreason = #{notrequiredreason}</if>
</where>
</select>
@@ -100,6 +167,9 @@
<select id="patInfoByContion" parameterType="com.smartor.domain.PatArchiveReq" resultMap="PatArchiveResult">
select
a.id,
+ a.age_unit,
+ a.notrequired_flag,
+ a.notrequiredreason,
a.patientno,
a.patid_his,
a.sd_flag,
@@ -170,6 +240,9 @@
<if test="createTime != null">create_time,</if>
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
+ <if test="ageUnit != null">age_unit,</if>
+ <if test="notrequiredFlag != null ">notrequired_flag,</if>
+ <if test="notrequiredreason != null ">notrequiredreason,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="patientno != null">#{patientno},</if>
@@ -204,18 +277,21 @@
<if test="createTime != null">#{createTime},</if>
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
+ <if test="ageUnit != null">#{ageUnit},</if>
+ <if test="notrequiredFlag != null ">#{notrequiredFlag},</if>
+ <if test="notrequiredreason != null ">#{notrequiredreason},</if>
</trim>
</insert>
<insert id="insertPatArchive">
insert into
pat_archive(name,viptype,sex,idcardno,birthdate,place_of_residence,age,sourcefrom,archivetime,archiveby,telcode,relativetelcode,idcardtype,orgid,openid,dduserid,update_by,update_time
- ,create_by,create_time,isupload,upload_time,pattype,nation,birthplace,native_place,patientno,patid_his,sd_flag)
+ ,create_by,create_time,isupload,upload_time,pattype,nation,birthplace,native_place,patientno,patid_his,sd_flag,age_unit,notrequired_flag,notrequiredreason)
values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.name},#{item.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.placeOfResidence},#{item.age},#{item.sourcefrom},#{item.archivetime},#{item.archiveby}
,#{item.telcode},#{item.archiveby},#{item.idcardtype},#{item.orgid},#{item.openid},#{item.dduserid},#{item.updateBy},
- #{item.updateTime},#{item.createBy},#{item.createTime},#{item.isupload},#{item.uploadTime},#{item.pattype},#{item.nation},#{item.birthplace},#{item.nativePlace},#{item.patientno},#{item.patidHis},#{item.sdFlag}
+ #{item.updateTime},#{item.createBy},#{item.createTime},#{item.isupload},#{item.uploadTime},#{item.pattype},#{item.nation},#{item.birthplace},#{item.nativePlace},#{item.patientno},#{item.patidHis},#{item.sdFlag},#{item.ageUnit},#{item.notrequiredFlag},#{item.notrequiredreason}
)
</foreach>
</insert>
@@ -249,6 +325,9 @@
<if test="viptype != null">patientno = #{patientno},</if>
<if test="viptype != null">patid_his = #{patidHis},</if>
<if test="viptype != null">sd_flag = #{sdFlag},</if>
+ <if test="ageUnit != null">age_unit = #{ageUnit},</if>
+ <if test="notrequiredFlag != null ">notrequired_flag = #{notrequiredFlag},</if>
+ <if test="notrequiredreason != null ">notrequiredreason = #{notrequiredreason},</if>
</trim>
where id = #{id}
</update>
@@ -267,11 +346,14 @@
</delete>
<select id="selectPatArchiveInfoByAllhosp" parameterType="com.smartor.domain.PatArchiveReq"
- resultMap="PatArchiveResult">
+ resultMap="PatArchiveOthreInfoResult">
SELECT
a.id,
+ a.age_unit,
a.patid_his,
+ a.notrequired_flag,
+ a.notrequiredreason,
a.sd_flag,
a.patientno,
a.NAME,
@@ -323,15 +405,22 @@
<select id="selectPatArchiveInfoByInhosp" parameterType="com.smartor.domain.PatArchiveReq"
- resultMap="PatArchiveResult">
+ resultMap="PatArchiveOthreInfoResult">
select
a.id,
+ a.age_unit,
+ a.inhospno,
+ a.notrequired_flag,
+ a.notrequiredreason,
a.patid_his,
a.sd_flag,
a.patientno,
a.NAME,
d.deptname,
+ d.deptcode,
+ d.drcode,
+ d.drname,
a.sex,
a.nation,
a.native_place,
@@ -358,7 +447,13 @@
a.upload_time,
a.pattype,
d.bed_no,
- d.starttime AS inhosptime,
+ d.starttime,
+ d.endtime,
+ d.nurse_name,
+ d.nurse_id,
+ d.endtime,
+ d.leavehospitaldistrictname AS leavehospitaldistrictname,
+ d.leavehospitaldistrictcode AS leavehospitaldistrictcode,
t.tagname
FROM
pat_med_inhosp d
@@ -400,6 +495,20 @@
<if test="deptname != null and deptname != ''">
AND d.deptname LIKE concat('%',#{deptname}, '%')
</if>
+ <if test="leavehospitaldistrictcodes != null">
+ AND d.leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
+ close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test="leaveldeptcodes != null">
+ AND d.leaveldeptcode IN
+ <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
+ close=")">
+ #{leaveldeptcode}
+ </foreach>
+ </if>
<if test="pids != null">
AND a.id NOT IN
<foreach collection="pids" item="pid" open="(" separator="," close=")">
@@ -414,14 +523,20 @@
</select>
<select id="selectPatArchiveInfoByOuthosp" parameterType="com.smartor.domain.PatArchiveReq"
- resultMap="PatArchiveResult">
+ resultMap="PatArchiveOthreInfoResult">
select
a.id,
+ a.age_unit,
a.patid_his,
a.sd_flag,
a.patientno,
+ a.notrequired_flag,
+ a.notrequiredreason,
d.deptname,
+ d.deptcode,
+ d.drcode,
+ d.drname,
a.name,
a.sex,
a.nation,
@@ -447,6 +562,8 @@
a.create_time,
a.isupload,
a.upload_time,
+ d.leavehospitaldistrictcode AS leavehospitaldistrictcode,
+ d.leavehospitaldistrictname AS leavehospitaldistrictname,
a.pattype
from pat_med_outhosp d JOIN pat_archive a ON a.id = d.patid
LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
@@ -473,6 +590,9 @@
<if test="deptname != null and deptname != ''">
and d.deptname LIKE concat('%', #{deptname}, '%')
</if>
+ <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">
+ and d.leavehospitaldistrictname LIKE concat('%', #{leavehospitaldistrictname}, '%')
+ </if>
<if test="drname != null and drname != ''">
AND d.drname LIKE concat('%',#{drname}, '%')
</if>
@@ -490,16 +610,22 @@
</select>
<select id="selectPatArchiveInfoByPhysical" parameterType="com.smartor.domain.PatArchiveReq"
- resultMap="PatArchiveResult">
+ resultMap="PatArchiveOthreInfoResult">
select
a.id,
+ a.age_unit,
a.name,
+ a.notrequired_flag,
+ a.notrequiredreason,
a.patid_his,
a.sd_flag,
a.patientno,
a.sex,
d.deptname,
+ d.deptcode,
+ d.drcode,
+ d.drname,
a.nation,
a.native_place,
a.place_of_residence,
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 373f395..079bde5 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -48,14 +48,26 @@
<result property="patno" column="patno"/>
<result property="inhospstate" column="inhospstate"/>
<result property="checkFlag" column="check_flag"/>
+ <result property="age" column="age"/>
+ <result property="telcode" column="telcode"/>
+ <result property="longTaskReason" column="long_task_reason"/>
+ <result property="nurseId" column="nurse_id"/>
+ <result property="nurseName" column="nurse_name"/>
+ <result property="outWayId" column="out_way_id"/>
+ <result property="outWayName" column="out_way_name"/>
</resultMap>
<sql id="selectPatMedInhospVo">
select inhospid,
patname,
+ out_way_id,
+ out_way_name,
+ nurse_id,
+ nurse_name,
check_flag,
inhospstate,
patno,
+ long_task_reason,
inhospno,
serialnum,
hospitalname,
@@ -98,8 +110,64 @@
</sql>
<select id="selectPatMedInhospList" parameterType="com.smartor.domain.PatMedInhosp" resultMap="PatMedInhospResult">
- <include refid="selectPatMedInhospVo"/>
+ select CONCAT( a.age, a.age_unit ) AS age,
+ a.telcode as telcode,
+ b.inhospid,
+ b.nurse_id,
+ b.nurse_name,
+ b.patname,
+ b.out_way_id,
+ b.out_way_name,
+ b.check_flag,
+ b.inhospstate,
+ b.patno,
+ b.inhospno,
+ b.serialnum,
+ b.hospitalname,
+ b.hospitalcode,
+ b.hospitaldistrictcode,
+ b.hospitaldistrictname,
+ b.icd10code,
+ b.diagname,
+ b.starttime,
+ b.endtime,
+ b.deptcode,
+ b.deptname,
+ b.roomno,
+ b.bed_no,
+ b.orgid,
+ b.del_flag,
+ b.update_by,
+ b.update_time,
+ b.create_by,
+ b.create_time,
+ b.isupload,
+ b.upload_time,
+ b.patid,
+ b.leavediagname,
+ b.leaveicd10code,
+ b.drcode,
+ b.drname,
+ b.schemestatus,
+ b.generalschemestatus,
+ b.leaveldeptcode,
+ b.leaveldeptname,
+ b.hospitaldistrictid,
+ b.leavehospitaldistrictcode,
+ b.leavehospitaldistrictname,
+ b.leavehospitaldistrictid,
+ b.deptid,
+ b.leaveldeptid,
+ b.long_task_reason,
+ b.schemetime
+ FROM
+ pat_med_inhosp b,
+ pat_archive a
<where>
+ a.del_flag=0
+ and b.del_flag=0
+ and a.id = b.patid
+ AND a.idcardno != ''
<if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
'%')
</if>
@@ -107,24 +175,125 @@
<if test="hospitaldistrictname != null and hospitaldistrictname != ''">and hospitaldistrictname like
concat('%', #{hospitaldistrictname}, '%')
</if>
- <if test="endtime != null ">and endtime = #{endtime}</if>
- <if test="patno != null ">and patno = #{patno}</if>
- <if test="checkFlag != null ">and check_flag = #{checkFlag}</if>
- <if test="inhospstate != null ">and inhospstate = #{inhospstate}</if>
- <if test="schemestatus != null ">and schemestatus = #{schemestatus}</if>
- <if test="leavediagname != null and leavediagname != ''">and leavediagname like concat('%',
+ <if test="endtime != null ">and b.endtime = #{endtime}</if>
+ <if test="patno != null ">and b.patno = #{patno}</if>
+ <if test="nurseId != null ">and b.nurse_id = #{nurseId}</if>
+ <if test="nurseName != null ">and b.nurse_name = #{nurseName}</if>
+ <if test="checkFlag != null ">and b.check_flag = #{checkFlag}</if>
+ <if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
+ <if test="schemestatus != null ">and b.schemestatus = #{schemestatus}</if>
+ <if test="outWayId != null ">and b.out_way_id = #{outWayId}</if>
+ <if test="outWayName != null ">and b.out_way_name = #{outWayName}</if>
+ <if test="leavediagname != null and leavediagname != ''">and b.leavediagname like concat('%',
#{leavediagname}, '%')
</if>
- <if test="drname != null and drname != ''">and drname like concat('%', #{drname}, '%')</if>
- <if test="leaveldeptname != null and leaveldeptname != ''">and leaveldeptname like concat('%',
+ <if test="drname != null and drname != ''">and b.drname like concat('%', #{drname}, '%')</if>
+ <if test="leaveldeptname != null and leaveldeptname != ''">and b.leaveldeptname like concat('%',
#{leaveldeptname}, '%')
</if>
<if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">and
- leavehospitaldistrictname like concat('%', #{leavehospitaldistrictname}, '%')
+ b.leavehospitaldistrictname like concat('%', #{leavehospitaldistrictname}, '%')
</if>
</where>
- order by update_time desc
+ order by b.inhospid desc
</select>
+
+ <select id="selectPatMedInhospListByCondition" parameterType="com.smartor.domain.PatMedInhospVO"
+ resultMap="PatMedInhospResult">
+ select CONCAT( a.age, a.age_unit ) AS age,
+ a.telcode as telcode,
+ b.inhospid,
+ b.patname,
+ b.out_way_id,
+ b.out_way_name,
+ b.nurse_id,
+ b.nurse_name,
+ b.check_flag,
+ b.inhospstate,
+ b.patno,
+ b.inhospno,
+ b.serialnum,
+ b.hospitalname,
+ b.hospitalcode,
+ b.hospitaldistrictcode,
+ b.hospitaldistrictname,
+ b.icd10code,
+ b.diagname,
+ b.starttime,
+ b.endtime,
+ b.deptcode,
+ b.deptname,
+ b.roomno,
+ b.bed_no,
+ b.orgid,
+ b.del_flag,
+ b.update_by,
+ b.update_time,
+ b.create_by,
+ b.create_time,
+ b.isupload,
+ b.upload_time,
+ b.patid,
+ b.leavediagname,
+ b.leaveicd10code,
+ b.drcode,
+ b.drname,
+ b.schemestatus,
+ b.generalschemestatus,
+ b.leaveldeptcode,
+ b.leaveldeptname,
+ b.hospitaldistrictid,
+ b.leavehospitaldistrictcode,
+ b.leavehospitaldistrictname,
+ b.leavehospitaldistrictid,
+ b.deptid,
+ b.leaveldeptid,
+ b.long_task_reason,
+ b.schemetime
+ FROM
+ pat_med_inhosp b,
+ pat_archive a
+ <where>
+ a.del_flag=0
+ and b.del_flag=0
+ and a.id = b.patid
+ AND a.idcardno != ''
+ <if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
+ '%')
+ </if>
+ <if test="patname != null and patname != ''">and patname like concat('%', #{patname}, '%')</if>
+ <if test="hospitaldistrictname != null and hospitaldistrictname != ''">and hospitaldistrictname like
+ concat('%', #{hospitaldistrictname}, '%')
+ </if>
+ <if test="endtime != null ">and b.endtime = #{endtime}</if>
+ <if test="nurseId != null ">and b.nurse_id = #{nurseId}</if>
+ <if test="nurseName != null ">and b.nurse_name = #{nurseName}</if>
+ <if test="patno != null ">and b.patno = #{patno}</if>
+ <if test="checkFlag != null ">and b.check_flag = #{checkFlag}</if>
+ <if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
+ <if test="schemestatus != null ">and b.schemestatus = #{schemestatus}</if>
+ <if test="leavediagname != null and leavediagname != ''">and b.leavediagname like concat('%',
+ #{leavediagname}, '%')
+ </if>
+ <if test="drname != null and drname != ''">and b.drname like concat('%', #{drname}, '%')</if>
+ <if test="leavehospitaldistrictcodes != null">
+ AND b.leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
+ close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test="leaveldeptcodes != null">
+ AND b.leaveldeptcode IN
+ <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
+ close=")">
+ #{leaveldeptcode}
+ </foreach>
+ </if>
+ </where>
+ order by b.inhospid desc
+ </select>
+
<select id="selectPatMedInhospByInhospid" parameterType="Long" resultMap="PatMedInhospResult">
<include refid="selectPatMedInhospVo"/>
@@ -176,6 +345,11 @@
<if test="patno != null">patno,</if>
<if test="inhospstate != null">inhospstate,</if>
<if test="checkFlag != null">check_flag,</if>
+ <if test="longTaskReason != null">long_task_reason,</if>
+ <if test="nurseId != null ">nurse_id,</if>
+ <if test="nurseName != null ">nurse_name,</if>
+ <if test="outWayId != null ">out_way_id,</if>
+ <if test="outWayName != null ">out_way_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialnum != null">#{serialnum},</if>
@@ -219,6 +393,11 @@
<if test="patno != null">#{patno},</if>
<if test="inhospstate != null">#{inhospstate},</if>
<if test="checkFlag != null">#{checkFlag},</if>
+ <if test="longTaskReason != null">#{longTaskReason},</if>
+ <if test="nurseId != null ">#{nurseId},</if>
+ <if test="nurseName != null ">#{nurseName},</if>
+ <if test="outWayId != null ">#{outWayId},</if>
+ <if test="outWayName != null ">#{outWayName},</if>
</trim>
</insert>
@@ -266,6 +445,11 @@
<if test="patno != null">patno = #{patno},</if>
<if test="inhospstate != null">inhospstate = #{inhospstate},</if>
<if test="checkFlag != null">check_flag = #{checkFlag},</if>
+ <if test="longTaskReason != null">long_task_reason = #{longTaskReason},</if>
+ <if test="nurseId != null ">nurse_id = #{nurseId},</if>
+ <if test="nurseName != null ">nurse_name = #{nurseName},</if>
+ <if test="outWayId != null ">out_way_id = #{outWayId},</if>
+ <if test="outWayName != null ">out_way_name = #{outWayName},</if>
</trim>
where inhospid = #{inhospid}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index b91d5d2..3c0d5cf 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -9,6 +9,8 @@
<result property="sendname" column="sendname"/>
<result property="phone" column="phone"/>
<result property="sex" column="sex"/>
+ <result property="nurseName" column="nurse_name"/>
+ <result property="nurseId" column="nurse_id"/>
<result property="age" column="age"/>
<result property="sfzh" column="sfzh"/>
<result property="addr" column="addr"/>
@@ -58,6 +60,17 @@
<result property="longSendTime" column="long_send_time"/>
<result property="serviceType" column="service_type"/>
<result property="score" column="score"/>
+ <result property="submit" column="submit"/>
+ <result property="drname" column="drname"/>
+ <result property="drcode" column="drcode"/>
+ <result property="starttime" column="starttime"/>
+ <result property="endtime" column="endtime"/>
+ <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
+ <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
+ <result property="excep" column="excep"/>
+ <result property="remark" column="remark"/>
+ <result property="suggest" column="suggest"/>
+ <result property="sendstate" column="sendstate"/>
</resultMap>
<resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -70,8 +83,19 @@
<sql id="selectServiceSubtaskVo">
select id,
hosp_type,
+ suggest,
+ sendstate,
+ endtime,
+ nurse_id,
+ nurse_name,
+ starttime,
+ submit,
+ drname,
+ excep,
+ drcode,
long_send_time,
openid,
+ remark,
service_type,
libtemplateid,
libtemplatename,
@@ -121,6 +145,8 @@
admindate,
deptname,
stop_state,
+ leavehospitaldistrictcode,
+ leavehospitaldistrictname,
diagname
from service_subtask
</sql>
@@ -132,8 +158,15 @@
del_flag=0
<if test="sendname != null and sendname != ''">and sendname like concat('%', #{sendname}, '%')</if>
<if test="phone != null and phone != ''">and phone = #{phone}</if>
+ <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">and
+ leavehospitaldistrictcode = #{leavehospitaldistrictcode}
+ </if>
+ <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">and
+ leavehospitaldistrictname = #{leavehospitaldistrictname}
+ </if>
<if test="sex != null and sex != ''">and sex = #{sex}</if>
<if test="age != null ">and age = #{age}</if>
+ <if test="submit != null ">and submit = #{submit}</if>
<if test="serviceType != null ">and service_type = #{serviceType}</if>
<if test="patid != null ">and patid = #{patid}</if>
<if test="sfzh != null and sfzh != ''">and sfzh = #{sfzh}</if>
@@ -153,6 +186,7 @@
<if test="exrecallcount != null ">and exrecallcount = #{exrecallcount}</if>
<if test="pulltime != null ">and pulltime = #{pulltime}</if>
<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
+ <if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
<if test="labelstatus != null ">and labelstatus = #{labelstatus}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
@@ -172,9 +206,20 @@
<if test="openid != null ">and openid = #{openid}</if>
<if test="longSendTime != null ">and long_send_time = #{longSendTime}</if>
<if test="sendstate != null ">and sendstate = #{sendstate}</if>
- <if test="score != null">
- and score = #{score}
+ <if test="drname != null ">and drname = #{drname}</if>
+ <if test="drcode != null ">and drcode = #{drcode}</if>
+ <if test="starttime != null ">and starttime = #{starttime}</if>
+ <if test="endtime != null ">and endtime = #{endtime}</if>
+ <if test="excep != null ">and excep = #{excep}</if>
+ <if test="nurseId != null ">and nurse_id = #{nurseId}</if>
+ <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
+ <if test="leavehospitaldistrictcode != null ">and leavehospitaldistrictcode = #{leavehospitaldistrictcode}
</if>
+ <if test="leavehospitaldistrictname != null ">and leavehospitaldistrictname = #{leavehospitaldistrictname}
+ </if>
+ <if test="score != null">and score = #{score}</if>
+ <if test="remark != null">and remark = #{remark}</if>
+ <if test="suggest != null">and suggest = #{suggest}</if>
</where>
order by update_time desc,id desc
</select>
@@ -208,7 +253,6 @@
<if test="pulltime != null">pulltime,</if>
<if test="deptcode != null">deptcode,</if>
<if test="labelstatus != null">labelstatus,</if>
- <if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="createBy != null">create_by,</if>
@@ -240,6 +284,23 @@
<if test="longSendTime != null ">long_send_time,</if>
<if test="serviceType != null ">service_type,</if>
<if test="score != null ">score,</if>
+ <if test="submit != null ">submit,</if>
+ <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">
+ leavehospitaldistrictcode,
+ </if>
+ <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">
+ leavehospitaldistrictname,
+ </if>
+ <if test="drname != null ">drname,</if>
+ <if test="drcode != null ">drcode,</if>
+ <if test="endtime != null ">endtime,</if>
+ <if test="starttime != null ">starttime,</if>
+ <if test="excep != null ">excep,</if>
+ <if test="nurseName != null ">nurse_name,</if>
+ <if test="nurseId != null ">nurse_id,</if>
+ <if test="remark != null ">remark,</if>
+ <if test="suggest != null ">suggest,</if>
+ <if test="sendstate != null ">sendstate,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sendname != null">#{sendname},</if>
@@ -262,7 +323,6 @@
<if test="pulltime != null">#{pulltime},</if>
<if test="deptcode != null">#{deptcode},</if>
<if test="labelstatus != null">#{labelstatus},</if>
- <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createBy != null">#{createBy},</if>
@@ -294,6 +354,23 @@
<if test="longSendTime != null ">#{longSendTime},</if>
<if test="serviceType != null ">#{serviceType},</if>
<if test="score != null ">#{score},</if>
+ <if test="submit != null ">#{submit},</if>
+ <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">
+ #{leavehospitaldistrictcode},
+ </if>
+ <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">
+ #{leavehospitaldistrictname},
+ </if>
+ <if test="drname != null ">#{drname},</if>
+ <if test="drcode != null ">#{drcode},</if>
+ <if test="endtime != null ">#{endtime},</if>
+ <if test="starttime != null ">#{starttime},</if>
+ <if test="excep != null ">#{excep},</if>
+ <if test="nurseName != null ">#{nurseName},</if>
+ <if test="nurseId != null ">#{nurseId},</if>
+ <if test="remark != null ">#{remark},</if>
+ <if test="suggest != null ">#{suggest},</if>
+ <if test="sendstate != null ">#{sendstate},</if>
</trim>
</insert>
@@ -320,7 +397,6 @@
<if test="pulltime != null">pulltime = #{pulltime},</if>
<if test="deptcode != null">deptcode = #{deptcode},</if>
<if test="labelstatus != null">labelstatus = #{labelstatus},</if>
- <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@@ -353,6 +429,22 @@
<if test="sendstate != null ">sendstate = #{sendstate},</if>
<if test="serviceType != null ">service_type = #{serviceType},</if>
<if test="score != null ">score = #{score},</if>
+ <if test="submit != null ">submit = #{submit},</if>
+ <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">leavehospitaldistrictcode
+ = #{leavehospitaldistrictcode},
+ </if>
+ <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">leavehospitaldistrictname
+ = #{leavehospitaldistrictname},
+ </if>
+ <if test="drname != null ">drname = #{drname},</if>
+ <if test="drcode != null ">drcode = #{drcode},</if>
+ <if test="starttime != null ">starttime = #{starttime},</if>
+ <if test="endtime != null ">endtime = #{endtime},</if>
+ <if test="excep != null ">excep = #{excep},</if>
+ <if test="nurseName != null ">nurse_name=#{nurseName},</if>
+ <if test="nurseId != null ">nurse_id=#{nurseId},</if>
+ <if test="remark != null ">remark=#{remark},</if>
+ <if test="suggest != null ">suggest=#{suggest},</if>
</trim>
where id = #{id}
</update>
@@ -380,7 +472,6 @@
<if test="pulltime != null">pulltime = #{pulltime},</if>
<if test="deptcode != null">deptcode = #{deptcode},</if>
<if test="labelstatus != null">labelstatus = #{labelstatus},</if>
- <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@@ -412,7 +503,22 @@
<if test="longSendTime != null ">long_send_time = #{longSendTime},</if>
<if test="serviceType != null ">service_type = #{serviceType},</if>
<if test="score != null ">score = #{score},</if>
-
+ <if test="submit != null ">submit = #{submit},</if>
+ <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">leavehospitaldistrictcode
+ = #{leavehospitaldistrictcode},
+ </if>
+ <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">leavehospitaldistrictname
+ = #{leavehospitaldistrictname},
+ </if>
+ <if test="drname != null ">drname = #{drname},</if>
+ <if test="drcode != null ">drcode = #{drcode},</if>
+ <if test="endtime != null ">endtime = #{endtime},</if>
+ <if test="starttime != null ">starttime = #{starttime},</if>
+ <if test="excep != null ">excep = #{excep},</if>
+ <if test="nurseName != null ">nurse_name=#{nurseName},</if>
+ <if test="nurseId != null ">nurse_id=#{nurseId},</if>
+ <if test="remark != null ">remark=#{remark},</if>
+ <if test="suggest != null ">suggest=#{suggest},</if>
</trim>
where patid = #{patid} and taskid = #{taskid}
</update>
@@ -439,6 +545,7 @@
sendname,
long_send_time,
phone,
+ suggest,
sex,
age,
openid,
@@ -485,6 +592,16 @@
service_type,
deptname,
score,
+ drname,
+ drcode,
+ starttime,
+ endtime,
+ leavehospitaldistrictcode,
+ leavehospitaldistrictname,
+ excep,
+ nurse_id,
+ nurse_name,
+ remark,
diagname
FROM service_subtask,
JSON_TABLE(send_time_slot, '$[*]' COLUMNS (
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index 3610ac4..6b01e6b 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -20,6 +20,7 @@
<result property="type" column="type"/>
<result property="typename" column="typename"/>
<result property="deptcode" column="deptcode"/>
+ <result property="deptname" column="deptname"/>
<result property="delFlag" column="del_flag"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
@@ -46,6 +47,10 @@
<result property="textParam" column="text_param"/>
<result property="serviceType" column="service_type"/>
<result property="longTask" column="long_task"/>
+ <result property="kcb" column="kcb"/>
+ <result property="jsy" column="jsy"/>
+ <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
+ <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
</resultMap>
<sql id="selectServiceTaskVo">
@@ -75,6 +80,7 @@
hosp_type,
typename,
deptcode,
+ deptname,
del_flag,
update_by,
update_time,
@@ -89,6 +95,10 @@
send_state,
send_time_slot,
service_type,
+ kcb,
+ jsy,
+ leavehospitaldistrictcode,
+ leavehospitaldistrictname,
orgid
from service_task
</sql>
@@ -125,6 +135,7 @@
</if>
<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
+ <if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
@@ -133,6 +144,8 @@
<if test="libtemplatename != null and libtemplatename != ''">and libtemplatename = #{libtemplatename}</if>
<if test="createBy != null and createBy != ''">and create_by = #{createBy}</if>
<if test="sendState != null ">and send_state = #{sendState}</if>
+ <if test="leavehospitaldistrictname != null ">and leavehospitaldistrictname = #{leavehospitaldistrictname}</if>
+ <if test="leavehospitaldistrictcode != null ">and leavehospitaldistrictcode = #{leavehospitaldistrictcode}</if>
</where>
order by update_time desc,taskid desc
</select>
@@ -160,6 +173,7 @@
<if test="type != null">type,</if>
<if test="typename != null">typename,</if>
<if test="deptcode != null">deptcode,</if>
+ <if test="deptname != null">deptname,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
@@ -174,7 +188,6 @@
<if test="sendType != null">send_type,</if>
<if test="sendState != null">send_state,</if>
<if test="hospType != null and hospType != ''">hosp_type,</if>
-
<if test="taskDesc != null and taskDesc != ''">task_desc,</if>
<if test="libtemplateid != null ">libtemplateid,</if>
<if test="libtemplatename != null and libtemplatename != ''">libtemplatename,</if>
@@ -187,6 +200,10 @@
<if test="textParam != null and textParam != ''">text_param,</if>
<if test="serviceType != null and serviceType != ''">service_type,</if>
<if test="longTask != null and longTask != ''">long_task,</if>
+ <if test="kcb != null and kcb != ''">kcb,</if>
+ <if test="jsy != null and jsy != ''">jsy,</if>
+ <if test="leavehospitaldistrictname != null ">leavehospitaldistrictname,</if>
+ <if test="leavehospitaldistrictcode != null ">leavehospitaldistrictcode,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskName != null">#{taskName},</if>
@@ -203,6 +220,7 @@
<if test="type != null">#{type},</if>
<if test="typename != null">#{typename},</if>
<if test="deptcode != null">#{deptcode},</if>
+ <if test="deptname != null">#{deptname},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
@@ -229,6 +247,10 @@
<if test="textParam != null and textParam != ''">#{textParam},</if>
<if test="serviceType != null and serviceType != ''">#{serviceType},</if>
<if test="longTask != null and longTask != ''">#{longTask},</if>
+ <if test="kcb != null and kcb != ''">#{kcb},</if>
+ <if test="jsy != null and jsy != ''">#{jsy},</if>
+ <if test="leavehospitaldistrictname != null ">#{leavehospitaldistrictname},</if>
+ <if test="leavehospitaldistrictcode != null ">#{leavehospitaldistrictcode},</if>
</trim>
</insert>
@@ -249,6 +271,7 @@
<if test="type != null">type = #{type},</if>
<if test="typename != null">typename = #{typename},</if>
<if test="deptcode != null">deptcode = #{deptcode},</if>
+ <if test="deptname != null">deptname = #{deptname},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
@@ -275,6 +298,10 @@
<if test="textParam != null and textParam != ''">text_param=#{textParam},</if>
<if test="serviceType != null and serviceType != ''">service_type = #{serviceType},</if>
<if test="longTask != null and longTask != ''">long_task = #{longTask},</if>
+ <if test="kcb != null and kcb != ''">kcb = #{kcb},</if>
+ <if test="jsy != null and jsy != ''">kcb = #{jsy},</if>
+ <if test="leavehospitaldistrictname != null ">leavehospitaldistrictname = #{leavehospitaldistrictname},</if>
+ <if test="leavehospitaldistrictcode != null ">leavehospitaldistrictcode = #{leavehospitaldistrictcode},</if>
</trim>
where taskid = #{taskid}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateMapper.xml
index c86f309..6b157c5 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateMapper.xml
@@ -41,12 +41,18 @@
<result property="prologue" column="prologue"/>
<result property="instruction" column="instruction"/>
<result property="conclusion" column="conclusion"/>
+ <result property="deptCode" column="dept_code"/>
+ <result property="longTemp" column="long_temp"/>
+ <result property="sendDay" column="send_day"/>
</resultMap>
<sql id="selectSvyTaskTemplateVo">
select id,
templateid,
prologue,
+ dept_code,
+ long_temp,
+ send_day,
instruction,
conclusion,
categoryid,
@@ -87,6 +93,7 @@
resultMap="SvyTaskTemplateResult">
<include refid="selectSvyTaskTemplateVo"/>
<where>
+ del_flag=0
<if test="templateid != null ">and templateid = #{templateid}</if>
<if test="categoryid != null ">and categoryid = #{categoryid}</if>
<if test="svycode != null and svycode != ''">and svycode = #{svycode}</if>
@@ -116,6 +123,9 @@
<if test="valueType != null and valueType != ''">and value_type = #{valueType}</if>
<if test="reply != null and reply != ''">and reply = #{reply}</if>
<if test="taskid != null ">and taskid = #{taskid}</if>
+ <if test="deptCode != null ">and dept_code = #{deptCode}</if>
+ <if test="longTemp != null ">and long_temp = #{longTemp}</if>
+ <if test="sendDay != null ">and send_day = #{sendDay}</if>
</where>
</select>
@@ -163,6 +173,9 @@
<if test="prologue != null">prologue,</if>
<if test="instruction != null">instruction,</if>
<if test="conclusion != null">conclusion,</if>
+ <if test="deptCode != null ">dept_code,</if>
+ <if test="longTemp != null ">long_temp,</if>
+ <if test="sendDay != null ">send_day,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="templateid != null">#{templateid},</if>
@@ -200,6 +213,9 @@
<if test="prologue != null">#{prologue},</if>
<if test="instruction != null">#{instruction},</if>
<if test="conclusion != null">#{conclusion},</if>
+ <if test="deptCode != null ">#{deptCode},</if>
+ <if test="longTemp != null ">#{longTemp},</if>
+ <if test="sendDay != null ">#{sendDay},</if>
</trim>
</insert>
@@ -241,6 +257,9 @@
<if test="prologue != null">prologue = #{prologue},</if>
<if test="instruction != null">instruction = #{instruction},</if>
<if test="conclusion != null">conclusion = #{conclusion},</if>
+ <if test="deptCode != null ">dept_code = #{deptCode},</if>
+ <if test="longTemp != null ">long_temp = #{longTemp},</if>
+ <if test="sendDay != null ">send_day = #{sendDay},</if>
</trim>
where id = #{id}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
index d1f1939..92b8d2f 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
@@ -9,6 +9,8 @@
<result property="userId" column="user_id"/>
<result property="deptId" column="dept_id"/>
<result property="delFlag" column="del_flag"/>
+ <result property="deptCode" column="dept_code"/>
+ <result property="deptType" column="dept_type"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
@@ -24,7 +26,14 @@
</resultMap>
<sql id="selectSysUserDeptVo">
- select id, user_id, dept_id, del_flag, create_time, update_time
+ select id,
+ user_id,
+ dept_id,
+ del_flag,
+ create_time,
+ update_time,
+ dept_code,
+ dept_type
from sys_user_dept
</sql>
@@ -73,6 +82,12 @@
<if test="updateTime != null ">
update_time,
</if>
+ <if test="deptType != null ">
+ dept_type,
+ </if>
+ <if test="deptCode != null ">
+ dept_code,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">#{userId},
@@ -87,6 +102,12 @@
</if>
<if test="updateTime != null ">
#{updateTime},
+ </if>
+ <if test="deptType != null ">
+ #{deptType},
+ </if>
+ <if test="deptCode != null ">
+ #{deptCode},
</if>
</trim>
</insert>
@@ -109,6 +130,12 @@
<if test="updateTime != null ">
update_time = #{updateTime},
</if>
+ <if test="deptType != null ">
+ dept_type = #{deptType},
+ </if>
+ <if test="deptCode != null ">
+ dept_code = #{deptCode},
+ </if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3