代码提交

liusheng

2023-12-15 78b0e909aa6ece787091e5d81450c8927ef2599e

代码提交

 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>

 ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -30,6 +30,6 @@
                " |  |  \\    /  \\      /           \n" +
                " ''-'   `'-'    `-..-'              ");
        //开启SOCKET
        new SocketCommunication().socketCommunication();
//        new SocketCommunication().socketCommunication();
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatArchinvecontactController.java

ÎļþÒÑɾ³ý

 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));
    }

 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));
    }

 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("输入有误，请检查");
        }

 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));
    }

 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));
    }
}

 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));

 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()) {

 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));

 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));

 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));

 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));

 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));

 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 @@

/**
 * æ‰©å±•è¯æœ¯æ¨¡æ¿åº“Controller
 * 
 *
 * @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));
    }
}

 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));

 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));

 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));

 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));
    }
}

 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;

/**
 * æŒ‡æ ‡åº“Controller
 * 
 * @author smartor
 * @date 2023-03-22
 * æŒ‡æ ‡é€‰é¡¹åº“Controller
 *
 * @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));
    }
}

 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;

/**
 * æŒ‡æ ‡é€‰é¡¹åº“Controller
 * 
 * @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));
    }
}

 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));

 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));

 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));

 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));

 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));

 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));

 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));

 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));

 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));

 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));

 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));

 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));

 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));

 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));
    }
}

 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));

 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));

 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));

 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));

 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));

 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));
    }
}

 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));
    }

 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;

/**
 * æ‚£è€…档案Controller
@@ -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 = "患者id")
    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 = "患者id集合", 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;
    }

}

 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;

/**
 * æ‚£è€…联系方式Controller
 *
 * @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));
    }
}

 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));
    }

 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));

 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));

 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));
    }

 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));

 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));
    }

 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));
    }

 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));

 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));

 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));
    }

 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));

 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));

 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));

 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));

 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));

 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));

 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));

 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));
    }
}

 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));

 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));

 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));

 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));
    }
}

 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));

 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));
    }

 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));

 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));

 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));

 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));

 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));

 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));
    }

 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));
    }

 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));

 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));
    }

 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));
    }

 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();
    }
}

 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) {
        }
    }
}
//}

 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，Linux配置 /home/ruoyi/logs,不填同级目录logs）
  path: D:/ruoyi/ls/logs
  level:
    com.ruoyi: debug
    org.springframework: warn

 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" />


 ruoyi-admin/src/main/resources/template/question.ftl

@@ -30,6 +30,7 @@
        <br>
    </#list>


    <input type="submit" value="Submit">
</form>
</body>

 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();
    }
}

 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;

}

 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;
    }
    /**
     * çˆ¶ID
     */
    @ApiModelProperty(name = "父ID")
    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();
    }
}

 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;

    /**
     * çˆ¶ID
     */
    @ApiModelProperty(name = "父ID")
    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();
    }
}

 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;
    }
    /**
     * çˆ¶ID
     */
    @Excel(name = "父ID")
    @ApiModelProperty(name = "父ID")
    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();
    }
}

 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;

    /**
     * çˆ¶id
     */
    @ApiModelProperty(name = "父id")
    @Excel(name = "父id")
    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();
    }
}

 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;

    /**
     * çˆ¶id
     */
    @ApiModelProperty(name = "父id")
    @Excel(name = "父id")
    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();
    }
}

 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;

    /**
     * çˆ¶ID
     */
    @ApiModelProperty(name = "父ID")
    @Excel(name = "父ID")
    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();
    }
}

 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;

    /**
     * æ‚£è€…id
     */
    @Excel(name = "患者id")
    @ApiModelProperty(value = "患者id")
    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();
    }
}

 smartor/src/main/java/com/smartor/domain/PatArchinvecontact.java

ÎļþÒÑɾ³ý

 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();
    }
}

 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();
    }
}

 smartor/src/main/java/com/smartor/domain/PatArchiveReq.java

@@ -21,6 +21,12 @@
@ApiModel(value = "PatArchiveReq", description = "患者档案请求对象")
@Data
public class PatArchiveReq {
    /**
     * å§“名
     */
    @ApiModelProperty("患者id")
    @Excel(name = " æ‚£è€…id ")
    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;



}

 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;

    /**
     * çˆ¶ID
     */
    @Excel(name = "父ID")
    @ApiModelProperty(value = "父ID")
    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();
    }
}

 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() {

 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) 

 smartor/src/main/java/com/smartor/domain/PatientManageDto.java

ÎļþÒÑɾ³ý

 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 ç»“æžœ
     */

 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);
}

 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;

/**
 * æŒ‡æ ‡åº“Mapper接口
 * æŒ‡æ ‡é€‰é¡¹åº“Mapper接口
 * 
 * @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);
}

 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;

/**
 * æŒ‡æ ‡é€‰é¡¹åº“Mapper接口
 *
 * @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);
}

 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);
}

 smartor/src/main/java/com/smartor/mapper/PatArchinvecontactMapper.java

ÎļþÒÑɾ³ý

 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;

/**
 * æ‚£è€…档案Mapper接口
@@ -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);


}

 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;

/**
 * æ‚£è€…联系方式Mapper接口
 * 
 * @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);
}

 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);


    /**
     * æŸ¥è¯¢æ‚£è€…档案标签列表

 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 ç»“æžœ
     */

 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);
}

 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;

/**
 * æŒ‡æ ‡åº“Service接口
 * æŒ‡æ ‡é€‰é¡¹åº“Service接口
 * 
 * @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);
}

 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;

/**
 * æŒ‡æ ‡é€‰é¡¹åº“Service接口
 * 
 * @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);
}

 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);
}

 smartor/src/main/java/com/smartor/service/IPatArchinvecontactService.java

ÎļþÒÑɾ³ý

 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);
}

 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;

/**
 * æ‚£è€…联系方式Service接口
 * 
 * @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);
}

 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);
    }
}

 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);
        //将pid为空的，过滤掉
        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);
    }
}

 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;

/**
 * æŒ‡æ ‡åº“Service业务层处理
 * æŒ‡æ ‡é€‰é¡¹åº“Service业务层处理
 * 
 * @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);
    }

 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;

/**
 * æŒ‡æ ‡é€‰é¡¹åº“Service业务层处理
 * 
 * @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);
    }
}

 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);
    }
}

 smartor/src/main/java/com/smartor/service/impl/PatArchinvecontactServiceImpl.java

ÎļþÒÑɾ³ý

 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 {
                //如果在basetag中存在,则根据tagid和patid去pat_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)) {
                    //如果存在，continue;
                    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);
            }
        }


        //根据患者ID进行分组
        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，放到patArchive1里的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());
            }

 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;

/**
 * æ‚£è€…联系方式Service业务层处理
 * 
 * @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);
    }
}

 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);
    }

    /**

 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>

 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>

 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>

 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>


 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>

 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>

 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-->
        <!--&lt;!&ndash;            <if test="birthdate != null">birthdate,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="age != null">age,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="source != null">source,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="archivetime != null">archivetime,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="archiveby != null">archiveby,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="telcode != null">telcode,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="relativetelcode != null">relativetelcode,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="iccardtype != null">iccardtype,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="orgid != null">orgid,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="openid != null">openid,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="delFlag != null and delFlag != ''">del_flag,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="updateBy != null">update_by,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="updateTime != null">update_time,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="createBy != null">create_by,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="createTime != null">create_time,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="isupload != null">isupload,</if>&ndash;&gt;-->
        <!--&lt;!&ndash;            <if test="uploadTime != null">upload_time,</if>&ndash;&gt;-->
        <!--        </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>-->
        <!--&lt;!&ndash;                <if test="birthdate != null">#{birthdate},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="age != null">#{item.age},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="source != null">#{item.source},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="archivetime != null">#{item.archivetime},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="archiveby != null">#{item.archiveby},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="telcode != null">#{item.telcode},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="relativetelcode != null">#{item.relativetelcode},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="iccardtype != null">#{item.iccardtype},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="orgid != null">#{item.orgid},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="openid != null">#{item.openid},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="delFlag != null and delFlag != ''">#{item.delFlag},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="updateBy != null">#{item.updateBy},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="updateTime != null">#{item.updateTime},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="createBy != null">#{item.createBy},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="createTime != null">#{item.createTime},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="isupload != null">#{item.isupload},</if>&ndash;&gt;-->
        <!--&lt;!&ndash;                <if test="uploadTime != null">#{item.uploadTime},</if>&ndash;&gt;-->
        <!--            </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>

 smartor/src/main/resources/mapper/smartor/PatArchivecontactMapper.xml

ÎļþÃû´Ó smartor/src/main/resources/mapper/smartor/PatArchinvecontactMapper.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>

 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>

 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>