From 78b0e909aa6ece787091e5d81450c8927ef2599e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 15 十二月 2023 17:03:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentcategoryController.java | 10
smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java | 74
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordCalldetailController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedPhysicalController.java | 10
smartor/src/main/java/com/smartor/service/impl/PatArchivetagServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/test/pctest.java | 86
smartor/src/main/resources/mapper/smartor/HeCategoryMapper.xml | 75
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrScenecategoryController.java | 34
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlowController.java | 10
smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml | 169 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskController.java | 10
smartor/src/main/resources/mapper/smartor/HeLocallibraryMapper.xml | 8
smartor/src/main/java/com/smartor/service/IPatArchiveService.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodeController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java | 10
smartor/src/main/java/com/smartor/mapper/MedicalHistoryMapper.java | 63
smartor/src/main/java/com/smartor/mapper/HeCategoryMapper.java | 20
smartor/src/main/java/com/smartor/mapper/PatArchivecontactMapper.java | 64
smartor/src/main/java/com/smartor/mapper/PatArchiveMapper.java | 18
smartor/src/main/java/com/smartor/service/IHeCategoryService.java | 21
smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java | 401 +--
ruoyi-admin/src/main/resources/application.yml | 4
smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml | 16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptController.java | 10
smartor/src/main/java/com/smartor/service/impl/PatArchivecontactServiceImpl.java | 97
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallrecordController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibResultController.java | 10
ruoyi-admin/src/main/resources/template/question.ftl | 1
smartor/src/main/java/com/smartor/domain/PatArchiveReq.java | 62
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplatetargetController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggersceneController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicoptionController.java | 10
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 501 +++-
smartor/src/main/resources/mapper/smartor/IvrLibaTargetAssortMapper.xml | 81
smartor/src/main/resources/mapper/smartor/MedicalHistoryMapper.xml | 111 +
smartor/src/main/java/com/smartor/service/impl/HeCategoryServiceImpl.java | 55
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptcategoryController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/EquipmentinfoController.java | 10
smartor/src/main/java/com/smartor/service/impl/MedicalHistoryServiceImpl.java | 94
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptmodelController.java | 10
smartor/src/main/java/com/smartor/domain/MedicalHistory.java | 131 +
smartor/src/main/java/com/smartor/service/IPatArchivecontactService.java | 62
smartor/src/main/resources/mapper/smartor/PatArchivecontactMapper.xml | 42
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLocallibraryController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IntelligenceCenterController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedBloodsugarController.java | 10
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java | 20
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibIntentController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemePlanController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTasksmsController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java | 10
smartor/src/main/java/com/smartor/domain/PatArchiveAndTag.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrepeatconfigController.java | 34
smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java | 43
smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml | 146
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java | 23
smartor/src/main/java/com/smartor/mapper/PatArchivetagMapper.java | 8
smartor/src/main/java/com/smartor/domain/BaseTag.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskconfigController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishtopicController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptmodelController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsParamController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneIntentController.java | 10
smartor/src/main/java/com/smartor/service/IMedicalHistoryService.java | 62
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodebranchController.java | 10
smartor/src/main/java/com/smartor/service/IIvrLibaTargetoptionService.java | 62
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 21
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneExecuteconfigController.java | 10
smartor/src/main/java/com/smartor/domain/HeCategoryVO.java | 82
smartor/src/main/java/com/smartor/service/IIvrLibaTargetAssortService.java | 63
smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java | 68
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTaskrecordController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivecontactController.java | 100
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java | 102 +
ruoyi-admin/src/main/java/com/ruoyi/web/test/DingTalkService.java | 55
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateController.java | 34
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 | 10
smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java | 42
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 382 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplatescriptController.java | 10
ruoyi-admin/src/main/resources/logback.xml | 2
smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetoptionServiceImpl.java | 97
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java | 99
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeCategoryController.java | 42
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedDrugController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTopicController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MinioFileController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneGlobalconfigController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java | 25
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcalldetailController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneRecallController.java | 10
smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java | 51
smartor/src/main/java/com/smartor/domain/HeCategory.java | 108
smartor/src/main/java/com/smartor/domain/PatArchive.java | 62
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java | 103
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsRecordsController.java | 34
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeTriggerruleController.java | 10
smartor/src/main/java/com/smartor/mapper/IvrLibaTargetoptionMapper.java | 63
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInspectionController.java | 12
smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java | 43
ruoyi-admin/pom.xml | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeLocallibraryController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeCategoryController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibExceptionController.java | 10
/dev/null | 97
smartor/src/main/java/com/smartor/domain/PatMedInhosp.java | 313 ---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishoptionController.java | 10
smartor/src/main/java/com/smartor/mapper/IvrLibaTargetAssortMapper.java | 64
smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java | 151 +
smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java | 113 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java | 100
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 37
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScripttargetController.java | 10
smartor/src/main/java/com/smartor/domain/PatArchivecontact.java | 131 +
132 files changed, 4,196 insertions(+), 1,829 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 1d17e3d..6f99bbc 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -24,6 +24,10 @@
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional> <!-- 琛ㄧず渚濊禆涓嶄細浼犻�� -->
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </dependency>
<!-- swagger3-->
<dependency>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index 6e1d70b..a26e256 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -30,6 +30,6 @@
" | | \\ / \\ / \n" +
" ''-' `'-' `-..-' ");
//寮�鍚疭OCKET
- new SocketCommunication().socketCommunication();
+// new SocketCommunication().socketCommunication();
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatArchinvecontactController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatArchinvecontactController.java
deleted file mode 100644
index 19ecf19..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatArchinvecontactController.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.ruoyi.web.controller;
-
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.smartor.domain.PatArchinvecontact;
-import com.smartor.service.IPatArchinvecontactService;
-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.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 鎮ｈ�呰仈绯绘柟寮廋ontroller
- *
- * @author ruoyi
- * @date 2023-06-16
- */
-@Api(description = "鎮ｈ�呰仈绯绘柟寮�")
-@RestController
-@RequestMapping("/system/archinvecontact")
-public class PatArchinvecontactController extends BaseController {
- @Autowired
- private IPatArchinvecontactService patArchinvecontactService;
-
- /**
- * 鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�
- */
- @ApiOperation("鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�")
- @PreAuthorize("@ss.hasPermi('system:archinvecontact:list')")
- @GetMapping("/list")
- public TableDataInfo list(PatArchinvecontact patArchinvecontact) {
- startPage();
- List<PatArchinvecontact> list = patArchinvecontactService.selectPatArchinvecontactList(patArchinvecontact);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭鎮ｈ�呰仈绯绘柟寮忓垪琛�
- */
- @ApiOperation("瀵煎嚭鎮ｈ�呰仈绯绘柟寮忓垪琛�")
- @PreAuthorize("@ss.hasPermi('system:archinvecontact:export')")
- @Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, PatArchinvecontact patArchinvecontact) {
- List<PatArchinvecontact> list = patArchinvecontactService.selectPatArchinvecontactList(patArchinvecontact);
- ExcelUtil<PatArchinvecontact> util = new ExcelUtil<PatArchinvecontact>(PatArchinvecontact.class);
- util.exportExcel(response, list, "鎮ｈ�呰仈绯绘柟寮忔暟鎹�");
- }
-
- /**
- * 鑾峰彇鎮ｈ�呰仈绯绘柟寮忚缁嗕俊鎭�
- */
- @ApiOperation("鑾峰彇鎮ｈ�呰仈绯绘柟寮忚缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:archinvecontact:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id) {
- return success(patArchinvecontactService.selectPatArchinvecontactById(id));
- }
-
- /**
- * 鏂板鎮ｈ�呰仈绯绘柟寮�
- */
- @ApiOperation("鏂板鎮ｈ�呰仈绯绘柟寮�")
- @PreAuthorize("@ss.hasPermi('system:archinvecontact:add')")
- @Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody PatArchinvecontact patArchinvecontact) {
- return toAjax(patArchinvecontactService.insertPatArchinvecontact(patArchinvecontact));
- }
-
- /**
- * 淇敼鎮ｈ�呰仈绯绘柟寮�
- */
- @ApiOperation("淇敼鎮ｈ�呰仈绯绘柟寮�")
- @PreAuthorize("@ss.hasPermi('system:archinvecontact:edit')")
- @Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody PatArchinvecontact patArchinvecontact) {
- return toAjax(patArchinvecontactService.updatePatArchinvecontact(patArchinvecontact));
- }
-
- /**
- * 鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
- */
- @ApiOperation("鍒犻櫎鎮ｈ�呰仈绯绘柟寮�")
- @PreAuthorize("@ss.hasPermi('system:archinvecontact:remove')")
- @Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids) {
- return toAjax(patArchinvecontactService.deletePatArchinvecontactByIds(ids));
- }
-}
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 0ec41b1..ed2d911 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
@@ -4,6 +4,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.utils.PageUtils;
import com.smartor.domain.BaseTag;
import com.smartor.service.IBaseTagService;
import io.swagger.annotations.Api;
@@ -45,8 +46,9 @@
@ApiOperation("鏌ヨ鏍囩鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:tag:list')")
@PostMapping("/list")
- public TableDataInfo list(BaseTag baseTag) {
- startPage();
+ public TableDataInfo list(@RequestBody BaseTag baseTag) {
+ PageUtils.startPageByPost(baseTag.getPageNum(), baseTag.getPageSize());
+ if (baseTag.getTagcategoryid() == 0) baseTag.setTagcategoryid(null);
List<BaseTag> list = baseTagService.selectBaseTagList(baseTag);
return getDataTable(list);
}
@@ -81,7 +83,7 @@
@ApiOperation("鏂板鏍囩")
@PreAuthorize("@ss.hasPermi('system:tag:add')")
@Log(title = "鏍囩", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody BaseTag baseTag) {
return toAjax(baseTagService.insertBaseTag(baseTag));
}
@@ -92,7 +94,7 @@
@ApiOperation("淇敼鏍囩")
@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "鏍囩", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseTag baseTag) {
return toAjax(baseTagService.updateBaseTag(baseTag));
}
@@ -104,7 +106,7 @@
@ApiImplicitParam(name = "remove", value = "涓婚敭ID", dataType = "long", dataTypeClass = Array.class)
@PreAuthorize("@ss.hasPermi('system:tag:remove')")
@Log(title = "鏍囩", businessType = BusinessType.DELETE)
- @DeleteMapping("/{tagids}")
+ @GetMapping("/remove/{tagids}")
public AjaxResult remove(@PathVariable Long[] tagids) {
return toAjax(baseTagService.deleteBaseTagByTagids(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 452f242..83af2e8 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
@@ -36,8 +36,8 @@
* 鏌ヨ鏍囩鍒嗙被鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('system:tagcategory:list')")
- @GetMapping("/list")
- public TableDataInfo list(BaseTagcategory baseTagcategory) {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody BaseTagcategory baseTagcategory) {
startPage();
List<BaseTagcategory> list = baseTagcategoryService.selectBaseTagcategoryList(baseTagcategory);
return getDataTable(list);
@@ -70,7 +70,7 @@
@PreAuthorize("@ss.hasPermi('system:tagcategory:add')")
@Log(title = "鏍囩鍒嗙被", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鏍囩鍒嗙被")
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody BaseTagcategory baseTagcategory) {
return toAjax(baseTagcategoryService.insertBaseTagcategory(baseTagcategory));
}
@@ -81,7 +81,7 @@
@PreAuthorize("@ss.hasPermi('system:tagcategory:edit')")
@Log(title = "鏍囩鍒嗙被", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼鏍囩鍒嗙被")
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseTagcategory baseTagcategory) {
return toAjax(baseTagcategoryService.updateBaseTagcategory(baseTagcategory));
}
@@ -92,7 +92,7 @@
@PreAuthorize("@ss.hasPermi('system:tagcategory:remove')")
@Log(title = "鏍囩鍒嗙被", businessType = BusinessType.DELETE)
@ApiOperation("鏍规嵁鍒嗙被ID鍒犻櫎鏍囩鍒嗙被")
- @DeleteMapping("/{tagcategoryids}")
+ @GetMapping("/remove/{tagcategoryids}")
public AjaxResult remove(@PathVariable Long[] tagcategoryids) {
return toAjax(baseTagcategoryService.deleteBaseTagcategoryByTagcategoryids(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 19fb6a5..4ddc79d 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
@@ -6,14 +6,7 @@
import com.ruoyi.common.utils.StringUtils;
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 org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -39,8 +32,8 @@
* 鏌ヨ鐢ㄦ埛鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('system:info:list')")
- @GetMapping("/list")
- public TableDataInfo list(BaseUserInfo baseUserInfo) {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody BaseUserInfo baseUserInfo) {
startPage();
List<BaseUserInfo> list = baseUserInfoService.selectBaseUserInfoList(baseUserInfo);
return getDataTable(list);
@@ -72,7 +65,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:info:add')")
@Log(title = "鐢ㄦ埛", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody BaseUserInfo baseUserInfo) {
return toAjax(baseUserInfoService.insertBaseUserInfo(baseUserInfo));
}
@@ -82,7 +75,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:info:edit')")
@Log(title = "鐢ㄦ埛", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseUserInfo baseUserInfo) {
return toAjax(baseUserInfoService.updateBaseUserInfo(baseUserInfo));
}
@@ -92,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:info:remove')")
@Log(title = "鐢ㄦ埛", businessType = BusinessType.DELETE)
- @DeleteMapping("/{userids}")
+ @GetMapping("/remove/{userids}")
public AjaxResult remove(@PathVariable Long[] userids) {
return toAjax(baseUserInfoService.deleteBaseUserInfoByUserids(userids));
}
@@ -100,12 +93,12 @@
/**
* 鑾峰彇浜哄憳鐨勮仈绯绘柟寮�
*
- * @param personNo 浜哄憳缂栧彿
+ * @param personCode 浜哄憳缂栧彿
* @param noticeWay 閫氱煡鏂瑰紡
* @return
*/
- @RequestMapping("/reportContent")
- public AjaxResult getContact(String personCode, String noticeWay) {
+ @GetMapping("/reportContent")
+ public AjaxResult getContact(@RequestParam("personCode") String personCode, @RequestParam("noticeWay") String noticeWay) {
if (StringUtils.isEmpty(personCode) || StringUtils.isEmpty(noticeWay)) {
return error("杈撳叆鏈夎锛岃妫�鏌�");
}
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 e9294f7..dfefed3 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
@@ -44,8 +44,8 @@
* 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:equipmentinfo:list')")
- @GetMapping("/list")
- public TableDataInfo list(Equipmentinfo equipmentinfo) {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody Equipmentinfo equipmentinfo) {
startPage();
List<Equipmentinfo> list = equipmentinfoService.selectEquipmentinfoList(equipmentinfo);
return getDataTable(list);
@@ -77,7 +77,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:equipmentinfo:add')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody Equipmentinfo equipmentinfo) {
return toAjax(equipmentinfoService.insertEquipmentinfo(equipmentinfo));
}
@@ -87,7 +87,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:equipmentinfo:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody Equipmentinfo equipmentinfo) {
return toAjax(equipmentinfoService.updateEquipmentinfo(equipmentinfo));
}
@@ -97,7 +97,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:equipmentinfo:remove')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(equipmentinfoService.deleteEquipmentinfoByIds(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 90cf6b6..ef1546f 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
@@ -1,8 +1,9 @@
-package com.smartor.controller;
+package com.ruoyi.web.controller.smartor;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.smartor.domain.HeCategoryVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,28 +27,26 @@
/**
* 瀹ｆ暀鍒嗙被Controller
- *
+ *
* @author smartor
* @date 2023-03-04
*/
@Api("瀹ｆ暀鍒嗙被(瀹ｆ暀绫诲埆)")
@RestController
@RequestMapping("/smartor/hecategory")
-public class HeCategoryController extends BaseController
-{
+public class HeCategoryController extends BaseController {
@Autowired
private IHeCategoryService heCategoryService;
/**
* 鏌ヨ瀹ｆ暀鍒嗙被鍒楄〃
*/
- @ApiOperation("鏌ヨ鎮ｈ�呮。妗堝垪琛�")
+ @ApiOperation("鏌ヨ瀹ｆ暀鍒嗙被鍒楄〃")
@PreAuthorize("@ss.hasPermi('smartor:hecategory:list')")
- @GetMapping("/list")
- public TableDataInfo list(HeCategory heCategory)
- {
+ @PostMapping("/selectHeCategoryList")
+ public TableDataInfo selectHeCategorylist(@RequestBody HeCategory heCategory) {
startPage();
- List<HeCategory> list = heCategoryService.selectHeCategoryList(heCategory);
+ List<HeCategoryVO> list = heCategoryService.selectHeCategoryList(heCategory);
return getDataTable(list);
}
@@ -58,10 +57,9 @@
@PreAuthorize("@ss.hasPermi('smartor:hecategory:export')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, HeCategory heCategory)
- {
- List<HeCategory> list = heCategoryService.selectHeCategoryList(heCategory);
- ExcelUtil<HeCategory> util = new ExcelUtil<HeCategory>(HeCategory.class);
+ public void export(HttpServletResponse response, HeCategory heCategory) {
+ List<HeCategoryVO> list = heCategoryService.selectHeCategoryList(heCategory);
+ ExcelUtil<HeCategoryVO> util = new ExcelUtil<HeCategoryVO>(HeCategoryVO.class);
util.exportExcel(response, list, "瀹ｆ暀鍒嗙被鏁版嵁");
}
@@ -71,8 +69,7 @@
@ApiOperation("鑾峰彇瀹ｆ暀鍒嗙被璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('smartor:hecategory:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(heCategoryService.selectHeCategoryById(id));
}
@@ -82,9 +79,8 @@
@ApiOperation("鏂板瀹ｆ暀鍒嗙被")
@PreAuthorize("@ss.hasPermi('smartor:hecategory:add')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody HeCategory heCategory)
- {
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody HeCategory heCategory) {
return toAjax(heCategoryService.insertHeCategory(heCategory));
}
@@ -94,9 +90,8 @@
@ApiOperation("淇敼瀹ｆ暀鍒嗙被")
@PreAuthorize("@ss.hasPermi('smartor:hecategory:edit')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody HeCategory heCategory)
- {
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody HeCategory heCategory) {
return toAjax(heCategoryService.updateHeCategory(heCategory));
}
@@ -106,9 +101,8 @@
@ApiOperation("鍒犻櫎瀹ｆ暀鍒嗙被")
@PreAuthorize("@ss.hasPermi('smartor:hecategory:remove')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(heCategoryService.deleteHeCategoryByIds(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 5b0340b..2284bf3 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
@@ -38,8 +38,8 @@
* 鏌ヨ瀹ｆ暀搴撳垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:helibrary:list')")
- @GetMapping("/list")
- public TableDataInfo list(HeLocallibrary heLocallibrary)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody HeLocallibrary heLocallibrary)
{
startPage();
List<HeLocallibrary> list = heLocallibraryService.selectHeLocallibraryList(heLocallibrary);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:helibrary:add')")
@Log(title = "瀹ｆ暀搴�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("add")
public AjaxResult add(@RequestBody HeLocallibrary heLocallibrary)
{
return toAjax(heLocallibraryService.insertHeLocallibrary(heLocallibrary));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:helibrary:edit')")
@Log(title = "瀹ｆ暀搴�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody HeLocallibrary heLocallibrary)
{
return toAjax(heLocallibraryService.updateHeLocallibrary(heLocallibrary));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:helibrary:remove')")
@Log(title = "瀹ｆ暀搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(heLocallibraryService.deleteHeLocallibraryByIds(ids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IntelligenceCenterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IntelligenceCenterController.java
index 13cd509..814059e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IntelligenceCenterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IntelligenceCenterController.java
@@ -30,7 +30,7 @@
private IntelligenceCenterService intelligenceCenterService;
@PostMapping("/processList")
- public void processList(@RequestBody List<Map<String, Object>> list) {
+ public void processlist(@RequestBody List<Map<String, Object>> list) {
for (Map<String, Object> map : list) {
// 閬嶅巻 list 涓殑姣忎釜 map
for (Map.Entry<String, Object> entry : map.entrySet()) {
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 7816a15..21cfe24 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
@@ -38,8 +38,8 @@
* 鏌ヨAI鎰忓浘搴撳垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrLibIntent ivrLibIntent)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibIntent ivrLibIntent)
{
startPage();
List<IvrLibIntent> list = ivrLibIntentService.selectIvrLibIntentList(ivrLibIntent);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:add')")
@Log(title = "AI鎰忓浘搴�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibIntent ivrLibIntent)
{
return toAjax(ivrLibIntentService.insertIvrLibIntent(ivrLibIntent));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:edit')")
@Log(title = "AI鎰忓浘搴�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibIntent ivrLibIntent)
{
return toAjax(ivrLibIntentService.updateIvrLibIntent(ivrLibIntent));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibintent:remove')")
@Log(title = "AI鎰忓浘搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{intentids}")
+ @GetMapping("/remove/{intentids}")
public AjaxResult remove(@PathVariable Long[] intentids)
{
return toAjax(ivrLibIntentService.deleteIvrLibIntentByIntentids(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 d4f3572..27a9a08 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
@@ -38,8 +38,8 @@
* 鏌ヨAI鎰忓浘搴撳垎绫诲垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrLibIntentcategory ivrLibIntentcategory)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibIntentcategory ivrLibIntentcategory)
{
startPage();
List<IvrLibIntentcategory> list = ivrLibIntentcategoryService.selectIvrLibIntentcategoryList(ivrLibIntentcategory);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:add')")
@Log(title = "AI鎰忓浘搴撳垎绫�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibIntentcategory ivrLibIntentcategory)
{
return toAjax(ivrLibIntentcategoryService.insertIvrLibIntentcategory(ivrLibIntentcategory));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:edit')")
@Log(title = "AI鎰忓浘搴撳垎绫�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibIntentcategory ivrLibIntentcategory)
{
return toAjax(ivrLibIntentcategoryService.updateIvrLibIntentcategory(ivrLibIntentcategory));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibintentcategory:remove')")
@Log(title = "AI鎰忓浘搴撳垎绫�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{intertcatids}")
+ @GetMapping("/remove/{intertcatids}")
public AjaxResult remove(@PathVariable Long[] intertcatids)
{
return toAjax(ivrLibIntentcategoryService.deleteIvrLibIntentcategoryByIntertcatids(intertcatids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptController.java
index 51cc817..34380c3 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
@@ -38,8 +38,8 @@
* 鏌ヨAI璇濇湳搴撳垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrLibScript ivrLibScript)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibScript ivrLibScript)
{
startPage();
List<IvrLibScript> list = ivrLibScriptService.selectIvrLibScriptList(ivrLibScript);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:add')")
@Log(title = "AI璇濇湳搴�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibScript ivrLibScript)
{
return toAjax(ivrLibScriptService.insertIvrLibScript(ivrLibScript));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:edit')")
@Log(title = "AI璇濇湳搴�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibScript ivrLibScript)
{
return toAjax(ivrLibScriptService.updateIvrLibScript(ivrLibScript));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibscript:remove')")
@Log(title = "AI璇濇湳搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{scriptids}")
+ @GetMapping("/remove/{scriptids}")
public AjaxResult remove(@PathVariable Long[] scriptids)
{
return toAjax(ivrLibScriptService.deleteIvrLibScriptByScriptids(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 17a8968..c510b97 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
@@ -38,8 +38,8 @@
* 鏌ヨAI璇濇湳搴撳垎绫诲垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrLibScriptcategory ivrLibScriptcategory)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibScriptcategory ivrLibScriptcategory)
{
startPage();
List<IvrLibScriptcategory> list = ivrLibScriptcategoryService.selectIvrLibScriptcategoryList(ivrLibScriptcategory);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:add')")
@Log(title = "AI璇濇湳搴撳垎绫�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibScriptcategory ivrLibScriptcategory)
{
return toAjax(ivrLibScriptcategoryService.insertIvrLibScriptcategory(ivrLibScriptcategory));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:edit')")
@Log(title = "AI璇濇湳搴撳垎绫�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibScriptcategory ivrLibScriptcategory)
{
return toAjax(ivrLibScriptcategoryService.updateIvrLibScriptcategory(ivrLibScriptcategory));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptcategory:remove')")
@Log(title = "AI璇濇湳搴撳垎绫�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{categoryids}")
+ @GetMapping("/remove/{categoryids}")
public AjaxResult remove(@PathVariable Long[] categoryids)
{
return toAjax(ivrLibScriptcategoryService.deleteIvrLibScriptcategoryByCategoryids(categoryids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptmodelController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibScriptmodelController.java
index a0b9037..28345ed 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
@@ -38,8 +38,8 @@
* 鏌ヨAI璇濇湳妯″潡鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrLibScriptmodel ivrLibScriptmodel)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibScriptmodel ivrLibScriptmodel)
{
startPage();
List<IvrLibScriptmodel> list = ivrLibScriptmodelService.selectIvrLibScriptmodelList(ivrLibScriptmodel);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:add')")
@Log(title = "AI璇濇湳妯″潡", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibScriptmodel ivrLibScriptmodel)
{
return toAjax(ivrLibScriptmodelService.insertIvrLibScriptmodel(ivrLibScriptmodel));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:edit')")
@Log(title = "AI璇濇湳妯″潡", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibScriptmodel ivrLibScriptmodel)
{
return toAjax(ivrLibScriptmodelService.updateIvrLibScriptmodel(ivrLibScriptmodel));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibscriptmodel:remove')")
@Log(title = "AI璇濇湳妯″潡", businessType = BusinessType.DELETE)
- @DeleteMapping("/{modelids}")
+ @GetMapping("/remove/{modelids}")
public AjaxResult remove(@PathVariable Long[] modelids)
{
return toAjax(ivrLibScriptmodelService.deleteIvrLibScriptmodelByModelids(modelids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateController.java
index 5ce0478..160d7e3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateController.java
@@ -1,7 +1,8 @@
-package com.smartor.controller;
+package com.ruoyi.web.controller.smartor;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +24,13 @@
/**
* 鎵╁睍璇濇湳妯℃澘搴揅ontroller
- *
+ *
* @author smartor
* @date 2023-03-22
*/
@RestController
@RequestMapping("/smartor/ivrextemplate")
-public class IvrLibaExtemplateController extends BaseController
-{
+public class IvrLibaExtemplateController extends BaseController {
@Autowired
private IIvrLibaExtemplateService ivrLibaExtemplateService;
@@ -38,9 +38,8 @@
* 鏌ヨ鎵╁睍璇濇湳妯℃澘搴撳垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrextemplate:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrLibaExtemplate ivrLibaExtemplate)
- {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibaExtemplate ivrLibaExtemplate) {
startPage();
List<IvrLibaExtemplate> list = ivrLibaExtemplateService.selectIvrLibaExtemplateList(ivrLibaExtemplate);
return getDataTable(list);
@@ -52,8 +51,7 @@
@PreAuthorize("@ss.hasPermi('smartor:ivrextemplate:export')")
@Log(title = "鎵╁睍璇濇湳妯℃澘搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrLibaExtemplate ivrLibaExtemplate)
- {
+ public void export(HttpServletResponse response, IvrLibaExtemplate ivrLibaExtemplate) {
List<IvrLibaExtemplate> list = ivrLibaExtemplateService.selectIvrLibaExtemplateList(ivrLibaExtemplate);
ExcelUtil<IvrLibaExtemplate> util = new ExcelUtil<IvrLibaExtemplate>(IvrLibaExtemplate.class);
util.exportExcel(response, list, "鎵╁睍璇濇湳妯℃澘搴撴暟鎹�");
@@ -64,8 +62,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrextemplate:query')")
@GetMapping(value = "/{subModuleID}")
- public AjaxResult getInfo(@PathVariable("subModuleID") String subModuleID)
- {
+ public AjaxResult getInfo(@PathVariable("subModuleID") String subModuleID) {
return success(ivrLibaExtemplateService.selectIvrLibaExtemplateBySubModuleID(subModuleID));
}
@@ -74,9 +71,8 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrextemplate:add')")
@Log(title = "鎵╁睍璇濇湳妯℃澘搴�", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody IvrLibaExtemplate ivrLibaExtemplate)
- {
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody IvrLibaExtemplate ivrLibaExtemplate) {
return toAjax(ivrLibaExtemplateService.insertIvrLibaExtemplate(ivrLibaExtemplate));
}
@@ -85,9 +81,8 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrextemplate:edit')")
@Log(title = "鎵╁睍璇濇湳妯℃澘搴�", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody IvrLibaExtemplate ivrLibaExtemplate)
- {
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody IvrLibaExtemplate ivrLibaExtemplate) {
return toAjax(ivrLibaExtemplateService.updateIvrLibaExtemplate(ivrLibaExtemplate));
}
@@ -96,9 +91,8 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrextemplate:remove')")
@Log(title = "鎵╁睍璇濇湳妯℃澘搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{subModuleIDs}")
- public AjaxResult remove(@PathVariable String[] subModuleIDs)
- {
+ @GetMapping("/remove/{subModuleIDs}")
+ public AjaxResult remove(@PathVariable String[] subModuleIDs) {
return toAjax(ivrLibaExtemplateService.deleteIvrLibaExtemplateBySubModuleIDs(subModuleIDs));
}
}
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 f9be8dc..c008137 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplatescriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplatescriptController.java
@@ -1,4 +1,4 @@
-package com.smartor.controller;
+package com.ruoyi.web.controller.smartor;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -38,8 +38,8 @@
* 鏌ヨ鎵╁睍璇濇湳妯℃澘搴撹瘽鏈垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrextemplatescript:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrLibaExtemplatescript ivrLibaExtemplatescript)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibaExtemplatescript ivrLibaExtemplatescript)
{
startPage();
List<IvrLibaExtemplatescript> list = ivrLibaExtemplatescriptService.selectIvrLibaExtemplatescriptList(ivrLibaExtemplatescript);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrextemplatescript:add')")
@Log(title = "鎵╁睍璇濇湳妯℃澘搴撹瘽鏈�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaExtemplatescript ivrLibaExtemplatescript)
{
return toAjax(ivrLibaExtemplatescriptService.insertIvrLibaExtemplatescript(ivrLibaExtemplatescript));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrextemplatescript:edit')")
@Log(title = "鎵╁睍璇濇湳妯℃澘搴撹瘽鏈�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaExtemplatescript ivrLibaExtemplatescript)
{
return toAjax(ivrLibaExtemplatescriptService.updateIvrLibaExtemplatescript(ivrLibaExtemplatescript));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrextemplatescript:remove')")
@Log(title = "鎵╁睍璇濇湳妯℃澘搴撹瘽鏈�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{DetailIDs}")
+ @GetMapping("/remove/{DetailIDs}")
public AjaxResult remove(@PathVariable String[] DetailIDs)
{
return toAjax(ivrLibaExtemplatescriptService.deleteIvrLibaExtemplatescriptByDetailIDs(DetailIDs));
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 96ab960..e2c3056 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,8 +38,8 @@
* 鏌ヨ璇濇湳搴撳垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibascript:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrLibaScript ivrLibaScript)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibaScript ivrLibaScript)
{
startPage();
List<IvrLibaScript> list = ivrLibaScriptService.selectIvrLibaScriptList(ivrLibaScript);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibascript:add')")
@Log(title = "璇濇湳搴�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaScript ivrLibaScript)
{
return toAjax(ivrLibaScriptService.insertIvrLibaScript(ivrLibaScript));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibascript:edit')")
@Log(title = "璇濇湳搴�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaScript ivrLibaScript)
{
return toAjax(ivrLibaScriptService.updateIvrLibaScript(ivrLibaScript));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrlibascript:remove')")
@Log(title = "璇濇湳搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{questionids}")
+ @GetMapping("/remove/{questionids}")
public AjaxResult remove(@PathVariable String[] questionids)
{
return toAjax(ivrLibaScriptService.deleteIvrLibaScriptByQuestionids(questionids));
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 d911cfc..4ab6bf3 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
@@ -38,8 +38,8 @@
* 鏌ヨ璇濇湳搴撹瘽鏈寚鏍囧垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscripttarget:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrLibaScripttarget ivrLibaScripttarget)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibaScripttarget ivrLibaScripttarget)
{
startPage();
List<IvrLibaScripttarget> list = ivrLibaScripttargetService.selectIvrLibaScripttargetList(ivrLibaScripttarget);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscripttarget:add')")
@Log(title = "璇濇湳搴撹瘽鏈寚鏍�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaScripttarget ivrLibaScripttarget)
{
return toAjax(ivrLibaScripttargetService.insertIvrLibaScripttarget(ivrLibaScripttarget));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscripttarget:edit')")
@Log(title = "璇濇湳搴撹瘽鏈寚鏍�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaScripttarget ivrLibaScripttarget)
{
return toAjax(ivrLibaScripttargetService.updateIvrLibaScripttarget(ivrLibaScripttarget));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscripttarget:remove')")
@Log(title = "璇濇湳搴撹瘽鏈寚鏍�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{questionTargetIDs}")
+ @GetMapping("/remove/{questionTargetIDs}")
public AjaxResult remove(@PathVariable String[] questionTargetIDs)
{
return toAjax(ivrLibaScripttargetService.deleteIvrLibaScripttargetByQuestionTargetIDs(questionTargetIDs));
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
new file mode 100644
index 0000000..fabb1ba
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java
@@ -0,0 +1,100 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.IvrLibaTargetAssort;
+import com.smartor.domain.IvrLibaTargetAssortVO;
+import com.smartor.service.IIvrLibaTargetAssortService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鎸囨爣鍒嗙被Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-14
+ */
+@RestController
+@RequestMapping("/smartor/assort")
+public class IvrLibaTargetAssortController extends BaseController
+{
+ @Autowired
+ private IIvrLibaTargetAssortService ivrLibaTargetAssortService;
+
+ /**
+ * 鏌ヨ鎸囨爣鍒嗙被鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:assort:list')")
+ @PostMapping("/selectIvrLibaTargetAssortList")
+ public TableDataInfo list(@RequestBody IvrLibaTargetAssort ivrLibaTargetAssort)
+ {
+ PageUtils.startPageByPost(ivrLibaTargetAssort.getPageNum(),ivrLibaTargetAssort.getPageSize());
+ List<IvrLibaTargetAssortVO> ivrLibaTargetAssortVOS = ivrLibaTargetAssortService.selectIvrLibaTargetAssortList(ivrLibaTargetAssort);
+ return getDataTable(ivrLibaTargetAssortVOS);
+ }
+
+ /**
+ * 瀵煎嚭鎸囨爣鍒嗙被鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:assort:export')")
+ @Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, IvrLibaTargetAssort ivrLibaTargetAssort)
+ {
+ List<IvrLibaTargetAssortVO> list = ivrLibaTargetAssortService.selectIvrLibaTargetAssortList(ivrLibaTargetAssort);
+ ExcelUtil<IvrLibaTargetAssortVO> util = new ExcelUtil<IvrLibaTargetAssortVO>(IvrLibaTargetAssortVO.class);
+ util.exportExcel(response, list, "鎸囨爣鍒嗙被鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鎸囨爣鍒嗙被璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:assort:query')")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(ivrLibaTargetAssortService.selectIvrLibaTargetAssortById(id));
+ }
+
+ /**
+ * 鏂板鎸囨爣鍒嗙被
+ */
+ @PreAuthorize("@ss.hasPermi('system:assort:add')")
+ @Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody IvrLibaTargetAssort ivrLibaTargetAssort)
+ {
+ return toAjax(ivrLibaTargetAssortService.insertIvrLibaTargetAssort(ivrLibaTargetAssort));
+ }
+
+ /**
+ * 淇敼鎸囨爣鍒嗙被
+ */
+ @PreAuthorize("@ss.hasPermi('system:assort:edit')")
+ @Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody IvrLibaTargetAssort ivrLibaTargetAssort)
+ {
+ return toAjax(ivrLibaTargetAssortService.updateIvrLibaTargetAssort(ivrLibaTargetAssort));
+ }
+
+ /**
+ * 鍒犻櫎鎸囨爣鍒嗙被
+ */
+ @PreAuthorize("@ss.hasPermi('system:assort:remove')")
+ @Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.DELETE)
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(ivrLibaTargetAssortService.deleteIvrLibaTargetAssortByIds(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 178c7e2..c0ebcae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
@@ -1,104 +1,93 @@
-package com.smartor.controller;
+package com.ruoyi.web.controller.smartor;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-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 cn.hutool.db.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.IvrLibaTarget;
import com.smartor.service.IIvrLibaTargetService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
- * 鎸囨爣搴揅ontroller
- *
- * @author smartor
- * @date 2023-03-22
+ * 鎸囨爣閫夐」搴揅ontroller
+ *
+ * @author ruoyi
+ * @date 2023-12-14
*/
@RestController
-@RequestMapping("/smartor/ivrtarget")
-public class IvrLibaTargetController extends BaseController
-{
+@RequestMapping("/smartor/target")
+public class IvrLibaTargetController extends BaseController {
@Autowired
private IIvrLibaTargetService ivrLibaTargetService;
/**
- * 鏌ヨ鎸囨爣搴撳垪琛�
+ * 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtarget:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrLibaTarget ivrLibaTarget)
- {
- startPage();
+ @PreAuthorize("@ss.hasPermi('system:target:list')")
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibaTarget ivrLibaTarget) {
+ PageUtils.startPageByPost(ivrLibaTarget.getPageNum(),ivrLibaTarget.getPageSize());
List<IvrLibaTarget> list = ivrLibaTargetService.selectIvrLibaTargetList(ivrLibaTarget);
return getDataTable(list);
}
/**
- * 瀵煎嚭鎸囨爣搴撳垪琛�
+ * 瀵煎嚭鎸囨爣閫夐」搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtarget:export')")
- @Log(title = "鎸囨爣搴�", businessType = BusinessType.EXPORT)
+ @PreAuthorize("@ss.hasPermi('system:target:export')")
+ @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrLibaTarget ivrLibaTarget)
- {
+ public void export(HttpServletResponse response, IvrLibaTarget ivrLibaTarget) {
List<IvrLibaTarget> list = ivrLibaTargetService.selectIvrLibaTargetList(ivrLibaTarget);
ExcelUtil<IvrLibaTarget> util = new ExcelUtil<IvrLibaTarget>(IvrLibaTarget.class);
- util.exportExcel(response, list, "鎸囨爣搴撴暟鎹�");
+ util.exportExcel(response, list, "鎸囨爣閫夐」搴撴暟鎹�");
}
/**
- * 鑾峰彇鎸囨爣搴撹缁嗕俊鎭�
+ * 鑾峰彇鎸囨爣閫夐」搴撹缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtarget:query')")
- @GetMapping(value = "/{targetID}")
- public AjaxResult getInfo(@PathVariable("targetID") String targetID)
- {
+ @PreAuthorize("@ss.hasPermi('system:target:query')")
+ @GetMapping(value = "/getInfo/{targetID}")
+ public AjaxResult getInfo(@PathVariable("targetID") Long targetID) {
return success(ivrLibaTargetService.selectIvrLibaTargetByTargetID(targetID));
}
/**
- * 鏂板鎸囨爣搴�
+ * 鏂板鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtarget:add')")
- @Log(title = "鎸囨爣搴�", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody IvrLibaTarget ivrLibaTarget)
- {
+ @PreAuthorize("@ss.hasPermi('system:target:add')")
+ @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody IvrLibaTarget ivrLibaTarget) {
return toAjax(ivrLibaTargetService.insertIvrLibaTarget(ivrLibaTarget));
}
/**
- * 淇敼鎸囨爣搴�
+ * 淇敼鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtarget:edit')")
- @Log(title = "鎸囨爣搴�", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody IvrLibaTarget ivrLibaTarget)
- {
+ @PreAuthorize("@ss.hasPermi('system:target:edit')")
+ @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody IvrLibaTarget ivrLibaTarget) {
return toAjax(ivrLibaTargetService.updateIvrLibaTarget(ivrLibaTarget));
}
/**
- * 鍒犻櫎鎸囨爣搴�
+ * 鍒犻櫎鎸囨爣閫夐」搴�
*/
- @PreAuthorize("@ss.hasPermi('smartor:ivrtarget:remove')")
- @Log(title = "鎸囨爣搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{targetIDs}")
- public AjaxResult remove(@PathVariable String[] targetIDs)
- {
+ @PreAuthorize("@ss.hasPermi('system:target:remove')")
+ @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
+ @GetMapping("/remove/{targetIDs}")
+ public AjaxResult remove(@PathVariable Long[] targetIDs) {
return toAjax(ivrLibaTargetService.deleteIvrLibaTargetByTargetIDs(targetIDs));
}
}
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
new file mode 100644
index 0000000..22a407f
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java
@@ -0,0 +1,99 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.IvrLibaTargetoption;
+import com.smartor.service.IIvrLibaTargetoptionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鎸囨爣閫夐」搴揅ontroller
+ *
+ * @author ruoyi
+ * @date 2023-12-14
+ */
+@RestController
+@RequestMapping("/smartor/targetoption")
+public class IvrLibaTargetoptionController extends BaseController
+{
+ @Autowired
+ private IIvrLibaTargetoptionService ivrLibaTargetoptionService;
+
+ /**
+ * 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('system:targetoption:list')")
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibaTargetoption ivrLibaTargetoption)
+ {
+ PageUtils.startPageByPost(ivrLibaTargetoption.getPageNum(),ivrLibaTargetoption.getPageSize());
+ List<IvrLibaTargetoption> list = ivrLibaTargetoptionService.selectIvrLibaTargetoptionList(ivrLibaTargetoption);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鎸囨爣閫夐」搴撳垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('system:targetoption:export')")
+ @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, IvrLibaTargetoption ivrLibaTargetoption)
+ {
+ List<IvrLibaTargetoption> list = ivrLibaTargetoptionService.selectIvrLibaTargetoptionList(ivrLibaTargetoption);
+ ExcelUtil<IvrLibaTargetoption> util = new ExcelUtil<IvrLibaTargetoption>(IvrLibaTargetoption.class);
+ util.exportExcel(response, list, "鎸囨爣閫夐」搴撴暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇鎸囨爣閫夐」搴撹缁嗕俊鎭�
+ */
+ @PreAuthorize("@ss.hasPermi('system:targetoption:query')")
+ @GetMapping(value = "/getInfo/{targetoptionid}")
+ public AjaxResult getInfo(@PathVariable("targetoptionid") Long targetoptionid)
+ {
+ return success(ivrLibaTargetoptionService.selectIvrLibaTargetoptionByTargetoptionid(targetoptionid));
+ }
+
+ /**
+ * 鏂板鎸囨爣閫夐」搴�
+ */
+ @PreAuthorize("@ss.hasPermi('system:targetoption:add')")
+ @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody IvrLibaTargetoption ivrLibaTargetoption)
+ {
+ return toAjax(ivrLibaTargetoptionService.insertIvrLibaTargetoption(ivrLibaTargetoption));
+ }
+
+ /**
+ * 淇敼鎸囨爣閫夐」搴�
+ */
+ @PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
+ @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody IvrLibaTargetoption ivrLibaTargetoption)
+ {
+ return toAjax(ivrLibaTargetoptionService.updateIvrLibaTargetoption(ivrLibaTargetoption));
+ }
+
+ /**
+ * 鍒犻櫎鎸囨爣閫夐」搴�
+ */
+ @PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
+ @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
+ @GetMapping("/remove/{targetoptionids}")
+ public AjaxResult remove(@PathVariable Long[] targetoptionids)
+ {
+ return toAjax(ivrLibaTargetoptionService.deleteIvrLibaTargetoptionByTargetoptionids(targetoptionids));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
index 35963a7..1527e9f 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
@@ -38,8 +38,8 @@
* 鏌ヨ璇濇湳妯℃澘搴撳垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtemplate:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrLibaTemplate ivrLibaTemplate)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibaTemplate ivrLibaTemplate)
{
startPage();
List<IvrLibaTemplate> list = ivrLibaTemplateService.selectIvrLibaTemplateList(ivrLibaTemplate);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtemplate:add')")
@Log(title = "璇濇湳妯℃澘搴�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTemplate ivrLibaTemplate)
{
return toAjax(ivrLibaTemplateService.insertIvrLibaTemplate(ivrLibaTemplate));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtemplate:edit')")
@Log(title = "璇濇湳妯℃澘搴�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTemplate ivrLibaTemplate)
{
return toAjax(ivrLibaTemplateService.updateIvrLibaTemplate(ivrLibaTemplate));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtemplate:remove')")
@Log(title = "璇濇湳妯℃澘搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{templateIDs}")
+ @GetMapping("/remove/{templateIDs}")
public AjaxResult remove(@PathVariable String[] templateIDs)
{
return toAjax(ivrLibaTemplateService.deleteIvrLibaTemplateByTemplateIDs(templateIDs));
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 369e067..3bc794d 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
@@ -38,8 +38,8 @@
* 鏌ヨ璇濇湳妯℃澘搴撹瘽鏈垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtemplatescript:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrLibaTemplatescript ivrLibaTemplatescript)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibaTemplatescript ivrLibaTemplatescript)
{
startPage();
List<IvrLibaTemplatescript> list = ivrLibaTemplatescriptService.selectIvrLibaTemplatescriptList(ivrLibaTemplatescript);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtemplatescript:add')")
@Log(title = "璇濇湳妯℃澘搴撹瘽鏈�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTemplatescript ivrLibaTemplatescript)
{
return toAjax(ivrLibaTemplatescriptService.insertIvrLibaTemplatescript(ivrLibaTemplatescript));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtemplatescript:edit')")
@Log(title = "璇濇湳妯℃澘搴撹瘽鏈�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTemplatescript ivrLibaTemplatescript)
{
return toAjax(ivrLibaTemplatescriptService.updateIvrLibaTemplatescript(ivrLibaTemplatescript));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtemplatescript:remove')")
@Log(title = "璇濇湳妯℃澘搴撹瘽鏈�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{templateQuestionIDs}")
+ @GetMapping("/remove/{templateQuestionIDs}")
public AjaxResult remove(@PathVariable String[] templateQuestionIDs)
{
return toAjax(ivrLibaTemplatescriptService.deleteIvrLibaTemplatescriptByTemplateQuestionIDs(templateQuestionIDs));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplatetargetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplatetargetController.java
index 0c3e3f1..3895eb0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplatetargetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplatetargetController.java
@@ -38,8 +38,8 @@
* 鏌ヨ璇濇湳妯℃澘搴撹瘽鏈寚鏍囧垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtemplatetarget:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrLibaTemplatetarget ivrLibaTemplatetarget)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrLibaTemplatetarget ivrLibaTemplatetarget)
{
startPage();
List<IvrLibaTemplatetarget> list = ivrLibaTemplatetargetService.selectIvrLibaTemplatetargetList(ivrLibaTemplatetarget);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtemplatetarget:add')")
@Log(title = "璇濇湳妯℃澘搴撹瘽鏈寚鏍�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrLibaTemplatetarget ivrLibaTemplatetarget)
{
return toAjax(ivrLibaTemplatetargetService.insertIvrLibaTemplatetarget(ivrLibaTemplatetarget));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtemplatetarget:edit')")
@Log(title = "璇濇湳妯℃澘搴撹瘽鏈寚鏍�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrLibaTemplatetarget ivrLibaTemplatetarget)
{
return toAjax(ivrLibaTemplatetargetService.updateIvrLibaTemplatetarget(ivrLibaTemplatetarget));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtemplatetarget:remove')")
@Log(title = "璇濇湳妯℃澘搴撹瘽鏈寚鏍�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{templateTargetIDs}")
+ @GetMapping("/remove/{templateTargetIDs}")
public AjaxResult remove(@PathVariable String[] templateTargetIDs)
{
return toAjax(ivrLibaTemplatetargetService.deleteIvrLibaTemplatetargetByTemplateTargetIDs(templateTargetIDs));
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 5cdca3c..0a75be8 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
@@ -38,8 +38,8 @@
* 鏌ヨAI澶栧懠鍦烘櫙绠＄悊鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscene:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrScene ivrScene)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrScene ivrScene)
{
startPage();
List<IvrScene> list = ivrSceneService.selectIvrSceneList(ivrScene);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscene:add')")
@Log(title = "AI澶栧懠鍦烘櫙绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrScene ivrScene)
{
return toAjax(ivrSceneService.insertIvrScene(ivrScene));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscene:edit')")
@Log(title = "AI澶栧懠鍦烘櫙绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrScene ivrScene)
{
return toAjax(ivrSceneService.updateIvrScene(ivrScene));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscene:remove')")
@Log(title = "AI澶栧懠鍦烘櫙绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{sceneids}")
+ @GetMapping("/remove/{sceneids}")
public AjaxResult remove(@PathVariable Long[] sceneids)
{
return toAjax(ivrSceneService.deleteIvrSceneBySceneids(sceneids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneExecuteconfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneExecuteconfigController.java
index 2d22615..ec13ed7 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
@@ -38,8 +38,8 @@
* 鏌ヨAI澶栧懠鎵ц閰嶇疆鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrSceneExecuteconfig ivrSceneExecuteconfig)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrSceneExecuteconfig ivrSceneExecuteconfig)
{
startPage();
List<IvrSceneExecuteconfig> list = ivrSceneExecuteconfigService.selectIvrSceneExecuteconfigList(ivrSceneExecuteconfig);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:add')")
@Log(title = "AI澶栧懠鎵ц閰嶇疆", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneExecuteconfig ivrSceneExecuteconfig)
{
return toAjax(ivrSceneExecuteconfigService.insertIvrSceneExecuteconfig(ivrSceneExecuteconfig));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:edit')")
@Log(title = "AI澶栧懠鎵ц閰嶇疆", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneExecuteconfig ivrSceneExecuteconfig)
{
return toAjax(ivrSceneExecuteconfigService.updateIvrSceneExecuteconfig(ivrSceneExecuteconfig));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrexecuteconfig:remove')")
@Log(title = "AI澶栧懠鎵ц閰嶇疆", businessType = BusinessType.DELETE)
- @DeleteMapping("/{scenecfgids}")
+ @GetMapping("/remove/{scenecfgids}")
public AjaxResult remove(@PathVariable Long[] scenecfgids)
{
return toAjax(ivrSceneExecuteconfigService.deleteIvrSceneExecuteconfigByScenecfgids(scenecfgids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlowController.java
index 87c2999..d35f300 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
@@ -38,8 +38,8 @@
* 鏌ヨAI澶栧懠娴佺▼鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrflow:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrSceneFlow ivrSceneFlow)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrSceneFlow ivrSceneFlow)
{
startPage();
List<IvrSceneFlow> list = ivrSceneFlowService.selectIvrSceneFlowList(ivrSceneFlow);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrflow:add')")
@Log(title = "AI澶栧懠娴佺▼", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneFlow ivrSceneFlow)
{
return toAjax(ivrSceneFlowService.insertIvrSceneFlow(ivrSceneFlow));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrflow:edit')")
@Log(title = "AI澶栧懠娴佺▼", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneFlow ivrSceneFlow)
{
return toAjax(ivrSceneFlowService.updateIvrSceneFlow(ivrSceneFlow));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrflow:remove')")
@Log(title = "AI澶栧懠娴佺▼", businessType = BusinessType.DELETE)
- @DeleteMapping("/{flowids}")
+ @GetMapping("/remove/{flowids}")
public AjaxResult remove(@PathVariable Long[] flowids)
{
return toAjax(ivrSceneFlowService.deleteIvrSceneFlowByFlowids(flowids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneFlownodeController.java
index 8779f5c..ba1a18a 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
@@ -38,8 +38,8 @@
* 鏌ヨAI澶栧懠娴佺▼鑺傜偣鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrflownode:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrSceneFlownode ivrSceneFlownode)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrSceneFlownode ivrSceneFlownode)
{
startPage();
List<IvrSceneFlownode> list = ivrSceneFlownodeService.selectIvrSceneFlownodeList(ivrSceneFlownode);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrflownode:add')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneFlownode ivrSceneFlownode)
{
return toAjax(ivrSceneFlownodeService.insertIvrSceneFlownode(ivrSceneFlownode));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrflownode:edit')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneFlownode ivrSceneFlownode)
{
return toAjax(ivrSceneFlownodeService.updateIvrSceneFlownode(ivrSceneFlownode));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrflownode:remove')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣", businessType = BusinessType.DELETE)
- @DeleteMapping("/{flownodeids}")
+ @GetMapping("/remove/{flownodeids}")
public AjaxResult remove(@PathVariable Long[] flownodeids)
{
return toAjax(ivrSceneFlownodeService.deleteIvrSceneFlownodeByFlownodeids(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 4ca0c52..df992d1 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
@@ -38,8 +38,8 @@
* 鏌ヨAI澶栧懠娴佺▼鑺傜偣鍒嗘敮鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrSceneFlownodebranch ivrSceneFlownodebranch)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrSceneFlownodebranch ivrSceneFlownodebranch)
{
startPage();
List<IvrSceneFlownodebranch> list = ivrSceneFlownodebranchService.selectIvrSceneFlownodebranchList(ivrSceneFlownodebranch);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:add')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣鍒嗘敮", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneFlownodebranch ivrSceneFlownodebranch)
{
return toAjax(ivrSceneFlownodebranchService.insertIvrSceneFlownodebranch(ivrSceneFlownodebranch));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:edit')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣鍒嗘敮", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneFlownodebranch ivrSceneFlownodebranch)
{
return toAjax(ivrSceneFlownodebranchService.updateIvrSceneFlownodebranch(ivrSceneFlownodebranch));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrflownodebranch:remove')")
@Log(title = "AI澶栧懠娴佺▼鑺傜偣鍒嗘敮", businessType = BusinessType.DELETE)
- @DeleteMapping("/{branchids}")
+ @GetMapping("/remove/{branchids}")
public AjaxResult remove(@PathVariable Long[] branchids)
{
return toAjax(ivrSceneFlownodebranchService.deleteIvrSceneFlownodebranchByBranchids(branchids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneGlobalconfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneGlobalconfigController.java
index fe1f67c..dc2cdf8 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
@@ -38,8 +38,8 @@
* 鏌ヨAI澶栧懠鍏ㄥ眬閰嶇疆鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrSceneGlobalconfig ivrSceneGlobalconfig)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrSceneGlobalconfig ivrSceneGlobalconfig)
{
startPage();
List<IvrSceneGlobalconfig> list = ivrSceneGlobalconfigService.selectIvrSceneGlobalconfigList(ivrSceneGlobalconfig);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:add')")
@Log(title = "AI澶栧懠鍏ㄥ眬閰嶇疆", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneGlobalconfig ivrSceneGlobalconfig)
{
return toAjax(ivrSceneGlobalconfigService.insertIvrSceneGlobalconfig(ivrSceneGlobalconfig));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:edit')")
@Log(title = "AI澶栧懠鍏ㄥ眬閰嶇疆", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneGlobalconfig ivrSceneGlobalconfig)
{
return toAjax(ivrSceneGlobalconfigService.updateIvrSceneGlobalconfig(ivrSceneGlobalconfig));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrglobalconfig:remove')")
@Log(title = "AI澶栧懠鍏ㄥ眬閰嶇疆", businessType = BusinessType.DELETE)
- @DeleteMapping("/{gblconfigids}")
+ @GetMapping("/remove/{gblconfigids}")
public AjaxResult remove(@PathVariable Long[] gblconfigids)
{
return toAjax(ivrSceneGlobalconfigService.deleteIvrSceneGlobalconfigByGblconfigids(gblconfigids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneIntentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneIntentController.java
index a1c9243..2a9957e 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
@@ -38,8 +38,8 @@
* 鏌ヨAI澶栧懠鎰忓浘鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrintent:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrSceneIntent ivrSceneIntent)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrSceneIntent ivrSceneIntent)
{
startPage();
List<IvrSceneIntent> list = ivrSceneIntentService.selectIvrSceneIntentList(ivrSceneIntent);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrintent:add')")
@Log(title = "AI澶栧懠鎰忓浘", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneIntent ivrSceneIntent)
{
return toAjax(ivrSceneIntentService.insertIvrSceneIntent(ivrSceneIntent));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrintent:edit')")
@Log(title = "AI澶栧懠鎰忓浘", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneIntent ivrSceneIntent)
{
return toAjax(ivrSceneIntentService.updateIvrSceneIntent(ivrSceneIntent));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrintent:remove')")
@Log(title = "AI澶栧懠鎰忓浘", businessType = BusinessType.DELETE)
- @DeleteMapping("/{sceneintentids}")
+ @GetMapping("/remove/{sceneintentids}")
public AjaxResult remove(@PathVariable Long[] sceneintentids)
{
return toAjax(ivrSceneIntentService.deleteIvrSceneIntentBySceneintentids(sceneintentids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneRecallController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneRecallController.java
index 79ea468..99c46d1 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
@@ -38,8 +38,8 @@
* 鏌ヨAI澶栧懠閲嶆嫧閰嶇疆鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrSceneRecall ivrSceneRecall)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrSceneRecall ivrSceneRecall)
{
startPage();
List<IvrSceneRecall> list = ivrSceneRecallService.selectIvrSceneRecallList(ivrSceneRecall);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:add')")
@Log(title = "AI澶栧懠閲嶆嫧閰嶇疆", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneRecall ivrSceneRecall)
{
return toAjax(ivrSceneRecallService.insertIvrSceneRecall(ivrSceneRecall));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:edit')")
@Log(title = "AI澶栧懠閲嶆嫧閰嶇疆", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneRecall ivrSceneRecall)
{
return toAjax(ivrSceneRecallService.updateIvrSceneRecall(ivrSceneRecall));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrrecall:remove')")
@Log(title = "AI澶栧懠閲嶆嫧閰嶇疆", businessType = BusinessType.DELETE)
- @DeleteMapping("/{recallids}")
+ @GetMapping("/remove/{recallids}")
public AjaxResult remove(@PathVariable Long[] recallids)
{
return toAjax(ivrSceneRecallService.deleteIvrSceneRecallByRecallids(recallids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptController.java
index 34a2f12..8628a64 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
@@ -38,8 +38,8 @@
* 鏌ヨAI澶栧懠璇濇湳鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscript:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrSceneScript ivrSceneScript)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrSceneScript ivrSceneScript)
{
startPage();
List<IvrSceneScript> list = ivrSceneScriptService.selectIvrSceneScriptList(ivrSceneScript);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscript:add')")
@Log(title = "AI澶栧懠璇濇湳", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneScript ivrSceneScript)
{
return toAjax(ivrSceneScriptService.insertIvrSceneScript(ivrSceneScript));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscript:edit')")
@Log(title = "AI澶栧懠璇濇湳", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneScript ivrSceneScript)
{
return toAjax(ivrSceneScriptService.updateIvrSceneScript(ivrSceneScript));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscript:remove')")
@Log(title = "AI澶栧懠璇濇湳", businessType = BusinessType.DELETE)
- @DeleteMapping("/{scenescrids}")
+ @GetMapping("/remove/{scenescrids}")
public AjaxResult remove(@PathVariable Long[] scenescrids)
{
return toAjax(ivrSceneScriptService.deleteIvrSceneScriptByScenescrids(scenescrids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptmodelController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrSceneScriptmodelController.java
index 8c4b668..82fac46 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
@@ -38,8 +38,8 @@
* 鏌ヨAI澶栧懠璇濇湳妯″潡鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrSceneScriptmodel ivrSceneScriptmodel)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrSceneScriptmodel ivrSceneScriptmodel)
{
startPage();
List<IvrSceneScriptmodel> list = ivrSceneScriptmodelService.selectIvrSceneScriptmodelList(ivrSceneScriptmodel);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:add')")
@Log(title = "AI澶栧懠璇濇湳妯″潡", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrSceneScriptmodel ivrSceneScriptmodel)
{
return toAjax(ivrSceneScriptmodelService.insertIvrSceneScriptmodel(ivrSceneScriptmodel));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:edit')")
@Log(title = "AI澶栧懠璇濇湳妯″潡", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrSceneScriptmodel ivrSceneScriptmodel)
{
return toAjax(ivrSceneScriptmodelService.updateIvrSceneScriptmodel(ivrSceneScriptmodel));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscriptmodel:remove')")
@Log(title = "AI澶栧懠璇濇湳妯″潡", businessType = BusinessType.DELETE)
- @DeleteMapping("/{scenemodids}")
+ @GetMapping("/remove/{scenemodids}")
public AjaxResult remove(@PathVariable Long[] scenemodids)
{
return toAjax(ivrSceneScriptmodelService.deleteIvrSceneScriptmodelByScenemodids(scenemodids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrScenecategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrScenecategoryController.java
index 529640b..8e0d532 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
@@ -1,7 +1,8 @@
-package com.smartor.controller;
+package com.ruoyi.web.controller.smartor;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +24,13 @@
/**
* AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被Controller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@RestController
@RequestMapping("/smartor/ivrscenecategory")
-public class IvrScenecategoryController extends BaseController
-{
+public class IvrScenecategoryController extends BaseController {
@Autowired
private IIvrScenecategoryService ivrScenecategoryService;
@@ -38,9 +38,8 @@
* 鏌ヨAI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrScenecategory ivrScenecategory)
- {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrScenecategory ivrScenecategory) {
startPage();
List<IvrScenecategory> list = ivrScenecategoryService.selectIvrScenecategoryList(ivrScenecategory);
return getDataTable(list);
@@ -52,8 +51,7 @@
@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:export')")
@Log(title = "AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, IvrScenecategory ivrScenecategory)
- {
+ public void export(HttpServletResponse response, IvrScenecategory ivrScenecategory) {
List<IvrScenecategory> list = ivrScenecategoryService.selectIvrScenecategoryList(ivrScenecategory);
ExcelUtil<IvrScenecategory> util = new ExcelUtil<IvrScenecategory>(IvrScenecategory.class);
util.exportExcel(response, list, "AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被鏁版嵁");
@@ -64,8 +62,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:query')")
@GetMapping(value = "/{scenecatid}")
- public AjaxResult getInfo(@PathVariable("scenecatid") Long scenecatid)
- {
+ public AjaxResult getInfo(@PathVariable("scenecatid") Long scenecatid) {
return success(ivrScenecategoryService.selectIvrScenecategoryByScenecatid(scenecatid));
}
@@ -74,9 +71,8 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:add')")
@Log(title = "AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody IvrScenecategory ivrScenecategory)
- {
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody IvrScenecategory ivrScenecategory) {
return toAjax(ivrScenecategoryService.insertIvrScenecategory(ivrScenecategory));
}
@@ -85,9 +81,8 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:edit')")
@Log(title = "AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody IvrScenecategory ivrScenecategory)
- {
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody IvrScenecategory ivrScenecategory) {
return toAjax(ivrScenecategoryService.updateIvrScenecategory(ivrScenecategory));
}
@@ -96,9 +91,8 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrscenecategory:remove')")
@Log(title = "AI鏈嶅姟鍦烘櫙绠＄悊鍒嗙被", businessType = BusinessType.DELETE)
- @DeleteMapping("/{scenecatids}")
- public AjaxResult remove(@PathVariable Long[] scenecatids)
- {
+ @GetMapping("/remove/{scenecatids}")
+ public AjaxResult remove(@PathVariable Long[] scenecatids) {
return toAjax(ivrScenecategoryService.deleteIvrScenecategoryByScenecatids(scenecatids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java
index 981417c..385bf69 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java
@@ -38,8 +38,8 @@
* 鏌ヨ璇煶浠诲姟鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtask:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrTask ivrTask)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrTask ivrTask)
{
startPage();
List<IvrTask> list = ivrTaskService.selectIvrTaskList(ivrTask);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtask:add')")
@Log(title = "璇煶浠诲姟", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrTask ivrTask)
{
return toAjax(ivrTaskService.insertIvrTask(ivrTask));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtask:edit')")
@Log(title = "璇煶浠诲姟", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTask ivrTask)
{
return toAjax(ivrTaskService.updateIvrTask(ivrTask));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtask:remove')")
@Log(title = "璇煶浠诲姟", businessType = BusinessType.DELETE)
- @DeleteMapping("/{taskids}")
+ @GetMapping("/remove/{taskids}")
public AjaxResult remove(@PathVariable Long[] taskids)
{
return toAjax(ivrTaskService.deleteIvrTaskByTaskids(taskids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallController.java
index ba823e2..13325e6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallController.java
@@ -38,8 +38,8 @@
* 鏌ヨ璇煶浠诲姟鍛煎彨鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcall:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrTaskcall ivrTaskcall)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrTaskcall ivrTaskcall)
{
startPage();
List<IvrTaskcall> list = ivrTaskcallService.selectIvrTaskcallList(ivrTaskcall);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcall:add')")
@Log(title = "璇煶浠诲姟鍛煎彨", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrTaskcall ivrTaskcall)
{
return toAjax(ivrTaskcallService.insertIvrTaskcall(ivrTaskcall));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcall:edit')")
@Log(title = "璇煶浠诲姟鍛煎彨", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTaskcall ivrTaskcall)
{
return toAjax(ivrTaskcallService.updateIvrTaskcall(ivrTaskcall));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcall:remove')")
@Log(title = "璇煶浠诲姟鍛煎彨", businessType = BusinessType.DELETE)
- @DeleteMapping("/{callids}")
+ @GetMapping("/remove/{callids}")
public AjaxResult remove(@PathVariable Long[] callids)
{
return toAjax(ivrTaskcallService.deleteIvrTaskcallByCallids(callids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcalldetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcalldetailController.java
index 229039c..caf07de 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcalldetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcalldetailController.java
@@ -38,8 +38,8 @@
* 鏌ヨ璇煶浠诲姟鍛煎彨鏄庣粏鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcalldetail:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrTaskcalldetail ivrTaskcalldetail)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrTaskcalldetail ivrTaskcalldetail)
{
startPage();
List<IvrTaskcalldetail> list = ivrTaskcalldetailService.selectIvrTaskcalldetailList(ivrTaskcalldetail);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcalldetail:add')")
@Log(title = "璇煶浠诲姟鍛煎彨鏄庣粏", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrTaskcalldetail ivrTaskcalldetail)
{
return toAjax(ivrTaskcalldetailService.insertIvrTaskcalldetail(ivrTaskcalldetail));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcalldetail:edit')")
@Log(title = "璇煶浠诲姟鍛煎彨鏄庣粏", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTaskcalldetail ivrTaskcalldetail)
{
return toAjax(ivrTaskcalldetailService.updateIvrTaskcalldetail(ivrTaskcalldetail));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcalldetail:remove')")
@Log(title = "璇煶浠诲姟鍛煎彨鏄庣粏", businessType = BusinessType.DELETE)
- @DeleteMapping("/{calldetailids}")
+ @GetMapping("/remove/{calldetailids}")
public AjaxResult remove(@PathVariable String[] calldetailids)
{
return toAjax(ivrTaskcalldetailService.deleteIvrTaskcalldetailByCalldetailids(calldetailids));
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 73bf56f..bec7787 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
@@ -38,8 +38,8 @@
* 鏌ヨ璇煶浠诲姟鍛煎彨璁板綍鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrTaskcallrecord ivrTaskcallrecord)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrTaskcallrecord ivrTaskcallrecord)
{
startPage();
List<IvrTaskcallrecord> list = ivrTaskcallrecordService.selectIvrTaskcallrecordList(ivrTaskcallrecord);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:add')")
@Log(title = "璇煶浠诲姟鍛煎彨璁板綍", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrTaskcallrecord ivrTaskcallrecord)
{
return toAjax(ivrTaskcallrecordService.insertIvrTaskcallrecord(ivrTaskcallrecord));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:edit')")
@Log(title = "璇煶浠诲姟鍛煎彨璁板綍", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTaskcallrecord ivrTaskcallrecord)
{
return toAjax(ivrTaskcallrecordService.updateIvrTaskcallrecord(ivrTaskcallrecord));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtaskcallrecord:remove')")
@Log(title = "璇煶浠诲姟鍛煎彨璁板綍", businessType = BusinessType.DELETE)
- @DeleteMapping("/{uuids}")
+ @GetMapping("/remove/{uuids}")
public AjaxResult remove(@PathVariable String[] uuids)
{
return toAjax(ivrTaskcallrecordService.deleteIvrTaskcallrecordByUuids(uuids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTasksmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTasksmsController.java
index 29f8f05..7b96026 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
@@ -38,8 +38,8 @@
* 鏌ヨ璇煶浠诲姟鐭俊鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:list')")
- @GetMapping("/list")
- public TableDataInfo list(IvrTasksms ivrTasksms)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody IvrTasksms ivrTasksms)
{
startPage();
List<IvrTasksms> list = ivrTasksmsService.selectIvrTasksmsList(ivrTasksms);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:add')")
@Log(title = "璇煶浠诲姟鐭俊", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody IvrTasksms ivrTasksms)
{
return toAjax(ivrTasksmsService.insertIvrTasksms(ivrTasksms));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:edit')")
@Log(title = "璇煶浠诲姟鐭俊", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTasksms ivrTasksms)
{
return toAjax(ivrTasksmsService.updateIvrTasksms(ivrTasksms));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:ivrtasksms:remove')")
@Log(title = "璇煶浠诲姟鐭俊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(ivrTasksmsService.deleteIvrTasksmsByIds(ids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java
new file mode 100644
index 0000000..2eb6c2b
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java
@@ -0,0 +1,102 @@
+package com.ruoyi.web.controller.smartor;
+
+import cn.hutool.db.Page;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.MedicalHistory;
+import com.smartor.service.IMedicalHistoryService;
+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.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鐥呭彶Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Api(description = "鐥呭彶")
+@RestController
+@RequestMapping("/medicalhistory")
+public class MedicalHistoryController extends BaseController {
+ @Autowired
+ private IMedicalHistoryService medicalHistoryService;
+
+ /**
+ * 鏌ヨ鐥呭彶鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:history:list')")
+ @PostMapping("/selectMedicalHistoryList")
+ @ApiOperation("鏌ヨ鐥呭彶鍒楄〃")
+ public TableDataInfo selectMedicalHistorylist(@RequestBody MedicalHistory medicalHistory) {
+ PageUtils.startPageByPost(medicalHistory.getPageNum(),medicalHistory.getPageSize());
+ List<MedicalHistory> list = medicalHistoryService.selectMedicalHistoryList(medicalHistory);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鐥呭彶鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:history:export')")
+ @Log(title = "鐥呭彶", businessType = BusinessType.EXPORT)
+ @ApiOperation("瀵煎嚭鐥呭彶鍒楄〃")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, MedicalHistory medicalHistory) {
+ List<MedicalHistory> list = medicalHistoryService.selectMedicalHistoryList(medicalHistory);
+ ExcelUtil<MedicalHistory> util = new ExcelUtil<MedicalHistory>(MedicalHistory.class);
+ util.exportExcel(response, list, "鐥呭彶鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鐥呭彶璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:history:query')")
+ @ApiOperation("鑾峰彇鐥呭彶璇︾粏淇℃伅")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id,@PathVariable("pid") Long pid) {
+ return success(medicalHistoryService.selectMedicalHistoryById(id));
+ }
+
+ /**
+ * 鏂板鐥呭彶
+ */
+ @PreAuthorize("@ss.hasPermi('system:history:add')")
+ @Log(title = "鐥呭彶", businessType = BusinessType.INSERT)
+ @ApiOperation("鏂板鐥呭彶")
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody MedicalHistory medicalHistory) {
+ return toAjax(medicalHistoryService.insertMedicalHistory(medicalHistory));
+ }
+
+ /**
+ * 淇敼鐥呭彶
+ */
+ @PreAuthorize("@ss.hasPermi('system:history:edit')")
+ @Log(title = "鐥呭彶", businessType = BusinessType.UPDATE)
+ @ApiOperation("淇敼鐥呭彶")
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody MedicalHistory medicalHistory) {
+ return toAjax(medicalHistoryService.updateMedicalHistory(medicalHistory));
+ }
+
+ /**
+ * 鍒犻櫎鐥呭彶
+ */
+ @PreAuthorize("@ss.hasPermi('system:history:remove')")
+ @Log(title = "鐥呭彶", businessType = BusinessType.DELETE)
+ @ApiOperation("鍒犻櫎鐥呭彶")
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(medicalHistoryService.deleteMedicalHistoryByIds(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 4c902d2..6d47030 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
@@ -37,8 +37,8 @@
* 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:file:list')")
- @GetMapping("/list")
- public TableDataInfo list(MinioFile minioFile) {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody MinioFile minioFile) {
startPage();
List<MinioFile> list = minioFileService.selectMinioFileList(minioFile);
return getDataTable(list);
@@ -70,7 +70,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:file:add')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody MinioFile minioFile) {
return toAjax(minioFileService.insertMinioFile(minioFile));
}
@@ -80,7 +80,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:file:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody MinioFile minioFile) {
return toAjax(minioFileService.updateMinioFile(minioFile));
}
@@ -90,7 +90,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:file:remove')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(minioFileService.deleteMinioFileByIds(ids));
}
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 914d3da..6f6c85b 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
@@ -7,11 +7,9 @@
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.poi.ExcelUtil;
-import com.smartor.domain.PatArchive;
-import com.smartor.domain.PatArchiveReq;
-import com.smartor.domain.PatImportInfoVO;
-import com.smartor.domain.PatUpInfoVO;
+import com.smartor.domain.*;
import com.smartor.service.IPatArchiveService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -25,6 +23,8 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
/**
* 鎮ｈ�呮。妗圕ontroller
@@ -44,8 +44,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呮。妗堝垪琛�")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
- @GetMapping("/list")
- public TableDataInfo list(PatArchive patArchive) {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody PatArchive patArchive) {
startPage();
List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
return getDataTable(list);
@@ -69,7 +69,7 @@
*/
@ApiOperation("鑾峰彇鎮ｈ�呮。妗堣缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:query')")
- @GetMapping(value = "/{patid}")
+ @GetMapping(value = "/getInfo/{patid}")
@ApiImplicitParam(name = "patid", value = "鎮ｈ�卛d")
public AjaxResult getInfo(@PathVariable(name = "patid") Long patid) {
return success(patArchiveService.selectPatArchiveByPatid(patid));
@@ -81,7 +81,7 @@
@ApiOperation("鏂板鎮ｈ�呮。妗�")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
@Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody PatArchive patArchive) {
return toAjax(patArchiveService.insertPatArchive(patArchive));
}
@@ -92,7 +92,7 @@
@ApiOperation("淇敼鎮ｈ�呮。妗�")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
@Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody PatArchive patArchive) {
return toAjax(patArchiveService.updatePatArchive(patArchive));
}
@@ -103,7 +103,7 @@
@ApiOperation("鍒犻櫎鎮ｈ�呮。妗�")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:remove')")
@Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{patids}")
+ @GetMapping("/remove/{patids}")
@ApiImplicitParam(name = "patids", value = "鎮ｈ�卛d闆嗗悎", dataType = "long", dataTypeClass = Long.class)
public AjaxResult remove(@PathVariable Long[] patids) {
return toAjax(patArchiveService.deletePatArchiveByPatids(patids));
@@ -119,6 +119,7 @@
@PostMapping("/importFilehandle")
@ApiImplicitParams({@ApiImplicitParam(name = "tags", value = "鏍囩"), @ApiImplicitParam(name = "multipartFile", value = "涓婁紶鏂囦欢")})
public AjaxResult importFilehandle(@RequestParam("tags") String tags, @RequestParam("multipartFile") MultipartFile multipartFile) {
+ Executor executor = Executors.newFixedThreadPool(3);
//鑾峰彇褰撳墠鐧婚檰浜�
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
@@ -134,7 +135,8 @@
@ApiOperation("鎮ｈ�呬俊鎭鍏ユā鏉�")
@PostMapping("/patImportTemplate")
public void patImportTemplate(HttpServletResponse response) {
- ExcelUtil<PatImportInfoVO> util = new ExcelUtil<PatImportInfoVO>(PatImportInfoVO.class);
+// ExcelUtil<PatImportInfoVO> util = new ExcelUtil<PatImportInfoVO>(PatImportInfoVO.class);
+ ExcelUtil<PatArchive> util = new ExcelUtil<PatArchive>(PatArchive.class);
util.importTemplateExcel(response, "鎮ｈ�呬俊鎭鍏�");
}
@@ -157,7 +159,7 @@
@ApiOperation("鏌ヨ鎮ｈ�呭垪琛�")
@PostMapping("/patInfoByContion")
public TableDataInfo patInfoByCondition(@RequestBody PatArchiveReq patArchive) {
- startPage();
+ PageUtils.startPageByPost(patArchive.getPageNum(),patArchive.getPageSize());
return getDataTable(patArchiveService.patInfoByContion(patArchive));
}
@@ -190,4 +192,15 @@
util.exportExcel(response, patArchives, "鎮ｈ�呮。妗堟暟鎹�");
}
+ /**
+ * 鑾峰彇鐢ㄦ埛璇婄枟淇℃伅锛堝尰鐤楁。妗堬級
+ *
+ * @return
+ */
+ @ApiOperation("鑾峰彇鐢ㄦ埛璇婄枟淇℃伅锛堝尰鐤楁。妗�")
+ @PostMapping("/getUserTreatmentInfo")
+ public AjaxResult getUserTreatmentInfo(@RequestParam("pid") String pid,@RequestParam("type") String type) {
+ return null;
+ }
+
}
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
new file mode 100644
index 0000000..2411735
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivecontactController.java
@@ -0,0 +1,100 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.PatArchivecontact;
+import com.smartor.service.IPatArchivecontactService;
+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.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鎮ｈ�呰仈绯绘柟寮廋ontroller
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Api(description = "鎮ｈ�呰仈绯绘柟寮�")
+@RestController
+@RequestMapping("/archivecontact")
+public class PatArchivecontactController extends BaseController {
+ @Autowired
+ private IPatArchivecontactService patArchivecontactService;
+
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�
+ */
+ @ApiOperation("鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�")
+ @PreAuthorize("@ss.hasPermi('system:archivecontact:list')")
+ @PostMapping("/selectPatArchivecontactList")
+ public TableDataInfo selectPatArchivecontactlist(@RequestBody PatArchivecontact patArchivecontact) {
+ PageUtils.startPageByPost(patArchivecontact.getPageNum(), patArchivecontact.getPageSize());
+ List<PatArchivecontact> list = patArchivecontactService.selectPatArchivecontactList(patArchivecontact);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鎮ｈ�呰仈绯绘柟寮忓垪琛�
+ */
+ @ApiOperation("瀵煎嚭鎮ｈ�呰仈绯绘柟寮忓垪琛�")
+ @PreAuthorize("@ss.hasPermi('system:archivecontact:export')")
+ @Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, PatArchivecontact patArchivecontact) {
+ List<PatArchivecontact> list = patArchivecontactService.selectPatArchivecontactList(patArchivecontact);
+ ExcelUtil<PatArchivecontact> util = new ExcelUtil<PatArchivecontact>(PatArchivecontact.class);
+ util.exportExcel(response, list, "鎮ｈ�呰仈绯绘柟寮忔暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇鎮ｈ�呰仈绯绘柟寮忚缁嗕俊鎭�
+ */
+ @ApiOperation("鑾峰彇鎮ｈ�呰仈绯绘柟寮忚缁嗕俊鎭�")
+ @PreAuthorize("@ss.hasPermi('system:archivecontact:query')")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(patArchivecontactService.selectPatArchivecontactById(id));
+ }
+
+ /**
+ * 鏂板鎮ｈ�呰仈绯绘柟寮�
+ */
+ @ApiOperation("鏂板鎮ｈ�呰仈绯绘柟寮�")
+ @PreAuthorize("@ss.hasPermi('system:archivecontact:add')")
+ @Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody PatArchivecontact patArchivecontact) {
+ return toAjax(patArchivecontactService.insertPatArchivecontact(patArchivecontact));
+ }
+
+ /**
+ * 淇敼鎮ｈ�呰仈绯绘柟寮�
+ */
+ @ApiOperation("淇敼鎮ｈ�呰仈绯绘柟寮�")
+ @PreAuthorize("@ss.hasPermi('system:archivecontact:edit')")
+ @Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody PatArchivecontact patArchivecontact) {
+ return toAjax(patArchivecontactService.updatePatArchivecontact(patArchivecontact));
+ }
+
+ /**
+ * 鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
+ */
+ @ApiOperation("鍒犻櫎鎮ｈ�呰仈绯绘柟寮�")
+ @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 8d113a5..1250253 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
@@ -6,6 +6,7 @@
import com.smartor.domain.PatArchivetag;
import com.smartor.service.IPatArchivetagService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -31,7 +32,7 @@
*/
@Api(description = "鎮ｈ�呮。妗堟爣绛�")
@RestController
-@RequestMapping("/system/archivetag")
+@RequestMapping("/archivetag")
public class PatArchivetagController extends BaseController {
@Autowired
private IPatArchivetagService patArchivetagService;
@@ -40,8 +41,9 @@
* 鏌ヨ鎮ｈ�呮。妗堟爣绛惧垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:archivetag:list')")
- @GetMapping("/list")
- public TableDataInfo list(PatArchivetag patArchivetag) {
+ @PostMapping("/list")
+ @ApiOperation("鏌ヨ鎮ｈ�呮。妗堟爣绛惧垪琛�")
+ public TableDataInfo list(@RequestBody PatArchivetag patArchivetag) {
startPage();
List<PatArchivetag> list = patArchivetagService.selectPatArchivetagList(patArchivetag);
return getDataTable(list);
@@ -51,8 +53,8 @@
* 瀵煎嚭鎮ｈ�呮。妗堟爣绛惧垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:archivetag:export')")
- @Log(title = "鎮ｈ�呮。妗堟爣绛�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
+ @ApiOperation("瀵煎嚭鎮ｈ�呮。妗堟爣绛惧垪琛�")
public void export(HttpServletResponse response, PatArchivetag patArchivetag) {
List<PatArchivetag> list = patArchivetagService.selectPatArchivetagList(patArchivetag);
ExcelUtil<PatArchivetag> util = new ExcelUtil<PatArchivetag>(PatArchivetag.class);
@@ -62,6 +64,7 @@
/**
* 鑾峰彇鎮ｈ�呮。妗堟爣绛捐缁嗕俊鎭�
*/
+ @ApiOperation("鑾峰彇鎮ｈ�呮。妗堟爣绛捐缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('system:archivetag:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -72,8 +75,8 @@
* 鏂板鎮ｈ�呮。妗堟爣绛�
*/
@PreAuthorize("@ss.hasPermi('system:archivetag:add')")
- @Log(title = "鎮ｈ�呮。妗堟爣绛�", businessType = BusinessType.INSERT)
- @PostMapping
+ @ApiOperation("鏂板鎮ｈ�呮。妗堟爣绛�")
+ @PostMapping("/add")
public AjaxResult add(@RequestBody PatArchivetag patArchivetag) {
return toAjax(patArchivetagService.insertPatArchivetag(patArchivetag));
}
@@ -82,8 +85,8 @@
* 淇敼鎮ｈ�呮。妗堟爣绛�
*/
@PreAuthorize("@ss.hasPermi('system:archivetag:edit')")
- @Log(title = "鎮ｈ�呮。妗堟爣绛�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @ApiOperation("淇敼鎮ｈ�呮。妗堟爣绛�")
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody PatArchivetag patArchivetag) {
return toAjax(patArchivetagService.updatePatArchivetag(patArchivetag));
}
@@ -92,8 +95,8 @@
* 鍒犻櫎鎮ｈ�呮。妗堟爣绛�
*/
@PreAuthorize("@ss.hasPermi('system:archivetag:remove')")
- @Log(title = "鎮ｈ�呮。妗堟爣绛�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @ApiOperation("鍒犻櫎鎮ｈ�呮。妗堟爣绛�")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patArchivetagService.deletePatArchivetagByIds(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 2d0f9b9..495f15f 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
@@ -36,9 +36,9 @@
* 鏌ヨ鎮ｈ�呰绯栬褰曞垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:bloodsugar:list')")
- @GetMapping("/list")
+ @PostMapping("/list")
@ApiOperation("鏌ヨ鎮ｈ�呰绯栬褰曞垪琛�")
- public TableDataInfo list(PatMedBloodsugar patMedBloodsugar) {
+ public TableDataInfo list(@RequestBody PatMedBloodsugar patMedBloodsugar) {
startPage();
List<PatMedBloodsugar> list = patMedBloodsugarService.selectPatMedBloodsugarList(patMedBloodsugar);
return getDataTable(list);
@@ -73,7 +73,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:bloodsugar:add')")
@Log(title = "鏂板鎮ｈ�呰绯栬褰�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@ApiOperation("鏂板鎮ｈ�呰绯栬褰�")
public AjaxResult add(@RequestBody PatMedBloodsugar patMedBloodsugar) {
return toAjax(patMedBloodsugarService.insertPatMedBloodsugar(patMedBloodsugar));
@@ -84,7 +84,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:bloodsugar:edit')")
@Log(title = "鎮ｈ�呰绯栬褰�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
@ApiOperation("淇敼鎮ｈ�呰绯栬褰�")
public AjaxResult edit(@RequestBody PatMedBloodsugar patMedBloodsugar) {
return toAjax(patMedBloodsugarService.updatePatMedBloodsugar(patMedBloodsugar));
@@ -96,7 +96,7 @@
@ApiOperation("鍒犻櫎鎮ｈ�呰绯栬褰�")
@PreAuthorize("@ss.hasPermi('system:bloodsugar:remove')")
@Log(title = "鎮ｈ�呰绯栬褰�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{bloodsugarids}")
+ @GetMapping("/remove/{bloodsugarids}")
@ApiImplicitParam(name = "bloodsugarids", value = "涓婚敭ID闆嗗悎", dataType = "long", dataTypeClass = Array.class)
public AjaxResult remove(@PathVariable Long[] bloodsugarids) {
return toAjax(patMedBloodsugarService.deletePatMedBloodsugarByBloodsugarids(bloodsugarids));
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 56cc1bd..b57a610 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
@@ -36,8 +36,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呯敤鑽褰曞垪琛�")
@PreAuthorize("@ss.hasPermi('system:drug:list')")
- @GetMapping("/list")
- public TableDataInfo list(PatMedDrug patMedDrug)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody PatMedDrug patMedDrug)
{
startPage();
List<PatMedDrug> list = patMedDrugService.selectPatMedDrugList(patMedDrug);
@@ -75,7 +75,7 @@
@ApiOperation("鏂板鎮ｈ�呯敤鑽褰�")
@PreAuthorize("@ss.hasPermi('system:drug:add')")
@Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody PatMedDrug patMedDrug)
{
return toAjax(patMedDrugService.insertPatMedDrug(patMedDrug));
@@ -87,7 +87,7 @@
@ApiOperation("淇敼鎮ｈ�呯敤鑽褰�")
@PreAuthorize("@ss.hasPermi('system:drug:edit')")
@Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedDrug patMedDrug)
{
return toAjax(patMedDrugService.updatePatMedDrug(patMedDrug));
@@ -99,7 +99,7 @@
@ApiOperation("鍒犻櫎鎮ｈ�呯敤鑽褰�")
@PreAuthorize("@ss.hasPermi('system:drug:remove')")
@Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(patMedDrugService.deletePatMedDrugByIds(ids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java
index 2696fbb..10d88b3 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
@@ -36,9 +36,9 @@
* 鏌ヨ鎮ｈ�呴珮琛�鍘嬭褰曞垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:hypertension:list')")
- @GetMapping("/list")
+ @PostMapping("/list")
@ApiOperation("鏌ヨ鎮ｈ�呴珮琛�鍘嬭褰曞垪琛�")
- public TableDataInfo list(PatMedHypertension patMedHypertension) {
+ public TableDataInfo list(@RequestBody PatMedHypertension patMedHypertension) {
startPage();
List<PatMedHypertension> list = patMedHypertensionService.selectPatMedHypertensionList(patMedHypertension);
return getDataTable(list);
@@ -74,7 +74,7 @@
@ApiOperation("鎮ｈ�呴珮琛�鍘嬭褰�")
@PreAuthorize("@ss.hasPermi('system:hypertension:add')")
@Log(title = "鎮ｈ�呴珮琛�鍘嬭褰�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody PatMedHypertension patMedHypertension) {
return toAjax(patMedHypertensionService.insertPatMedHypertension(patMedHypertension));
}
@@ -85,7 +85,7 @@
@ApiOperation("鎮ｈ�呴珮琛�鍘嬭褰�")
@PreAuthorize("@ss.hasPermi('system:hypertension:edit')")
@Log(title = "鎮ｈ�呴珮琛�鍘嬭褰�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedHypertension patMedHypertension) {
return toAjax(patMedHypertensionService.updatePatMedHypertension(patMedHypertension));
}
@@ -97,7 +97,7 @@
@PreAuthorize("@ss.hasPermi('system:hypertension:remove')")
@Log(title = "鎮ｈ�呴珮琛�鍘嬭褰�", businessType = BusinessType.DELETE)
@ApiImplicitParam(name = "remove", value = "涓婚敭ID", dataType = "long", dataTypeClass = Array.class)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patMedHypertensionService.deletePatMedHypertensionByIds(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 3fbecd7..719e1f4 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
@@ -43,8 +43,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呬綇闄㈣褰曞垪琛�")
@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')")
- @GetMapping("/list")
- public TableDataInfo list(PatMedInhosp patMedInhosp)
+ @PostMapping("/selectPatMedInhospList")
+ public TableDataInfo selectPatMedInhosplist(@RequestBody PatMedInhosp patMedInhosp)
{
startPage();
List<PatMedInhosp> list = patMedInhospService.selectPatMedInhospList(patMedInhosp);
@@ -82,7 +82,7 @@
@ApiOperation("鏂板鎮ｈ�呬綇闄㈣褰�")
@PreAuthorize("@ss.hasPermi('smartor:patinhosp:add')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody PatMedInhosp patMedInhosp)
{
return toAjax(patMedInhospService.insertPatMedInhosp(patMedInhosp));
@@ -94,7 +94,7 @@
@ApiOperation("淇敼鎮ｈ�呬綇闄㈣褰�")
@PreAuthorize("@ss.hasPermi('smartor:patinhosp:edit')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedInhosp patMedInhosp)
{
return toAjax(patMedInhospService.updatePatMedInhosp(patMedInhosp));
@@ -106,7 +106,7 @@
@ApiOperation("鍒犻櫎鎮ｈ�呬綇闄㈣褰�")
@PreAuthorize("@ss.hasPermi('smartor:patinhosp:remove')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{inhospids}")
+ @GetMapping("/remove/{inhospids}")
public AjaxResult remove(@PathVariable Long[] inhospids)
{
return toAjax(patMedInhospService.deletePatMedInhospByInhospids(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 a8cf7de..bde8d6d 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
@@ -25,7 +25,7 @@
*/
@Api(description = "鎮ｈ�呮鏌ユ楠岃褰�")
@RestController
-@RequestMapping("/system/inspection")
+@RequestMapping("/smartor/inspection")
public class PatMedInspectionController extends BaseController {
@Autowired
private IPatMedInspectionService patMedInspectionService;
@@ -35,8 +35,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞垪琛�")
@PreAuthorize("@ss.hasPermi('system:inspection:list')")
- @GetMapping("/list")
- public TableDataInfo list(PatMedInspection patMedInspection) {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody PatMedInspection patMedInspection) {
startPage();
List<PatMedInspection> list = patMedInspectionService.selectPatMedInspectionList(patMedInspection);
return getDataTable(list);
@@ -71,7 +71,7 @@
@PreAuthorize("@ss.hasPermi('system:inspection:add')")
@Log(title = "鏂板鎮ｈ�呮鏌ユ楠岃褰�", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鎮ｈ�呮鏌ユ楠岃褰�")
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody PatMedInspection patMedInspection) {
return toAjax(patMedInspectionService.insertPatMedInspection(patMedInspection));
}
@@ -82,7 +82,7 @@
@PreAuthorize("@ss.hasPermi('system:inspection:edit')")
@Log(title = "淇敼鎮ｈ�呮鏌ユ楠岃褰�", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼鎮ｈ�呮鏌ユ楠岃褰�")
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedInspection patMedInspection) {
return toAjax(patMedInspectionService.updatePatMedInspection(patMedInspection));
}
@@ -93,7 +93,7 @@
@PreAuthorize("@ss.hasPermi('system:inspection:remove')")
@Log(title = "鎮ｈ�呮鏌ユ楠岃褰�", businessType = BusinessType.DELETE)
@ApiOperation("鎮ｈ�呮鏌ユ楠岃褰�")
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patMedInspectionService.deletePatMedInspectionByIds(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 d7502dd..c233309 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
@@ -43,9 +43,9 @@
* 鏌ヨ鎮ｈ�呴棬璇婅褰曞垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:patouthosp:list')")
- @GetMapping("/list")
+ @PostMapping("/selectPatMedOuthospList")
@ApiOperation("鏌ヨ鎮ｈ�呴棬璇婅褰曞垪琛�")
- public TableDataInfo list(PatMedOuthosp patMedOuthosp) {
+ public TableDataInfo selectPatMedOuthosplist(@RequestBody PatMedOuthosp patMedOuthosp) {
startPage();
List<PatMedOuthosp> list = patMedOuthospService.selectPatMedOuthospList(patMedOuthosp);
return getDataTable(list);
@@ -81,7 +81,7 @@
@ApiOperation("鏂板鎮ｈ�呴棬璇婅褰�")
@PreAuthorize("@ss.hasPermi('smartor:patouthosp:add')")
@Log(title = "鎮ｈ�呴棬璇婅褰�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody PatMedOuthosp patMedOuthosp) {
return toAjax(patMedOuthospService.insertPatMedOuthosp(patMedOuthosp));
}
@@ -92,7 +92,7 @@
@ApiOperation("淇敼鎮ｈ�呴棬璇婅褰�")
@PreAuthorize("@ss.hasPermi('smartor:patouthosp:edit')")
@Log(title = "鎮ｈ�呴棬璇婅褰�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedOuthosp patMedOuthosp) {
return toAjax(patMedOuthospService.updatePatMedOuthosp(patMedOuthosp));
}
@@ -104,7 +104,7 @@
@PreAuthorize("@ss.hasPermi('smartor:patouthosp:remove')")
@ApiImplicitParam(name = "remove", value = "涓婚敭ID", dataType = "long", dataTypeClass = Array.class)
@Log(title = "鎮ｈ�呴棬璇婅褰�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patMedOuthospService.deletePatMedOuthospByIds(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 f4bc5de..65fdc81 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
@@ -43,8 +43,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呬綋妫�璁板綍鍒楄〃")
@PreAuthorize("@ss.hasPermi('smartor:patphysical:list')")
- @GetMapping("/list")
- public TableDataInfo list(PatMedPhysical patMedPhysical)
+ @PostMapping("/selectPatMedPhysicalList")
+ public TableDataInfo selectPatMedPhysicallist(@RequestBody PatMedPhysical patMedPhysical)
{
startPage();
List<PatMedPhysical> list = patMedPhysicalService.selectPatMedPhysicalList(patMedPhysical);
@@ -82,7 +82,7 @@
@ApiOperation("鏂板鎮ｈ�呬綋妫�璁板綍")
@PreAuthorize("@ss.hasPermi('smartor:patphysical:add')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody PatMedPhysical patMedPhysical)
{
return toAjax(patMedPhysicalService.insertPatMedPhysical(patMedPhysical));
@@ -94,7 +94,7 @@
@ApiOperation("淇敼鎮ｈ�呬綋妫�璁板綍")
@PreAuthorize("@ss.hasPermi('smartor:patphysical:edit')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedPhysical patMedPhysical)
{
return toAjax(patMedPhysicalService.updatePatMedPhysical(patMedPhysical));
@@ -106,7 +106,7 @@
@ApiOperation("鍒犻櫎鎮ｈ�呬綋妫�璁板綍")
@PreAuthorize("@ss.hasPermi('smartor:patphysical:remove')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(patMedPhysicalService.deletePatMedPhysicalByIds(ids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java
index f49d9cf..4b32eed 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
@@ -38,8 +38,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呬綋閲嶈褰曞垪琛�")
@PreAuthorize("@ss.hasPermi('system:weight:list')")
- @GetMapping("/list")
- public TableDataInfo list(PatMedWeight patMedWeight)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody PatMedWeight patMedWeight)
{
startPage();
List<PatMedWeight> list = patMedWeightService.selectPatMedWeightList(patMedWeight);
@@ -78,7 +78,7 @@
@ApiOperation("鏂板鎮ｈ�呬綋閲嶈褰�")
@PreAuthorize("@ss.hasPermi('system:weight:add')")
@Log(title = "鎮ｈ�呬綋閲嶈褰�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody PatMedWeight patMedWeight)
{
return toAjax(patMedWeightService.insertPatMedWeight(patMedWeight));
@@ -90,7 +90,7 @@
@ApiOperation("淇敼鎮ｈ�呬綋閲嶈褰�")
@PreAuthorize("@ss.hasPermi('system:weight:edit')")
@Log(title = "淇敼鎮ｈ�呬綋閲嶈褰�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedWeight patMedWeight)
{
return toAjax(patMedWeightService.updatePatMedWeight(patMedWeight));
@@ -103,7 +103,7 @@
@PreAuthorize("@ss.hasPermi('system:weight:remove')")
@Log(title = "鍒犻櫎鎮ｈ�呬綋閲嶈褰�", businessType = BusinessType.DELETE)
@ApiImplicitParam(name = "remove", value = "涓婚敭ID", dataType = "long", dataTypeClass = Array.class)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(patMedWeightService.deletePatMedWeightByIds(ids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java
index 52b771c..c7c22ae 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
@@ -38,8 +38,8 @@
* 鏌ヨ鏂规缁撴瑙勫垯鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:list')")
- @GetMapping("/list")
- public TableDataInfo list(SchemeAutofinshrule schemeAutofinshrule) {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SchemeAutofinshrule schemeAutofinshrule) {
startPage();
List<SchemeAutofinshrule> list = schemeAutofinshruleService.selectSchemeAutofinshruleList(schemeAutofinshrule);
return getDataTable(list);
@@ -71,7 +71,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:add')")
@Log(title = "鏂规缁撴瑙勫垯", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SchemeAutofinshrule schemeAutofinshrule) {
return toAjax(schemeAutofinshruleService.insertSchemeAutofinshrule(schemeAutofinshrule));
}
@@ -81,7 +81,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:edit')")
@Log(title = "鏂规缁撴瑙勫垯", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeAutofinshrule schemeAutofinshrule) {
return toAjax(schemeAutofinshruleService.updateSchemeAutofinshrule(schemeAutofinshrule));
}
@@ -91,7 +91,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemeautofinshrule:remove')")
@Log(title = "鏂规缁撴瑙勫垯", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(schemeAutofinshruleService.deleteSchemeAutofinshruleByIds(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 9bee334..b2fef49 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
@@ -38,8 +38,8 @@
* 鏌ヨ鏂规鍒嗙被鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:schemecategory:list')")
- @GetMapping("/list")
- public TableDataInfo list(SchemeCategory schemeCategory)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SchemeCategory schemeCategory)
{
startPage();
List<SchemeCategory> list = schemeCategoryService.selectSchemeCategoryList(schemeCategory);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemecategory:add')")
@Log(title = "鏂规鍒嗙被", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SchemeCategory schemeCategory)
{
return toAjax(schemeCategoryService.insertSchemeCategory(schemeCategory));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemecategory:edit')")
@Log(title = "鏂规鍒嗙被", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeCategory schemeCategory)
{
return toAjax(schemeCategoryService.updateSchemeCategory(schemeCategory));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemecategory:remove')")
@Log(title = "鏂规鍒嗙被", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schemeCategoryService.deleteSchemeCategoryByIds(ids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeLocallibraryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeLocallibraryController.java
index bad0436..5701426 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
@@ -38,8 +38,8 @@
* 鏌ヨ鏈嶅姟鏂规搴撳垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:schemelibrary:list')")
- @GetMapping("/list")
- public TableDataInfo list(SchemeLocallibrary schemeLocallibrary)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SchemeLocallibrary schemeLocallibrary)
{
startPage();
List<SchemeLocallibrary> list = schemeLocallibraryService.selectSchemeLocallibraryList(schemeLocallibrary);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemelibrary:add')")
@Log(title = "鏈嶅姟鏂规搴�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SchemeLocallibrary schemeLocallibrary)
{
return toAjax(schemeLocallibraryService.insertSchemeLocallibrary(schemeLocallibrary));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemelibrary:edit')")
@Log(title = "鏈嶅姟鏂规搴�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeLocallibrary schemeLocallibrary)
{
return toAjax(schemeLocallibraryService.updateSchemeLocallibrary(schemeLocallibrary));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemelibrary:remove')")
@Log(title = "鏈嶅姟鏂规搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schemeLocallibraryService.deleteSchemeLocallibraryByIds(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 55c607d..dc84c27 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
@@ -38,8 +38,8 @@
* 鏌ヨ绠＄悊璁″垝鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:schemeplan:list')")
- @GetMapping("/list")
- public TableDataInfo list(SchemePlan schemePlan)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SchemePlan schemePlan)
{
startPage();
List<SchemePlan> list = schemePlanService.selectSchemePlanList(schemePlan);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemeplan:add')")
@Log(title = "绠＄悊璁″垝", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SchemePlan schemePlan)
{
return toAjax(schemePlanService.insertSchemePlan(schemePlan));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemeplan:edit')")
@Log(title = "绠＄悊璁″垝", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemePlan schemePlan)
{
return toAjax(schemePlanService.updateSchemePlan(schemePlan));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemeplan:remove')")
@Log(title = "绠＄悊璁″垝", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schemePlanService.deleteSchemePlanByIds(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 271a5ce..eb40509 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
@@ -38,8 +38,8 @@
* 鏌ヨ鏂规浠诲姟鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetask:list')")
- @GetMapping("/list")
- public TableDataInfo list(SchemeTask schemeTask)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SchemeTask schemeTask)
{
startPage();
List<SchemeTask> list = schemeTaskService.selectSchemeTaskList(schemeTask);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetask:add')")
@Log(title = "鏂规浠诲姟", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTask schemeTask)
{
return toAjax(schemeTaskService.insertSchemeTask(schemeTask));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetask:edit')")
@Log(title = "鏂规浠诲姟", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTask schemeTask)
{
return toAjax(schemeTaskService.updateSchemeTask(schemeTask));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetask:remove')")
@Log(title = "鏂规浠诲姟", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schemeTaskService.deleteSchemeTaskByIds(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 28934cf..076eec7 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
@@ -38,8 +38,8 @@
* 鏌ヨ鏂规浠诲姟閰嶇疆鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:list')")
- @GetMapping("/list")
- public TableDataInfo list(SchemeTaskconfig schemeTaskconfig)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SchemeTaskconfig schemeTaskconfig)
{
startPage();
List<SchemeTaskconfig> list = schemeTaskconfigService.selectSchemeTaskconfigList(schemeTaskconfig);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:add')")
@Log(title = "鏂规浠诲姟閰嶇疆", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTaskconfig schemeTaskconfig)
{
return toAjax(schemeTaskconfigService.insertSchemeTaskconfig(schemeTaskconfig));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:edit')")
@Log(title = "鏂规浠诲姟閰嶇疆", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTaskconfig schemeTaskconfig)
{
return toAjax(schemeTaskconfigService.updateSchemeTaskconfig(schemeTaskconfig));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetaskconfig:remove')")
@Log(title = "鏂规浠诲姟閰嶇疆", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schemeTaskconfigService.deleteSchemeTaskconfigByIds(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 d41338d..4bce45f 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
@@ -38,8 +38,8 @@
* 鏌ヨ鏂规AI澶栧懠浠诲姟璇︽儏鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:list')")
- @GetMapping("/list")
- public TableDataInfo list(SchemeTaskrecordCalldetail schemeTaskrecordCalldetail)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SchemeTaskrecordCalldetail schemeTaskrecordCalldetail)
{
startPage();
List<SchemeTaskrecordCalldetail> list = schemeTaskrecordCalldetailService.selectSchemeTaskrecordCalldetailList(schemeTaskrecordCalldetail);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:add')")
@Log(title = "鏂规AI澶栧懠浠诲姟璇︽儏", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTaskrecordCalldetail schemeTaskrecordCalldetail)
{
return toAjax(schemeTaskrecordCalldetailService.insertSchemeTaskrecordCalldetail(schemeTaskrecordCalldetail));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:edit')")
@Log(title = "鏂规AI澶栧懠浠诲姟璇︽儏", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTaskrecordCalldetail schemeTaskrecordCalldetail)
{
return toAjax(schemeTaskrecordCalldetailService.updateSchemeTaskrecordCalldetail(schemeTaskrecordCalldetail));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemecalldetail:remove')")
@Log(title = "鏂规AI澶栧懠浠诲姟璇︽儏", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schemeTaskrecordCalldetailService.deleteSchemeTaskrecordCalldetailByIds(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 976cc37..307e4a0 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
@@ -38,8 +38,8 @@
* 鏌ヨ鏂规浠诲姟澶勭悊璁板綍鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:list')")
- @GetMapping("/list")
- public TableDataInfo list(SchemeTaskrecord schemeTaskrecord)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SchemeTaskrecord schemeTaskrecord)
{
startPage();
List<SchemeTaskrecord> list = schemeTaskrecordService.selectSchemeTaskrecordList(schemeTaskrecord);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:add')")
@Log(title = "鏂规浠诲姟澶勭悊璁板綍", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTaskrecord schemeTaskrecord)
{
return toAjax(schemeTaskrecordService.insertSchemeTaskrecord(schemeTaskrecord));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:edit')")
@Log(title = "鏂规浠诲姟澶勭悊璁板綍", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTaskrecord schemeTaskrecord)
{
return toAjax(schemeTaskrecordService.updateSchemeTaskrecord(schemeTaskrecord));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetaskrecord:remove')")
@Log(title = "鏂规浠诲姟澶勭悊璁板綍", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schemeTaskrecordService.deleteSchemeTaskrecordByIds(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 a355e6e..811b0f5 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
@@ -1,7 +1,8 @@
-package com.smartor.controller;
+package com.ruoyi.web.controller.smartor;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +24,13 @@
/**
* 鏂规浠诲姟閲嶅彂閰嶇疆Controller
- *
+ *
* @author smartor
* @date 2023-03-04
*/
@RestController
@RequestMapping("/smartor/schemetaskrepeatconfig")
-public class SchemeTaskrepeatconfigController extends BaseController
-{
+public class SchemeTaskrepeatconfigController extends BaseController {
@Autowired
private ISchemeTaskrepeatconfigService schemeTaskrepeatconfigService;
@@ -38,9 +38,8 @@
* 鏌ヨ鏂规浠诲姟閲嶅彂閰嶇疆鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:list')")
- @GetMapping("/list")
- public TableDataInfo list(SchemeTaskrepeatconfig schemeTaskrepeatconfig)
- {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SchemeTaskrepeatconfig schemeTaskrepeatconfig) {
startPage();
List<SchemeTaskrepeatconfig> list = schemeTaskrepeatconfigService.selectSchemeTaskrepeatconfigList(schemeTaskrepeatconfig);
return getDataTable(list);
@@ -52,8 +51,7 @@
@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:export')")
@Log(title = "鏂规浠诲姟閲嶅彂閰嶇疆", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SchemeTaskrepeatconfig schemeTaskrepeatconfig)
- {
+ public void export(HttpServletResponse response, SchemeTaskrepeatconfig schemeTaskrepeatconfig) {
List<SchemeTaskrepeatconfig> list = schemeTaskrepeatconfigService.selectSchemeTaskrepeatconfigList(schemeTaskrepeatconfig);
ExcelUtil<SchemeTaskrepeatconfig> util = new ExcelUtil<SchemeTaskrepeatconfig>(SchemeTaskrepeatconfig.class);
util.exportExcel(response, list, "鏂规浠诲姟閲嶅彂閰嶇疆鏁版嵁");
@@ -64,8 +62,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(schemeTaskrepeatconfigService.selectSchemeTaskrepeatconfigById(id));
}
@@ -74,9 +71,8 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:add')")
@Log(title = "鏂规浠诲姟閲嶅彂閰嶇疆", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody SchemeTaskrepeatconfig schemeTaskrepeatconfig)
- {
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody SchemeTaskrepeatconfig schemeTaskrepeatconfig) {
return toAjax(schemeTaskrepeatconfigService.insertSchemeTaskrepeatconfig(schemeTaskrepeatconfig));
}
@@ -85,9 +81,8 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:edit')")
@Log(title = "鏂规浠诲姟閲嶅彂閰嶇疆", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody SchemeTaskrepeatconfig schemeTaskrepeatconfig)
- {
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody SchemeTaskrepeatconfig schemeTaskrepeatconfig) {
return toAjax(schemeTaskrepeatconfigService.updateSchemeTaskrepeatconfig(schemeTaskrepeatconfig));
}
@@ -96,9 +91,8 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetaskrepeatconfig:remove')")
@Log(title = "鏂规浠诲姟閲嶅彂閰嶇疆", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(schemeTaskrepeatconfigService.deleteSchemeTaskrepeatconfigByIds(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 ffb5d95..8f5430f 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
@@ -38,8 +38,8 @@
* 鏌ヨ鏂规瑙﹀彂鏉′欢瑙勫垯鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:list')")
- @GetMapping("/list")
- public TableDataInfo list(SchemeTriggerrule schemeTriggerrule)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SchemeTriggerrule schemeTriggerrule)
{
startPage();
List<SchemeTriggerrule> list = schemeTriggerruleService.selectSchemeTriggerruleList(schemeTriggerrule);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:add')")
@Log(title = "鏂规瑙﹀彂鏉′欢瑙勫垯", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTriggerrule schemeTriggerrule)
{
return toAjax(schemeTriggerruleService.insertSchemeTriggerrule(schemeTriggerrule));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:edit')")
@Log(title = "鏂规瑙﹀彂鏉′欢瑙勫垯", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTriggerrule schemeTriggerrule)
{
return toAjax(schemeTriggerruleService.updateSchemeTriggerrule(schemeTriggerrule));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetriggerrule:remove')")
@Log(title = "鏂规瑙﹀彂鏉′欢瑙勫垯", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schemeTriggerruleService.deleteSchemeTriggerruleByIds(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 36f07ee..359cd39 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
@@ -38,8 +38,8 @@
* 鏌ヨ鏂规瑙﹀彂鍦烘櫙鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:list')")
- @GetMapping("/list")
- public TableDataInfo list(SchemeTriggerscene schemeTriggerscene)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SchemeTriggerscene schemeTriggerscene)
{
startPage();
List<SchemeTriggerscene> list = schemeTriggersceneService.selectSchemeTriggersceneList(schemeTriggerscene);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:add')")
@Log(title = "鏂规瑙﹀彂鍦烘櫙", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SchemeTriggerscene schemeTriggerscene)
{
return toAjax(schemeTriggersceneService.insertSchemeTriggerscene(schemeTriggerscene));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:edit')")
@Log(title = "鏂规瑙﹀彂鍦烘櫙", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SchemeTriggerscene schemeTriggerscene)
{
return toAjax(schemeTriggersceneService.updateSchemeTriggerscene(schemeTriggerscene));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:schemetriggerscene:remove')")
@Log(title = "鏂规瑙﹀彂鍦烘櫙", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schemeTriggersceneService.deleteSchemeTriggersceneByIds(ids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsParamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsParamController.java
index 8eae13a..fd42a08 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
@@ -38,8 +38,8 @@
* 鏌ヨ鐭俊鍙傛暟鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:smsparam:list')")
- @GetMapping("/list")
- public TableDataInfo list(SmsParam smsParam)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SmsParam smsParam)
{
startPage();
List<SmsParam> list = smsParamService.selectSmsParamList(smsParam);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:smsparam:add')")
@Log(title = "鐭俊鍙傛暟", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SmsParam smsParam)
{
return toAjax(smsParamService.insertSmsParam(smsParam));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:smsparam:edit')")
@Log(title = "鐭俊鍙傛暟", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SmsParam smsParam)
{
return toAjax(smsParamService.updateSmsParam(smsParam));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:smsparam:remove')")
@Log(title = "鐭俊鍙傛暟", businessType = BusinessType.DELETE)
- @DeleteMapping("/{paramids}")
+ @GetMapping("/remove/{paramids}")
public AjaxResult remove(@PathVariable Long[] paramids)
{
return toAjax(smsParamService.deleteSmsParamByParamids(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 db31000..b049f1e 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
@@ -1,7 +1,8 @@
-package com.smartor.controller;
+package com.ruoyi.web.controller.smartor;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +24,13 @@
/**
* 鐭俊璁板綍Controller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@RestController
@RequestMapping("/smartor/smsrecords")
-public class SmsRecordsController extends BaseController
-{
+public class SmsRecordsController extends BaseController {
@Autowired
private ISmsRecordsService smsRecordsService;
@@ -38,9 +38,8 @@
* 鏌ヨ鐭俊璁板綍鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:smsrecords:list')")
- @GetMapping("/list")
- public TableDataInfo list(SmsRecords smsRecords)
- {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SmsRecords smsRecords) {
startPage();
List<SmsRecords> list = smsRecordsService.selectSmsRecordsList(smsRecords);
return getDataTable(list);
@@ -52,8 +51,7 @@
@PreAuthorize("@ss.hasPermi('smartor:smsrecords:export')")
@Log(title = "鐭俊璁板綍", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SmsRecords smsRecords)
- {
+ public void export(HttpServletResponse response, SmsRecords smsRecords) {
List<SmsRecords> list = smsRecordsService.selectSmsRecordsList(smsRecords);
ExcelUtil<SmsRecords> util = new ExcelUtil<SmsRecords>(SmsRecords.class);
util.exportExcel(response, list, "鐭俊璁板綍鏁版嵁");
@@ -64,8 +62,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:smsrecords:query')")
@GetMapping(value = "/{recordid}")
- public AjaxResult getInfo(@PathVariable("recordid") Long recordid)
- {
+ public AjaxResult getInfo(@PathVariable("recordid") Long recordid) {
return success(smsRecordsService.selectSmsRecordsByRecordid(recordid));
}
@@ -74,9 +71,8 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:smsrecords:add')")
@Log(title = "鐭俊璁板綍", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody SmsRecords smsRecords)
- {
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody SmsRecords smsRecords) {
return toAjax(smsRecordsService.insertSmsRecords(smsRecords));
}
@@ -85,9 +81,8 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:smsrecords:edit')")
@Log(title = "鐭俊璁板綍", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody SmsRecords smsRecords)
- {
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody SmsRecords smsRecords) {
return toAjax(smsRecordsService.updateSmsRecords(smsRecords));
}
@@ -96,9 +91,8 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:smsrecords:remove')")
@Log(title = "鐭俊璁板綍", businessType = BusinessType.DELETE)
- @DeleteMapping("/{recordids}")
- public AjaxResult remove(@PathVariable Long[] recordids)
- {
+ @GetMapping("/remove/{recordids}")
+ public AjaxResult remove(@PathVariable Long[] recordids) {
return toAjax(smsRecordsService.deleteSmsRecordsByRecordids(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 49e4ad8..ab0adff 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
@@ -38,8 +38,8 @@
* 鏌ヨ鐭俊妯℃澘鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:smstemplet:list')")
- @GetMapping("/list")
- public TableDataInfo list(SmsTemplet smsTemplet)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SmsTemplet smsTemplet)
{
startPage();
List<SmsTemplet> list = smsTempletService.selectSmsTempletList(smsTemplet);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:smstemplet:add')")
@Log(title = "鐭俊妯℃澘", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SmsTemplet smsTemplet)
{
return toAjax(smsTempletService.insertSmsTemplet(smsTemplet));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:smstemplet:edit')")
@Log(title = "鐭俊妯℃澘", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SmsTemplet smsTemplet)
{
return toAjax(smsTempletService.updateSmsTemplet(smsTemplet));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:smstemplet:remove')")
@Log(title = "鐭俊妯℃澘", businessType = BusinessType.DELETE)
- @DeleteMapping("/{templetids}")
+ @GetMapping("/remove/{templetids}")
public AjaxResult remove(@PathVariable Long[] templetids)
{
return toAjax(smsTempletService.deleteSmsTempletByTempletids(templetids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java
index ccb0e4e..ef6e573 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
@@ -36,8 +36,8 @@
* 鏌ヨ闂嵎鍒嗙被鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:svycategory:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyCategory svyCategory) {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SvyCategory svyCategory) {
startPage();
List<SvyCategory> list = svyCategoryService.selectSvyCategoryList(svyCategory);
return getDataTable(list);
@@ -71,7 +71,7 @@
@PreAuthorize("@ss.hasPermi('smartor:svycategory:add')")
@Log(title = "闂嵎鍒嗙被", businessType = BusinessType.INSERT)
@ApiOperation("鏂板闂嵎鍒嗙被")
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyCategory svyCategory) {
return toAjax(svyCategoryService.insertSvyCategory(svyCategory));
}
@@ -82,7 +82,7 @@
@PreAuthorize("@ss.hasPermi('smartor:svycategory:edit')")
@Log(title = "闂嵎鍒嗙被", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼闂嵎鍒嗙被")
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyCategory svyCategory) {
return toAjax(svyCategoryService.updateSvyCategory(svyCategory));
}
@@ -93,7 +93,7 @@
@PreAuthorize("@ss.hasPermi('smartor:svycategory:remove')")
@Log(title = "闂嵎鍒嗙被", businessType = BusinessType.DELETE)
@ApiOperation("鍒犻櫎闂嵎鍒嗙被")
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(svyCategoryService.deleteSvyCategoryByIds(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 1a8423e..34692af 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
@@ -38,8 +38,8 @@
* 鏌ヨ闂嵎鏈�缁堢粨鏋滃垪琛�
*/
@PreAuthorize("@ss.hasPermi('smartor:svyfinish:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyFinish svyFinish)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SvyFinish svyFinish)
{
startPage();
List<SvyFinish> list = svyFinishService.selectSvyFinishList(svyFinish);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyfinish:add')")
@Log(title = "闂嵎鏈�缁堢粨鏋�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyFinish svyFinish)
{
return toAjax(svyFinishService.insertSvyFinish(svyFinish));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyfinish:edit')")
@Log(title = "闂嵎鏈�缁堢粨鏋�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyFinish svyFinish)
{
return toAjax(svyFinishService.updateSvyFinish(svyFinish));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyfinish:remove')")
@Log(title = "闂嵎鏈�缁堢粨鏋�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(svyFinishService.deleteSvyFinishByIds(ids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishoptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishoptionController.java
index 74e65c6..47ff503 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
@@ -38,8 +38,8 @@
* 鏌ヨ闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyFinishoption svyFinishoption)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SvyFinishoption svyFinishoption)
{
startPage();
List<SvyFinishoption> list = svyFinishoptionService.selectSvyFinishoptionList(svyFinishoption);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:add')")
@Log(title = "闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyFinishoption svyFinishoption)
{
return toAjax(svyFinishoptionService.insertSvyFinishoption(svyFinishoption));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:edit')")
@Log(title = "闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyFinishoption svyFinishoption)
{
return toAjax(svyFinishoptionService.updateSvyFinishoption(svyFinishoption));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyfinishoption:remove')")
@Log(title = "闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(svyFinishoptionService.deleteSvyFinishoptionByIds(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 395ca18..3757fd9 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
@@ -38,8 +38,8 @@
* 鏌ヨ闂嵎璋冩煡缁撴灉璇︽儏鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyFinishtopic svyFinishtopic)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SvyFinishtopic svyFinishtopic)
{
startPage();
List<SvyFinishtopic> list = svyFinishtopicService.selectSvyFinishtopicList(svyFinishtopic);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:add')")
@Log(title = "闂嵎璋冩煡缁撴灉璇︽儏", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyFinishtopic svyFinishtopic)
{
return toAjax(svyFinishtopicService.insertSvyFinishtopic(svyFinishtopic));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:edit')")
@Log(title = "闂嵎璋冩煡缁撴灉璇︽儏", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyFinishtopic svyFinishtopic)
{
return toAjax(svyFinishtopicService.updateSvyFinishtopic(svyFinishtopic));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyfinishtopic:remove')")
@Log(title = "闂嵎璋冩煡缁撴灉璇︽儏", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(svyFinishtopicService.deleteSvyFinishtopicByIds(ids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibExceptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibExceptionController.java
index 914eadb..b49a8b8 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
@@ -38,8 +38,8 @@
* 鏌ヨ闂嵎寮傚父鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:svyexception:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyLibException svyLibException)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SvyLibException svyLibException)
{
startPage();
List<SvyLibException> list = svyLibExceptionService.selectSvyLibExceptionList(svyLibException);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyexception:add')")
@Log(title = "闂嵎寮傚父", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyLibException svyLibException)
{
return toAjax(svyLibExceptionService.insertSvyLibException(svyLibException));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyexception:edit')")
@Log(title = "闂嵎寮傚父", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibException svyLibException)
{
return toAjax(svyLibExceptionService.updateSvyLibException(svyLibException));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyexception:remove')")
@Log(title = "闂嵎寮傚父", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ecids}")
+ @GetMapping("/remove/{ecids}")
public AjaxResult remove(@PathVariable Long[] ecids)
{
return toAjax(svyLibExceptionService.deleteSvyLibExceptionByEcids(ecids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibResultController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibResultController.java
index ac96f78..f8f0330 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
@@ -38,8 +38,8 @@
* 鏌ヨ闂嵎缁撴灉鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:svyresult:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyLibResult svyLibResult)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SvyLibResult svyLibResult)
{
startPage();
List<SvyLibResult> list = svyLibResultService.selectSvyLibResultList(svyLibResult);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyresult:add')")
@Log(title = "闂嵎缁撴灉", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyLibResult svyLibResult)
{
return toAjax(svyLibResultService.insertSvyLibResult(svyLibResult));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyresult:edit')")
@Log(title = "闂嵎缁撴灉", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibResult svyLibResult)
{
return toAjax(svyLibResultService.updateSvyLibResult(svyLibResult));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svyresult:remove')")
@Log(title = "闂嵎缁撴灉", businessType = BusinessType.DELETE)
- @DeleteMapping("/{resultids}")
+ @GetMapping("/remove/{resultids}")
public AjaxResult remove(@PathVariable Long[] resultids)
{
return toAjax(svyLibResultService.deleteSvyLibResultByResultids(resultids));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleController.java
index a3640f1..d7b5fa1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleController.java
@@ -37,7 +37,7 @@
*/
@ApiOperation("鏌ヨ闂嵎鍒楄〃")
@PostMapping("/selectSvyLibTitlelist")
- public TableDataInfo selectSvyLibTitlelist(@RequestBody SvyLibTitleReq svyLibTitleReq) {
+ public TableDataInfo selectSvyLibTitlelist(@RequestBody SvyLibTitleReq svyLibTitleReq) {
startPage();
List<SvyLibTitle> list = svyLibTitleService.selectSvyLibTitleList(svyLibTitleReq);
return getDataTable(list);
@@ -67,7 +67,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svytitle:edit')")
@Log(title = "闂嵎", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTitle svyLibTitle) {
return toAjax(svyLibTitleService.updateSvyLibTitle(svyLibTitle));
}
@@ -77,7 +77,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svytitle:remove')")
@Log(title = "闂嵎", businessType = BusinessType.DELETE)
- @DeleteMapping("/{svyids}")
+ @GetMapping("/remove/{svyids}")
public AjaxResult remove(@PathVariable Long[] svyids) {
return toAjax(svyLibTitleService.deleteSvyLibTitleBySvyids(svyids));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java
index 43d5360..17d6c4d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java
@@ -47,8 +47,8 @@
* 鏌ヨ闂嵎棰樼洰鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:svytopic:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyLibTopic svyLibTopic) {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SvyLibTopic svyLibTopic) {
startPage();
List<SvyLibTopic> list = svyLibTopicService.selectSvyLibTopicList(svyLibTopic);
return getDataTable(list);
@@ -83,7 +83,7 @@
@ApiOperation("鏂板闂嵎棰樼洰")
@PreAuthorize("@ss.hasPermi('smartor:svytopic:add')")
@Log(title = "闂嵎棰樼洰", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyLibTopic svyLibTopic) {
return toAjax(svyLibTopicService.insertSvyLibTopic(svyLibTopic));
}
@@ -94,7 +94,7 @@
@ApiOperation("淇敼闂嵎棰樼洰")
@PreAuthorize("@ss.hasPermi('smartor:svytopic:edit')")
@Log(title = "闂嵎棰樼洰", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTopic svyLibTopic) {
return toAjax(svyLibTopicService.updateSvyLibTopic(svyLibTopic));
}
@@ -105,7 +105,7 @@
@ApiOperation("鍒犻櫎闂嵎棰樼洰")
@PreAuthorize("@ss.hasPermi('smartor:svytopic:remove')")
@Log(title = "闂嵎棰樼洰", businessType = BusinessType.DELETE)
- @DeleteMapping("/{topicids}")
+ @GetMapping("/remove/{topicids}")
public AjaxResult remove(@PathVariable Long[] topicids) {
return toAjax(svyLibTopicService.deleteSvyLibTopicByTopicids(topicids));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicoptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicoptionController.java
index f633598..25852b8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicoptionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicoptionController.java
@@ -38,8 +38,8 @@
* 鏌ヨ闂嵎闂閫夐」鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:svytopicoption:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyLibTopicoption svyLibTopicoption)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SvyLibTopicoption svyLibTopicoption)
{
startPage();
List<SvyLibTopicoption> list = svyLibTopicoptionService.selectSvyLibTopicoptionList(svyLibTopicoption);
@@ -74,7 +74,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svytopicoption:add')")
@Log(title = "闂嵎闂閫夐」", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyLibTopicoption svyLibTopicoption)
{
return toAjax(svyLibTopicoptionService.insertSvyLibTopicoption(svyLibTopicoption));
@@ -85,7 +85,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svytopicoption:edit')")
@Log(title = "闂嵎闂閫夐」", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTopicoption svyLibTopicoption)
{
return toAjax(svyLibTopicoptionService.updateSvyLibTopicoption(svyLibTopicoption));
@@ -96,7 +96,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svytopicoption:remove')")
@Log(title = "闂嵎闂閫夐」", businessType = BusinessType.DELETE)
- @DeleteMapping("/{optionids}")
+ @GetMapping("/remove/{optionids}")
public AjaxResult remove(@PathVariable Long[] optionids)
{
return toAjax(svyLibTopicoptionService.deleteSvyLibTopicoptionByOptionids(optionids));
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 702336b..fbc0e9b 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,8 +39,8 @@
* 鏌ヨ棰樼洰鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('system:topic:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyTopic svyTopic) {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SvyTopic svyTopic) {
startPage();
List<SvyTopic> list = svyTopicService.selectSvyTopicList(svyTopic);
return getDataTable(list);
@@ -72,7 +72,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:topic:add')")
@Log(title = "棰樼洰", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyTopic svyTopic) {
return toAjax(svyTopicService.insertSvyTopic(svyTopic));
}
@@ -82,7 +82,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:topic:edit')")
@Log(title = "棰樼洰", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTopic svyTopic) {
return toAjax(svyTopicService.updateSvyTopic(svyTopic));
}
@@ -92,7 +92,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:topic:remove')")
@Log(title = "棰樼洰", businessType = BusinessType.DELETE)
- @DeleteMapping("/{topicids}")
+ @GetMapping("/remove/{topicids}")
public AjaxResult remove(@PathVariable Long[] topicids) {
return toAjax(svyTopicService.deleteSvyTopicByTopicids(topicids));
}
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 679d6e2..be8106a 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
@@ -39,8 +39,8 @@
* 鏌ヨ鐭俊璐﹀彿鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('smartor:smsaccount:list')")
- @GetMapping("/list")
- public TableDataInfo list(BaseSmsaccount baseSmsaccount) {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody BaseSmsaccount baseSmsaccount) {
startPage();
List<BaseSmsaccount> list = baseSmsaccountService.selectBaseSmsaccountList(baseSmsaccount);
return getDataTable(list);
@@ -82,7 +82,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:smsaccount:edit')")
@Log(title = "鐭俊璐﹀彿", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseSmsaccount baseSmsaccount) {
return toAjax(baseSmsaccountService.updateBaseSmsaccount(baseSmsaccount));
}
@@ -92,7 +92,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:smsaccount:remove')")
@Log(title = "鐭俊璐﹀彿", businessType = BusinessType.DELETE)
- @DeleteMapping("/{smsacountids}")
+ @GetMapping("/remove/{smsacountids}")
public AjaxResult remove(@PathVariable Long[] smsacountids) {
return toAjax(baseSmsaccountService.deleteBaseSmsaccountBySmsacountids(smsacountids));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/test/DingTalkService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/test/DingTalkService.java
index 945cc11..3c44ace 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/test/DingTalkService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/test/DingTalkService.java
@@ -20,6 +20,8 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class DingTalkService {
@@ -118,30 +120,37 @@
}
public static void main(String[] args) throws ApiException, IOException {
-// String appId = "wx1c5243d2337753f4";
-// String appSecret = "84a2186a0d175e88345267c716516cd3";
-// WeChatService weChatService = new WeChatService(appId, appSecret);
-// weChatService.sendMessageToFollowers("浣犲湪璇村暐鍛紵锛燂紵锛�");
-// // new com.smartor.controller.BaseSmsaccountController().sendMessageToFollowers("AIJSl-IF6M05NzaXofPYbT5wgSP3bWH7I9OBmvJqsaU","www.baidu.com");
+ String str = "鎴戣繕娌¤传骞冲嚟琛�鏈夊悆杩囬キ";
+ String pattern = "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10";
-// sendNotification("17607179857", "1", "2", "3");
- Workbook workbook = new XSSFWorkbook();
- Sheet sheet = workbook.createSheet("Sheet1");
- // 鍒涘缓琛屽拰鍗曞厓鏍硷紝骞惰缃崟鍏冩牸鐨勫��
- Row row = sheet.createRow(0);
- row.createCell(0).setCellValue("濮撳悕");
- row.createCell(1).setCellValue("鎬у埆");
- row.createCell(2).setCellValue("璇佷欢绫诲瀷");
- row.createCell(3).setCellValue("鍑虹敓鏃ユ湡");
- row.createCell(4).setCellValue("鏈汉鑱旂郴鏂瑰紡");
- row.createCell(5).setCellValue("浜插睘鑱旂郴鏂瑰紡");
- row.createCell(6).setCellValue("鎮ｈ�呮爣绛�");
- row.createCell(7).setCellValue("閿欒鍘熷洜");
+ Pattern r = Pattern.compile(pattern);
+ Matcher m = r.matcher(str);
- // 淇濆瓨宸ヤ綔绨垮埌鏂囦欢
- FileOutputStream outputStream = new FileOutputStream("example.xlsx");
- workbook.write(outputStream);
- outputStream.close();
- workbook.close();
+ System.out.println(m.find());
+//// String appId = "wx1c5243d2337753f4";
+//// String appSecret = "84a2186a0d175e88345267c716516cd3";
+//// WeChatService weChatService = new WeChatService(appId, appSecret);
+//// weChatService.sendMessageToFollowers("浣犲湪璇村暐鍛紵锛燂紵锛�");
+//// // new com.smartor.controller.BaseSmsaccountController().sendMessageToFollowers("AIJSl-IF6M05NzaXofPYbT5wgSP3bWH7I9OBmvJqsaU","www.baidu.com");
+//
+//// sendNotification("17607179857", "1", "2", "3");
+// Workbook workbook = new XSSFWorkbook();
+// Sheet sheet = workbook.createSheet("Sheet1");
+// // 鍒涘缓琛屽拰鍗曞厓鏍硷紝骞惰缃崟鍏冩牸鐨勫��
+// Row row = sheet.createRow(0);
+// row.createCell(0).setCellValue("濮撳悕");
+// row.createCell(1).setCellValue("鎬у埆");
+// row.createCell(2).setCellValue("璇佷欢绫诲瀷");
+// row.createCell(3).setCellValue("鍑虹敓鏃ユ湡");
+// row.createCell(4).setCellValue("鏈汉鑱旂郴鏂瑰紡");
+// row.createCell(5).setCellValue("浜插睘鑱旂郴鏂瑰紡");
+// row.createCell(6).setCellValue("鎮ｈ�呮爣绛�");
+// row.createCell(7).setCellValue("閿欒鍘熷洜");
+//
+// // 淇濆瓨宸ヤ綔绨垮埌鏂囦欢
+// FileOutputStream outputStream = new FileOutputStream("example.xlsx");
+// workbook.write(outputStream);
+// outputStream.close();
+// workbook.close();
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/test/pctest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/test/pctest.java
new file mode 100644
index 0000000..e176112
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/test/pctest.java
@@ -0,0 +1,86 @@
+package com.ruoyi.web.test;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.http.HttpUtils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+
+public class pctest {
+
+ public static void main(String[] args) {
+ String str = null;
+// for (int i = 51; i <= 189; i++) {
+// System.out.print(i + " ");
+ try {
+
+// long l = System.currentTimeMillis();
+//// str = "2263艙189艙艙232105105搂鑳搁儴鑲跨槫绉戞棩闂寸梾鎴挎偅鑰�<font color='#30a6f5'>闅�</font><font color='#30a6f5'>璁�</font>搂11陇232334680搂鑳搁儴鑲跨槫绉戞偅鑰呭嚭闄�<font color='#30a6f5'>闅�</font><font color='#30a6f5'>璁�</font>搂19陇232313714搂鑳搁儴鑲跨槫绉戦绠＄檶鎮ｈ�呭嚭闄�<font color='#30a6f5'>闅�</font><font color='#30a6f5'>璁�</font>搂20陇232294126搂鑳搁儴鑲跨槫绉戣偤鐧屾偅鑰呭嚭闄�<font color='#30a6f5'>闅�</font><font color='#30a6f5'>璁�</font>搂22陇232231895搂TKA鏈悗<font color='#30a6f5'>闅�</font><font color='#30a6f5'>璁�</font>搂16陇232349695搂<font color='#30a6f5'>闅�</font><font color='#30a6f5'>璁�</font>1鏈埪�29陇232303115搂楂樼硸<font color='#30a6f5'>闅�</font><font color='#30a6f5'>璁�</font>宸ヤ綔鍩硅璇曢搂16陇232295017搂鑲跨槫<font color='#30a6f5'>闅�</font><font color='#30a6f5'>璁�</font>鐧昏鍩硅娴嬭瘯棰樎�15陇232233427搂鑰佸勾鍋ュ悍鐩戞祴闃熷垪<font color='#30a6f5'>闅�</font><font color='#30a6f5'>璁�</font>鍩硅娴嬭瘯搂10陇232215217搂24鐥呭尯IBD鎮ｈ��<font color='#30a6f5'>闅�</font><font color='#30a6f5'>璁�</font>闂嵎锛�8.22-8.28锛壜�20陇232169849搂2023.8.25灏忛噾浜轰勘涔愰儴MDT闂ㄨ瘖<font color='#30a6f5'>闅�</font><font color='#30a6f5'>璁�</font>搂9陇232173705搂<font color='#30a6f5'>闅�</font><font color='#30a6f5'>璁�</font>淇℃伅鍙嶉琛�6陇";
+//// str = HttpUtils.sendGet("https://www.wjx.cn/handler/Search.ashx?input=%E9%9A%8F%E8%AE%BF&qc=&cp=" + i + "&nw=1&qt=1&accurate=0&t=" + l);
+// while (true) {
+// if (str.contains("<font")) {
+// str = str.substring(0, str.indexOf("<font")) + str.substring(str.indexOf("</font>") + 7);
+// } else {
+//// System.out.println(str);
+
+ List<String> list = new ArrayList<>();
+ String folderPath = "E:/pc";
+ try {
+ Files.walk(Paths.get(folderPath)).filter(Files::isRegularFile).forEach(path -> list.add(path.getFileName().toString()));
+ } catch (IOException e) {
+ System.out.println("An error occurred while traversing the folder.");
+ e.printStackTrace();
+ }
+
+ for (String name : list) {
+ name = name.substring(0, name.indexOf(".html"));
+// String sd = "https://www.wjx.cn/xz/" + name + ".aspx";
+// String content = HttpUtils.sendGet(sd, "review=1&u_atoken=31d3a0e6-e00e-483c-b956-b6177972e734&u_asession=01691hXKO9p1D59fHgd0NAIGdr-8HrPakCUS6X_v_Z43ohuMPPQJnwrrPl3mly-UFXYrO71Pz35K7wOrV6v8t3g9sq8AL43dpOnCClYrgFm6o&u_asig=052KZ_HPijdQddSitCTcvhNlwy7cGO2t46JgQGTyclFPT7xwZjoK0YBNED-DbuN5gugFYO36lFqDfxMpnRFufeLFk7BSuILL02zWW0QNCM-NWgLElQ9wTw7yMg4BFlXpIhOVzkXl1W45ZWoBPny57uZ3WVmTrcdvNBGM1L1rWev0UwpA9oQuqX4mfRyWspmK8gksmHjM0JOodanL5-M1Qs1Srh04GpT7zItRH0TxDThMR15LDAE7pTBPfvFUyoAgUl5gGKGQH-vEmN2Ae1t4GLLQkS6fjps_twKYxR-u2135jY94r_LXIIil3Y3aVPRGAe&u_aref=gk2k7DQa4vfdgaFwA4iVd7KUI4Q%3D", Constants.UTF8);
+// String sd = "https://www.wjx.cn/xz/214877887.aspx?review=1&u_atoken=7ea94b7e-ff2c-4f9f-a16a-2377e7b932f7&u_asession=01mUmaPv86XmI35R93EFzW4vAn-_bjd_hg8O3aV3Qj_hY4LTkzoq3vcQyaBAt_bXG0L3UvT1OC8yhlQ_Vrlj1nD9sq8AL43dpOnCClYrgFm6o&u_asig=05qqfmDpV5jnzQ3zaOR-kKvhCvox19kVoC-lC8wI68PnJ7lkckawOfhM2Sz6TSlLyxhPCLiM-UkS5JtWfnNrZeTMme2Xl4_nh34yljc8iiZeJybY6mcSFGRriqnFvQfUeuCvV5odDJuWRnGyKMRbx_RypafWqYj328He90miD2j6an7QQBtuwLgtjfNI6ktmk7ksmHjM0JOodanL5-M1Qs1cOGKb4pT6nOz7TsF50O_Y5mwcLzFTlOSTrqpuPzNwho1AC5ZokKrUg3JS1GlbH-sRHfAvD91UjmwUK--AQbESDY94r_LXIIil3Y3aVPRGAe&u_aref=muWANYNZeB7WW%2B%2F7kLKv3uRT8ws%3D";
+// String content = HttpUtils.sendGet(sd);
+ HttpRequest get = HttpUtil.createGet("https://www.wjx.cn/xz/215122141.aspx?review=1&u_atoken=ae7fe80c-bf23-4e45-bcda-e1a79738fa28&u_asession=014vQCkRvW7c3i2ofZKQ4cwL_Kbllht28bP58Yv5WaOmib7bTm0yOu3E9ghHeDwRromXsXiqHPUHP-r4N4zkLsNdsq8AL43dpOnCClYrgFm6o&u_asig=05cv8a98zgMB5Y5sCj2tshR0ymwhcsf5o0ZnRdzw_MWEqjWv9qUXA2y-W56hqxwwu62XCEZ1EDfpROWbv7u5K0esMlHJrRxH3x6MobynAbRVK73TZbz-pPzJrSvkDKmiOfptL_k4wm25Oa44SC2LnI-f_gUMOBxNBqpVgCnR54boOBWxWY3t65iSXiQbR5_szmksmHjM0JOodanL5-M1Qs1XAPImYHnI2tMZUJbFSrHeeZf56fnMo9lJFDBHsYIUFUSQYCfCQCLXjf34sWIadxtsAb6Kn2CIzT3kClvRmyaM_Y94r_LXIIil3Y3aVPRGAe&u_aref=OUtfes0VUTyTV7SKqEByRa9VGaU%3D");
+ String content = get.execute().body();
+ //鍒涘缓鏂囦欢澶�
+ Path folder = Paths.get("E:/pc2/" + name + ".html");
+ Files.createFile(folder);
+ Files.write(Paths.get("E:/pc2/" + name + ".html"), content.getBytes());
+ }
+
+
+// int index = 0;
+// while (true) {
+// int dd = str.indexOf("陇", index) + 1;
+// String newStr = str.substring(dd, str.indexOf("搂", dd));
+// index = dd;
+// String sd = "https://www.wjx.cn/xz/" + newStr + ".aspx";
+// String content = HttpUtils.sendGet(sd, "review=1");
+//
+// //鍒涘缓鏂囦欢澶�
+// Path folder = Paths.get("E:/pc/" + newStr + ".html");
+// Files.createFile(folder);
+// Files.write(Paths.get("E:/pc/" + newStr + ".html"), content.getBytes());
+//
+// if (index == -1) {
+// break;
+// }
+// }
+// break;
+// }
+
+// }
+
+ } catch (Exception e) {
+ }
+ }
+}
+//}
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 22c8630..b13553d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -18,7 +18,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8080
+ port: 8089
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -35,6 +35,8 @@
# 鏃ュ織閰嶇疆
logging:
+ # 鏃ュ織璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/logs锛孡inux閰嶇疆 /home/ruoyi/logs,涓嶅～鍚岀骇鐩綍logs锛�
+ path: D:/ruoyi/ls/logs
level:
com.ruoyi: debug
org.springframework: warn
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index 8756ec0..9c29df4 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 鏃ュ織瀛樻斁璺緞 -->
- <property name="log.path" value="D:/CodeSource/zhfw-master/logs" />
+ <property name="log.path" value="D:/lihu/logs" />
<!-- 鏃ュ織杈撳嚭鏍煎紡 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
diff --git a/ruoyi-admin/src/main/resources/template/question.ftl b/ruoyi-admin/src/main/resources/template/question.ftl
index 13a458a..8b82c72 100644
--- a/ruoyi-admin/src/main/resources/template/question.ftl
+++ b/ruoyi-admin/src/main/resources/template/question.ftl
@@ -30,6 +30,7 @@
<br>
</#list>
+
<input type="submit" value="Submit">
</form>
</body>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
index 70e9b08..2cec013 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
@@ -7,16 +7,14 @@
/**
* 鍒嗛〉宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
-public class PageUtils extends PageHelper
-{
+public class PageUtils extends PageHelper {
/**
* 璁剧疆璇锋眰鍒嗛〉鏁版嵁
*/
- public static void startPage()
- {
+ public static void startPage() {
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
@@ -26,10 +24,18 @@
}
/**
+ * 璁剧疆璇锋眰鍒嗛〉鏁版嵁
+ */
+ public static void startPageByPost(Integer pageNum, Integer pageSize) {
+ if (pageNum == null) pageNum = 1;
+ if (pageSize == null) pageSize = 10;
+ PageHelper.startPage(pageNum, pageSize, "").setReasonable(true);
+ }
+
+ /**
* 娓呯悊鍒嗛〉鐨勭嚎绋嬪彉閲�
*/
- public static void clearPage()
- {
+ public static void clearPage() {
PageHelper.clearPage();
}
}
diff --git a/smartor/src/main/java/com/smartor/domain/BaseTag.java b/smartor/src/main/java/com/smartor/domain/BaseTag.java
index 86210f7..d4a0999 100644
--- a/smartor/src/main/java/com/smartor/domain/BaseTag.java
+++ b/smartor/src/main/java/com/smartor/domain/BaseTag.java
@@ -86,4 +86,16 @@
@ApiModelProperty("鏄惁寮�鍚� 1寮�鍚� 0鍏抽棴")
private Integer isenable;
+ /**
+ * pageNum
+ */
+ @ApiModelProperty("pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty("pageSize")
+ private Integer pageSize;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/HeCategory.java b/smartor/src/main/java/com/smartor/domain/HeCategory.java
index 5270f0a..5c709f4 100644
--- a/smartor/src/main/java/com/smartor/domain/HeCategory.java
+++ b/smartor/src/main/java/com/smartor/domain/HeCategory.java
@@ -1,9 +1,11 @@
package com.smartor.domain;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -11,107 +13,65 @@
/**
* 瀹ｆ暀鍒嗙被瀵硅薄 he_category
- *
+ *
* @author smartor
* @date 2023-03-04
*/
+@Data
@ApiModel(value = "HeCategory", description = "瀹ｆ暀鍒嗙被瀵硅薄")
-public class HeCategory extends BaseEntity
-{
+public class HeCategory extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 鑷ID */
+ /**
+ * 鑷ID
+ */
@ApiModelProperty(name = "鑷ID")
private Long id;
- /** 鍒嗙被鍚嶇О */
+ /**
+ * 鍒嗙被鍚嶇О
+ */
@ApiModelProperty(name = "鍒嗙被鍚嶇О")
private String categoryname;
- /** 鏈烘瀯ID */
+ /**
+ * 鏈烘瀯ID
+ */
@ApiModelProperty(name = "鏈烘瀯ID")
private String orgid;
- /** 鍒犻櫎鏍囪 */
+ /**
+ * 鍒犻櫎鏍囪
+ */
@ApiModelProperty(name = "鍒犻櫎鏍囪")
private String delFlag;
- /** 涓婁紶鏍囪 */
+ /**
+ * 涓婁紶鏍囪
+ */
@ApiModelProperty(name = "涓婁紶鏍囪")
private Long isupload;
- /** 涓婁紶鏃堕棿 */
+ /**
+ * 涓婁紶鏃堕棿
+ */
@ApiModelProperty(name = "涓婁紶鏃堕棿")
private Date uploadTime;
- public void setId(Long id)
- {
- this.id = id;
- }
+ /**
+ * 鐖禝D
+ */
+ @ApiModelProperty(name = "鐖禝D")
+ private Long pid;
- public Long getId()
- {
- return id;
- }
- public void setCategoryname(String categoryname)
- {
- this.categoryname = categoryname;
- }
-
- public String getCategoryname()
- {
- return categoryname;
- }
- public void setOrgid(String orgid)
- {
- this.orgid = orgid;
- }
-
- public String getOrgid()
- {
- return orgid;
- }
- public void setDelFlag(String delFlag)
- {
- this.delFlag = delFlag;
- }
-
- public String getDelFlag()
- {
- return delFlag;
- }
- public void setIsupload(Long isupload)
- {
- this.isupload = isupload;
- }
-
- public Long getIsupload()
- {
- return isupload;
- }
- public void setUploadTime(Date uploadTime)
- {
- this.uploadTime = uploadTime;
- }
-
- public Date getUploadTime()
- {
- return uploadTime;
- }
+ /**
+ * GUID
+ */
+ @ApiModelProperty(name = "GUID")
+ private String guid;
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("categoryname", getCategoryname())
- .append("orgid", getOrgid())
- .append("delFlag", getDelFlag())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("isupload", getIsupload())
- .append("uploadTime", getUploadTime())
- .toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("categoryname", getCategoryname()).append("orgid", getOrgid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).toString();
}
}
diff --git a/smartor/src/main/java/com/smartor/domain/HeCategoryVO.java b/smartor/src/main/java/com/smartor/domain/HeCategoryVO.java
new file mode 100644
index 0000000..72efeb7
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/HeCategoryVO.java
@@ -0,0 +1,82 @@
+package com.smartor.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 瀹ｆ暀鍒嗙被瀵硅薄 he_category
+ *
+ * @author smartor
+ * @date 2023-03-04
+ */
+@Data
+@ApiModel(value = "HeCategory", description = "瀹ｆ暀鍒嗙被杩斿弬瀵硅薄")
+public class HeCategoryVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鑷ID
+ */
+ @ApiModelProperty(name = "鑷ID")
+ private Long id;
+
+ /**
+ * 鍒嗙被鍚嶇О
+ */
+ @ApiModelProperty(name = "鍒嗙被鍚嶇О")
+ private String categoryname;
+
+ /**
+ * 鏈烘瀯ID
+ */
+ @ApiModelProperty(name = "鏈烘瀯ID")
+ private String orgid;
+
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty(name = "鍒犻櫎鏍囪")
+ private String delFlag;
+
+ /**
+ * 涓婁紶鏍囪
+ */
+ @ApiModelProperty(name = "涓婁紶鏍囪")
+ private Long isupload;
+
+ /**
+ * 涓婁紶鏃堕棿
+ */
+ @ApiModelProperty(name = "涓婁紶鏃堕棿")
+ private Date uploadTime;
+
+ /**
+ * 鐖禝D
+ */
+ @ApiModelProperty(name = "鐖禝D")
+ private Long pid;
+
+ /**
+ * guid
+ */
+ @ApiModelProperty(name = "guid")
+ private String guid;
+
+ /**
+ * 瀛愭暟鎹�
+ */
+ @ApiModelProperty(name = "瀛愭暟鎹�")
+ private List<HeCategory> heCategoryList;
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("categoryname", getCategoryname()).append("orgid", getOrgid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).toString();
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java
index 492ddf9..4cbcaea 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java
@@ -1,7 +1,11 @@
package com.smartor.domain;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -9,328 +13,157 @@
/**
* 鎸囨爣搴撳璞� ivr_liba_target
- *
- * @author smartor
- * @date 2023-03-22
+ *
+ * @author ruoyi
+ * @date 2023-12-14
*/
-public class IvrLibaTarget extends BaseEntity
-{
+@Data
+@ApiModel(value = "IvrLibaTarget", description = "鎸囨爣搴撳璞�")
+public class IvrLibaTarget extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
- private String targetID;
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty(name = "涓婚敭")
+ private Long targetID;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private String targetType;
+ /**
+ * 鍒嗙粍ID
+ */
+ @Excel(name = "鍒嗙粍ID")
+ @ApiModelProperty(name = "鍒嗙粍ID")
+ private String groupid;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private String categoryName;
+ /**
+ * 鎸囨爣绫诲瀷
+ */
+ @Excel(name = "鎸囨爣绫诲瀷")
+ @ApiModelProperty(name = "鎸囨爣绫诲瀷")
+ private String targettype;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private String targetValue;
+ /**
+ * 鎸囨爣鍚嶇О
+ */
+ @Excel(name = "鎸囨爣鍚嶇О")
+ @ApiModelProperty(name = "鎸囨爣鍚嶇О")
+ private String targetname;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private String targetRegex;
- /** $column.columnComment */
- @Excel(name = "${note}", readConverterExp = "$column.readConverterExp()")
- private String note;
+ /**
+ * 鎸囨爣鎻忚堪
+ */
+ @Excel(name = "鎸囨爣鎻忚堪")
+ @ApiModelProperty(name = "鎸囨爣鎻忚堪")
+ private String targetdesc;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /**
+ * 璇█
+ */
+ @Excel(name = "璇█")
+ @ApiModelProperty(name = "璇█")
private String language;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /**
+ * 鐗堟湰
+ */
+ @Excel(name = "鐗堟湰")
+ @ApiModelProperty(name = "鐗堟湰")
private Long version;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private Long isEnable;
+ /**
+ * 鍊肩被鍨嬶紙1 閫夐」 2 鏂囨湰 3 鏁板�硷級
+ */
+ @ApiModelProperty(name = "鍊肩被鍨嬶紙1 閫夐」 2 鏂囨湰 3 鏁板�硷級")
+ @Excel(name = "鍊肩被鍨�", readConverterExp = "1=,閫�=椤�,2=,鏂�=鏈�,3=,鏁�=鍊�")
+ private Long isenable;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private Long isDel;
-
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private String addUserID;
-
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private Date addTime;
-
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private String modifyUserID;
-
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private Date modifyTime;
-
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private String groupID;
-
- /** 鏄惁寮傚父鏍囪瘑 */
+ /**
+ * 鏄惁寮傚父鏍囪瘑
+ */
@Excel(name = "鏄惁寮傚父鏍囪瘑")
- private Long isAbnormal;
+ @ApiModelProperty(name = "鏄惁寮傚父鏍囪瘑")
+ private Long isabnormal;
- /** 棰勮闃�鍊间笂闄� */
+ /**
+ * 棰勮闃�鍊间笂闄�
+ */
@Excel(name = "棰勮闃�鍊间笂闄�")
- private Long WarnUp;
+ @ApiModelProperty(name = "棰勮闃�鍊间笂闄�")
+ private Long warnup;
- /** 棰勮闃�鍊间笅闄� */
+ /**
+ * 棰勮闃�鍊间笅闄�
+ */
@Excel(name = "棰勮闃�鍊间笅闄�")
- private Long WarnDown;
+ @ApiModelProperty(name = "棰勮闃�鍊间笅闄�")
+ private Long warndown;
- /** 鍒犻櫎鏍囪 */
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty(name = "鍒犻櫎鏍囪")
private String delFlag;
- /** 涓婁紶鏍囪 */
+ /**
+ * 涓婁紶鏍囪
+ */
@Excel(name = " 涓婁紶鏍囪 ")
+ @ApiModelProperty(name = "涓婁紶鏍囪")
private Long isupload;
- /** 涓婁紶鏃堕棿 */
+ /**
+ * 涓婁紶鏃堕棿
+ */
@JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(name = "涓婁紶鏃堕棿")
@Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
private Date uploadTime;
- /** 鏈烘瀯ID */
+ /**
+ * 鏈烘瀯ID
+ */
@Excel(name = " 鏈烘瀯ID ")
+ @ApiModelProperty(name = "鏈烘瀯ID")
private String orgid;
- public void setTargetID(String targetID)
- {
- this.targetID = targetID;
- }
+ /**
+ * 鐖禝D
+ */
+ @Excel(name = "鐖禝D")
+ @ApiModelProperty(name = "鐖禝D")
+ private Long pid;
- public String getTargetID()
- {
- return targetID;
- }
- public void setTargetType(String targetType)
- {
- this.targetType = targetType;
- }
+ /**
+ * GUID
+ */
+ @Excel(name = "GUID")
+ @ApiModelProperty(name = "GUID")
+ private String guid;
- public String getTargetType()
- {
- return targetType;
- }
- public void setCategoryName(String categoryName)
- {
- this.categoryName = categoryName;
- }
+ /**
+ * 鍒嗙被id
+ */
+ @Excel(name = "鍒嗙被id")
+ @ApiModelProperty(name = "鍒嗙被id")
+ private Long assortid;
- public String getCategoryName()
- {
- return categoryName;
- }
- public void setTargetValue(String targetValue)
- {
- this.targetValue = targetValue;
- }
+ /**
+ * pageNum
+ */
+ @ApiModelProperty(name = "pageNum")
+ @Excel(name = "pageNum")
+ private Integer pageNum;
- public String getTargetValue()
- {
- return targetValue;
- }
- public void setTargetRegex(String targetRegex)
- {
- this.targetRegex = targetRegex;
- }
+ /**
+ * pageSize
+ */
+ @ApiModelProperty(name = "pageSize")
+ @Excel(name = "pageSize")
+ private Integer pageSize;
- public String getTargetRegex()
- {
- return targetRegex;
- }
- public void setNote(String note)
- {
- this.note = note;
- }
-
- public String getNote()
- {
- return note;
- }
- public void setLanguage(String language)
- {
- this.language = language;
- }
-
- public String getLanguage()
- {
- return language;
- }
- public void setVersion(Long version)
- {
- this.version = version;
- }
-
- public Long getVersion()
- {
- return version;
- }
- public void setIsEnable(Long isEnable)
- {
- this.isEnable = isEnable;
- }
-
- public Long getIsEnable()
- {
- return isEnable;
- }
- public void setIsDel(Long isDel)
- {
- this.isDel = isDel;
- }
-
- public Long getIsDel()
- {
- return isDel;
- }
- public void setAddUserID(String addUserID)
- {
- this.addUserID = addUserID;
- }
-
- public String getAddUserID()
- {
- return addUserID;
- }
- public void setAddTime(Date addTime)
- {
- this.addTime = addTime;
- }
-
- public Date getAddTime()
- {
- return addTime;
- }
- public void setModifyUserID(String modifyUserID)
- {
- this.modifyUserID = modifyUserID;
- }
-
- public String getModifyUserID()
- {
- return modifyUserID;
- }
- public void setModifyTime(Date modifyTime)
- {
- this.modifyTime = modifyTime;
- }
-
- public Date getModifyTime()
- {
- return modifyTime;
- }
- public void setGroupID(String groupID)
- {
- this.groupID = groupID;
- }
-
- public String getGroupID()
- {
- return groupID;
- }
- public void setIsAbnormal(Long isAbnormal)
- {
- this.isAbnormal = isAbnormal;
- }
-
- public Long getIsAbnormal()
- {
- return isAbnormal;
- }
- public void setWarnUp(Long WarnUp)
- {
- this.WarnUp = WarnUp;
- }
-
- public Long getWarnUp()
- {
- return WarnUp;
- }
- public void setWarnDown(Long WarnDown)
- {
- this.WarnDown = WarnDown;
- }
-
- public Long getWarnDown()
- {
- return WarnDown;
- }
- public void setDelFlag(String delFlag)
- {
- this.delFlag = delFlag;
- }
-
- public String getDelFlag()
- {
- return delFlag;
- }
- public void setIsupload(Long isupload)
- {
- this.isupload = isupload;
- }
-
- public Long getIsupload()
- {
- return isupload;
- }
- public void setUploadTime(Date uploadTime)
- {
- this.uploadTime = uploadTime;
- }
-
- public Date getUploadTime()
- {
- return uploadTime;
- }
- public void setOrgid(String orgid)
- {
- this.orgid = orgid;
- }
-
- public String getOrgid()
- {
- return orgid;
- }
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("targetID", getTargetID())
- .append("targetType", getTargetType())
- .append("categoryName", getCategoryName())
- .append("targetValue", getTargetValue())
- .append("targetRegex", getTargetRegex())
- .append("note", getNote())
- .append("language", getLanguage())
- .append("version", getVersion())
- .append("isEnable", getIsEnable())
- .append("isDel", getIsDel())
- .append("addUserID", getAddUserID())
- .append("addTime", getAddTime())
- .append("modifyUserID", getModifyUserID())
- .append("modifyTime", getModifyTime())
- .append("groupID", getGroupID())
- .append("isAbnormal", getIsAbnormal())
- .append("WarnUp", getWarnUp())
- .append("WarnDown", getWarnDown())
- .append("delFlag", getDelFlag())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("isupload", getIsupload())
- .append("uploadTime", getUploadTime())
- .append("orgid", getOrgid())
- .toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("targetID", getTargetID()).append("groupid", getGroupid()).append("targettype", getTargettype()).append("targetname", getTargetname()).append("targetdesc", getTargetdesc()).append("language", getLanguage()).append("version", getVersion()).append("isenable", getIsenable()).append("isabnormal", getIsabnormal()).append("warnup", getWarnup()).append("warndown", getWarndown()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).append("orgid", getOrgid()).append("pid", getPid()).append("guid", getGuid()).append("assortid", getAssortid()).toString();
}
}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java
new file mode 100644
index 0000000..dd84b39
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java
@@ -0,0 +1,68 @@
+package com.smartor.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 鎸囨爣鍒嗙被瀵硅薄 ivr_liba_target_assort
+ *
+ * @author ruoyi
+ * @date 2023-12-14
+ */
+@Data
+@ApiModel(value = "IvrLibaTarget", description = "鎸囨爣搴撳璞�")
+public class IvrLibaTargetAssort extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty(name = "涓婚敭")
+ private Long id;
+
+ /**
+ * 鎸囨爣鍒嗙被鍚嶇О
+ */
+ @ApiModelProperty(name = "涓婚敭")
+ @Excel(name = "鎸囨爣鍒嗙被鍚嶇О")
+ private String indexAssortName;
+
+ /**
+ * 鍒犻櫎
+ */
+ @ApiModelProperty(name = "鍒犻櫎")
+ private String delFlag;
+
+ /**
+ * 鐖秈d
+ */
+ @ApiModelProperty(name = "鐖秈d")
+ @Excel(name = "鐖秈d")
+ private Long pid;
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty(name = "pageNum")
+ @Excel(name = "pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty(name = "pageSize")
+ @Excel(name = "pageSize")
+ private Integer pageSize;
+
+
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("indexAssortName", getIndexAssortName()).append("delFlag", getDelFlag()).append("createTime", getCreateTime()).append("updateTime", getUpdateTime()).append("pid", getPid()).toString();
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java
new file mode 100644
index 0000000..45bb2df
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java
@@ -0,0 +1,74 @@
+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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣鍒嗙被瀵硅薄 ivr_liba_target_assort
+ *
+ * @author ruoyi
+ * @date 2023-12-14
+ */
+@Data
+@ApiModel(value = "IvrLibaTarget", description = "鎸囨爣搴撳璞�")
+public class IvrLibaTargetAssortVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty(name = "涓婚敭")
+ private Long id;
+
+ /**
+ * 鎸囨爣鍒嗙被鍚嶇О
+ */
+ @ApiModelProperty(name = "涓婚敭")
+ @Excel(name = "鎸囨爣鍒嗙被鍚嶇О")
+ private String indexAssortName;
+
+ /**
+ * 鍒犻櫎
+ */
+ @ApiModelProperty(name = "鍒犻櫎")
+ private String delFlag;
+
+ /**
+ * 鐖秈d
+ */
+ @ApiModelProperty(name = "鐖秈d")
+ @Excel(name = "鐖秈d")
+ private Long pid;
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty(name = "pageNum")
+ @Excel(name = "pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty(name = "pageSize")
+ @Excel(name = "pageSize")
+ private Integer pageSize;
+
+ /**
+ * 瀛愭暟鎹�
+ */
+ @ApiModelProperty(name = "瀛愭暟鎹�")
+ private List<IvrLibaTargetAssort> ivrLibaTargetAssortList;
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("indexAssortName", getIndexAssortName()).append("delFlag", getDelFlag()).append("createTime", getCreateTime()).append("updateTime", getUpdateTime()).append("pid", getPid()).toString();
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
new file mode 100644
index 0000000..8c91dd0
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
@@ -0,0 +1,151 @@
+package com.smartor.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 鎸囨爣閫夐」搴撳璞� ivr_liba_targetoption
+ *
+ * @author ruoyi
+ * @date 2023-12-14
+ */
+@Data
+@ApiModel(value = "IvrLibaTargetoption", description = "鎸囨爣閫夐」搴撳璞�")
+public class IvrLibaTargetoption extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty(name = "涓婚敭")
+ private Long targetoptionid;
+
+ @ApiModelProperty(name = "鎸囨爣ID")
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private Long targetid;
+
+ @ApiModelProperty(name = "鎸囨爣绫诲瀷")
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String targettype;
+
+ /**
+ * 绫诲埆鍚嶇О
+ */
+ @ApiModelProperty(name = "绫诲埆鍚嶇О")
+ @Excel(name = "绫诲埆鍚嶇О")
+ private String categoryName;
+
+ @ApiModelProperty(name = "鎸囨爣鍊�")
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String targetvalue;
+
+ @ApiModelProperty(name = "姝ｅ垯")
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String targetregex;
+
+ @ApiModelProperty(name = "閫夐」鎻忚堪")
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String optiondesc;
+
+ @ApiModelProperty(name = "璇█")
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String language;
+
+ @ApiModelProperty(name = "鐗堟湰鍙�")
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private Long version;
+
+ @ApiModelProperty(name = "鍒嗙粍ID")
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String groupid;
+
+ /**
+ * 鏄惁寮傚父鏍囪瘑
+ */
+ @ApiModelProperty(name = "鏄惁寮傚父鏍囪瘑")
+ @Excel(name = "鏄惁寮傚父鏍囪瘑")
+ private Long isabnormal;
+
+ /**
+ * 棰勮闃�鍊间笂闄�
+ */
+ @ApiModelProperty(name = "棰勮闃�鍊间笂闄�")
+ @Excel(name = "棰勮闃�鍊间笂闄�")
+ private Long warnup;
+
+ /**
+ * 棰勮闃�鍊间笅闄�
+ */
+ @ApiModelProperty(name = "棰勮闃�鍊间笅闄�")
+ @Excel(name = "棰勮闃�鍊间笅闄�")
+ private Long warndown;
+
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty(name = "鍒犻櫎鏍囪")
+ private String delFlag;
+
+ /**
+ * 涓婁紶鏍囪
+ */
+ @ApiModelProperty(name = "涓婁紶鏍囪")
+ @Excel(name = " 涓婁紶鏍囪 ")
+ private Long isupload;
+
+ /**
+ * 涓婁紶鏃堕棿
+ */
+ @ApiModelProperty(name = "涓婁紶鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date uploadTime;
+
+ /**
+ * 鏈烘瀯ID
+ */
+ @ApiModelProperty(name = "鏈烘瀯ID")
+ @Excel(name = " 鏈烘瀯ID ")
+ private String orgid;
+
+ /**
+ * 鐖禝D
+ */
+ @ApiModelProperty(name = "鐖禝D")
+ @Excel(name = "鐖禝D")
+ private Long pid;
+
+ /**
+ * GUID
+ */
+ @ApiModelProperty(name = "GUID")
+ @Excel(name = "GUID")
+ private String guid;
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty(name = "pageNum")
+ @Excel(name = "pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty(name = "pageSize")
+ @Excel(name = "pageSize")
+ private Integer pageSize;
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("targetoptionid", getTargetoptionid()).append("targetid", getTargetid()).append("targettype", getTargettype()).append("categoryName", getCategoryName()).append("targetvalue", getTargetvalue()).append("targetregex", getTargetregex()).append("optiondesc", getOptiondesc()).append("language", getLanguage()).append("version", getVersion()).append("groupid", getGroupid()).append("isabnormal", getIsabnormal()).append("warnup", getWarnup()).append("warndown", getWarndown()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).append("orgid", getOrgid()).append("pid", getPid()).append("guid", getGuid()).toString();
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/domain/MedicalHistory.java b/smartor/src/main/java/com/smartor/domain/MedicalHistory.java
new file mode 100644
index 0000000..a228a3a
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/MedicalHistory.java
@@ -0,0 +1,131 @@
+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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 鐥呭彶瀵硅薄 medical_history
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Data
+@ApiModel(value = "MedicalHistory", description = "鐥呭彶瀵硅薄")
+public class MedicalHistory extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty(value = "涓婚敭")
+ private Long id;
+
+ /**
+ * 杩囧線鐤剧梾
+ */
+ @Excel(name = "杩囧線鐤剧梾")
+ @ApiModelProperty(value = "杩囧線鐤剧梾")
+ private String pastIllnesses;
+
+ /**
+ * 鑽墿杩囨晱
+ */
+ @Excel(name = "鑽墿杩囨晱")
+ @ApiModelProperty(value = "鑽墿杩囨晱")
+ private String drugAllergy;
+
+ /**
+ * 瀹舵棌鐥呭彶
+ */
+ @Excel(name = "瀹舵棌鐥呭彶")
+ @ApiModelProperty(value = "瀹舵棌鐥呭彶")
+ private String familyHistory;
+
+ /**
+ * 鎵嬫湳鍙�
+ */
+ @Excel(name = "鎵嬫湳鍙�")
+ @ApiModelProperty(value = "鎵嬫湳鍙�")
+ private String surgicalHistory;
+
+ /**
+ * 鐢熻偛鍙�
+ */
+ @Excel(name = "鐢熻偛鍙�")
+ @ApiModelProperty(value = "鐢熻偛鍙�")
+ private String reproductiveHistory;
+
+ /**
+ * 鏈堢粡鍙�
+ */
+ @Excel(name = "鏈堢粡鍙�")
+ @ApiModelProperty(value = "鏈堢粡鍙�")
+ private String menstrualHistory;
+
+ /**
+ * 鍚哥儫鎯呭喌
+ */
+ @Excel(name = "鍚哥儫鎯呭喌")
+ @ApiModelProperty(value = "鍚哥儫鎯呭喌")
+ private String smoking;
+
+ /**
+ * 楗厭鎯呭喌
+ */
+ @Excel(name = "楗厭鎯呭喌")
+ @ApiModelProperty(value = "楗厭鎯呭喌")
+ private String drink;
+
+ /**
+ * 杩愬姩鎯呭喌
+ */
+ @Excel(name = "杩愬姩鎯呭喌")
+ @ApiModelProperty(value = "杩愬姩鎯呭喌")
+ private String motion;
+
+ /**
+ * 楗鎯呭喌
+ */
+ @Excel(name = "楗鎯呭喌")
+ @ApiModelProperty(value = "楗鎯呭喌")
+ private String diet;
+
+ /**
+ * 蹇冪悊鎯呭喌
+ */
+ @Excel(name = "蹇冪悊鎯呭喌")
+ @ApiModelProperty(value = "蹇冪悊鎯呭喌")
+ private String psychology;
+
+ /**
+ * 鎮ｈ�卛d
+ */
+ @Excel(name = "鎮ｈ�卛d")
+ @ApiModelProperty(value = "鎮ｈ�卛d")
+ private Long pid;
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty(name = "pageNum")
+ @Excel(name = "pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty(name = "pageSize")
+ @Excel(name = "pageSize")
+ private Integer pageSize;
+
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("pastIllnesses", getPastIllnesses()).append("drugAllergy", getDrugAllergy()).append("familyHistory", getFamilyHistory()).append("surgicalHistory", getSurgicalHistory()).append("reproductiveHistory", getReproductiveHistory()).append("menstrualHistory", getMenstrualHistory()).append("smoking", getSmoking()).append("drink", getDrink()).append("motion", getMotion()).append("diet", getDiet()).append("psychology", getPsychology()).append("pid", getPid()).toString();
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchinvecontact.java b/smartor/src/main/java/com/smartor/domain/PatArchinvecontact.java
deleted file mode 100644
index 628853a..0000000
--- a/smartor/src/main/java/com/smartor/domain/PatArchinvecontact.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.smartor.domain;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 鎮ｈ�呰仈绯绘柟寮忓璞� pat_archinvecontact
- *
- * @author ruoyi
- * @date 2023-06-16
- */
-@ApiModel(value = "PatArchinvecontact", description = "鎮ｈ�呰仈绯绘柟寮忓璞�")
-@Data
-public class PatArchinvecontact extends BaseEntity {
- private static final long serialVersionUID = 1L;
-
- /**
- * 鑷ID
- */
- @ApiModelProperty(value = "鑷ID")
- private Long id;
-
- /**
- * 鑱旂郴鏂瑰紡ID
- */
- @Excel(name = " 鑱旂郴鏂瑰紡ID ")
- @ApiModelProperty(value = "鑱旂郴鏂瑰紡ID")
- private Long patid;
-
- /**
- * 鑱旂郴鏂瑰紡
- */
- @Excel(name = " 鑱旂郴鏂瑰紡 ")
- @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
- private String contactway;
-
- /**
- * 鍏崇郴
- */
- @Excel(name = " 鍏崇郴 ")
- @ApiModelProperty(value = "鍏崇郴")
- private Long relation;
-
- /**
- * 鏁版嵁鏉ユ簮
- */
- @Excel(name = " 鏁版嵁鏉ユ簮 ")
- @ApiModelProperty(value = "鏁版嵁鏉ユ簮")
- private Long datasource;
-
- /**
- * 鏄惁榛樿
- */
- @Excel(name = " 鏄惁榛樿 ")
- @ApiModelProperty(value = "鏄惁榛樿")
- private Long isdefault;
-
- /**
- * 鏈烘瀯ID
- */
- @Excel(name = " 鏈烘瀯ID ")
- @ApiModelProperty(value = "鏈烘瀯ID")
- private String orgid;
-
- /**
- * 鍒犻櫎鏍囪
- */
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- private String delFlag;
-
- /**
- * 涓婁紶鏍囪
- */
- @Excel(name = " 涓婁紶鏍囪 ")
- @ApiModelProperty(value = "涓婁紶鏍囪")
- private Long isupload;
-
- /**
- * 涓婁紶鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "涓婁紶鏃堕棿")
- @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
- private Date uploadTime;
-
- /**
- * 鑱旂郴濮撳悕
- */
- @Excel(name = " 鑱旂郴濮撳悕 ")
- @ApiModelProperty(value = "鑱旂郴濮撳悕")
- private String contactname;
-
-
-}
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchive.java b/smartor/src/main/java/com/smartor/domain/PatArchive.java
index b133aee..6c92148 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -45,11 +45,43 @@
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 iccardno;
+ private String idcardno;
/**
* 鐢熸棩
@@ -70,6 +102,7 @@
* 鏉ユ簮
*/
@ApiModelProperty("鏉ユ簮")
+ @Excel(name = " 鏉ユ簮 ")
private Long source;
/**
@@ -83,6 +116,7 @@
* 寤烘。浜�
*/
@ApiModelProperty("寤烘。浜�")
+ @Excel(name = " 寤烘。浜� ")
private String archiveby;
/**
@@ -92,6 +126,7 @@
@Excel(name = " 鎵嬫満鍙风爜 ")
private String telcode;
+
/**
* 浜插睘鍙风爜
*/
@@ -100,22 +135,24 @@
private String relativetelcode;
/**
- * 璇佷欢绫诲瀷
+ * 姘戞棌
*/
- @ApiModelProperty("璇佷欢绫诲瀷")
- @Excel(name = " 璇佷欢绫诲瀷 ")
- private String iccardtype;
+ @ApiModelProperty("姘戞棌")
+ @Excel(name = " 姘戞棌 ")
+ private String nation;
/**
* 鏈烘瀯ID
*/
@ApiModelProperty("鏈烘瀯ID")
+ @Excel(name = " 鏈烘瀯ID ")
private String orgid;
/**
* 寰俊openid
*/
@ApiModelProperty("寰俊openid")
+ @Excel(name = " 寰俊openid ")
private String openid;
/**
@@ -146,9 +183,22 @@
@ApiModelProperty("鏍囩闆嗗悎")
private List<String> tagList;
+ /**
+ * 鏍囩
+ */
+ @ApiModelProperty("鎮ｈ�呯被鍨�")
+ @Excel(name = " 鎮ｈ�呯被鍨� ", cellType = Excel.ColumnType.STRING)
+ private String pattype;
+
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("閽夐拤鍙�")
+ @Excel(name = " 閽夐拤鍙� ")
+ private String dduserid;
@Override
public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("patid", getPatid()).append("name", getName()).append("sex", getSex()).append("iccardno", getIccardno()).append("birthdate", getBirthdate()).append("age", getAge()).append("source", getSource()).append("archivetime", getArchivetime()).append("archiveby", getArchiveby()).append("telcode", getTelcode()).append("relativetelcode", getRelativetelcode()).append("iccardtype", getIccardtype()).append("orgid", getOrgid()).append("openid", getOpenid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("patid", getPatid()).append("name", getName()).append("sex", getSex()).append("idcardno", getIdcardno()).append("birthdate", getBirthdate()).append("age", getAge()).append("source", getSource()).append("archivetime", getArchivetime()).append("archiveby", getArchiveby()).append("telcode", getTelcode()).append("relativetelcode", getRelativetelcode()).append("idcardtype", getIdcardtype()).append("orgid", getOrgid()).append("openid", getOpenid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).toString();
}
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveAndTag.java b/smartor/src/main/java/com/smartor/domain/PatArchiveAndTag.java
index 0b6c84e..99e72e5 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveAndTag.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveAndTag.java
@@ -48,7 +48,7 @@
*/
@ApiModelProperty("璇佷欢鍙风爜")
@Excel(name = " 璇佷欢鍙风爜 ")
- private String iccardno;
+ private String idcardno;
/**
* 鐢熸棩
@@ -101,7 +101,7 @@
* 璇佷欢绫诲瀷
*/
@ApiModelProperty("璇佷欢绫诲瀷")
- private String iccardtype;
+ private String idcardtype;
/**
* 鏈烘瀯ID
@@ -145,6 +145,6 @@
@Override
public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("patid", getPatid()).append("name", getName()).append("sex", getSex()).append("iccardno", getIccardno()).append("birthdate", getBirthdate()).append("age", getAge()).append("source", getSource()).append("archivetime", getArchivetime()).append("archiveby", getArchiveby()).append("telcode", getTelcode()).append("relativetelcode", getRelativetelcode()).append("iccardtype", getIccardtype()).append("orgid", getOrgid()).append("openid", getOpenid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("patid", getPatid()).append("name", getName()).append("sex", getSex()).append("iccardno", getIdcardno()).append("birthdate", getBirthdate()).append("age", getAge()).append("source", getSource()).append("archivetime", getArchivetime()).append("archiveby", getArchiveby()).append("telcode", getTelcode()).append("relativetelcode", getRelativetelcode()).append("iccardtype", getIdcardtype()).append("orgid", getOrgid()).append("openid", getOpenid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).toString();
}
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
index 598079a..17e3abb 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
@@ -21,6 +21,12 @@
@ApiModel(value = "PatArchiveReq", description = "鎮ｈ�呮。妗堣姹傚璞�")
@Data
public class PatArchiveReq {
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("鎮ｈ�卛d")
+ @Excel(name = " 鎮ｈ�卛d ")
+ private String pid;
/**
* 濮撳悕
@@ -34,7 +40,7 @@
*/
@ApiModelProperty("璇佷欢鍙风爜")
@Excel(name = " 璇佷欢鍙风爜 ")
- private String iccardno;
+ private String idcardno;
/**
@@ -51,4 +57,58 @@
private List<String> tagIds;
+ /**
+ * 鏌ョ湅鍏ㄩ儴 0 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
+ */
+ @ApiModelProperty(value = "鏌ョ湅鍏ㄩ儴 0 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3")
+ private Long allhosp;
+
+
+ /**
+ * 鍖婚櫌鍚嶇О
+ */
+ @ApiModelProperty(value = "鍖婚櫌鍚嶇О")
+ private String hospitalname;
+
+ /**
+ * 鍖婚櫌鍚嶇О
+ */
+ @ApiModelProperty(value = "绉戝/鐥呭尯")
+ private String deptname;
+
+ /**
+ * 鍖婚櫌鍚嶇О
+ */
+ @ApiModelProperty(value = "鍖荤敓")
+ private String drname;
+
+
+ /**
+ * 鍖婚櫌鍚嶇О
+ */
+ @ApiModelProperty(value = "鍖荤敓")
+ private Date endtime;
+
+ /**
+ * 灏辫瘖缂栧彿
+ */
+ @ApiModelProperty(value = "闂ㄨ瘖缂栧彿")
+ private String visitno;
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty(name = "pageNum")
+ @Excel(name = "pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty(name = "pageSize")
+ @Excel(name = "pageSize")
+ private Integer pageSize;
+
+
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchivecontact.java b/smartor/src/main/java/com/smartor/domain/PatArchivecontact.java
new file mode 100644
index 0000000..c2be437
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatArchivecontact.java
@@ -0,0 +1,131 @@
+package com.smartor.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 鎮ｈ�呰仈绯绘柟寮忓璞� pat_archivecontact
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Data
+@ApiModel(value = "鎮ｈ�呰仈绯绘柟寮忓璞�")
+public class PatArchivecontact extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鑷ID
+ */
+ private Long id;
+
+ /**
+ * 鑱旂郴鏂瑰紡ID
+ */
+ @Excel(name = " 鑱旂郴鏂瑰紡ID ")
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡ID")
+ private Long patid;
+
+ /**
+ * 鑱旂郴鏂瑰紡
+ */
+ @Excel(name = " 鑱旂郴鏂瑰紡 ")
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
+ private String contactway;
+
+ /**
+ * 鍏崇郴
+ */
+ @Excel(name = " 鍏崇郴 ")
+ @ApiModelProperty(value = "鍏崇郴")
+ private String relation;
+
+ /**
+ * 鏁版嵁鏉ユ簮
+ */
+ @Excel(name = " 鏁版嵁鏉ユ簮 ")
+ @ApiModelProperty(value = "鏁版嵁鏉ユ簮")
+ private Long datasource;
+
+ /**
+ * 鏄惁榛樿
+ */
+ @Excel(name = " 鏄惁榛樿 ")
+ @ApiModelProperty(value = "鏄惁榛樿")
+ private Long isdefault;
+
+ /**
+ * 鏈烘瀯ID
+ */
+ @Excel(name = " 鏈烘瀯ID ")
+ @ApiModelProperty(value = "鏈烘瀯ID")
+ private String orgid;
+
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ private String delFlag;
+
+ /**
+ * 涓婁紶鏍囪
+ */
+ @Excel(name = " 涓婁紶鏍囪 ")
+ @ApiModelProperty(value = "涓婁紶鏍囪")
+ private Long isupload;
+
+ /**
+ * 涓婁紶鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
+ private Date uploadTime;
+
+ /**
+ * 鑱旂郴濮撳悕
+ */
+ @Excel(name = " 鑱旂郴濮撳悕 ")
+ @ApiModelProperty(value = "鑱旂郴濮撳悕")
+ private String contactname;
+
+ /**
+ * 鐖禝D
+ */
+ @Excel(name = "鐖禝D")
+ @ApiModelProperty(value = "鐖禝D")
+ private Long pid;
+
+ /**
+ * GUID
+ */
+ @Excel(name = "GUID")
+ @ApiModelProperty(value = "GUID")
+ private String guid;
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty(name = "pageNum")
+ @Excel(name = "pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty(name = "pageSize")
+ @Excel(name = "pageSize")
+ private Integer pageSize;
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("patid", getPatid()).append("contactway", getContactway()).append("relation", getRelation()).append("datasource", getDatasource()).append("isdefault", getIsdefault()).append("orgid", getOrgid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).append("contactname", getContactname()).append("pid", getPid()).append("guid", getGuid()).toString();
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
index d5aacdc..c45fdbc 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
@@ -4,6 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -16,6 +17,7 @@
* @date 2023-03-04
*/
@ApiModel(value = "PatMedInhosp", description = "鎮ｈ�呬綇闄㈣褰曞璞�")
+@Data
public class PatMedInhosp extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -23,6 +25,10 @@
/** 鑷ID */
@ApiModelProperty(value = "鑷ID")
private Long inhospid;
+
+ /** 鑷ID */
+ @ApiModelProperty(value = "鑷ID")
+ private String inhospno;
/** 娴佹按鍙� */
@ApiModelProperty(value = "娴佹按鍙�")
@@ -167,313 +173,6 @@
/** 鏂规鐘舵�佹搷浣滄椂闂� */
@ApiModelProperty(value = "鏂规鐘舵�佹搷浣滄椂闂�")
private Date schemetime;
-
- public void setInhospid(Long inhospid)
- {
- this.inhospid = inhospid;
- }
-
- public Long getInhospid()
- {
- return inhospid;
- }
- public void setSerialnum(String serialnum)
- {
- this.serialnum = serialnum;
- }
-
- public String getSerialnum()
- {
- return serialnum;
- }
- public void setHospitalname(String hospitalname)
- {
- this.hospitalname = hospitalname;
- }
-
- public String getHospitalname()
- {
- return hospitalname;
- }
- public void setHospitalcode(String hospitalcode)
- {
- this.hospitalcode = hospitalcode;
- }
-
- public String getHospitalcode()
- {
- return hospitalcode;
- }
- public void setHospitaldistrictcode(String hospitaldistrictcode)
- {
- this.hospitaldistrictcode = hospitaldistrictcode;
- }
-
- public String getHospitaldistrictcode()
- {
- return hospitaldistrictcode;
- }
- public void setHospitaldistrictname(String hospitaldistrictname)
- {
- this.hospitaldistrictname = hospitaldistrictname;
- }
-
- public String getHospitaldistrictname()
- {
- return hospitaldistrictname;
- }
- public void setIcd10code(String icd10code)
- {
- this.icd10code = icd10code;
- }
-
- public String getIcd10code()
- {
- return icd10code;
- }
- public void setDiagname(String diagname)
- {
- this.diagname = diagname;
- }
-
- public String getDiagname()
- {
- return diagname;
- }
- public void setStarttime(Date starttime)
- {
- this.starttime = starttime;
- }
-
- public Date getStarttime()
- {
- return starttime;
- }
- public void setEndtime(Date endtime)
- {
- this.endtime = endtime;
- }
-
- public Date getEndtime()
- {
- return endtime;
- }
- public void setDeptcode(String deptcode)
- {
- this.deptcode = deptcode;
- }
-
- public String getDeptcode()
- {
- return deptcode;
- }
- public void setDeptname(String deptname)
- {
- this.deptname = deptname;
- }
-
- public String getDeptname()
- {
- return deptname;
- }
- public void setRoomno(String roomno)
- {
- this.roomno = roomno;
- }
-
- public String getRoomno()
- {
- return roomno;
- }
- public void setBedno(String bedno)
- {
- this.bedno = bedno;
- }
-
- public String getBedno()
- {
- return bedno;
- }
- public void setOrgid(String orgid)
- {
- this.orgid = orgid;
- }
-
- public String getOrgid()
- {
- return orgid;
- }
- public void setDelFlag(String delFlag)
- {
- this.delFlag = delFlag;
- }
-
- public String getDelFlag()
- {
- return delFlag;
- }
- public void setIsupload(Long isupload)
- {
- this.isupload = isupload;
- }
-
- public Long getIsupload()
- {
- return isupload;
- }
- public void setUploadTime(Date uploadTime)
- {
- this.uploadTime = uploadTime;
- }
-
- public Date getUploadTime()
- {
- return uploadTime;
- }
- public void setPatid(Long patid)
- {
- this.patid = patid;
- }
-
- public Long getPatid()
- {
- return patid;
- }
- public void setLeavediagname(String leavediagname)
- {
- this.leavediagname = leavediagname;
- }
-
- public String getLeavediagname()
- {
- return leavediagname;
- }
- public void setLeaveicd10code(String leaveicd10code)
- {
- this.leaveicd10code = leaveicd10code;
- }
-
- public String getLeaveicd10code()
- {
- return leaveicd10code;
- }
- public void setDrcode(String drcode)
- {
- this.drcode = drcode;
- }
-
- public String getDrcode()
- {
- return drcode;
- }
- public void setDrname(String drname)
- {
- this.drname = drname;
- }
-
- public String getDrname()
- {
- return drname;
- }
- public void setSchemestatus(Long schemestatus)
- {
- this.schemestatus = schemestatus;
- }
-
- public Long getSchemestatus()
- {
- return schemestatus;
- }
- public void setGeneralschemestatus(Long generalschemestatus)
- {
- this.generalschemestatus = generalschemestatus;
- }
-
- public Long getGeneralschemestatus()
- {
- return generalschemestatus;
- }
- public void setLeaveldeptcode(String leaveldeptcode)
- {
- this.leaveldeptcode = leaveldeptcode;
- }
-
- public String getLeaveldeptcode()
- {
- return leaveldeptcode;
- }
- public void setLeaveldeptname(String leaveldeptname)
- {
- this.leaveldeptname = leaveldeptname;
- }
-
- public String getLeaveldeptname()
- {
- return leaveldeptname;
- }
- public void setHospitaldistrictid(Long hospitaldistrictid)
- {
- this.hospitaldistrictid = hospitaldistrictid;
- }
-
- public Long getHospitaldistrictid()
- {
- return hospitaldistrictid;
- }
- public void setLeavehospitaldistrictcode(String leavehospitaldistrictcode)
- {
- this.leavehospitaldistrictcode = leavehospitaldistrictcode;
- }
-
- public String getLeavehospitaldistrictcode()
- {
- return leavehospitaldistrictcode;
- }
- public void setLeavehospitaldistrictname(String leavehospitaldistrictname)
- {
- this.leavehospitaldistrictname = leavehospitaldistrictname;
- }
-
- public String getLeavehospitaldistrictname()
- {
- return leavehospitaldistrictname;
- }
- public void setLeavehospitaldistrictid(Long leavehospitaldistrictid)
- {
- this.leavehospitaldistrictid = leavehospitaldistrictid;
- }
-
- public Long getLeavehospitaldistrictid()
- {
- return leavehospitaldistrictid;
- }
- public void setDeptid(Long deptid)
- {
- this.deptid = deptid;
- }
-
- public Long getDeptid()
- {
- return deptid;
- }
- public void setLeaveldeptid(Long leaveldeptid)
- {
- this.leaveldeptid = leaveldeptid;
- }
-
- public Long getLeaveldeptid()
- {
- return leaveldeptid;
- }
- public void setSchemetime(Date schemetime)
- {
- this.schemetime = schemetime;
- }
-
- public Date getSchemetime()
- {
- return schemetime;
- }
@Override
public String toString() {
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
index a5cf2c4..f298834 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
@@ -21,92 +21,92 @@
private static final long serialVersionUID = 1L;
/** 鑷ID */
- @ApiModelProperty(name = "鑷ID")
+ @ApiModelProperty(value = "鑷ID")
private Long id;
/** 娴佹按鍙� */
- @ApiModelProperty(name = "娴佹按鍙�")
+ @ApiModelProperty(value = "娴佹按鍙�")
private String serialnum;
/** 妗ｆID */
- @ApiModelProperty(name = "妗ｆID")
+ @ApiModelProperty(value = "妗ｆID")
private Long patid;
/** 鍖婚櫌鍚嶇О */
- @ApiModelProperty(name = "鍖婚櫌鍚嶇О")
+ @ApiModelProperty(value = "鍖婚櫌鍚嶇О")
private String hospitalname;
/** 鍖婚櫌缂栧彿 */
- @ApiModelProperty(name = "鍖婚櫌缂栧彿")
+ @ApiModelProperty(value = "鍖婚櫌缂栧彿")
private String hospitalcode;
/** 璇婃柇ICD鍊� */
- @ApiModelProperty(name = "璇婃柇ICD鍊�")
+ @ApiModelProperty(value = "璇婃柇ICD鍊�")
private String icd10code;
/** 璇婃柇鍚嶇О */
- @ApiModelProperty(name = "璇婃柇鍚嶇О")
+ @ApiModelProperty(value = "璇婃柇鍚嶇О")
private String diagname;
/** 绉戝浠ｇ爜 */
- @ApiModelProperty(name = "绉戝浠ｇ爜")
+ @ApiModelProperty(value = "绉戝浠ｇ爜")
private String deptcode;
/** 绉戝鍚嶇О */
- @ApiModelProperty(name = "绉戝鍚嶇О")
+ @ApiModelProperty(value = "绉戝鍚嶇О")
@Excel(name = " 绉戝鍚嶇О ")
private String deptname;
/** 鍖荤敓宸ュ彿 */
- @ApiModelProperty(name = "鍖荤敓宸ュ彿")
+ @ApiModelProperty(value = "鍖荤敓宸ュ彿")
private String drcode;
/** 鍖荤敓鍚嶇О */
- @ApiModelProperty(name = "鍖荤敓鍚嶇О")
+ @ApiModelProperty(value = "鍖荤敓鍚嶇О")
private String drname;
/** 灏辫瘖鏃ユ湡 */
- @ApiModelProperty(name = "灏辫瘖鏃ユ湡")
+ @ApiModelProperty(value = "灏辫瘖鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = " 灏辫瘖鏃ユ湡 ", width = 30, dateFormat = "yyyy-MM-dd")
private Date admitdate;
/** 鏈烘瀯ID */
- @ApiModelProperty(name = "鏈烘瀯ID")
+ @ApiModelProperty(value = "鏈烘瀯ID")
private String orgid;
/** 鍒犻櫎鏍囪 */
- @ApiModelProperty(name = "鍒犻櫎鏍囪")
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
private String delFlag;
/** 涓婁紶鏍囪 */
- @ApiModelProperty(name = "涓婁紶鏍囪")
+ @ApiModelProperty(value = "涓婁紶鏍囪")
private Long isupload;
/** 涓婁紶鏃堕棿 */
- @ApiModelProperty(name = "涓婁紶鏃堕棿")
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
private Date uploadTime;
/** 鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚灏辫瘖 9鏃犲尮閰嶆柟妗� */
- @ApiModelProperty(name = "鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚灏辫瘖 9鏃犲尮閰嶆柟妗�")
+ @ApiModelProperty(value = "鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚灏辫瘖 9鏃犲尮閰嶆柟妗�")
private Long schemestatus;
/** 绉戝ID */
- @ApiModelProperty(name = "绉戝ID")
+ @ApiModelProperty(value = "绉戝ID")
private Long deptid;
/** 鏂规鐘舵�佹搷浣滄椂闂� */
- @ApiModelProperty(name = "鏂规鐘舵�佹搷浣滄椂闂�")
+ @ApiModelProperty(value = "鏂规鐘舵�佹搷浣滄椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = " 鏂规鐘舵�佹搷浣滄椂闂� ", width = 30, dateFormat = "yyyy-MM-dd")
private Date schemetime;
/** 鐜扮梾鍙� */
- @ApiModelProperty(name = "鐜扮梾鍙�")
+ @ApiModelProperty(value = "鐜扮梾鍙�")
private String hpi;
/** 涓昏堪 */
- @ApiModelProperty(name = "涓昏堪")
+ @ApiModelProperty(value = "涓昏堪")
private String mainsuit;
public void setId(Long id)
diff --git a/smartor/src/main/java/com/smartor/domain/PatientManageDto.java b/smartor/src/main/java/com/smartor/domain/PatientManageDto.java
deleted file mode 100644
index 8632b9b..0000000
--- a/smartor/src/main/java/com/smartor/domain/PatientManageDto.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.smartor.domain;
-
-public class PatientManageDto {
-}
diff --git a/smartor/src/main/java/com/smartor/mapper/HeCategoryMapper.java b/smartor/src/main/java/com/smartor/mapper/HeCategoryMapper.java
index 098d575..12d84fb 100644
--- a/smartor/src/main/java/com/smartor/mapper/HeCategoryMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/HeCategoryMapper.java
@@ -1,19 +1,21 @@
package com.smartor.mapper;
import java.util.List;
+
import com.smartor.domain.HeCategory;
+import org.apache.ibatis.annotations.Mapper;
/**
* 瀹ｆ暀鍒嗙被Mapper鎺ュ彛
- *
+ *
* @author smartor
* @date 2023-03-04
*/
-public interface HeCategoryMapper
-{
+@Mapper
+public interface HeCategoryMapper {
/**
* 鏌ヨ瀹ｆ暀鍒嗙被
- *
+ *
* @param id 瀹ｆ暀鍒嗙被涓婚敭
* @return 瀹ｆ暀鍒嗙被
*/
@@ -21,7 +23,7 @@
/**
* 鏌ヨ瀹ｆ暀鍒嗙被鍒楄〃
- *
+ *
* @param heCategory 瀹ｆ暀鍒嗙被
* @return 瀹ｆ暀鍒嗙被闆嗗悎
*/
@@ -29,7 +31,7 @@
/**
* 鏂板瀹ｆ暀鍒嗙被
- *
+ *
* @param heCategory 瀹ｆ暀鍒嗙被
* @return 缁撴灉
*/
@@ -37,7 +39,7 @@
/**
* 淇敼瀹ｆ暀鍒嗙被
- *
+ *
* @param heCategory 瀹ｆ暀鍒嗙被
* @return 缁撴灉
*/
@@ -45,7 +47,7 @@
/**
* 鍒犻櫎瀹ｆ暀鍒嗙被
- *
+ *
* @param id 瀹ｆ暀鍒嗙被涓婚敭
* @return 缁撴灉
*/
@@ -53,7 +55,7 @@
/**
* 鎵归噺鍒犻櫎瀹ｆ暀鍒嗙被
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetAssortMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetAssortMapper.java
new file mode 100644
index 0000000..da14cc5
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetAssortMapper.java
@@ -0,0 +1,64 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.IvrLibaTargetAssort;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣鍒嗙被Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-14
+ */
+@Mapper
+public interface IvrLibaTargetAssortMapper
+{
+ /**
+ * 鏌ヨ鎸囨爣鍒嗙被
+ *
+ * @param id 鎸囨爣鍒嗙被涓婚敭
+ * @return 鎸囨爣鍒嗙被
+ */
+ public IvrLibaTargetAssort selectIvrLibaTargetAssortById(Long id);
+
+ /**
+ * 鏌ヨ鎸囨爣鍒嗙被鍒楄〃
+ *
+ * @param ivrLibaTargetAssort 鎸囨爣鍒嗙被
+ * @return 鎸囨爣鍒嗙被闆嗗悎
+ */
+ public List<IvrLibaTargetAssort> selectIvrLibaTargetAssortList(IvrLibaTargetAssort ivrLibaTargetAssort);
+
+ /**
+ * 鏂板鎸囨爣鍒嗙被
+ *
+ * @param ivrLibaTargetAssort 鎸囨爣鍒嗙被
+ * @return 缁撴灉
+ */
+ public int insertIvrLibaTargetAssort(IvrLibaTargetAssort ivrLibaTargetAssort);
+
+ /**
+ * 淇敼鎸囨爣鍒嗙被
+ *
+ * @param ivrLibaTargetAssort 鎸囨爣鍒嗙被
+ * @return 缁撴灉
+ */
+ public int updateIvrLibaTargetAssort(IvrLibaTargetAssort ivrLibaTargetAssort);
+
+ /**
+ * 鍒犻櫎鎸囨爣鍒嗙被
+ *
+ * @param id 鎸囨爣鍒嗙被涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteIvrLibaTargetAssortById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鎸囨爣鍒嗙被
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteIvrLibaTargetAssortByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java
index 11b6be1..81d514a 100644
--- a/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java
@@ -1,61 +1,64 @@
package com.smartor.mapper;
-import java.util.List;
import com.smartor.domain.IvrLibaTarget;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
/**
- * 鎸囨爣搴揗apper鎺ュ彛
+ * 鎸囨爣閫夐」搴揗apper鎺ュ彛
*
- * @author smartor
- * @date 2023-03-22
+ * @author ruoyi
+ * @date 2023-12-14
*/
+@Mapper
public interface IvrLibaTargetMapper
{
/**
- * 鏌ヨ鎸囨爣搴�
+ * 鏌ヨ鎸囨爣閫夐」搴�
*
- * @param targetID 鎸囨爣搴撲富閿�
- * @return 鎸囨爣搴�
+ * @param targetID 鎸囨爣閫夐」搴撲富閿�
+ * @return 鎸囨爣閫夐」搴�
*/
- public IvrLibaTarget selectIvrLibaTargetByTargetID(String targetID);
+ public IvrLibaTarget selectIvrLibaTargetByTargetID(Long targetID);
/**
- * 鏌ヨ鎸囨爣搴撳垪琛�
+ * 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
*
- * @param ivrLibaTarget 鎸囨爣搴�
- * @return 鎸囨爣搴撻泦鍚�
+ * @param ivrLibaTarget 鎸囨爣閫夐」搴�
+ * @return 鎸囨爣閫夐」搴撻泦鍚�
*/
public List<IvrLibaTarget> selectIvrLibaTargetList(IvrLibaTarget ivrLibaTarget);
/**
- * 鏂板鎸囨爣搴�
+ * 鏂板鎸囨爣閫夐」搴�
*
- * @param ivrLibaTarget 鎸囨爣搴�
+ * @param ivrLibaTarget 鎸囨爣閫夐」搴�
* @return 缁撴灉
*/
public int insertIvrLibaTarget(IvrLibaTarget ivrLibaTarget);
/**
- * 淇敼鎸囨爣搴�
+ * 淇敼鎸囨爣閫夐」搴�
*
- * @param ivrLibaTarget 鎸囨爣搴�
+ * @param ivrLibaTarget 鎸囨爣閫夐」搴�
* @return 缁撴灉
*/
public int updateIvrLibaTarget(IvrLibaTarget ivrLibaTarget);
/**
- * 鍒犻櫎鎸囨爣搴�
+ * 鍒犻櫎鎸囨爣閫夐」搴�
*
- * @param targetID 鎸囨爣搴撲富閿�
+ * @param targetID 鎸囨爣閫夐」搴撲富閿�
* @return 缁撴灉
*/
- public int deleteIvrLibaTargetByTargetID(String targetID);
+ public int deleteIvrLibaTargetByTargetID(Long targetID);
/**
- * 鎵归噺鍒犻櫎鎸囨爣搴�
+ * 鎵归噺鍒犻櫎鎸囨爣閫夐」搴�
*
* @param targetIDs 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int deleteIvrLibaTargetByTargetIDs(String[] targetIDs);
+ public int deleteIvrLibaTargetByTargetIDs(Long[] targetIDs);
}
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetoptionMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetoptionMapper.java
new file mode 100644
index 0000000..dae98f1
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetoptionMapper.java
@@ -0,0 +1,63 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.IvrLibaTargetoption;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣閫夐」搴揗apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-14
+ */
+@Mapper
+public interface IvrLibaTargetoptionMapper {
+ /**
+ * 鏌ヨ鎸囨爣閫夐」搴�
+ *
+ * @param targetoptionid 鎸囨爣閫夐」搴撲富閿�
+ * @return 鎸囨爣閫夐」搴�
+ */
+ public IvrLibaTargetoption selectIvrLibaTargetoptionByTargetoptionid(Long targetoptionid);
+
+ /**
+ * 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
+ *
+ * @param ivrLibaTargetoption 鎸囨爣閫夐」搴�
+ * @return 鎸囨爣閫夐」搴撻泦鍚�
+ */
+ public List<IvrLibaTargetoption> selectIvrLibaTargetoptionList(IvrLibaTargetoption ivrLibaTargetoption);
+
+ /**
+ * 鏂板鎸囨爣閫夐」搴�
+ *
+ * @param ivrLibaTargetoption 鎸囨爣閫夐」搴�
+ * @return 缁撴灉
+ */
+ public int insertIvrLibaTargetoption(IvrLibaTargetoption ivrLibaTargetoption);
+
+ /**
+ * 淇敼鎸囨爣閫夐」搴�
+ *
+ * @param ivrLibaTargetoption 鎸囨爣閫夐」搴�
+ * @return 缁撴灉
+ */
+ public int updateIvrLibaTargetoption(IvrLibaTargetoption ivrLibaTargetoption);
+
+ /**
+ * 鍒犻櫎鎸囨爣閫夐」搴�
+ *
+ * @param targetoptionid 鎸囨爣閫夐」搴撲富閿�
+ * @return 缁撴灉
+ */
+ public int deleteIvrLibaTargetoptionByTargetoptionid(Long targetoptionid);
+
+ /**
+ * 鎵归噺鍒犻櫎鎸囨爣閫夐」搴�
+ *
+ * @param targetoptionids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteIvrLibaTargetoptionByTargetoptionids(Long[] targetoptionids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/MedicalHistoryMapper.java b/smartor/src/main/java/com/smartor/mapper/MedicalHistoryMapper.java
new file mode 100644
index 0000000..f814f51
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/MedicalHistoryMapper.java
@@ -0,0 +1,63 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.MedicalHistory;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鐥呭彶Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Mapper
+public interface MedicalHistoryMapper {
+ /**
+ * 鏌ヨ鐥呭彶
+ *
+ * @param id 鐥呭彶涓婚敭
+ * @return 鐥呭彶
+ */
+ public MedicalHistory selectMedicalHistoryById(Long id);
+
+ /**
+ * 鏌ヨ鐥呭彶鍒楄〃
+ *
+ * @param medicalHistory 鐥呭彶
+ * @return 鐥呭彶闆嗗悎
+ */
+ public List<MedicalHistory> selectMedicalHistoryList(MedicalHistory medicalHistory);
+
+ /**
+ * 鏂板鐥呭彶
+ *
+ * @param medicalHistory 鐥呭彶
+ * @return 缁撴灉
+ */
+ public int insertMedicalHistory(MedicalHistory medicalHistory);
+
+ /**
+ * 淇敼鐥呭彶
+ *
+ * @param medicalHistory 鐥呭彶
+ * @return 缁撴灉
+ */
+ public int updateMedicalHistory(MedicalHistory medicalHistory);
+
+ /**
+ * 鍒犻櫎鐥呭彶
+ *
+ * @param id 鐥呭彶涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteMedicalHistoryById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鐥呭彶
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteMedicalHistoryByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatArchinvecontactMapper.java b/smartor/src/main/java/com/smartor/mapper/PatArchinvecontactMapper.java
deleted file mode 100644
index 5e809db..0000000
--- a/smartor/src/main/java/com/smartor/mapper/PatArchinvecontactMapper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.smartor.mapper;
-
-import com.smartor.domain.PatArchinvecontact;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * 鎮ｈ�呰仈绯绘柟寮廙apper鎺ュ彛
- *
- * @author ruoyi
- * @date 2023-06-16
- */
-@Mapper
-public interface PatArchinvecontactMapper {
- /**
- * 鏌ヨ鎮ｈ�呰仈绯绘柟寮�
- *
- * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
- * @return 鎮ｈ�呰仈绯绘柟寮�
- */
- public PatArchinvecontact selectPatArchinvecontactById(Long id);
-
- /**
- * 鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�
- *
- * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
- * @return 鎮ｈ�呰仈绯绘柟寮忛泦鍚�
- */
- public List<PatArchinvecontact> selectPatArchinvecontactList(PatArchinvecontact patArchinvecontact);
-
- /**
- * 鏂板鎮ｈ�呰仈绯绘柟寮�
- *
- * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
- * @return 缁撴灉
- */
- public int insertPatArchinvecontact(PatArchinvecontact patArchinvecontact);
-
- /**
- * 淇敼鎮ｈ�呰仈绯绘柟寮�
- *
- * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
- * @return 缁撴灉
- */
- public int updatePatArchinvecontact(PatArchinvecontact patArchinvecontact);
-
- /**
- * 鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
- *
- * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
- * @return 缁撴灉
- */
- public int deletePatArchinvecontactById(Long id);
-
- /**
- * 鎵归噺鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deletePatArchinvecontactByIds(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 1308eda..f36b275 100644
--- a/smartor/src/main/java/com/smartor/mapper/PatArchiveMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/PatArchiveMapper.java
@@ -1,10 +1,10 @@
package com.smartor.mapper;
-import java.util.List;
-
import com.smartor.domain.PatArchive;
import com.smartor.domain.PatArchiveReq;
import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
/**
* 鎮ｈ�呮。妗圡apper鎺ュ彛
@@ -39,7 +39,7 @@
* @param patArchive 鎮ｈ�呮。妗�
* @return 缁撴灉
*/
- public int insertPatArchive(PatArchive patArchive);
+ public int insertPatArchive(List<PatArchive> patArchives);
/**
* 淇敼鎮ｈ�呮。妗�
@@ -64,4 +64,16 @@
* @return 缁撴灉
*/
public int deletePatArchiveByPatids(Long[] patids);
+
+
+
+ public List<PatArchive> selectPatArchiveInfoByAllhosp(PatArchiveReq patArchive);
+
+ public List<PatArchive> selectPatArchiveInfoByInhosp(PatArchiveReq patArchive);
+
+ public List<PatArchive> selectPatArchiveInfoByOuthosp(PatArchiveReq patArchive);
+
+ public List<PatArchive> selectPatArchiveInfoByPhysical(PatArchiveReq patArchive);
+
+
}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatArchivecontactMapper.java b/smartor/src/main/java/com/smartor/mapper/PatArchivecontactMapper.java
new file mode 100644
index 0000000..b710334
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/PatArchivecontactMapper.java
@@ -0,0 +1,64 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.PatArchivecontact;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呰仈绯绘柟寮廙apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Mapper
+public interface PatArchivecontactMapper
+{
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 鎮ｈ�呰仈绯绘柟寮�
+ */
+ public PatArchivecontact selectPatArchivecontactById(Long id);
+
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�
+ *
+ * @param patArchivecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 鎮ｈ�呰仈绯绘柟寮忛泦鍚�
+ */
+ public List<PatArchivecontact> selectPatArchivecontactList(PatArchivecontact patArchivecontact);
+
+ /**
+ * 鏂板鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param patArchivecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 缁撴灉
+ */
+ public int insertPatArchivecontact(PatArchivecontact patArchivecontact);
+
+ /**
+ * 淇敼鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param patArchivecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 缁撴灉
+ */
+ public int updatePatArchivecontact(PatArchivecontact patArchivecontact);
+
+ /**
+ * 鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 缁撴灉
+ */
+ public int deletePatArchivecontactById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deletePatArchivecontactByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatArchivetagMapper.java b/smartor/src/main/java/com/smartor/mapper/PatArchivetagMapper.java
index 4e0bc83..4256aa0 100644
--- a/smartor/src/main/java/com/smartor/mapper/PatArchivetagMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/PatArchivetagMapper.java
@@ -21,14 +21,6 @@
*/
public PatArchivetag selectPatArchivetagById(Long id);
- /**
- * 鏌ヨ鎮ｈ�呮。妗堟爣绛惧垪琛�
- *
- * @param patArchivetag 鎮ｈ�呮。妗堟爣绛�
- * @return 鎮ｈ�呮。妗堟爣绛鹃泦鍚�
- */
- public List<PatArchivetag> selectPatArchivetagList(PatArchivetag patArchivetag);
-
/**
* 鏌ヨ鎮ｈ�呮。妗堟爣绛惧垪琛�
diff --git a/smartor/src/main/java/com/smartor/service/IHeCategoryService.java b/smartor/src/main/java/com/smartor/service/IHeCategoryService.java
index 4123bdc..1048eb2 100644
--- a/smartor/src/main/java/com/smartor/service/IHeCategoryService.java
+++ b/smartor/src/main/java/com/smartor/service/IHeCategoryService.java
@@ -1,19 +1,20 @@
package com.smartor.service;
import java.util.List;
+
import com.smartor.domain.HeCategory;
+import com.smartor.domain.HeCategoryVO;
/**
* 瀹ｆ暀鍒嗙被Service鎺ュ彛
- *
+ *
* @author smartor
* @date 2023-03-04
*/
-public interface IHeCategoryService
-{
+public interface IHeCategoryService {
/**
* 鏌ヨ瀹ｆ暀鍒嗙被
- *
+ *
* @param id 瀹ｆ暀鍒嗙被涓婚敭
* @return 瀹ｆ暀鍒嗙被
*/
@@ -21,15 +22,15 @@
/**
* 鏌ヨ瀹ｆ暀鍒嗙被鍒楄〃
- *
+ *
* @param heCategory 瀹ｆ暀鍒嗙被
* @return 瀹ｆ暀鍒嗙被闆嗗悎
*/
- public List<HeCategory> selectHeCategoryList(HeCategory heCategory);
+ public List<HeCategoryVO> selectHeCategoryList(HeCategory heCategory);
/**
* 鏂板瀹ｆ暀鍒嗙被
- *
+ *
* @param heCategory 瀹ｆ暀鍒嗙被
* @return 缁撴灉
*/
@@ -37,7 +38,7 @@
/**
* 淇敼瀹ｆ暀鍒嗙被
- *
+ *
* @param heCategory 瀹ｆ暀鍒嗙被
* @return 缁撴灉
*/
@@ -45,7 +46,7 @@
/**
* 鎵归噺鍒犻櫎瀹ｆ暀鍒嗙被
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑瀹ｆ暀鍒嗙被涓婚敭闆嗗悎
* @return 缁撴灉
*/
@@ -53,7 +54,7 @@
/**
* 鍒犻櫎瀹ｆ暀鍒嗙被淇℃伅
- *
+ *
* @param id 瀹ｆ暀鍒嗙被涓婚敭
* @return 缁撴灉
*/
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaTargetAssortService.java b/smartor/src/main/java/com/smartor/service/IIvrLibaTargetAssortService.java
new file mode 100644
index 0000000..3533b90
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IIvrLibaTargetAssortService.java
@@ -0,0 +1,63 @@
+package com.smartor.service;
+
+import com.smartor.domain.IvrLibaTargetAssort;
+import com.smartor.domain.IvrLibaTargetAssortVO;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣鍒嗙被Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-14
+ */
+public interface IIvrLibaTargetAssortService
+{
+ /**
+ * 鏌ヨ鎸囨爣鍒嗙被
+ *
+ * @param id 鎸囨爣鍒嗙被涓婚敭
+ * @return 鎸囨爣鍒嗙被
+ */
+ public IvrLibaTargetAssort selectIvrLibaTargetAssortById(Long id);
+
+ /**
+ * 鏌ヨ鎸囨爣鍒嗙被鍒楄〃
+ *
+ * @param ivrLibaTargetAssort 鎸囨爣鍒嗙被
+ * @return 鎸囨爣鍒嗙被闆嗗悎
+ */
+ public List<IvrLibaTargetAssortVO> selectIvrLibaTargetAssortList(IvrLibaTargetAssort ivrLibaTargetAssort);
+
+ /**
+ * 鏂板鎸囨爣鍒嗙被
+ *
+ * @param ivrLibaTargetAssort 鎸囨爣鍒嗙被
+ * @return 缁撴灉
+ */
+ public int insertIvrLibaTargetAssort(IvrLibaTargetAssort ivrLibaTargetAssort);
+
+ /**
+ * 淇敼鎸囨爣鍒嗙被
+ *
+ * @param ivrLibaTargetAssort 鎸囨爣鍒嗙被
+ * @return 缁撴灉
+ */
+ public int updateIvrLibaTargetAssort(IvrLibaTargetAssort ivrLibaTargetAssort);
+
+ /**
+ * 鎵归噺鍒犻櫎鎸囨爣鍒嗙被
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎸囨爣鍒嗙被涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteIvrLibaTargetAssortByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鎸囨爣鍒嗙被淇℃伅
+ *
+ * @param id 鎸囨爣鍒嗙被涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteIvrLibaTargetAssortById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java b/smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java
index a761071..12a1111 100644
--- a/smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java
+++ b/smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java
@@ -1,61 +1,62 @@
package com.smartor.service;
-import java.util.List;
import com.smartor.domain.IvrLibaTarget;
+import java.util.List;
+
/**
- * 鎸囨爣搴揝ervice鎺ュ彛
+ * 鎸囨爣閫夐」搴揝ervice鎺ュ彛
*
- * @author smartor
- * @date 2023-03-22
+ * @author ruoyi
+ * @date 2023-12-14
*/
public interface IIvrLibaTargetService
{
/**
- * 鏌ヨ鎸囨爣搴�
+ * 鏌ヨ鎸囨爣閫夐」搴�
*
- * @param targetID 鎸囨爣搴撲富閿�
- * @return 鎸囨爣搴�
+ * @param targetID 鎸囨爣閫夐」搴撲富閿�
+ * @return 鎸囨爣閫夐」搴�
*/
- public IvrLibaTarget selectIvrLibaTargetByTargetID(String targetID);
+ public IvrLibaTarget selectIvrLibaTargetByTargetID(Long targetID);
/**
- * 鏌ヨ鎸囨爣搴撳垪琛�
+ * 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
*
- * @param ivrLibaTarget 鎸囨爣搴�
- * @return 鎸囨爣搴撻泦鍚�
+ * @param ivrLibaTarget 鎸囨爣閫夐」搴�
+ * @return 鎸囨爣閫夐」搴撻泦鍚�
*/
public List<IvrLibaTarget> selectIvrLibaTargetList(IvrLibaTarget ivrLibaTarget);
/**
- * 鏂板鎸囨爣搴�
+ * 鏂板鎸囨爣閫夐」搴�
*
- * @param ivrLibaTarget 鎸囨爣搴�
+ * @param ivrLibaTarget 鎸囨爣閫夐」搴�
* @return 缁撴灉
*/
public int insertIvrLibaTarget(IvrLibaTarget ivrLibaTarget);
/**
- * 淇敼鎸囨爣搴�
+ * 淇敼鎸囨爣閫夐」搴�
*
- * @param ivrLibaTarget 鎸囨爣搴�
+ * @param ivrLibaTarget 鎸囨爣閫夐」搴�
* @return 缁撴灉
*/
public int updateIvrLibaTarget(IvrLibaTarget ivrLibaTarget);
/**
- * 鎵归噺鍒犻櫎鎸囨爣搴�
+ * 鎵归噺鍒犻櫎鎸囨爣閫夐」搴�
*
- * @param targetIDs 闇�瑕佸垹闄ょ殑鎸囨爣搴撲富閿泦鍚�
+ * @param targetIDs 闇�瑕佸垹闄ょ殑鎸囨爣閫夐」搴撲富閿泦鍚�
* @return 缁撴灉
*/
- public int deleteIvrLibaTargetByTargetIDs(String[] targetIDs);
+ public int deleteIvrLibaTargetByTargetIDs(Long[] targetIDs);
/**
- * 鍒犻櫎鎸囨爣搴撲俊鎭�
+ * 鍒犻櫎鎸囨爣閫夐」搴撲俊鎭�
*
- * @param targetID 鎸囨爣搴撲富閿�
+ * @param targetID 鎸囨爣閫夐」搴撲富閿�
* @return 缁撴灉
*/
- public int deleteIvrLibaTargetByTargetID(String targetID);
+ public int deleteIvrLibaTargetByTargetID(Long targetID);
}
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaTargetoptionService.java b/smartor/src/main/java/com/smartor/service/IIvrLibaTargetoptionService.java
new file mode 100644
index 0000000..453c948
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IIvrLibaTargetoptionService.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.IvrLibaTargetoption;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣閫夐」搴揝ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-14
+ */
+public interface IIvrLibaTargetoptionService
+{
+ /**
+ * 鏌ヨ鎸囨爣閫夐」搴�
+ *
+ * @param targetoptionid 鎸囨爣閫夐」搴撲富閿�
+ * @return 鎸囨爣閫夐」搴�
+ */
+ public IvrLibaTargetoption selectIvrLibaTargetoptionByTargetoptionid(Long targetoptionid);
+
+ /**
+ * 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
+ *
+ * @param ivrLibaTargetoption 鎸囨爣閫夐」搴�
+ * @return 鎸囨爣閫夐」搴撻泦鍚�
+ */
+ public List<IvrLibaTargetoption> selectIvrLibaTargetoptionList(IvrLibaTargetoption ivrLibaTargetoption);
+
+ /**
+ * 鏂板鎸囨爣閫夐」搴�
+ *
+ * @param ivrLibaTargetoption 鎸囨爣閫夐」搴�
+ * @return 缁撴灉
+ */
+ public int insertIvrLibaTargetoption(IvrLibaTargetoption ivrLibaTargetoption);
+
+ /**
+ * 淇敼鎸囨爣閫夐」搴�
+ *
+ * @param ivrLibaTargetoption 鎸囨爣閫夐」搴�
+ * @return 缁撴灉
+ */
+ public int updateIvrLibaTargetoption(IvrLibaTargetoption ivrLibaTargetoption);
+
+ /**
+ * 鎵归噺鍒犻櫎鎸囨爣閫夐」搴�
+ *
+ * @param targetoptionids 闇�瑕佸垹闄ょ殑鎸囨爣閫夐」搴撲富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deleteIvrLibaTargetoptionByTargetoptionids(Long[] targetoptionids);
+
+ /**
+ * 鍒犻櫎鎸囨爣閫夐」搴撲俊鎭�
+ *
+ * @param targetoptionid 鎸囨爣閫夐」搴撲富閿�
+ * @return 缁撴灉
+ */
+ public int deleteIvrLibaTargetoptionByTargetoptionid(Long targetoptionid);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IMedicalHistoryService.java b/smartor/src/main/java/com/smartor/service/IMedicalHistoryService.java
new file mode 100644
index 0000000..5cf6962
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IMedicalHistoryService.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.MedicalHistory;
+
+import java.util.List;
+
+/**
+ * 鐥呭彶Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+public interface IMedicalHistoryService
+{
+ /**
+ * 鏌ヨ鐥呭彶
+ *
+ * @param id 鐥呭彶涓婚敭
+ * @return 鐥呭彶
+ */
+ public MedicalHistory selectMedicalHistoryById(Long id);
+
+ /**
+ * 鏌ヨ鐥呭彶鍒楄〃
+ *
+ * @param medicalHistory 鐥呭彶
+ * @return 鐥呭彶闆嗗悎
+ */
+ public List<MedicalHistory> selectMedicalHistoryList(MedicalHistory medicalHistory);
+
+ /**
+ * 鏂板鐥呭彶
+ *
+ * @param medicalHistory 鐥呭彶
+ * @return 缁撴灉
+ */
+ public int insertMedicalHistory(MedicalHistory medicalHistory);
+
+ /**
+ * 淇敼鐥呭彶
+ *
+ * @param medicalHistory 鐥呭彶
+ * @return 缁撴灉
+ */
+ public int updateMedicalHistory(MedicalHistory medicalHistory);
+
+ /**
+ * 鎵归噺鍒犻櫎鐥呭彶
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鐥呭彶涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteMedicalHistoryByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鐥呭彶淇℃伅
+ *
+ * @param id 鐥呭彶涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteMedicalHistoryById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IPatArchinvecontactService.java b/smartor/src/main/java/com/smartor/service/IPatArchinvecontactService.java
deleted file mode 100644
index 52487fc..0000000
--- a/smartor/src/main/java/com/smartor/service/IPatArchinvecontactService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.smartor.service;
-
-import com.smartor.domain.PatArchinvecontact;
-
-import java.util.List;
-
-/**
- * 鎮ｈ�呰仈绯绘柟寮廠ervice鎺ュ彛
- *
- * @author ruoyi
- * @date 2023-06-16
- */
-public interface IPatArchinvecontactService
-{
- /**
- * 鏌ヨ鎮ｈ�呰仈绯绘柟寮�
- *
- * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
- * @return 鎮ｈ�呰仈绯绘柟寮�
- */
- public PatArchinvecontact selectPatArchinvecontactById(Long id);
-
- /**
- * 鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�
- *
- * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
- * @return 鎮ｈ�呰仈绯绘柟寮忛泦鍚�
- */
- public List<PatArchinvecontact> selectPatArchinvecontactList(PatArchinvecontact patArchinvecontact);
-
- /**
- * 鏂板鎮ｈ�呰仈绯绘柟寮�
- *
- * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
- * @return 缁撴灉
- */
- public int insertPatArchinvecontact(PatArchinvecontact patArchinvecontact);
-
- /**
- * 淇敼鎮ｈ�呰仈绯绘柟寮�
- *
- * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
- * @return 缁撴灉
- */
- public int updatePatArchinvecontact(PatArchinvecontact patArchinvecontact);
-
- /**
- * 鎵归噺鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鎮ｈ�呰仈绯绘柟寮忎富閿泦鍚�
- * @return 缁撴灉
- */
- public int deletePatArchinvecontactByIds(Long[] ids);
-
- /**
- * 鍒犻櫎鎮ｈ�呰仈绯绘柟寮忎俊鎭�
- *
- * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
- * @return 缁撴灉
- */
- public int deletePatArchinvecontactById(Long id);
-}
diff --git a/smartor/src/main/java/com/smartor/service/IPatArchiveService.java b/smartor/src/main/java/com/smartor/service/IPatArchiveService.java
index d72589c..677f222 100644
--- a/smartor/src/main/java/com/smartor/service/IPatArchiveService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatArchiveService.java
@@ -32,6 +32,7 @@
*/
public List<PatArchive> selectPatArchiveList(PatArchive patArchive);
+
/**
* 鏂板鎮ｈ�呮。妗�
*
@@ -46,7 +47,7 @@
* @param patArchive 鎮ｈ�呮。妗�
* @return 缁撴灉
*/
- public int updatePatArchive(PatArchive patArchive);
+ public Boolean updatePatArchive(PatArchive patArchive);
/**
* 鎵归噺鍒犻櫎鎮ｈ�呮。妗�
@@ -87,4 +88,6 @@
public List<PatArchivetagAndPatientInfo> patTagByContion(List<Long> tagids);
public List<PatArchivetagAndPatientInfo> patInfoByTag(List<Long> tagids);
+
+ public List<Object> getUserTreatmentInfo(String pid,String type);
}
diff --git a/smartor/src/main/java/com/smartor/service/IPatArchivecontactService.java b/smartor/src/main/java/com/smartor/service/IPatArchivecontactService.java
new file mode 100644
index 0000000..b68cc83
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IPatArchivecontactService.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.PatArchivecontact;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呰仈绯绘柟寮廠ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+public interface IPatArchivecontactService
+{
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 鎮ｈ�呰仈绯绘柟寮�
+ */
+ public PatArchivecontact selectPatArchivecontactById(Long id);
+
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�
+ *
+ * @param patArchivecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 鎮ｈ�呰仈绯绘柟寮忛泦鍚�
+ */
+ public List<PatArchivecontact> selectPatArchivecontactList(PatArchivecontact patArchivecontact);
+
+ /**
+ * 鏂板鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param patArchivecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 缁撴灉
+ */
+ public int insertPatArchivecontact(PatArchivecontact patArchivecontact);
+
+ /**
+ * 淇敼鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param patArchivecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 缁撴灉
+ */
+ public int updatePatArchivecontact(PatArchivecontact patArchivecontact);
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎮ｈ�呰仈绯绘柟寮忎富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deletePatArchivecontactByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鎮ｈ�呰仈绯绘柟寮忎俊鎭�
+ *
+ * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 缁撴灉
+ */
+ public int deletePatArchivecontactById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/HeCategoryServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/HeCategoryServiceImpl.java
index 60d5bff..ede9405 100644
--- a/smartor/src/main/java/com/smartor/service/impl/HeCategoryServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/HeCategoryServiceImpl.java
@@ -1,7 +1,14 @@
package com.smartor.service.impl;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DtoConversionUtils;
+import com.smartor.domain.HeCategoryVO;
+import io.jsonwebtoken.lang.Collections;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.smartor.mapper.HeCategoryMapper;
@@ -10,87 +17,91 @@
/**
* 瀹ｆ暀鍒嗙被Service涓氬姟灞傚鐞�
- *
+ *
* @author smartor
* @date 2023-03-04
*/
@Service
-public class HeCategoryServiceImpl implements IHeCategoryService
-{
+public class HeCategoryServiceImpl implements IHeCategoryService {
@Autowired
private HeCategoryMapper heCategoryMapper;
/**
* 鏌ヨ瀹ｆ暀鍒嗙被
- *
+ *
* @param id 瀹ｆ暀鍒嗙被涓婚敭
* @return 瀹ｆ暀鍒嗙被
*/
@Override
- public HeCategory selectHeCategoryById(Long id)
- {
+ public HeCategory selectHeCategoryById(Long id) {
return heCategoryMapper.selectHeCategoryById(id);
}
/**
* 鏌ヨ瀹ｆ暀鍒嗙被鍒楄〃
- *
+ *
* @param heCategory 瀹ｆ暀鍒嗙被
* @return 瀹ｆ暀鍒嗙被
*/
@Override
- public List<HeCategory> selectHeCategoryList(HeCategory heCategory)
- {
- return heCategoryMapper.selectHeCategoryList(heCategory);
+ public List<HeCategoryVO> selectHeCategoryList(HeCategory heCategory) {
+ List<HeCategory> heCategories = heCategoryMapper.selectHeCategoryList(heCategory);
+ List<HeCategoryVO> heCategoryVOS = DtoConversionUtils.sourceToTarget(heCategories, HeCategoryVO.class);
+ //閬嶅巻鏌ュ嚭鏉ョ殑鏁版嵁锛岄�氳繃 id=pid 鑾峰彇浠栦滑鐨勫瓙鏁版嵁
+ for (HeCategoryVO heCategoryVO : heCategoryVOS) {
+ HeCategory heCategory2 = new HeCategory();
+ heCategory2.setPid(heCategoryVO.getId());
+ List<HeCategory> heCategories1 = heCategoryMapper.selectHeCategoryList(heCategory2);
+ if (!Collections.isEmpty(heCategories1)) {
+ heCategoryVO.setHeCategoryList(heCategories1);
+ }
+ }
+ return heCategoryVOS;
}
/**
* 鏂板瀹ｆ暀鍒嗙被
- *
+ *
* @param heCategory 瀹ｆ暀鍒嗙被
* @return 缁撴灉
*/
@Override
- public int insertHeCategory(HeCategory heCategory)
- {
+ public int insertHeCategory(HeCategory heCategory) {
heCategory.setCreateTime(DateUtils.getNowDate());
return heCategoryMapper.insertHeCategory(heCategory);
}
/**
* 淇敼瀹ｆ暀鍒嗙被
- *
+ *
* @param heCategory 瀹ｆ暀鍒嗙被
* @return 缁撴灉
*/
@Override
- public int updateHeCategory(HeCategory heCategory)
- {
+ public int updateHeCategory(HeCategory heCategory) {
heCategory.setUpdateTime(DateUtils.getNowDate());
return heCategoryMapper.updateHeCategory(heCategory);
}
/**
* 鎵归噺鍒犻櫎瀹ｆ暀鍒嗙被
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑瀹ｆ暀鍒嗙被涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteHeCategoryByIds(Long[] ids)
- {
+ public int deleteHeCategoryByIds(Long[] ids) {
return heCategoryMapper.deleteHeCategoryByIds(ids);
}
/**
* 鍒犻櫎瀹ｆ暀鍒嗙被淇℃伅
- *
+ *
* @param id 瀹ｆ暀鍒嗙被涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteHeCategoryById(Long id)
- {
+ public int deleteHeCategoryById(Long id) {
return heCategoryMapper.deleteHeCategoryById(id);
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java
new file mode 100644
index 0000000..ff8edb2
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java
@@ -0,0 +1,113 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DtoConversionUtils;
+import com.smartor.domain.HeCategory;
+import com.smartor.domain.HeCategoryVO;
+import com.smartor.domain.IvrLibaTargetAssort;
+import com.smartor.domain.IvrLibaTargetAssortVO;
+import com.smartor.mapper.IvrLibaTargetAssortMapper;
+import com.smartor.service.IIvrLibaTargetAssortService;
+import io.jsonwebtoken.lang.Collections;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 鎸囨爣鍒嗙被Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-12-14
+ */
+@Service
+public class IvrLibaTargetAssortServiceImpl implements IIvrLibaTargetAssortService {
+ @Autowired
+ private IvrLibaTargetAssortMapper ivrLibaTargetAssortMapper;
+
+ /**
+ * 鏌ヨ鎸囨爣鍒嗙被
+ *
+ * @param id 鎸囨爣鍒嗙被涓婚敭
+ * @return 鎸囨爣鍒嗙被
+ */
+ @Override
+ public IvrLibaTargetAssort selectIvrLibaTargetAssortById(Long id) {
+ return ivrLibaTargetAssortMapper.selectIvrLibaTargetAssortById(id);
+ }
+
+ /**
+ * 鏌ヨ鎸囨爣鍒嗙被鍒楄〃
+ *
+ * @param ivrLibaTargetAssort 鎸囨爣鍒嗙被
+ * @return 鎸囨爣鍒嗙被
+ */
+ @Override
+ public List<IvrLibaTargetAssortVO> selectIvrLibaTargetAssortList(IvrLibaTargetAssort ivrLibaTargetAssort) {
+ List<IvrLibaTargetAssort> ivrLibaTargetAssorts = ivrLibaTargetAssortMapper.selectIvrLibaTargetAssortList(ivrLibaTargetAssort);
+ //灏唒id涓虹┖鐨勶紝杩囨护鎺�
+ ivrLibaTargetAssorts = ivrLibaTargetAssorts.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
+
+ List<IvrLibaTargetAssortVO> ivrLibaTargetAssortVOS = DtoConversionUtils.sourceToTarget(ivrLibaTargetAssorts, IvrLibaTargetAssortVO.class);
+ //閬嶅巻鏌ュ嚭鏉ョ殑鏁版嵁锛岄�氳繃 id=pid 鑾峰彇浠栦滑鐨勫瓙鏁版嵁
+ for (IvrLibaTargetAssortVO ivrLibaTargetAssortVO : ivrLibaTargetAssortVOS) {
+ if (ivrLibaTargetAssortVO.getPid() != null) {
+ continue;
+ }
+ IvrLibaTargetAssort ivrLibaTargetAssort1 = new IvrLibaTargetAssort();
+ ivrLibaTargetAssort1.setPid(ivrLibaTargetAssortVO.getId());
+ List<IvrLibaTargetAssort> ivrLibaTargetAssorts2 = ivrLibaTargetAssortMapper.selectIvrLibaTargetAssortList(ivrLibaTargetAssort1);
+ if (!Collections.isEmpty(ivrLibaTargetAssorts2)) {
+ ivrLibaTargetAssortVO.setIvrLibaTargetAssortList(ivrLibaTargetAssorts2);
+ }
+ }
+ return ivrLibaTargetAssortVOS;
+ }
+
+ /**
+ * 鏂板鎸囨爣鍒嗙被
+ *
+ * @param ivrLibaTargetAssort 鎸囨爣鍒嗙被
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertIvrLibaTargetAssort(IvrLibaTargetAssort ivrLibaTargetAssort) {
+ ivrLibaTargetAssort.setCreateTime(DateUtils.getNowDate());
+ return ivrLibaTargetAssortMapper.insertIvrLibaTargetAssort(ivrLibaTargetAssort);
+ }
+
+ /**
+ * 淇敼鎸囨爣鍒嗙被
+ *
+ * @param ivrLibaTargetAssort 鎸囨爣鍒嗙被
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateIvrLibaTargetAssort(IvrLibaTargetAssort ivrLibaTargetAssort) {
+ ivrLibaTargetAssort.setUpdateTime(DateUtils.getNowDate());
+ return ivrLibaTargetAssortMapper.updateIvrLibaTargetAssort(ivrLibaTargetAssort);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鎸囨爣鍒嗙被
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎸囨爣鍒嗙被涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteIvrLibaTargetAssortByIds(Long[] ids) {
+ return ivrLibaTargetAssortMapper.deleteIvrLibaTargetAssortByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鎸囨爣鍒嗙被淇℃伅
+ *
+ * @param id 鎸囨爣鍒嗙被涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteIvrLibaTargetAssortById(Long id) {
+ return ivrLibaTargetAssortMapper.deleteIvrLibaTargetAssortById(id);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
index 533c031..4b71a2d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
@@ -1,42 +1,43 @@
package com.smartor.service.impl;
-import java.util.List;
import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.IvrLibaTarget;
+import com.smartor.mapper.IvrLibaTargetMapper;
+import com.smartor.service.IIvrLibaTargetService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.smartor.mapper.IvrLibaTargetMapper;
-import com.smartor.domain.IvrLibaTarget;
-import com.smartor.service.IIvrLibaTargetService;
+
+import java.util.List;
/**
- * 鎸囨爣搴揝ervice涓氬姟灞傚鐞�
+ * 鎸囨爣閫夐」搴揝ervice涓氬姟灞傚鐞�
*
- * @author smartor
- * @date 2023-03-22
+ * @author ruoyi
+ * @date 2023-12-14
*/
@Service
-public class IvrLibaTargetServiceImpl implements IIvrLibaTargetService
+public class IvrLibaTargetServiceImpl implements IIvrLibaTargetService
{
@Autowired
private IvrLibaTargetMapper ivrLibaTargetMapper;
/**
- * 鏌ヨ鎸囨爣搴�
+ * 鏌ヨ鎸囨爣閫夐」搴�
*
- * @param targetID 鎸囨爣搴撲富閿�
- * @return 鎸囨爣搴�
+ * @param targetID 鎸囨爣閫夐」搴撲富閿�
+ * @return 鎸囨爣閫夐」搴�
*/
@Override
- public IvrLibaTarget selectIvrLibaTargetByTargetID(String targetID)
+ public IvrLibaTarget selectIvrLibaTargetByTargetID(Long targetID)
{
return ivrLibaTargetMapper.selectIvrLibaTargetByTargetID(targetID);
}
/**
- * 鏌ヨ鎸囨爣搴撳垪琛�
+ * 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
*
- * @param ivrLibaTarget 鎸囨爣搴�
- * @return 鎸囨爣搴�
+ * @param ivrLibaTarget 鎸囨爣閫夐」搴�
+ * @return 鎸囨爣閫夐」搴�
*/
@Override
public List<IvrLibaTarget> selectIvrLibaTargetList(IvrLibaTarget ivrLibaTarget)
@@ -45,9 +46,9 @@
}
/**
- * 鏂板鎸囨爣搴�
+ * 鏂板鎸囨爣閫夐」搴�
*
- * @param ivrLibaTarget 鎸囨爣搴�
+ * @param ivrLibaTarget 鎸囨爣閫夐」搴�
* @return 缁撴灉
*/
@Override
@@ -58,9 +59,9 @@
}
/**
- * 淇敼鎸囨爣搴�
+ * 淇敼鎸囨爣閫夐」搴�
*
- * @param ivrLibaTarget 鎸囨爣搴�
+ * @param ivrLibaTarget 鎸囨爣閫夐」搴�
* @return 缁撴灉
*/
@Override
@@ -71,25 +72,25 @@
}
/**
- * 鎵归噺鍒犻櫎鎸囨爣搴�
+ * 鎵归噺鍒犻櫎鎸囨爣閫夐」搴�
*
- * @param targetIDs 闇�瑕佸垹闄ょ殑鎸囨爣搴撲富閿�
+ * @param targetIDs 闇�瑕佸垹闄ょ殑鎸囨爣閫夐」搴撲富閿�
* @return 缁撴灉
*/
@Override
- public int deleteIvrLibaTargetByTargetIDs(String[] targetIDs)
+ public int deleteIvrLibaTargetByTargetIDs(Long[] targetIDs)
{
return ivrLibaTargetMapper.deleteIvrLibaTargetByTargetIDs(targetIDs);
}
/**
- * 鍒犻櫎鎸囨爣搴撲俊鎭�
+ * 鍒犻櫎鎸囨爣閫夐」搴撲俊鎭�
*
- * @param targetID 鎸囨爣搴撲富閿�
+ * @param targetID 鎸囨爣閫夐」搴撲富閿�
* @return 缁撴灉
*/
@Override
- public int deleteIvrLibaTargetByTargetID(String targetID)
+ public int deleteIvrLibaTargetByTargetID(Long targetID)
{
return ivrLibaTargetMapper.deleteIvrLibaTargetByTargetID(targetID);
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetoptionServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetoptionServiceImpl.java
new file mode 100644
index 0000000..c778a74
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetoptionServiceImpl.java
@@ -0,0 +1,97 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.IvrLibaTargetoption;
+import com.smartor.mapper.IvrLibaTargetoptionMapper;
+import com.smartor.service.IIvrLibaTargetoptionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣閫夐」搴揝ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-12-14
+ */
+@Service
+public class IvrLibaTargetoptionServiceImpl implements IIvrLibaTargetoptionService
+{
+ @Autowired
+ private IvrLibaTargetoptionMapper ivrLibaTargetoptionMapper;
+
+ /**
+ * 鏌ヨ鎸囨爣閫夐」搴�
+ *
+ * @param targetoptionid 鎸囨爣閫夐」搴撲富閿�
+ * @return 鎸囨爣閫夐」搴�
+ */
+ @Override
+ public IvrLibaTargetoption selectIvrLibaTargetoptionByTargetoptionid(Long targetoptionid)
+ {
+ return ivrLibaTargetoptionMapper.selectIvrLibaTargetoptionByTargetoptionid(targetoptionid);
+ }
+
+ /**
+ * 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
+ *
+ * @param ivrLibaTargetoption 鎸囨爣閫夐」搴�
+ * @return 鎸囨爣閫夐」搴�
+ */
+ @Override
+ public List<IvrLibaTargetoption> selectIvrLibaTargetoptionList(IvrLibaTargetoption ivrLibaTargetoption)
+ {
+ return ivrLibaTargetoptionMapper.selectIvrLibaTargetoptionList(ivrLibaTargetoption);
+ }
+
+ /**
+ * 鏂板鎸囨爣閫夐」搴�
+ *
+ * @param ivrLibaTargetoption 鎸囨爣閫夐」搴�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertIvrLibaTargetoption(IvrLibaTargetoption ivrLibaTargetoption)
+ {
+ ivrLibaTargetoption.setCreateTime(DateUtils.getNowDate());
+ return ivrLibaTargetoptionMapper.insertIvrLibaTargetoption(ivrLibaTargetoption);
+ }
+
+ /**
+ * 淇敼鎸囨爣閫夐」搴�
+ *
+ * @param ivrLibaTargetoption 鎸囨爣閫夐」搴�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateIvrLibaTargetoption(IvrLibaTargetoption ivrLibaTargetoption)
+ {
+ ivrLibaTargetoption.setUpdateTime(DateUtils.getNowDate());
+ return ivrLibaTargetoptionMapper.updateIvrLibaTargetoption(ivrLibaTargetoption);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鎸囨爣閫夐」搴�
+ *
+ * @param targetoptionids 闇�瑕佸垹闄ょ殑鎸囨爣閫夐」搴撲富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteIvrLibaTargetoptionByTargetoptionids(Long[] targetoptionids)
+ {
+ return ivrLibaTargetoptionMapper.deleteIvrLibaTargetoptionByTargetoptionids(targetoptionids);
+ }
+
+ /**
+ * 鍒犻櫎鎸囨爣閫夐」搴撲俊鎭�
+ *
+ * @param targetoptionid 鎸囨爣閫夐」搴撲富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteIvrLibaTargetoptionByTargetoptionid(Long targetoptionid)
+ {
+ return ivrLibaTargetoptionMapper.deleteIvrLibaTargetoptionByTargetoptionid(targetoptionid);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/MedicalHistoryServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/MedicalHistoryServiceImpl.java
new file mode 100644
index 0000000..3a866e9
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/MedicalHistoryServiceImpl.java
@@ -0,0 +1,94 @@
+package com.smartor.service.impl;
+
+import com.smartor.domain.MedicalHistory;
+import com.smartor.mapper.MedicalHistoryMapper;
+import com.smartor.service.IMedicalHistoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鐥呭彶Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Service
+public class MedicalHistoryServiceImpl implements IMedicalHistoryService
+{
+ @Autowired
+ private MedicalHistoryMapper medicalHistoryMapper;
+
+ /**
+ * 鏌ヨ鐥呭彶
+ *
+ * @param id 鐥呭彶涓婚敭
+ * @return 鐥呭彶
+ */
+ @Override
+ public MedicalHistory selectMedicalHistoryById(Long id)
+ {
+ return medicalHistoryMapper.selectMedicalHistoryById(id);
+ }
+
+ /**
+ * 鏌ヨ鐥呭彶鍒楄〃
+ *
+ * @param medicalHistory 鐥呭彶
+ * @return 鐥呭彶
+ */
+ @Override
+ public List<MedicalHistory> selectMedicalHistoryList(MedicalHistory medicalHistory)
+ {
+ return medicalHistoryMapper.selectMedicalHistoryList(medicalHistory);
+ }
+
+ /**
+ * 鏂板鐥呭彶
+ *
+ * @param medicalHistory 鐥呭彶
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertMedicalHistory(MedicalHistory medicalHistory)
+ {
+ return medicalHistoryMapper.insertMedicalHistory(medicalHistory);
+ }
+
+ /**
+ * 淇敼鐥呭彶
+ *
+ * @param medicalHistory 鐥呭彶
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateMedicalHistory(MedicalHistory medicalHistory)
+ {
+ return medicalHistoryMapper.updateMedicalHistory(medicalHistory);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鐥呭彶
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鐥呭彶涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteMedicalHistoryByIds(Long[] ids)
+ {
+ return medicalHistoryMapper.deleteMedicalHistoryByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鐥呭彶淇℃伅
+ *
+ * @param id 鐥呭彶涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteMedicalHistoryById(Long id)
+ {
+ return medicalHistoryMapper.deleteMedicalHistoryById(id);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchinvecontactServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchinvecontactServiceImpl.java
deleted file mode 100644
index bdc2e11..0000000
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchinvecontactServiceImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.smartor.service.impl;
-
-import com.ruoyi.common.utils.DateUtils;
-import com.smartor.domain.PatArchinvecontact;
-import com.smartor.mapper.PatArchinvecontactMapper;
-import com.smartor.service.IPatArchinvecontactService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 鎮ｈ�呰仈绯绘柟寮廠ervice涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2023-06-16
- */
-@Service
-public class PatArchinvecontactServiceImpl implements IPatArchinvecontactService
-{
- @Autowired
- private PatArchinvecontactMapper patArchinvecontactMapper;
-
- /**
- * 鏌ヨ鎮ｈ�呰仈绯绘柟寮�
- *
- * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
- * @return 鎮ｈ�呰仈绯绘柟寮�
- */
- @Override
- public PatArchinvecontact selectPatArchinvecontactById(Long id)
- {
- return patArchinvecontactMapper.selectPatArchinvecontactById(id);
- }
-
- /**
- * 鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�
- *
- * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
- * @return 鎮ｈ�呰仈绯绘柟寮�
- */
- @Override
- public List<PatArchinvecontact> selectPatArchinvecontactList(PatArchinvecontact patArchinvecontact)
- {
- return patArchinvecontactMapper.selectPatArchinvecontactList(patArchinvecontact);
- }
-
- /**
- * 鏂板鎮ｈ�呰仈绯绘柟寮�
- *
- * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
- * @return 缁撴灉
- */
- @Override
- public int insertPatArchinvecontact(PatArchinvecontact patArchinvecontact)
- {
- patArchinvecontact.setCreateTime(DateUtils.getNowDate());
- return patArchinvecontactMapper.insertPatArchinvecontact(patArchinvecontact);
- }
-
- /**
- * 淇敼鎮ｈ�呰仈绯绘柟寮�
- *
- * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
- * @return 缁撴灉
- */
- @Override
- public int updatePatArchinvecontact(PatArchinvecontact patArchinvecontact)
- {
- patArchinvecontact.setUpdateTime(DateUtils.getNowDate());
- return patArchinvecontactMapper.updatePatArchinvecontact(patArchinvecontact);
- }
-
- /**
- * 鎵归噺鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鎮ｈ�呰仈绯绘柟寮忎富閿�
- * @return 缁撴灉
- */
- @Override
- public int deletePatArchinvecontactByIds(Long[] ids)
- {
- return patArchinvecontactMapper.deletePatArchinvecontactByIds(ids);
- }
-
- /**
- * 鍒犻櫎鎮ｈ�呰仈绯绘柟寮忎俊鎭�
- *
- * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
- * @return 缁撴灉
- */
- @Override
- public int deletePatArchinvecontactById(Long id)
- {
- return patArchinvecontactMapper.deletePatArchinvecontactById(id);
- }
-}
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 55eb072..15fb59d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -1,26 +1,32 @@
package com.smartor.service.impl;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import java.util.stream.Collectors;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.smartor.mapper.BaseTagMapper;
import com.smartor.mapper.PatArchivetagMapper;
+import com.smartor.service.IPatMedInhospService;
+import com.smartor.service.IPatMedOuthospService;
+import com.smartor.service.IPatMedPhysicalService;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.ss.formula.functions.Now;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import com.smartor.mapper.PatArchiveMapper;
import com.smartor.service.IPatArchiveService;
@@ -33,6 +39,7 @@
* @author smartor
* @date 2023-03-04
*/
+@Slf4j
@Service
public class PatArchiveServiceImpl implements IPatArchiveService {
@Autowired
@@ -43,6 +50,18 @@
@Autowired
private PatArchivetagMapper patArchivetagMapper;
+
+ @Autowired
+ private IPatMedInhospService patMedInhospService;
+
+ @Autowired
+ private IPatMedOuthospService patMedOuthospService;
+
+ @Autowired
+ private IPatMedPhysicalService patMedPhysicalService;
+
+ @Autowired
+ private RedisCache redisCache;
/**
@@ -67,6 +86,7 @@
return patArchiveMapper.selectPatArchiveList(patArchive);
}
+
/**
* 鏂板鎮ｈ�呮。妗�
*
@@ -76,7 +96,9 @@
@Override
public int insertPatArchive(PatArchive patArchive) {
patArchive.setCreateTime(DateUtils.getNowDate());
- return patArchiveMapper.insertPatArchive(patArchive);
+ List<PatArchive> patArchives = new ArrayList<>();
+ patArchives.add(patArchive);
+ return patArchiveMapper.insertPatArchive(patArchives);
}
/**
@@ -85,10 +107,51 @@
* @param patArchive 鎮ｈ�呮。妗�
* @return 缁撴灉
*/
+ @Transactional(rollbackFor = Exception.class)
@Override
- public int updatePatArchive(PatArchive patArchive) {
+ public Boolean updatePatArchive(PatArchive patArchive) {
patArchive.setUpdateTime(DateUtils.getNowDate());
- return patArchiveMapper.updatePatArchive(patArchive);
+
+ for (String tagName : patArchive.getTagList()) {
+ BaseTag baseTag = new BaseTag();
+ baseTag.setTagname(tagName);
+ List<BaseTag> baseTags = baseTagMapper.selectBaseTagList(baseTag);
+
+ if (CollectionUtils.isEmpty(baseTags)) {
+ baseTag = new BaseTag();
+ baseTag.setTagcategoryid(1L);
+ baseTag.setTagname(tagName);
+ baseTag.setOrgid(null);
+ baseTag.setDelFlag("0");
+ baseTag.setCreateBy(null);
+ baseTag.setCreateTime(new Date());
+ baseTag.setCreateBy(null);
+ baseTag.setCreateTime(new Date());
+ baseTagMapper.insertBaseTag(baseTag);
+ //鐒跺悗鍐嶅線pat_archivetag琛ㄤ腑鏂板
+ } else {
+ //濡傛灉鍦╞asetag涓瓨鍦�,鍒欐牴鎹畉agid鍜宲atid鍘籶at_archivetag琛ㄤ腑鏌ヨ鏄惁瀛樺湪
+ baseTag = baseTags.get(0);
+ PatArchivetag patArchivetag = new PatArchivetag();
+ patArchivetag.setPatid(patArchive.getPatid());
+ patArchivetag.setTagid(baseTag.getTagid());
+ List<PatArchivetag> patArchivetags = patArchivetagMapper.selectPatArchivetagAndBaseTagList(patArchivetag);
+ if (CollectionUtils.isNotEmpty(patArchivetags)) {
+ //濡傛灉瀛樺湪锛宑ontinue;
+ continue;
+ } else {
+ //濡傛灉涓嶅瓨鍦紝鍒欏垯pat_archivetag涓柊澧�
+ // 鏂板鎮ｈ�呮。妗堟爣绛�
+ }
+ }
+ PatArchivetag patArchivetag = DtoConversionUtils.sourceToTarget(baseTag, PatArchivetag.class);
+ patArchivetag.setUpdateBy(null);
+ patArchivetag.setCreateTime(new Date());
+ patArchivetag.setPatid(patArchive.getPatid());
+ patArchivetagMapper.insertPatArchivetag(patArchivetag);
+ }
+ patArchiveMapper.updatePatArchive(patArchive);
+ return true;
}
/**
@@ -116,168 +179,240 @@
@Override
@Transactional
public PatUpInfoVO importFilehandle(SysUser user, String tags, MultipartFile file) {
+ System.out.println("start : " + System.currentTimeMillis() / 1000);
PatUpInfoVO patUpInfoVO = new PatUpInfoVO();
- Integer successNum = 0;
- Integer failNum = 0;
+ //闇�瑕佸鐞嗙殑鎬昏鏁�
+ int lastRowNum = 0;
- List<PatArchive> errorpatArchiveList = new ArrayList<>();
+ final List<PatArchive> errorpatArchiveList = new ArrayList<>();
+ //鍒涘缓绾跨▼姹�
+ ExecutorService pool = Executors.newFixedThreadPool(10);
try {
Workbook workbook = new XSSFWorkbook(file.getInputStream());
Sheet sheet = workbook.getSheetAt(0);
- for (int i = sheet.getFirstRowNum() + 1; i < sheet.getLastRowNum(); i++) {
- Row row = sheet.getRow(i);
- //濡傛灉琛屼负绌猴紝杩涜涓嬩竴娆″惊鐜�
- if (ObjectUtils.isEmpty(row)) {
- continue;
- }
- PatArchive patArchive = new PatArchive();
- if (ObjectUtils.isEmpty(row.getCell(3)) || StringUtils.isEmpty(row.getCell(3).toString())) {
- addRemark("韬唤璇佸彿涓虹┖", patArchive);
- } else {
- patArchive.setIccardno(row.getCell(3).toString());
- //鏍规嵁韬唤璇侊紝鍏堝幓鎮ｈ�呯鐞嗚〃閲岀湅鐪嬫湁娌℃湁杩欎釜浜�,濡傛灉鏈夎繖涓汉锛屼篃涓嶉渶瑕佹彃鍏ユ偅鑰呰〃
- List<PatArchive> patArchiveList1 = patArchiveMapper.selectPatArchiveList(patArchive);
- if (patArchiveList1.size() > 0) {
- patArchive.setRemark("璇ユ偅鑰呭凡瀛樺湪");
+ //鑾峰彇鏂囦欢閲岀殑鎬昏鏁�
+ lastRowNum = sheet.getLastRowNum();
+ //灏嗘枃浠堕噷鐨勬暟鎹垎鎴�10浠�
+ int partsize = lastRowNum / 10;
+ for (int i = 0; i < 10; i++) {
+ int start = i * partsize + 1;
+ int end = (i + 1) * partsize;
+
+ pool.execute(new Runnable() {
+ @Override
+ public void run() {
+ for (int j = start; j <= end; j++) {
+ List<PatArchive> patArchives = new ArrayList<>();
+ String name = Thread.currentThread().getName();
+ Row row = sheet.getRow(j);
+ //濡傛灉琛屼负绌猴紝杩涜涓嬩竴娆″惊鐜�
+ if (ObjectUtils.isEmpty(row)) {
+ continue;
+ }
+ PatArchive patArchive = new PatArchive();
+ if (ObjectUtils.isEmpty(row.getCell(6)) || StringUtils.isEmpty(row.getCell(6).toString())) {
+ addRemark("璇佷欢鍙风爜涓虹┖", patArchive);
+ } else {
+ patArchive.setIdcardno(row.getCell(6).toString());
+ //鏍规嵁韬唤璇侊紝鍏堝幓鎮ｈ�呯鐞嗚〃閲岀湅鐪嬫湁娌℃湁杩欎釜浜�,濡傛灉鏈夎繖涓汉锛屼篃涓嶉渶瑕佹彃鍏ユ偅鑰呰〃
+ // (杩欎竴鍧楁煡璇細褰卞搷鏁翠綋鐨勯�熷害,闇�瑕佷紭鍖�)
+ List<PatArchive> patArchiveList1 = patArchiveMapper.selectPatArchiveList(patArchive);
+ if (patArchiveList1.size() > 0) {
+ patArchive.setRemark("璇ユ偅鑰呭凡瀛樺湪");
+ }
+ }
+
+ //鍒ゆ柇濮撳悕鏄惁涓虹┖
+ if (Objects.isNull(row.getCell(0)) || StringUtils.isEmpty(row.getCell(0).toString())) {
+ addRemark("濮撳悕涓虹┖", patArchive);
+ } else {
+ patArchive.setName(row.getCell(0).toString());
+ }
+
+ //鍒ゆ柇鎬у埆鏄惁涓虹┖
+ if (ObjectUtils.isEmpty(row.getCell(1)) || StringUtils.isEmpty(row.getCell(1).toString())) {
+ addRemark("鎬у埆涓虹┖", patArchive);
+ } else {
+ patArchive.setSex(row.getCell(1).toString().equals("鐢�") ? 1L : 2L);
+ }
+
+ //鍒ゆ柇璇佷欢绫诲瀷鏄惁涓虹┖
+ if (ObjectUtils.isEmpty(row.getCell(2)) || StringUtils.isEmpty(row.getCell(2).toString())) {
+ addRemark("璇佷欢绫诲瀷涓虹┖", patArchive);
+ } else {
+ patArchive.setIdcardtype(row.getCell(2).toString());
+ }
+
+ //鍒ゆ柇绫嶈疮鏄惁涓虹┖
+ if (ObjectUtils.isEmpty(row.getCell(3)) || StringUtils.isEmpty(row.getCell(3).toString())) {
+ patArchive.setNativePlace(null);
+ } else {
+ patArchive.setNativePlace(row.getCell(3).toString());
+ }
+
+ //鍒ゆ柇灞呬綇鍦版槸鍚︿负绌�
+ if (ObjectUtils.isEmpty(row.getCell(4)) || StringUtils.isEmpty(row.getCell(4).toString())) {
+ patArchive.setPlaceOfResidence(null);
+ } else {
+ patArchive.setPlaceOfResidence(row.getCell(4).toString());
+ }
+
+ //鍒ゆ柇灞呬綇鍦版槸鍚︿负绌�
+ if (ObjectUtils.isEmpty(row.getCell(5)) || StringUtils.isEmpty(row.getCell(5).toString())) {
+ patArchive.setBirthplace(null);
+ } else {
+ patArchive.setBirthplace(row.getCell(5).toString());
+ }
+
+ //鍒ゆ柇鍑虹敓鏃ユ湡鏄惁涓虹┖
+ if (ObjectUtils.isEmpty(row.getCell(7)) || StringUtils.isEmpty(row.getCell(7).toString())) {
+// addRemark("鍑虹敓鏃ユ湡涓虹┖", patArchive);
+ patArchive.setBirthdate(null);
+ } else {
+ //鏍煎紡杞崲锛岃浆鎴愭棩鏈�
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Date javaDate = new Date();
+ if (row.getCell(7).getCellType().toString().equals("NUMERIC")) {
+ javaDate = HSSFDateUtil.getJavaDate(row.getCell(7).getNumericCellValue());
+ } else {
+ try {
+ javaDate = dateFormat.parse(row.getCell(7).toString());
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ dateFormat.format(javaDate);
+ patArchive.setBirthdate(javaDate);
+ }
+
+ //鍒ゆ柇骞撮緞鏄惁涓虹┖
+ if (ObjectUtils.isEmpty(row.getCell(8)) || StringUtils.isEmpty(row.getCell(8).toString())) {
+ patArchive.setAge(null);
+ } else {
+ patArchive.setAge(Long.valueOf(row.getCell(8).toString()));
+ }
+
+ //鍒ゆ柇鏈汉鑱旂郴鏄惁涓虹┖锛屽拰闀垮害鏄惁姝ｇ‘
+ if (ObjectUtils.isEmpty(row.getCell(12)) || StringUtils.isEmpty(row.getCell(12).toString())) {
+ addRemark("鏈汉鑱旂郴鐢佃瘽涓虹┖", patArchive);
+ } else {
+ //鏍煎紡杞崲锛岃浆鎴愭枃鏈�
+ if (row.getCell(12).getCellType().toString().equals("NUMERIC")) {
+ String cellData = String.valueOf((long) row.getCell(12).getNumericCellValue());
+ patArchive.setTelcode(cellData);
+ } else {
+ DataFormatter dataFormatter = new DataFormatter();
+ String cellValue = dataFormatter.formatCellValue(row.getCell(12));
+ patArchive.setTelcode(cellValue);
+ }
+ }
+
+ //鍒ゆ柇浜插睘鑱旂郴鏂瑰紡鏄惁涓虹┖锛岄暱搴︽槸鍚︽纭�
+ if (ObjectUtils.isEmpty(row.getCell(13)) || StringUtils.isEmpty(row.getCell(13).toString())) {
+// addRemark("浜插睘鑱旂郴鏂瑰紡涓虹┖", patArchive);
+ patArchive.setRelativetelcode(null);
+ } else {
+ //鏍煎紡杞崲锛岃浆鎴愭枃鏈�
+ if (row.getCell(13).getCellType().toString().equals("NUMERIC")) {
+ String cellData = String.valueOf((long) row.getCell(13).getNumericCellValue());
+ patArchive.setRelativetelcode(cellData);
+ } else {
+ DataFormatter dataFormatter = new DataFormatter();
+ String cellValue = dataFormatter.formatCellValue(row.getCell(13));
+ patArchive.setRelativetelcode(cellValue);
+ }
+ }
+ //鍒ゆ柇姘戞棌鏄惁涓虹┖
+ if (ObjectUtils.isEmpty(row.getCell(14)) || StringUtils.isEmpty(row.getCell(14).toString())) {
+ patArchive.setNation(null);
+ } else {
+ patArchive.setNation(row.getCell(14).toString());
+ }
+
+ //鎮ｉ兘鏍囩鏄惁涓虹┖
+ if (ObjectUtils.isEmpty(row.getCell(17)) || StringUtils.isEmpty(row.getCell(17).toString())) {
+ patArchive.setTag(tags);
+ } else {
+ if (StringUtils.isNotEmpty(tags)) {
+ patArchive.setTag(row.getCell(17).toString() + "," + tags);
+ } else {
+ patArchive.setTag(row.getCell(17).toString());
+ }
+ }
+
+ //鍒ゆ柇澶囨敞鏄惁涓虹┖
+ if (!StringUtils.isEmpty(patArchive.getRemark())) {
+ //濡傛灉澶囨敞瀛楁涓嶄负绌猴紝璇存湁璇ユ偅鑰呭～鍐欐湁闂
+ errorpatArchiveList.add(patArchive);
+ continue;
+ }
+
+ patArchive.setUploadTime(new Date());
+ patArchive.setIsupload(0L);
+ //寰�鎮ｈ�呰〃閲屾柊澧�,骞惰幏鍙栧埌鏂板ID
+ patArchives.add(patArchive);
+ int i1 = patArchiveMapper.insertPatArchive(patArchives);
+
+// // 鏍规嵁鏍囩鍚嶆煡璇㈠嚭鏍囩淇℃伅
+// String s = patArchive.getTag();
+// String[] split = s.split(",");
+// for (String tagName : split) {
+// BaseTag baseTag = new BaseTag();
+// baseTag.setTagname(tagName);
+// List<BaseTag> baseTags = baseTagMapper.selectBaseTagList(baseTag);
+//
+// //濡傛灉璇ユ爣绛句负绌猴紝鐜版爣绛剧鐞嗘病鏈夊嚭鐜拌繃鐨勬柊鏍囩鏃讹紝鑷姩灏嗘爣绛炬坊鍔犲埌"鏍囩绠＄悊"鏈垎绫烩�滀腑銆傜紪杈戜汉涓哄鍏ヨ处鍙�
+// if (CollectionUtils.isEmpty(baseTags)) {
+// baseTag = new BaseTag();
+// baseTag.setTagcategoryid(1L);
+// baseTag.setTagname(tagName);
+// baseTag.setOrgid(user.getDeptId().toString());
+// baseTag.setDelFlag("0");
+// baseTag.setCreateBy(user.getUserName());
+// baseTag.setCreateTime(new Date());
+// baseTag.setCreateBy(user.getUserName());
+// baseTag.setCreateTime(new Date());
+// baseTagMapper.insertBaseTag(baseTag);
+// } else {
+// baseTag = baseTags.get(0);
+// }
+//
+// // 鏂板鎮ｈ�呮。妗堟爣绛�
+// PatArchivetag patArchivetag = DtoConversionUtils.sourceToTarget(baseTag, PatArchivetag.class);
+// patArchivetag.setUpdateBy(user.getUserName());
+// patArchivetag.setCreateTime(new Date());
+// patArchivetag.setPatid(patArchive.getPatid());
+// patArchivetagMapper.insertPatArchivetag(patArchivetag);
+// }
+
+ patArchives.clear();
+ }
}
- }
-
- //鍒ゆ柇濮撳悕鏄惁涓虹┖
- if (Objects.isNull(row.getCell(0)) || StringUtils.isEmpty(row.getCell(0).toString())) {
- addRemark("濮撳悕涓虹┖", patArchive);
- } else {
- patArchive.setName(row.getCell(0).toString());
- }
-
- //鍒ゆ柇鎬у埆鏄惁涓虹┖
-
- if (ObjectUtils.isEmpty(row.getCell(1)) || StringUtils.isEmpty(row.getCell(1).toString())) {
- addRemark("鎬у埆涓虹┖", patArchive);
- } else {
- patArchive.setSex(row.getCell(1).toString().equals("鐢�") ? 1L : 2L);
- }
-
- //鍒ゆ柇璇佷欢绫诲瀷鏄惁涓虹┖
- if (ObjectUtils.isEmpty(row.getCell(2)) || StringUtils.isEmpty(row.getCell(2).toString())) {
- addRemark("璇佷欢绫诲瀷涓虹┖", patArchive);
- } else {
- patArchive.setIccardtype(row.getCell(2).toString());
- }
-
- //鍒ゆ柇鍑虹敓鏃ユ湡鏄惁涓虹┖
- if (ObjectUtils.isEmpty(row.getCell(4)) || StringUtils.isEmpty(row.getCell(4).toString())) {
- addRemark("鍑虹敓鏃ユ湡涓虹┖", patArchive);
- } else {
- //鏍煎紡杞崲锛岃浆鎴愭棩鏈�
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
- Date javaDate = new Date();
- if (row.getCell(4).getCellType().toString().equals("NUMERIC")) {
- javaDate = HSSFDateUtil.getJavaDate(row.getCell(4).getNumericCellValue());
- } else {
- javaDate = new Date(row.getCell(4).toString());
- }
- dateFormat.format(javaDate);
- patArchive.setBirthdate(javaDate);
- }
-
- //鍒ゆ柇鏈汉鑱旂郴鏄惁涓虹┖锛屽拰闀垮害鏄惁姝ｇ‘
- if (ObjectUtils.isEmpty(row.getCell(5)) || StringUtils.isEmpty(row.getCell(5).toString())) {
- addRemark("鏈汉鑱旂郴鐢佃瘽涓虹┖", patArchive);
- } else {
- //鏍煎紡杞崲锛岃浆鎴愭枃鏈�
- if (row.getCell(5).getCellType().toString().equals("NUMERIC")) {
- String cellData = String.valueOf((long) row.getCell(5).getNumericCellValue());
- patArchive.setTelcode(cellData);
- } else {
- DataFormatter dataFormatter = new DataFormatter();
- String cellValue = dataFormatter.formatCellValue(row.getCell(5));
- patArchive.setTelcode(cellValue);
- }
- }
-
- //鍒ゆ柇浜插睘鑱旂郴鏂瑰紡鏄惁涓虹┖锛岄暱搴︽槸鍚︽纭�
- if (ObjectUtils.isEmpty(row.getCell(6)) || StringUtils.isEmpty(row.getCell(6).toString())) {
- addRemark("浜插睘鑱旂郴鏂瑰紡涓虹┖", patArchive);
- } else {
- //鏍煎紡杞崲锛岃浆鎴愭枃鏈�
- if (row.getCell(6).getCellType().toString().equals("NUMERIC")) {
- String cellData = String.valueOf((long) row.getCell(6).getNumericCellValue());
- patArchive.setRelativetelcode(cellData);
- } else {
- DataFormatter dataFormatter = new DataFormatter();
- String cellValue = dataFormatter.formatCellValue(row.getCell(6));
- patArchive.setRelativetelcode(cellValue);
- }
- }
-
- //鎮ｉ兘鏍囩鏄惁涓虹┖
- if (ObjectUtils.isEmpty(row.getCell(7)) || StringUtils.isEmpty(row.getCell(7).toString())) {
- if (StringUtils.isEmpty(tags)) {
- addRemark("鎮ｈ�呮爣绛句负绌�", patArchive);
- } else {
- patArchive.setTag(tags);
-
- }
- } else {
- if (StringUtils.isNotEmpty(tags)) {
- patArchive.setTag(row.getCell(7).toString() + "," + tags);
- } else {
- patArchive.setTag(row.getCell(7).toString());
- }
- }
-
- //鍒ゆ柇澶囨敞鏄惁涓虹┖
- if (!StringUtils.isEmpty(patArchive.getRemark())) {
- //濡傛灉澶囨敞瀛楁涓嶄负绌猴紝璇存湁璇ユ偅鑰呭～鍐欐湁闂
- errorpatArchiveList.add(patArchive);
- failNum = failNum + 1;
- continue;
- }
-
- //寰�鎮ｈ�呰〃閲屾柊澧�,骞惰幏鍙栧埌鏂板ID
- patArchiveMapper.insertPatArchive(patArchive);
-
- //鏍规嵁鏍囩鍚嶆煡璇㈠嚭鏍囩淇℃伅
- String s = patArchive.getTag();
- String[] split = s.split(",");
- for (String tagName : split) {
- BaseTag baseTag = new BaseTag();
- baseTag.setTagname(tagName);
- List<BaseTag> baseTags = baseTagMapper.selectBaseTagList(baseTag);
-
- //濡傛灉璇ユ爣绛句负绌猴紝鐜版爣绛剧鐞嗘病鏈夊嚭鐜拌繃鐨勬柊鏍囩鏃讹紝鑷姩灏嗘爣绛炬坊鍔犲埌"鏍囩绠＄悊"鏈垎绫烩�滀腑銆傜紪杈戜汉涓哄鍏ヨ处鍙�
- if (CollectionUtils.isEmpty(baseTags)) {
- baseTag = new BaseTag();
- baseTag.setTagcategoryid(1L);
- baseTag.setTagname(tagName);
- baseTag.setOrgid(user.getDeptId().toString());
- baseTag.setDelFlag("0");
- baseTag.setCreateBy(user.getUserName());
- baseTag.setCreateTime(new Date());
- baseTag.setCreateBy(user.getUserName());
- baseTag.setCreateTime(new Date());
- baseTagMapper.insertBaseTag(baseTag);
- } else {
- baseTag = baseTags.get(0);
- }
-
- // 鏂板鎮ｈ�呮。妗堟爣绛�
- PatArchivetag patArchivetag = DtoConversionUtils.sourceToTarget(baseTag, PatArchivetag.class);
- patArchivetag.setUpdateBy(user.getUserName());
- patArchivetag.setCreateTime(new Date());
- patArchivetag.setPatid(patArchive.getPatid());
- patArchivetagMapper.insertPatArchivetag(patArchivetag);
- }
- successNum = successNum + 1;
+ });
}
-
} catch (Exception e) {
e.printStackTrace();
}
- patUpInfoVO.setFailNum(failNum);
- patUpInfoVO.setSuccessNum(successNum);
+ pool.shutdown();
+ Boolean aa = true;
+ d:
+ while (aa) {
+ boolean terminated = pool.isTerminated();
+ if (terminated) {
+ aa = false;
+ continue d;
+ }
+ }
+
+ if (errorpatArchiveList.size() != 0) {
+ patUpInfoVO.setSuccessNum(lastRowNum - errorpatArchiveList.size());
+ patUpInfoVO.setFailNum(errorpatArchiveList.size());
+ } else {
+ patUpInfoVO.setSuccessNum(lastRowNum == 0 ? 0 : lastRowNum);
+ patUpInfoVO.setFailNum(0);
+ }
patUpInfoVO.setPatArchiveList(errorpatArchiveList);
return patUpInfoVO;
}
@@ -314,14 +449,44 @@
List<PatArchive> patArchives = new ArrayList<>();
//鏍规嵁鏉′欢鑾峰彇鎮ｈ�呬俊鎭�
- List<PatArchive> patArchiveList = patArchiveMapper.patInfoByContion(patArchive);
+// List<PatArchive> patArchiveList = patArchiveMapper.patInfoByContion(patArchive);
+ List<PatArchive> patArchiveList = new ArrayList<>();
+
+ if (patArchive.getEndtime() != null) {
+ //鍑洪櫌鏃堕棿鍙湁浣忛櫌鎵嶆湁
+ patArchive.setAllhosp(1L);
+ }
+
+ if (patArchive.getAllhosp() != null && patArchive.getAllhosp() == 0) {
+ List<PatArchive> 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);
+ if (CollectionUtils.isNotEmpty(patArchives1)) {
+ patArchiveList.addAll(patArchives1);
+ }
+ } else if (patArchive.getAllhosp() != null && patArchive.getAllhosp() == 2) {
+ List<PatArchive> 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);
+ if (CollectionUtils.isNotEmpty(patArchives3)) {
+ patArchiveList.addAll(patArchives3);
+ }
+ }
+
+
//鏍规嵁鎮ｈ�匢D杩涜鍒嗙粍
Map<Long, List<PatArchive>> listMap = patArchiveList.stream().collect(Collectors.groupingBy(PatArchive::getPatid));
//瀵规暟鎹繘琛屽皝瑁�
for (List<PatArchive> list : listMap.values()) {
PatArchive patArchive1 = new PatArchive();
- List<String> stringList = new ArrayList<>();
+ Set<String> stringList = new HashSet<>();
for (int i = 0; i < list.size(); i++) {
if (i == 0) {
patArchive1 = DtoConversionUtils.sourceToTarget(list.get(0), PatArchive.class);
@@ -331,7 +496,7 @@
//灏嗘煡鍑虹殑tag锛屾斁鍒皃atArchive1閲岀殑TagList涓�
stringList.add(list.get(i).getTag());
}
- patArchive1.setTagList(stringList);
+ patArchive1.setTagList(stringList.stream().collect(Collectors.toList()));
patArchives.add(patArchive1);
}
@@ -378,7 +543,21 @@
public List<PatArchivetagAndPatientInfo> patInfoByTag(List<Long> tagids) {
+ return null;
+ }
+ @Override
+ public List<Object> getUserTreatmentInfo(String pid, String type) {
+ if (StringUtils.isEmpty(pid) || StringUtils.isEmpty(type)) {
+ throw new BaseException("鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
+ }
+ List<Object> objectList = new ArrayList<>();
+
+ //閫氳繃鎮ｈ�呰幏鍙栭棬璇婁俊鎭�
+ PatMedInhosp patMedInhosp = new PatMedInhosp();
+ patMedInhosp.setInhospno(pid);
+ List<PatMedInhosp> patMedInhosps = patMedInhospService.selectPatMedInhospList(patMedInhosp);
+ objectList.addAll(patMedInhosps);
return null;
@@ -399,8 +578,8 @@
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd");
row.createCell(0).setCellValue(patArchive.getName());
row.createCell(1).setCellValue(patArchive.getSex() == 1 ? "鐢�" : "濂�");
- row.createCell(2).setCellValue(patArchive.getIccardtype());
- row.createCell(3).setCellValue(patArchive.getIccardno());
+ row.createCell(2).setCellValue(patArchive.getIdcardtype());
+ row.createCell(3).setCellValue(patArchive.getIdcardno());
if (ObjectUtils.isNotEmpty(patArchive.getBirthdate())) {
row.createCell(4).setCellValue(simpleDateFormat.format(patArchive.getBirthdate()).toString());
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchivecontactServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchivecontactServiceImpl.java
new file mode 100644
index 0000000..f7f4b15
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchivecontactServiceImpl.java
@@ -0,0 +1,97 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.PatArchivecontact;
+import com.smartor.mapper.PatArchivecontactMapper;
+import com.smartor.service.IPatArchivecontactService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呰仈绯绘柟寮廠ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Service
+public class PatArchivecontactServiceImpl implements IPatArchivecontactService
+{
+ @Autowired
+ private PatArchivecontactMapper patArchivecontactMapper;
+
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 鎮ｈ�呰仈绯绘柟寮�
+ */
+ @Override
+ public PatArchivecontact selectPatArchivecontactById(Long id)
+ {
+ return patArchivecontactMapper.selectPatArchivecontactById(id);
+ }
+
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�
+ *
+ * @param patArchivecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 鎮ｈ�呰仈绯绘柟寮�
+ */
+ @Override
+ public List<PatArchivecontact> selectPatArchivecontactList(PatArchivecontact patArchivecontact)
+ {
+ return patArchivecontactMapper.selectPatArchivecontactList(patArchivecontact);
+ }
+
+ /**
+ * 鏂板鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param patArchivecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertPatArchivecontact(PatArchivecontact patArchivecontact)
+ {
+ patArchivecontact.setCreateTime(DateUtils.getNowDate());
+ return patArchivecontactMapper.insertPatArchivecontact(patArchivecontact);
+ }
+
+ /**
+ * 淇敼鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param patArchivecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updatePatArchivecontact(PatArchivecontact patArchivecontact)
+ {
+ patArchivecontact.setUpdateTime(DateUtils.getNowDate());
+ return patArchivecontactMapper.updatePatArchivecontact(patArchivecontact);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatArchivecontactByIds(Long[] ids)
+ {
+ return patArchivecontactMapper.deletePatArchivecontactByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鎮ｈ�呰仈绯绘柟寮忎俊鎭�
+ *
+ * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatArchivecontactById(Long id)
+ {
+ return patArchivecontactMapper.deletePatArchivecontactById(id);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchivetagServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchivetagServiceImpl.java
index 7e61dc4..2fed8d0 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchivetagServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchivetagServiceImpl.java
@@ -43,7 +43,7 @@
*/
@Override
public List<PatArchivetag> selectPatArchivetagList(PatArchivetag patArchivetag) {
- return patArchivetagMapper.selectPatArchivetagList(patArchivetag);
+ return patArchivetagMapper.selectPatArchivetagAndBaseTagList(patArchivetag);
}
/**
diff --git a/smartor/src/main/resources/mapper/smartor/HeCategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/HeCategoryMapper.xml
index 0c33367..4c6d566 100644
--- a/smartor/src/main/resources/mapper/smartor/HeCategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeCategoryMapper.xml
@@ -1,40 +1,59 @@
<?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.smartor.mapper.HeCategoryMapper">
-
- <resultMap type="HeCategory" id="HeCategoryResult">
- <result property="id" column="id" />
- <result property="categoryname" column="categoryname" />
- <result property="orgid" column="orgid" />
- <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="isupload" column="isupload" />
- <result property="uploadTime" column="upload_time" />
+
+ <resultMap type="com.smartor.domain.HeCategory" id="HeCategoryResult">
+ <result property="id" column="id"/>
+ <result property="categoryname" column="categoryname"/>
+ <result property="orgid" column="orgid"/>
+ <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="isupload" column="isupload"/>
+ <result property="uploadTime" column="upload_time"/>
+ <result property="pid" column="pid"/>
+ <result property="guid" column="guid"/>
</resultMap>
<sql id="selectHeCategoryVo">
- select id, categoryname, orgid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time from he_category
+ select id,
+ categoryname,
+ orgid,
+ del_flag,
+ update_by,
+ update_time,
+ create_by,
+ create_time,
+ isupload,
+ upload_time,
+ pid,
+ guid
+ from he_category
</sql>
- <select id="selectHeCategoryList" parameterType="HeCategory" resultMap="HeCategoryResult">
+ <select id="selectHeCategoryList" parameterType="com.smartor.domain.HeCategory" resultMap="HeCategoryResult">
<include refid="selectHeCategoryVo"/>
- <where>
- <if test="categoryname != null and categoryname != ''"> and categoryname like concat('%', #{categoryname}, '%')</if>
- <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
+ <where>
+ <if test="categoryname != null and categoryname != ''">and categoryname like concat('%', #{categoryname},
+ '%')
+ </if>
+ <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
+ <if test="id != null">and id = #{id}</if>
+ <if test="pid != null">and pid = #{pid}</if>
</where>
</select>
-
+
<select id="selectHeCategoryById" parameterType="Long" resultMap="HeCategoryResult">
<include refid="selectHeCategoryVo"/>
where id = #{id}
</select>
-
- <insert id="insertHeCategory" parameterType="HeCategory" useGeneratedKeys="true" keyProperty="id">
+
+ <insert id="insertHeCategory" parameterType="com.smartor.domain.HeCategory" useGeneratedKeys="true"
+ keyProperty="id">
insert into he_category
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="categoryname != null">categoryname,</if>
@@ -46,7 +65,7 @@
<if test="createTime != null">create_time,</if>
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
- </trim>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="categoryname != null">#{categoryname},</if>
<if test="orgid != null">#{orgid},</if>
@@ -57,10 +76,10 @@
<if test="createTime != null">#{createTime},</if>
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
- </trim>
+ </trim>
</insert>
- <update id="updateHeCategory" parameterType="HeCategory">
+ <update id="updateHeCategory" parameterType="com.smartor.domain.HeCategory">
update he_category
<trim prefix="SET" suffixOverrides=",">
<if test="categoryname != null">categoryname = #{categoryname},</if>
@@ -77,11 +96,13 @@
</update>
<delete id="deleteHeCategoryById" parameterType="Long">
- delete from he_category where id = #{id}
+ delete
+ from he_category
+ where id = #{id}
</delete>
<delete id="deleteHeCategoryByIds" parameterType="String">
- delete from he_category where id in
+ delete from he_category where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
diff --git a/smartor/src/main/resources/mapper/smartor/HeLocallibraryMapper.xml b/smartor/src/main/resources/mapper/smartor/HeLocallibraryMapper.xml
index e1293e2..b8f8da1 100644
--- a/smartor/src/main/resources/mapper/smartor/HeLocallibraryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeLocallibraryMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.HeLocallibraryMapper">
- <resultMap type="HeLocallibrary" id="HeLocallibraryResult">
+ <resultMap type="com.smartor.domain.HeLocallibrary" id="HeLocallibraryResult">
<result property="id" column="id" />
<result property="preachcategoryid" column="preachcategoryid" />
<result property="preachname" column="preachname" />
@@ -33,7 +33,7 @@
select id, preachcategoryid, preachname, version, preachform, preachdescription, preachcontent, templateid, preachcode, centerlibraryid, isenable, orgid, update_by, update_time, del_flag, create_by, create_time, isupload, upload_time, classification, islocal, centerlibrarycode from he_locallibrary
</sql>
- <select id="selectHeLocallibraryList" parameterType="HeLocallibrary" resultMap="HeLocallibraryResult">
+ <select id="selectHeLocallibraryList" parameterType="com.smartor.domain.HeLocallibrary" resultMap="HeLocallibraryResult">
<include refid="selectHeLocallibraryVo"/>
<where>
<if test="preachcategoryid != null "> and preachcategoryid = #{preachcategoryid}</if>
@@ -60,7 +60,7 @@
where id = #{id}
</select>
- <insert id="insertHeLocallibrary" parameterType="HeLocallibrary" useGeneratedKeys="true" keyProperty="id">
+ <insert id="insertHeLocallibrary" parameterType="com.smartor.domain.HeLocallibrary" useGeneratedKeys="true" keyProperty="id">
insert into he_locallibrary
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="preachcategoryid != null">preachcategoryid,</if>
@@ -110,7 +110,7 @@
</trim>
</insert>
- <update id="updateHeLocallibrary" parameterType="HeLocallibrary">
+ <update id="updateHeLocallibrary" parameterType="com.smartor.domain.HeLocallibrary">
update he_locallibrary
<trim prefix="SET" suffixOverrides=",">
<if test="preachcategoryid != null">preachcategoryid = #{preachcategoryid},</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetAssortMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetAssortMapper.xml
new file mode 100644
index 0000000..0f44a8a
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetAssortMapper.xml
@@ -0,0 +1,81 @@
+<?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.IvrLibaTargetAssortMapper">
+
+ <resultMap type="com.smartor.domain.IvrLibaTargetAssort" id="IvrLibaTargetAssortResult">
+ <result property="id" column="id"/>
+ <result property="indexAssortName" column="index_assort_name"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="pid" column="pid"/>
+ </resultMap>
+
+ <sql id="selectIvrLibaTargetAssortVo">
+ select id, index_assort_name, del_flag, create_time, update_time, pid
+ from ivr_liba_target_assort
+ </sql>
+
+ <select id="selectIvrLibaTargetAssortList" parameterType="com.smartor.domain.IvrLibaTargetAssort"
+ resultMap="IvrLibaTargetAssortResult">
+ <include refid="selectIvrLibaTargetAssortVo"/>
+ <where>
+ <if test="indexAssortName != null and indexAssortName != ''">and index_assort_name like concat('%',
+ #{indexAssortName}, '%')
+ </if>
+ <if test="pid != null ">and pid = #{pid}</if>
+ </where>
+ </select>
+
+ <select id="selectIvrLibaTargetAssortById" parameterType="Long" resultMap="IvrLibaTargetAssortResult">
+ <include refid="selectIvrLibaTargetAssortVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertIvrLibaTargetAssort" parameterType="com.smartor.domain.IvrLibaTargetAssort">
+ insert into ivr_liba_target_assort
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="indexAssortName != null and indexAssortName != ''">index_assort_name,</if>
+ <if test="delFlag != null">del_flag,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="pid != null">pid,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id},</if>
+ <if test="indexAssortName != null and indexAssortName != ''">#{indexAssortName},</if>
+ <if test="delFlag != null">#{delFlag},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="pid != null">#{pid},</if>
+ </trim>
+ </insert>
+
+ <update id="updateIvrLibaTargetAssort" parameterType="com.smartor.domain.IvrLibaTargetAssort">
+ update ivr_liba_target_assort
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="indexAssortName != null and indexAssortName != ''">index_assort_name = #{indexAssortName},</if>
+ <if test="delFlag != null">del_flag = #{delFlag},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="pid != null">pid = #{pid},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteIvrLibaTargetAssortById" parameterType="Long">
+ delete
+ from ivr_liba_target_assort
+ where id = #{id}
+ </delete>
+
+ <delete id="deleteIvrLibaTargetAssortByIds" parameterType="String">
+ delete from ivr_liba_target_assort where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
index 932720a..7bcdc08 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
@@ -4,25 +4,18 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.IvrLibaTargetMapper">
- <resultMap type="IvrLibaTarget" id="IvrLibaTargetResult">
+ <resultMap type="com.smartor.domain.IvrLibaTarget" id="IvrLibaTargetResult">
<result property="targetID" column="targetID" />
- <result property="targetType" column="targetType" />
- <result property="categoryName" column="categoryName" />
- <result property="targetValue" column="targetValue" />
- <result property="targetRegex" column="targetRegex" />
- <result property="note" column="note" />
+ <result property="groupid" column="groupid" />
+ <result property="targettype" column="targettype" />
+ <result property="targetname" column="targetname" />
+ <result property="targetdesc" column="targetdesc" />
<result property="language" column="language" />
<result property="version" column="version" />
- <result property="isEnable" column="isEnable" />
- <result property="isDel" column="isDel" />
- <result property="addUserID" column="addUserID" />
- <result property="addTime" column="addTime" />
- <result property="modifyUserID" column="modifyUserID" />
- <result property="modifyTime" column="modifyTime" />
- <result property="groupID" column="groupID" />
- <result property="isAbnormal" column="isAbnormal" />
- <result property="WarnUp" column="WarnUp" />
- <result property="WarnDown" column="WarnDown" />
+ <result property="isenable" column="isenable" />
+ <result property="isabnormal" column="isabnormal" />
+ <result property="warnup" column="warnup" />
+ <result property="warndown" column="warndown" />
<result property="delFlag" column="del_flag" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
@@ -31,64 +24,55 @@
<result property="isupload" column="isupload" />
<result property="uploadTime" column="upload_time" />
<result property="orgid" column="orgid" />
+ <result property="pid" column="pid" />
+ <result property="guid" column="guid" />
+ <result property="assortid" column="assortid" />
</resultMap>
<sql id="selectIvrLibaTargetVo">
- select targetID, targetType, categoryName, targetValue, targetRegex, note, language, version, isEnable, isDel, addUserID, addTime, modifyUserID, modifyTime, groupID, isAbnormal, WarnUp, WarnDown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_target
+ select targetID, groupid, targettype, targetname, targetdesc, language, version, isenable, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, assortid from ivr_liba_target
</sql>
- <select id="selectIvrLibaTargetList" parameterType="IvrLibaTarget" resultMap="IvrLibaTargetResult">
+ <select id="selectIvrLibaTargetList" parameterType="com.smartor.domain.IvrLibaTarget" resultMap="IvrLibaTargetResult">
<include refid="selectIvrLibaTargetVo"/>
<where>
- <if test="targetType != null and targetType != ''"> and targetType = #{targetType}</if>
- <if test="categoryName != null and categoryName != ''"> and categoryName like concat('%', #{categoryName}, '%')</if>
- <if test="targetValue != null and targetValue != ''"> and targetValue = #{targetValue}</if>
- <if test="targetRegex != null and targetRegex != ''"> and targetRegex = #{targetRegex}</if>
- <if test="note != null and note != ''"> and note = #{note}</if>
+ <if test="groupid != null and groupid != ''"> and groupid = #{groupid}</if>
+ <if test="targettype != null and targettype != ''"> and targettype = #{targettype}</if>
+ <if test="targetname != null and targetname != ''"> and targetname like concat('%', #{targetname}, '%')</if>
+ <if test="targetdesc != null and targetdesc != ''"> and targetdesc = #{targetdesc}</if>
<if test="language != null and language != ''"> and language = #{language}</if>
<if test="version != null "> and version = #{version}</if>
- <if test="isEnable != null "> and isEnable = #{isEnable}</if>
- <if test="isDel != null "> and isDel = #{isDel}</if>
- <if test="addUserID != null and addUserID != ''"> and addUserID = #{addUserID}</if>
- <if test="addTime != null "> and addTime = #{addTime}</if>
- <if test="modifyUserID != null and modifyUserID != ''"> and modifyUserID = #{modifyUserID}</if>
- <if test="modifyTime != null "> and modifyTime = #{modifyTime}</if>
- <if test="groupID != null and groupID != ''"> and groupID = #{groupID}</if>
- <if test="isAbnormal != null "> and isAbnormal = #{isAbnormal}</if>
- <if test="WarnUp != null "> and WarnUp = #{WarnUp}</if>
- <if test="WarnDown != null "> and WarnDown = #{WarnDown}</if>
+ <if test="isenable != null "> and isenable = #{isenable}</if>
+ <if test="isabnormal != null "> and isabnormal = #{isabnormal}</if>
+ <if test="warnup != null "> and warnup = #{warnup}</if>
+ <if test="warndown != null "> and warndown = #{warndown}</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>
+ <if test="pid != null "> and pid = #{pid}</if>
+ <if test="guid != null and guid != ''"> and guid = #{guid}</if>
+ <if test="assortid != null "> and assortid = #{assortid}</if>
</where>
</select>
- <select id="selectIvrLibaTargetByTargetID" parameterType="String" resultMap="IvrLibaTargetResult">
+ <select id="selectIvrLibaTargetByTargetID" parameterType="Long" resultMap="IvrLibaTargetResult">
<include refid="selectIvrLibaTargetVo"/>
where targetID = #{targetID}
</select>
- <insert id="insertIvrLibaTarget" parameterType="IvrLibaTarget">
+ <insert id="insertIvrLibaTarget" parameterType="com.smartor.domain.IvrLibaTarget" useGeneratedKeys="true" keyProperty="targetID">
insert into ivr_liba_target
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="targetID != null">targetID,</if>
- <if test="targetType != null and targetType != ''">targetType,</if>
- <if test="categoryName != null and categoryName != ''">categoryName,</if>
- <if test="targetValue != null">targetValue,</if>
- <if test="targetRegex != null">targetRegex,</if>
- <if test="note != null">note,</if>
+ <if test="groupid != null">groupid,</if>
+ <if test="targettype != null and targettype != ''">targettype,</if>
+ <if test="targetname != null and targetname != ''">targetname,</if>
+ <if test="targetdesc != null">targetdesc,</if>
<if test="language != null and language != ''">language,</if>
<if test="version != null">version,</if>
- <if test="isEnable != null">isEnable,</if>
- <if test="isDel != null">isDel,</if>
- <if test="addUserID != null">addUserID,</if>
- <if test="addTime != null">addTime,</if>
- <if test="modifyUserID != null">modifyUserID,</if>
- <if test="modifyTime != null">modifyTime,</if>
- <if test="groupID != null">groupID,</if>
- <if test="isAbnormal != null">isAbnormal,</if>
- <if test="WarnUp != null">WarnUp,</if>
- <if test="WarnDown != null">WarnDown,</if>
+ <if test="isenable != null">isenable,</if>
+ <if test="isabnormal != null">isabnormal,</if>
+ <if test="warnup != null">warnup,</if>
+ <if test="warndown != null">warndown,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
@@ -97,26 +81,21 @@
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
<if test="orgid != null">orgid,</if>
+ <if test="pid != null">pid,</if>
+ <if test="guid != null">guid,</if>
+ <if test="assortid != null">assortid,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="targetID != null">#{targetID},</if>
- <if test="targetType != null and targetType != ''">#{targetType},</if>
- <if test="categoryName != null and categoryName != ''">#{categoryName},</if>
- <if test="targetValue != null">#{targetValue},</if>
- <if test="targetRegex != null">#{targetRegex},</if>
- <if test="note != null">#{note},</if>
+ <if test="groupid != null">#{groupid},</if>
+ <if test="targettype != null and targettype != ''">#{targettype},</if>
+ <if test="targetname != null and targetname != ''">#{targetname},</if>
+ <if test="targetdesc != null">#{targetdesc},</if>
<if test="language != null and language != ''">#{language},</if>
<if test="version != null">#{version},</if>
- <if test="isEnable != null">#{isEnable},</if>
- <if test="isDel != null">#{isDel},</if>
- <if test="addUserID != null">#{addUserID},</if>
- <if test="addTime != null">#{addTime},</if>
- <if test="modifyUserID != null">#{modifyUserID},</if>
- <if test="modifyTime != null">#{modifyTime},</if>
- <if test="groupID != null">#{groupID},</if>
- <if test="isAbnormal != null">#{isAbnormal},</if>
- <if test="WarnUp != null">#{WarnUp},</if>
- <if test="WarnDown != null">#{WarnDown},</if>
+ <if test="isenable != null">#{isenable},</if>
+ <if test="isabnormal != null">#{isabnormal},</if>
+ <if test="warnup != null">#{warnup},</if>
+ <if test="warndown != null">#{warndown},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
@@ -125,29 +104,25 @@
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="orgid != null">#{orgid},</if>
+ <if test="pid != null">#{pid},</if>
+ <if test="guid != null">#{guid},</if>
+ <if test="assortid != null">#{assortid},</if>
</trim>
</insert>
- <update id="updateIvrLibaTarget" parameterType="IvrLibaTarget">
+ <update id="updateIvrLibaTarget" parameterType="com.smartor.domain.IvrLibaTarget">
update ivr_liba_target
<trim prefix="SET" suffixOverrides=",">
- <if test="targetType != null and targetType != ''">targetType = #{targetType},</if>
- <if test="categoryName != null and categoryName != ''">categoryName = #{categoryName},</if>
- <if test="targetValue != null">targetValue = #{targetValue},</if>
- <if test="targetRegex != null">targetRegex = #{targetRegex},</if>
- <if test="note != null">note = #{note},</if>
+ <if test="groupid != null">groupid = #{groupid},</if>
+ <if test="targettype != null and targettype != ''">targettype = #{targettype},</if>
+ <if test="targetname != null and targetname != ''">targetname = #{targetname},</if>
+ <if test="targetdesc != null">targetdesc = #{targetdesc},</if>
<if test="language != null and language != ''">language = #{language},</if>
<if test="version != null">version = #{version},</if>
- <if test="isEnable != null">isEnable = #{isEnable},</if>
- <if test="isDel != null">isDel = #{isDel},</if>
- <if test="addUserID != null">addUserID = #{addUserID},</if>
- <if test="addTime != null">addTime = #{addTime},</if>
- <if test="modifyUserID != null">modifyUserID = #{modifyUserID},</if>
- <if test="modifyTime != null">modifyTime = #{modifyTime},</if>
- <if test="groupID != null">groupID = #{groupID},</if>
- <if test="isAbnormal != null">isAbnormal = #{isAbnormal},</if>
- <if test="WarnUp != null">WarnUp = #{WarnUp},</if>
- <if test="WarnDown != null">WarnDown = #{WarnDown},</if>
+ <if test="isenable != null">isenable = #{isenable},</if>
+ <if test="isabnormal != null">isabnormal = #{isabnormal},</if>
+ <if test="warnup != null">warnup = #{warnup},</if>
+ <if test="warndown != null">warndown = #{warndown},</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>
@@ -156,11 +131,14 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="pid != null">pid = #{pid},</if>
+ <if test="guid != null">guid = #{guid},</if>
+ <if test="assortid != null">assortid = #{assortid},</if>
</trim>
where targetID = #{targetID}
</update>
- <delete id="deleteIvrLibaTargetByTargetID" parameterType="String">
+ <delete id="deleteIvrLibaTargetByTargetID" parameterType="Long">
delete from ivr_liba_target where targetID = #{targetID}
</delete>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml
new file mode 100644
index 0000000..f1f8267
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml
@@ -0,0 +1,169 @@
+<?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.IvrLibaTargetoptionMapper">
+
+ <resultMap type="com.smartor.domain.IvrLibaTargetoption" id="IvrLibaTargetoptionResult">
+ <result property="targetoptionid" column="targetoptionid"/>
+ <result property="targetid" column="targetid"/>
+ <result property="targettype" column="targettype"/>
+ <result property="categoryName" column="categoryName"/>
+ <result property="targetvalue" column="targetvalue"/>
+ <result property="targetregex" column="targetregex"/>
+ <result property="optiondesc" column="optiondesc"/>
+ <result property="language" column="language"/>
+ <result property="version" column="version"/>
+ <result property="groupid" column="groupid"/>
+ <result property="isabnormal" column="isabnormal"/>
+ <result property="warnup" column="warnup"/>
+ <result property="warndown" column="warndown"/>
+ <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="isupload" column="isupload"/>
+ <result property="uploadTime" column="upload_time"/>
+ <result property="orgid" column="orgid"/>
+ <result property="pid" column="pid"/>
+ <result property="guid" column="guid"/>
+ </resultMap>
+
+ <sql id="selectIvrLibaTargetoptionVo">
+ select targetoptionid,
+ targetid,
+ targettype,
+ categoryName,
+ targetvalue,
+ targetregex,
+ optiondesc, language, version, groupid, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid
+ from ivr_liba_targetoption
+ </sql>
+
+ <select id="selectIvrLibaTargetoptionList" parameterType="com.smartor.domain.IvrLibaTargetoption"
+ resultMap="IvrLibaTargetoptionResult">
+ <include refid="selectIvrLibaTargetoptionVo"/>
+ <where>
+ <if test="targetid != null ">and targetid = #{targetid}</if>
+ <if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
+ <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
+ '%')
+ </if>
+ <if test="targetvalue != null and targetvalue != ''">and targetvalue = #{targetvalue}</if>
+ <if test="targetregex != null and targetregex != ''">and targetregex = #{targetregex}</if>
+ <if test="optiondesc != null and optiondesc != ''">and optiondesc = #{optiondesc}</if>
+ <if test="language != null and language != ''">and language = #{language}</if>
+ <if test="version != null ">and version = #{version}</if>
+ <if test="groupid != null and groupid != ''">and groupid = #{groupid}</if>
+ <if test="isabnormal != null ">and isabnormal = #{isabnormal}</if>
+ <if test="warnup != null ">and warnup = #{warnup}</if>
+ <if test="warndown != null ">and warndown = #{warndown}</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>
+ <if test="pid != null ">and pid = #{pid}</if>
+ <if test="guid != null and guid != ''">and guid = #{guid}</if>
+ </where>
+ </select>
+
+ <select id="selectIvrLibaTargetoptionByTargetoptionid" parameterType="Long" resultMap="IvrLibaTargetoptionResult">
+ <include refid="selectIvrLibaTargetoptionVo"/>
+ where targetoptionid = #{targetoptionid}
+ </select>
+
+ <insert id="insertIvrLibaTargetoption" parameterType="com.smartor.domain.IvrLibaTargetoption"
+ useGeneratedKeys="true" keyProperty="targetoptionid">
+ insert into ivr_liba_targetoption
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="targetid != null">targetid,</if>
+ <if test="targettype != null and targettype != ''">targettype,</if>
+ <if test="categoryName != null and categoryName != ''">categoryName,</if>
+ <if test="targetvalue != null">targetvalue,</if>
+ <if test="targetregex != null">targetregex,</if>
+ <if test="optiondesc != null">optiondesc,</if>
+ <if test="language != null and language != ''">language,</if>
+ <if test="version != null">version,</if>
+ <if test="groupid != null">groupid,</if>
+ <if test="isabnormal != null">isabnormal,</if>
+ <if test="warnup != null">warnup,</if>
+ <if test="warndown != null">warndown,</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>
+ <if test="createTime != null">create_time,</if>
+ <if test="isupload != null">isupload,</if>
+ <if test="uploadTime != null">upload_time,</if>
+ <if test="orgid != null">orgid,</if>
+ <if test="pid != null">pid,</if>
+ <if test="guid != null">guid,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="targetid != null">#{targetid},</if>
+ <if test="targettype != null and targettype != ''">#{targettype},</if>
+ <if test="categoryName != null and categoryName != ''">#{categoryName},</if>
+ <if test="targetvalue != null">#{targetvalue},</if>
+ <if test="targetregex != null">#{targetregex},</if>
+ <if test="optiondesc != null">#{optiondesc},</if>
+ <if test="language != null and language != ''">#{language},</if>
+ <if test="version != null">#{version},</if>
+ <if test="groupid != null">#{groupid},</if>
+ <if test="isabnormal != null">#{isabnormal},</if>
+ <if test="warnup != null">#{warnup},</if>
+ <if test="warndown != null">#{warndown},</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>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="isupload != null">#{isupload},</if>
+ <if test="uploadTime != null">#{uploadTime},</if>
+ <if test="orgid != null">#{orgid},</if>
+ <if test="pid != null">#{pid},</if>
+ <if test="guid != null">#{guid},</if>
+ </trim>
+ </insert>
+
+ <update id="updateIvrLibaTargetoption" parameterType="com.smartor.domain.IvrLibaTargetoption">
+ update ivr_liba_targetoption
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="targetid != null">targetid = #{targetid},</if>
+ <if test="targettype != null and targettype != ''">targettype = #{targettype},</if>
+ <if test="categoryName != null and categoryName != ''">categoryName = #{categoryName},</if>
+ <if test="targetvalue != null">targetvalue = #{targetvalue},</if>
+ <if test="targetregex != null">targetregex = #{targetregex},</if>
+ <if test="optiondesc != null">optiondesc = #{optiondesc},</if>
+ <if test="language != null and language != ''">language = #{language},</if>
+ <if test="version != null">version = #{version},</if>
+ <if test="groupid != null">groupid = #{groupid},</if>
+ <if test="isabnormal != null">isabnormal = #{isabnormal},</if>
+ <if test="warnup != null">warnup = #{warnup},</if>
+ <if test="warndown != null">warndown = #{warndown},</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>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="isupload != null">isupload = #{isupload},</if>
+ <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+ <if test="orgid != null">orgid = #{orgid},</if>
+ <if test="pid != null">pid = #{pid},</if>
+ <if test="guid != null">guid = #{guid},</if>
+ </trim>
+ where targetoptionid = #{targetoptionid}
+ </update>
+
+ <delete id="deleteIvrLibaTargetoptionByTargetoptionid" parameterType="Long">
+ delete
+ from ivr_liba_targetoption
+ where targetoptionid = #{targetoptionid}
+ </delete>
+
+ <delete id="deleteIvrLibaTargetoptionByTargetoptionids" parameterType="String">
+ delete from ivr_liba_targetoption where targetoptionid in
+ <foreach item="targetoptionid" collection="array" open="(" separator="," close=")">
+ #{targetoptionid}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/MedicalHistoryMapper.xml b/smartor/src/main/resources/mapper/smartor/MedicalHistoryMapper.xml
new file mode 100644
index 0000000..aaab90e
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/MedicalHistoryMapper.xml
@@ -0,0 +1,111 @@
+<?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.MedicalHistoryMapper">
+
+ <resultMap type="com.smartor.domain.MedicalHistory" id="MedicalHistoryResult">
+ <result property="id" column="id" />
+ <result property="pastIllnesses" column="past_illnesses" />
+ <result property="drugAllergy" column="drug_allergy" />
+ <result property="familyHistory" column="family_history" />
+ <result property="surgicalHistory" column="surgical_history" />
+ <result property="reproductiveHistory" column="reproductive_history" />
+ <result property="menstrualHistory" column="menstrual_history" />
+ <result property="smoking" column="smoking" />
+ <result property="drink" column="drink" />
+ <result property="motion" column="motion" />
+ <result property="diet" column="diet" />
+ <result property="psychology" column="psychology" />
+ <result property="pid" column="pid" />
+ </resultMap>
+
+ <sql id="selectMedicalHistoryVo">
+ select id, past_illnesses, drug_allergy, family_history, surgical_history, reproductive_history, menstrual_history, smoking, drink, motion, diet, psychology, pid from medical_history
+ </sql>
+
+ <select id="selectMedicalHistoryList" parameterType="com.smartor.domain.MedicalHistory" resultMap="MedicalHistoryResult">
+ <include refid="selectMedicalHistoryVo"/>
+ <where>
+ <if test="pastIllnesses != null and pastIllnesses != ''"> and past_illnesses = #{pastIllnesses}</if>
+ <if test="drugAllergy != null and drugAllergy != ''"> and drug_allergy = #{drugAllergy}</if>
+ <if test="familyHistory != null and familyHistory != ''"> and family_history = #{familyHistory}</if>
+ <if test="surgicalHistory != null and surgicalHistory != ''"> and surgical_history = #{surgicalHistory}</if>
+ <if test="reproductiveHistory != null and reproductiveHistory != ''"> and reproductive_history = #{reproductiveHistory}</if>
+ <if test="menstrualHistory != null and menstrualHistory != ''"> and menstrual_history = #{menstrualHistory}</if>
+ <if test="smoking != null and smoking != ''"> and smoking = #{smoking}</if>
+ <if test="drink != null and drink != ''"> and drink = #{drink}</if>
+ <if test="motion != null and motion != ''"> and motion = #{motion}</if>
+ <if test="diet != null and diet != ''"> and diet = #{diet}</if>
+ <if test="psychology != null and psychology != ''"> and psychology = #{psychology}</if>
+ <if test="pid != null "> and pid = #{pid}</if>
+ </where>
+ </select>
+
+ <select id="selectMedicalHistoryById" parameterType="Long" resultMap="MedicalHistoryResult">
+ <include refid="selectMedicalHistoryVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertMedicalHistory" parameterType="com.smartor.domain.MedicalHistory" useGeneratedKeys="true" keyProperty="id">
+ insert into medical_history
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="pastIllnesses != null">past_illnesses,</if>
+ <if test="drugAllergy != null">drug_allergy,</if>
+ <if test="familyHistory != null">family_history,</if>
+ <if test="surgicalHistory != null">surgical_history,</if>
+ <if test="reproductiveHistory != null">reproductive_history,</if>
+ <if test="menstrualHistory != null">menstrual_history,</if>
+ <if test="smoking != null">smoking,</if>
+ <if test="drink != null">drink,</if>
+ <if test="motion != null">motion,</if>
+ <if test="diet != null">diet,</if>
+ <if test="psychology != null">psychology,</if>
+ <if test="pid != null">pid,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="pastIllnesses != null">#{pastIllnesses},</if>
+ <if test="drugAllergy != null">#{drugAllergy},</if>
+ <if test="familyHistory != null">#{familyHistory},</if>
+ <if test="surgicalHistory != null">#{surgicalHistory},</if>
+ <if test="reproductiveHistory != null">#{reproductiveHistory},</if>
+ <if test="menstrualHistory != null">#{menstrualHistory},</if>
+ <if test="smoking != null">#{smoking},</if>
+ <if test="drink != null">#{drink},</if>
+ <if test="motion != null">#{motion},</if>
+ <if test="diet != null">#{diet},</if>
+ <if test="psychology != null">#{psychology},</if>
+ <if test="pid != null">#{pid},</if>
+ </trim>
+ </insert>
+
+ <update id="updateMedicalHistory" parameterType="com.smartor.domain.MedicalHistory">
+ update medical_history
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="pastIllnesses != null">past_illnesses = #{pastIllnesses},</if>
+ <if test="drugAllergy != null">drug_allergy = #{drugAllergy},</if>
+ <if test="familyHistory != null">family_history = #{familyHistory},</if>
+ <if test="surgicalHistory != null">surgical_history = #{surgicalHistory},</if>
+ <if test="reproductiveHistory != null">reproductive_history = #{reproductiveHistory},</if>
+ <if test="menstrualHistory != null">menstrual_history = #{menstrualHistory},</if>
+ <if test="smoking != null">smoking = #{smoking},</if>
+ <if test="drink != null">drink = #{drink},</if>
+ <if test="motion != null">motion = #{motion},</if>
+ <if test="diet != null">diet = #{diet},</if>
+ <if test="psychology != null">psychology = #{psychology},</if>
+ <if test="pid != null">pid = #{pid},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteMedicalHistoryById" parameterType="Long">
+ delete from medical_history where id = #{id}
+ </delete>
+
+ <delete id="deleteMedicalHistoryByIds" parameterType="String">
+ delete from medical_history where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 1cc1517..e423628 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -8,7 +8,11 @@
<result property="patid" column="patid"/>
<result property="name" column="name"/>
<result property="sex" column="sex"/>
- <result property="iccardno" column="iccardno"/>
+ <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="source" column="source"/>
@@ -16,7 +20,7 @@
<result property="archiveby" column="archiveby"/>
<result property="telcode" column="telcode"/>
<result property="relativetelcode" column="relativetelcode"/>
- <result property="iccardtype" column="iccardtype"/>
+ <result property="idcardtype" column="idcardtype"/>
<result property="orgid" column="orgid"/>
<result property="openid" column="openid"/>
<result property="delFlag" column="del_flag"/>
@@ -27,21 +31,26 @@
<result property="isupload" column="isupload"/>
<result property="uploadTime" column="upload_time"/>
<result property="tag" column="tag"/>
+ <result property="pattype" column="pattype"/>
</resultMap>
<sql id="selectPatArchiveVo">
select patid,
name,
sex,
- iccardno,
+ idcardno,
birthdate,
age,
+ nation,
+ native_place,
+ place_of_residence,
+ birthplace,
source,
archivetime,
archiveby,
telcode,
relativetelcode,
- iccardtype,
+ idcardtype,
orgid,
openid,
del_flag,
@@ -50,6 +59,7 @@
create_by,
create_time,
isupload,
+ pattype,
upload_time
from pat_archive
</sql>
@@ -58,7 +68,7 @@
<include refid="selectPatArchiveVo"/>
<where>
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
- <if test="iccardno != null and iccardno != ''">and iccardno = #{iccardno}</if>
+ <if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
<if test="source != null ">and source = #{source}</if>
<if test="telcode != null and telcode != ''">and telcode = #{telcode}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
@@ -75,8 +85,8 @@
a.name,
a.sex,
c.tagname as tag,
- a.iccardtype,
- a.iccardno,
+ a.idcardtype,
+ a.idcardno,
a.age,
a.telcode,
a.create_time,
@@ -86,7 +96,7 @@
<where>
a.patid = b.patid and b.tagid = c.tagid
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
- <if test="iccardno != null and iccardno != ''">and iccardno = #{iccardno}</if>
+ <if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
<if test="telcode != null and telcode != ''">and telcode = #{telcode}</if>
<if test="tagIds != null and tagIds != ''">and c.tagid in
<foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
@@ -101,53 +111,64 @@
where patid = #{patid}
</select>
- <insert id="insertPatArchive" parameterType="com.smartor.domain.PatArchive" useGeneratedKeys="true"
- keyProperty="patid">
- insert into pat_archive
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="name != null">name,</if>
- <if test="sex != null">sex,</if>
- <if test="iccardno != null">iccardno,</if>
- <if test="birthdate != null">birthdate,</if>
- <if test="age != null">age,</if>
- <if test="source != null">source,</if>
- <if test="archivetime != null">archivetime,</if>
- <if test="archiveby != null">archiveby,</if>
- <if test="telcode != null">telcode,</if>
- <if test="relativetelcode != null">relativetelcode,</if>
- <if test="iccardtype != null">iccardtype,</if>
- <if test="orgid != null">orgid,</if>
- <if test="openid != null">openid,</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>
- <if test="createTime != null">create_time,</if>
- <if test="isupload != null">isupload,</if>
- <if test="uploadTime != null">upload_time,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="name != null">#{name},</if>
- <if test="sex != null">#{sex},</if>
- <if test="iccardno != null">#{iccardno},</if>
- <if test="birthdate != null">#{birthdate},</if>
- <if test="age != null">#{age},</if>
- <if test="source != null">#{source},</if>
- <if test="archivetime != null">#{archivetime},</if>
- <if test="archiveby != null">#{archiveby},</if>
- <if test="telcode != null">#{telcode},</if>
- <if test="relativetelcode != null">#{relativetelcode},</if>
- <if test="iccardtype != null">#{iccardtype},</if>
- <if test="orgid != null">#{orgid},</if>
- <if test="openid != null">#{openid},</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>
- <if test="createTime != null">#{createTime},</if>
- <if test="isupload != null">#{isupload},</if>
- <if test="uploadTime != null">#{uploadTime},</if>
- </trim>
+ <insert id="insertPatArchive">
+ <!-- insert into pat_archive-->
+ <!-- <trim prefix="(" suffix=")" suffixOverrides=",">-->
+ <!-- name,-->
+ <!-- sex,-->
+ <!-- iccardno-->
+ <!--<!– <if test="birthdate != null">birthdate,</if>–>-->
+ <!--<!– <if test="age != null">age,</if>–>-->
+ <!--<!– <if test="source != null">source,</if>–>-->
+ <!--<!– <if test="archivetime != null">archivetime,</if>–>-->
+ <!--<!– <if test="archiveby != null">archiveby,</if>–>-->
+ <!--<!– <if test="telcode != null">telcode,</if>–>-->
+ <!--<!– <if test="relativetelcode != null">relativetelcode,</if>–>-->
+ <!--<!– <if test="iccardtype != null">iccardtype,</if>–>-->
+ <!--<!– <if test="orgid != null">orgid,</if>–>-->
+ <!--<!– <if test="openid != null">openid,</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>–>-->
+ <!--<!– <if test="createTime != null">create_time,</if>–>-->
+ <!--<!– <if test="isupload != null">isupload,</if>–>-->
+ <!--<!– <if test="uploadTime != null">upload_time,</if>–>-->
+ <!-- </trim>-->
+ <!-- <trim prefix="values (" suffix=")" suffixOverrides=",">-->
+ <!-- <foreach item="item" index="index" collection="list" separator=",">-->
+ <!-- <if test="name != null">#{item.name},</if>-->
+ <!-- <if test="sex != null">#{item.sex},</if>-->
+ <!-- <if test="iccardno != null">#{item.iccardno},</if>-->
+ <!--<!– <if test="birthdate != null">#{birthdate},</if>–>-->
+ <!--<!– <if test="age != null">#{item.age},</if>–>-->
+ <!--<!– <if test="source != null">#{item.source},</if>–>-->
+ <!--<!– <if test="archivetime != null">#{item.archivetime},</if>–>-->
+ <!--<!– <if test="archiveby != null">#{item.archiveby},</if>–>-->
+ <!--<!– <if test="telcode != null">#{item.telcode},</if>–>-->
+ <!--<!– <if test="relativetelcode != null">#{item.relativetelcode},</if>–>-->
+ <!--<!– <if test="iccardtype != null">#{item.iccardtype},</if>–>-->
+ <!--<!– <if test="orgid != null">#{item.orgid},</if>–>-->
+ <!--<!– <if test="openid != null">#{item.openid},</if>–>-->
+ <!--<!– <if test="delFlag != null and delFlag != ''">#{item.delFlag},</if>–>-->
+ <!--<!– <if test="updateBy != null">#{item.updateBy},</if>–>-->
+ <!--<!– <if test="updateTime != null">#{item.updateTime},</if>–>-->
+ <!--<!– <if test="createBy != null">#{item.createBy},</if>–>-->
+ <!--<!– <if test="createTime != null">#{item.createTime},</if>–>-->
+ <!--<!– <if test="isupload != null">#{item.isupload},</if>–>-->
+ <!--<!– <if test="uploadTime != null">#{item.uploadTime},</if>–>-->
+ <!-- </foreach>-->
+ <!-- </trim>-->
+
+ insert into
+ pat_archive(name,sex,idcardno,birthdate,age,source,archivetime,archiveby,telcode,relativetelcode,idcardtype,orgid,openid,dduserid,update_by,update_time
+ ,create_by,create_time,isupload,upload_time,pattype,place_of_residence,nation,birthplace,native_place) values
+ <foreach item="item" index="index" collection="list" separator=",">
+ (#{item.name},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.age},#{item.source},#{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.placeOfResidence},#{item.nation},#{item.birthplace},#{item.nativePlace}
+ )
+ </foreach>
</insert>
<update id="updatePatArchive" parameterType="com.smartor.domain.PatArchive">
@@ -155,7 +176,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="sex != null">sex = #{sex},</if>
- <if test="iccardno != null">iccardno = #{iccardno},</if>
+ <if test="idcardno != null">idcardno = #{idcardno},</if>
<if test="birthdate != null">birthdate = #{birthdate},</if>
<if test="age != null">age = #{age},</if>
<if test="source != null">source = #{source},</if>
@@ -163,7 +184,7 @@
<if test="archiveby != null">archiveby = #{archiveby},</if>
<if test="telcode != null">telcode = #{telcode},</if>
<if test="relativetelcode != null">relativetelcode = #{relativetelcode},</if>
- <if test="iccardtype != null">iccardtype = #{iccardtype},</if>
+ <if test="idcardtype != null">idcardtype = #{idcardtype},</if>
<if test="orgid != null">orgid = #{orgid},</if>
<if test="openid != null">openid = #{openid},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
@@ -190,4 +211,251 @@
</foreach>
</delete>
+ <select id="selectPatArchiveInfoByAllhosp" parameterType="com.smartor.domain.PatArchiveReq"
+ resultMap="PatArchiveResult">
+
+ select
+ c.tagname as tag,
+ a.patid,
+ a.name,
+ a.sex,
+ a.nation,
+ a.native_place,
+ a.place_of_residence,
+ a.birthplace,
+ a.idcardno,
+ a.birthdate,
+ a.age,
+ a.source,
+ a.archivetime,
+ a.archiveby,
+ a.telcode,
+ a.relativetelcode,
+ a.idcardtype,
+ a.orgid,
+ a.openid,
+ a.del_flag,
+ a.update_by,
+ a.update_time,
+ a.create_by,
+ a.create_time,
+ a.isupload,
+ a.upload_time,
+ a.pattype
+ from pat_archive a,pat_archivetag b ,base_tag c
+ <where>
+ a.patid = b.patid and b.tagid = c.tagid
+ <if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
+ <if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
+ <if test="pid != null and pid != ''">and a.patid = #{pid}</if>
+ <if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
+ <if test="tagIds != null and tagIds != ''">and c.tagid in
+ <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
+ #{tagId}
+ </foreach>
+ </if>
+ AND b.del_flag != 1
+ AND c.del_flag != 1
+ AND a.del_flag != 1
+ </where>
+ </select>
+
+
+ <select id="selectPatArchiveInfoByInhosp" parameterType="com.smartor.domain.PatArchiveReq"
+ resultMap="PatArchiveResult">
+
+ select
+ c.tagname as tag,
+ a.patid,
+ a.name,
+ a.sex,
+ a.nation,
+ a.native_place,
+ a.place_of_residence,
+ a.birthplace,
+ a.idcardno,
+ a.birthdate,
+ a.age,
+ a.source,
+ a.archivetime,
+ a.archiveby,
+ a.telcode,
+ a.relativetelcode,
+ a.idcardtype,
+ a.orgid,
+ a.openid,
+ a.del_flag,
+ a.update_by,
+ a.update_time,
+ a.create_by,
+ a.create_time,
+ a.isupload,
+ a.upload_time,
+ a.pattype
+ from pat_archive a,pat_archivetag b ,base_tag c,pat_med_inhosp d
+ <where>
+ a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
+ <if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
+ <if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
+ <if test="pid != null and pid != ''">and a.patid = #{pid}</if>
+ <if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
+ <if test="tagIds != null and tagIds != ''">and c.tagid in
+ <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
+ #{tagId}
+ </foreach>
+ </if>
+
+ <if test="hospitalname != null and hospitalname != ''">
+ AND d.hospitalname = #{hospitalname}
+ </if>
+ <if test="endtime != null">
+ AND d.endtime = #{endtime}
+ </if>
+ <if test="visitno != null and visitno != ''">
+ AND d.inhospno = #{visitno}
+ </if>
+ <if test="deptname != null and deptname != ''">
+ and d.deptname LIKE concat('%', #{deptname}, '%')
+ </if>
+ <if test="drname != null and drname != ''">
+ AND d.drname LIKE concat('%',#{drname}, '%')
+ </if>
+
+ AND d.del_flag != 1
+ AND b.del_flag != 1
+ AND c.del_flag != 1
+ AND a.del_flag != 1
+ </where>
+ </select>
+
+ <select id="selectPatArchiveInfoByOuthosp" parameterType="com.smartor.domain.PatArchiveReq"
+ resultMap="PatArchiveResult">
+
+ select
+ c.tagname as tag,
+ a.patid,
+ a.name,
+ a.sex,
+ a.nation,
+ a.native_place,
+ a.place_of_residence,
+ a.birthplace,
+ a.idcardno,
+ a.birthdate,
+ a.age,
+ a.source,
+ a.archivetime,
+ a.archiveby,
+ a.telcode,
+ a.relativetelcode,
+ a.idcardtype,
+ a.orgid,
+ a.openid,
+ a.del_flag,
+ a.update_by,
+ a.update_time,
+ a.create_by,
+ a.create_time,
+ a.isupload,
+ a.upload_time,
+ a.pattype
+ from pat_archive a,pat_archivetag b ,base_tag c, pat_med_outhosp d
+ <where>
+ a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
+ <if test="pid != null and pid != ''">and a.patid = #{pid}</if>
+ <if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
+ <if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
+ <if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
+ <if test="tagIds != null and tagIds != ''">and c.tagid in
+ <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
+ #{tagId}
+ </foreach>
+ </if>
+
+ <if test="hospitalname != null and hospitalname != ''">
+ AND d.hospitalname = #{hospitalname}
+ </if>
+ <if test="visitno != null and visitno != ''">
+ AND d.outhospno = #{visitno}
+ </if>
+ <if test="deptname != null and deptname != ''">
+ and d.deptname LIKE concat('%', #{deptname}, '%')
+ </if>
+ <if test="drname != null and drname != ''">
+ AND d.drname LIKE concat('%',#{drname}, '%')
+ </if>
+
+ AND d.del_flag != 1
+ AND b.del_flag != 1
+ AND c.del_flag != 1
+ AND a.del_flag != 1
+ </where>
+ </select>
+
+ <select id="selectPatArchiveInfoByPhysical" parameterType="com.smartor.domain.PatArchiveReq"
+ resultMap="PatArchiveResult">
+
+ select
+ c.tagname as tag,
+ a.patid,
+ a.name,
+ a.sex,
+ a.nation,
+ a.native_place,
+ a.place_of_residence,
+ a.birthplace,
+ a.idcardno,
+ a.birthdate,
+ a.age,
+ a.source,
+ a.archivetime,
+ a.archiveby,
+ a.telcode,
+ a.relativetelcode,
+ a.idcardtype,
+ a.orgid,
+ a.openid,
+ a.del_flag,
+ a.update_by,
+ a.update_time,
+ a.create_by,
+ a.create_time,
+ a.isupload,
+ a.upload_time,
+ a.pattype
+ from pat_archive a,pat_archivetag b ,base_tag c, pat_med_physical d
+ <where>
+ a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
+ <if test="pid != null and pid != ''">and a.patid = #{pid}</if>
+ <if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
+ <if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
+ <if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
+ <if test="tagIds != null and tagIds != ''">and c.tagid in
+ <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
+ #{tagId}
+ </foreach>
+ </if>
+
+ <if test="hospitalname != null and hospitalname != ''">
+ AND d.hospitalname = #{hospitalname}
+ </if>
+
+ <if test="visitno != null and visitno != ''">
+ AND d.physno = #{visitno}
+ </if>
+ <if test="deptname != null and deptname != ''">
+ and d.deptname LIKE concat('%', #{deptname}, '%')
+ </if>
+ <if test="drname != null and drname != ''">
+ AND d.drname LIKE concat('%',#{drname}, '%')
+ </if>
+
+ AND d.del_flag != 1
+ AND b.del_flag != 1
+ AND c.del_flag != 1
+ AND a.del_flag != 1
+ </where>
+
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchinvecontactMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchivecontactMapper.xml
similarity index 75%
rename from smartor/src/main/resources/mapper/smartor/PatArchinvecontactMapper.xml
rename to smartor/src/main/resources/mapper/smartor/PatArchivecontactMapper.xml
index 0435eaf..9b82638 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchinvecontactMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchivecontactMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smartor.mapper.PatArchinvecontactMapper">
+<mapper namespace="com.smartor.mapper.PatArchivecontactMapper">
- <resultMap type="com.smartor.domain.PatArchinvecontact" id="PatArchinvecontactResult">
+ <resultMap type="com.smartor.domain.PatArchivecontact" id="PatArchivecontactResult">
<result property="id" column="id" />
<result property="patid" column="patid" />
<result property="contactway" column="contactway" />
@@ -20,14 +20,16 @@
<result property="isupload" column="isupload" />
<result property="uploadTime" column="upload_time" />
<result property="contactname" column="contactname" />
+ <result property="pid" column="pid" />
+ <result property="guid" column="guid" />
</resultMap>
- <sql id="selectPatArchinvecontactVo">
- select id, patid, contactway, relation, datasource, isdefault, orgid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, contactname from pat_archinvecontact
+ <sql id="selectPatArchivecontactVo">
+ select id, patid, contactway, relation, datasource, isdefault, orgid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, contactname, pid, guid from pat_archivecontact
</sql>
- <select id="selectPatArchinvecontactList" parameterType="com.smartor.domain.PatArchinvecontact" resultMap="PatArchinvecontactResult">
- <include refid="selectPatArchinvecontactVo"/>
+ <select id="selectPatArchivecontactList" parameterType="com.smartor.domain.PatArchivecontact" resultMap="PatArchivecontactResult">
+ <include refid="selectPatArchivecontactVo"/>
<where>
<if test="patid != null "> and patid = #{patid}</if>
<if test="contactway != null and contactway != ''"> and contactway = #{contactway}</if>
@@ -38,16 +40,18 @@
<if test="isupload != null "> and isupload = #{isupload}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
<if test="contactname != null and contactname != ''"> and contactname like concat('%', #{contactname}, '%')</if>
+ <if test="pid != null "> and pid = #{pid}</if>
+ <if test="guid != null and guid != ''"> and guid = #{guid}</if>
</where>
</select>
- <select id="selectPatArchinvecontactById" parameterType="Long" resultMap="PatArchinvecontactResult">
- <include refid="selectPatArchinvecontactVo"/>
+ <select id="selectPatArchivecontactById" parameterType="Long" resultMap="PatArchivecontactResult">
+ <include refid="selectPatArchivecontactVo"/>
where id = #{id}
</select>
- <insert id="insertPatArchinvecontact" parameterType="com.smartor.domain.PatArchinvecontact" useGeneratedKeys="true" keyProperty="id">
- insert into pat_archinvecontact
+ <insert id="insertPatArchivecontact" parameterType="com.smartor.domain.PatArchivecontact" useGeneratedKeys="true" keyProperty="id">
+ insert into pat_archivecontact
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="patid != null">patid,</if>
<if test="contactway != null">contactway,</if>
@@ -63,6 +67,8 @@
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
<if test="contactname != null">contactname,</if>
+ <if test="pid != null">pid,</if>
+ <if test="guid != null">guid,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="patid != null">#{patid},</if>
@@ -79,11 +85,13 @@
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="contactname != null">#{contactname},</if>
+ <if test="pid != null">#{pid},</if>
+ <if test="guid != null">#{guid},</if>
</trim>
</insert>
- <update id="updatePatArchinvecontact" parameterType="com.smartor.domain.PatArchinvecontact">
- update pat_archinvecontact
+ <update id="updatePatArchivecontact" parameterType="com.smartor.domain.PatArchivecontact">
+ update pat_archivecontact
<trim prefix="SET" suffixOverrides=",">
<if test="patid != null">patid = #{patid},</if>
<if test="contactway != null">contactway = #{contactway},</if>
@@ -99,16 +107,18 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="contactname != null">contactname = #{contactname},</if>
+ <if test="pid != null">pid = #{pid},</if>
+ <if test="guid != null">guid = #{guid},</if>
</trim>
where id = #{id}
</update>
- <delete id="deletePatArchinvecontactById" parameterType="Long">
- delete from pat_archinvecontact where id = #{id}
+ <delete id="deletePatArchivecontactById" parameterType="Long">
+ delete from pat_archivecontact where id = #{id}
</delete>
- <delete id="deletePatArchinvecontactByIds" parameterType="String">
- delete from pat_archinvecontact where id in
+ <delete id="deletePatArchivecontactByIds" parameterType="String">
+ delete from pat_archivecontact where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml
index 2b532bf..94f2bee 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml
@@ -36,20 +36,6 @@
from pat_archivetag
</sql>
- <select id="selectPatArchivetagList" parameterType="com.smartor.domain.PatArchivetag"
- resultMap="PatArchivetagResult">
- <include refid="selectPatArchivetagVo"/>
- <where>
- <if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
- <if test="tagid != null ">and tagid = #{tagid}</if>
- <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
- <if test="isupload != null ">and isupload = #{isupload}</if>
- <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
- <if test="patid != null ">and patid = #{patid}</if>
- </where>
- </select>
-
-
<select id="selectPatArchivetagAndBaseTagList" parameterType="com.smartor.domain.PatArchivetag"
resultMap="PatArchivetagResult">
select a.id,
@@ -69,7 +55,7 @@
<where>
a.tagid=b.tagid
<if test="tagcategoryid != null ">and a.tagcategoryid = #{tagcategoryid}</if>
- <if test="tagid != null ">and b.tagid = #{tagid}</if>
+ <if test="tagid != null ">and a.tagid = #{tagid}</if>
<if test="orgid != null and orgid != ''">and a.orgid = #{orgid}</if>
<if test="isupload != null ">and a.isupload = #{isupload}</if>
<if test="uploadTime != null ">and a.upload_time = #{uploadTime}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 811c5e4..9285192 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -3,9 +3,10 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.PatMedInhospMapper">
-
- <resultMap type="PatMedInhosp" id="PatMedInhospResult">
+
+ <resultMap type="com.smartor.domain.PatMedInhosp" id="PatMedInhospResult">
<result property="inhospid" column="inhospid" />
+ <result property="inhospno" column="inhospno" />
<result property="serialnum" column="serialnum" />
<result property="hospitalname" column="hospitalname" />
<result property="hospitalcode" column="hospitalcode" />
@@ -46,12 +47,12 @@
</resultMap>
<sql id="selectPatMedInhospVo">
- select inhospid, serialnum, hospitalname, hospitalcode, hospitaldistrictcode, hospitaldistrictname, icd10code, diagname, starttime, endtime, deptcode, deptname, roomno, bedno, orgid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, patid, leavediagname, leaveicd10code, drcode, drname, schemestatus, generalschemestatus, leaveldeptcode, leaveldeptname, hospitaldistrictid, leavehospitaldistrictcode, leavehospitaldistrictname, leavehospitaldistrictid, deptid, leaveldeptid, schemetime from pat_med_inhosp
+ select inhospid,inhospno, serialnum, hospitalname, hospitalcode, hospitaldistrictcode, hospitaldistrictname, icd10code, diagname, starttime, endtime, deptcode, deptname, roomno, bedno, orgid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, patid, leavediagname, leaveicd10code, drcode, drname, schemestatus, generalschemestatus, leaveldeptcode, leaveldeptname, hospitaldistrictid, leavehospitaldistrictcode, leavehospitaldistrictname, leavehospitaldistrictid, deptid, leaveldeptid, schemetime from pat_med_inhosp
</sql>
- <select id="selectPatMedInhospList" parameterType="PatMedInhosp" resultMap="PatMedInhospResult">
+ <select id="selectPatMedInhospList" parameterType="com.smartor.domain.PatMedInhosp" resultMap="PatMedInhospResult">
<include refid="selectPatMedInhospVo"/>
- <where>
+ <where>
<if test="hospitalname != null and hospitalname != ''"> and hospitalname like concat('%', #{hospitalname}, '%')</if>
<if test="hospitaldistrictname != null and hospitaldistrictname != ''"> and hospitaldistrictname like concat('%', #{hospitaldistrictname}, '%')</if>
<if test="endtime != null "> and endtime = #{endtime}</if>
@@ -61,13 +62,13 @@
<if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''"> and leavehospitaldistrictname like concat('%', #{leavehospitaldistrictname}, '%')</if>
</where>
</select>
-
+
<select id="selectPatMedInhospByInhospid" parameterType="Long" resultMap="PatMedInhospResult">
<include refid="selectPatMedInhospVo"/>
where inhospid = #{inhospid}
</select>
-
- <insert id="insertPatMedInhosp" parameterType="PatMedInhosp" useGeneratedKeys="true" keyProperty="inhospid">
+
+ <insert id="insertPatMedInhosp" parameterType="com.smartor.domain.PatMedInhosp" useGeneratedKeys="true" keyProperty="inhospid">
insert into pat_med_inhosp
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="serialnum != null">serialnum,</if>
@@ -149,7 +150,7 @@
</trim>
</insert>
- <update id="updatePatMedInhosp" parameterType="PatMedInhosp">
+ <update id="updatePatMedInhosp" parameterType="com.smartor.domain.PatMedInhosp">
update pat_med_inhosp
<trim prefix="SET" suffixOverrides=",">
<if test="serialnum != null">serialnum = #{serialnum},</if>
@@ -198,7 +199,7 @@
</delete>
<delete id="deletePatMedInhospByInhospids" parameterType="String">
- delete from pat_med_inhosp where inhospid in
+ delete from pat_med_inhosp where inhospid in
<foreach item="inhospid" collection="array" open="(" separator="," close=")">
#{inhospid}
</foreach>
--
Gitblit v1.9.3