From 7ef571e23124892654b480c7120fa69a4ae9eb36 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 25 七月 2024 09:34:43 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java | 30 +
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java | 23 +
smartor/src/main/java/com/smartor/domain/SvyLibTemplateTag.java | 92 ++++
smartor/src/main/java/com/smartor/service/ISvyLibScriptTagService.java | 61 +++
smartor/src/main/java/com/smartor/mapper/SvyLibScriptTagMapper.java | 64 +++
smartor/src/main/java/com/smartor/service/impl/SvyLibScriptTagServiceImpl.java | 97 ++++
smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java | 6
smartor/src/main/java/com/smartor/mapper/SvyLibTemplateTagMapper.java | 64 +++
ruoyi-admin/src/main/resources/application.yml | 2
smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTagController.java | 98 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptTagController.java | 98 ++++
smartor/src/main/java/com/smartor/domain/SvyLibScript.java | 6
smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java | 3
smartor/src/main/resources/mapper/smartor/BaseTagcategoryMapper.xml | 14
smartor/src/main/java/com/smartor/domain/SvyLibScriptTag.java | 98 ++++
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateTagServiceImpl.java | 97 ++++
smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml | 135 ++++++
smartor/src/main/java/com/smartor/service/ISvyLibTemplateTagService.java | 62 +++
smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml | 136 ++++++
20 files changed, 1,167 insertions(+), 25 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptTagController.java
new file mode 100644
index 0000000..b39f556
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptTagController.java
@@ -0,0 +1,98 @@
+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.poi.ExcelUtil;
+import com.smartor.domain.SvyLibScriptTag;
+import com.smartor.service.ISvyLibScriptTagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 闂璇濇湳鏍囩搴揅ontroller
+ *
+ * @author ruoyi
+ * @date 2024-07-24
+ */
+@RestController
+@RequestMapping("/smartor/svyLibScriptTag")
+public class SvyLibScriptTagController extends BaseController
+{
+ @Autowired
+ private ISvyLibScriptTagService svyLibScriptTagService;
+
+ /**
+ * 鏌ヨ闂璇濇湳鏍囩搴撳垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(SvyLibScriptTag svyLibScriptTag)
+ {
+ startPage();
+ List<SvyLibScriptTag> list = svyLibScriptTagService.selectSvyLibScriptTagList(svyLibScriptTag);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭闂璇濇湳鏍囩搴撳垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:export')")
+ @Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SvyLibScriptTag svyLibScriptTag)
+ {
+ List<SvyLibScriptTag> list = svyLibScriptTagService.selectSvyLibScriptTagList(svyLibScriptTag);
+ ExcelUtil<SvyLibScriptTag> util = new ExcelUtil<SvyLibScriptTag>(SvyLibScriptTag.class);
+ util.exportExcel(response, list, "闂璇濇湳鏍囩搴撴暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇闂璇濇湳鏍囩搴撹缁嗕俊鎭�
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(svyLibScriptTagService.selectSvyLibScriptTagById(id));
+ }
+
+ /**
+ * 鏂板闂璇濇湳鏍囩搴�
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:add')")
+ @Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody SvyLibScriptTag svyLibScriptTag)
+ {
+ return toAjax(svyLibScriptTagService.insertSvyLibScriptTag(svyLibScriptTag));
+ }
+
+ /**
+ * 淇敼闂璇濇湳鏍囩搴�
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:edit')")
+ @Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody SvyLibScriptTag svyLibScriptTag)
+ {
+ return toAjax(svyLibScriptTagService.updateSvyLibScriptTag(svyLibScriptTag));
+ }
+
+ /**
+ * 鍒犻櫎闂璇濇湳鏍囩搴�
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:remove')")
+ @Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(svyLibScriptTagService.deleteSvyLibScriptTagByIds(ids));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTagController.java
new file mode 100644
index 0000000..352a17a
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTagController.java
@@ -0,0 +1,98 @@
+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.poi.ExcelUtil;
+import com.smartor.domain.SvyLibTemplateTag;
+import com.smartor.service.ISvyLibTemplateTagService;
+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 2024-07-24
+ */
+@RestController
+@RequestMapping("/smartor/svyLibTemplateTag")
+public class SvyLibTemplateTagController extends BaseController
+{
+ @Autowired
+ private ISvyLibTemplateTagService svyLibTemplateTagService;
+
+ /**
+ * 鏌ヨ妯℃澘鏍囩鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(SvyLibTemplateTag svyLibTemplateTag)
+ {
+ startPage();
+ List<SvyLibTemplateTag> list = svyLibTemplateTagService.selectSvyLibTemplateTagList(svyLibTemplateTag);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭妯℃澘鏍囩鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:export')")
+ @Log(title = "妯℃澘鏍囩", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SvyLibTemplateTag svyLibTemplateTag)
+ {
+ List<SvyLibTemplateTag> list = svyLibTemplateTagService.selectSvyLibTemplateTagList(svyLibTemplateTag);
+ ExcelUtil<SvyLibTemplateTag> util = new ExcelUtil<SvyLibTemplateTag>(SvyLibTemplateTag.class);
+ util.exportExcel(response, list, "妯℃澘鏍囩鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇妯℃澘鏍囩璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(svyLibTemplateTagService.selectSvyLibTemplateTagById(id));
+ }
+
+ /**
+ * 鏂板妯℃澘鏍囩
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:add')")
+ @Log(title = "妯℃澘鏍囩", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody SvyLibTemplateTag svyLibTemplateTag)
+ {
+ return toAjax(svyLibTemplateTagService.insertSvyLibTemplateTag(svyLibTemplateTag));
+ }
+
+ /**
+ * 淇敼妯℃澘鏍囩
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:edit')")
+ @Log(title = "妯℃澘鏍囩", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody SvyLibTemplateTag svyLibTemplateTag)
+ {
+ return toAjax(svyLibTemplateTagService.updateSvyLibTemplateTag(svyLibTemplateTag));
+ }
+
+ /**
+ * 鍒犻櫎妯℃澘鏍囩
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:remove')")
+ @Log(title = "妯℃澘鏍囩", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(svyLibTemplateTagService.deleteSvyLibTemplateTagByIds(ids));
+ }
+}
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 757f8b2..1e71978 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -111,7 +111,7 @@
# 浠ょ墝瀵嗛挜
secret: abcdefghijklmnopqrstuvwxyz
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 30
+ expireTime: 120
# MyBatis閰嶇疆
mybatis:
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibScript.java b/smartor/src/main/java/com/smartor/domain/SvyLibScript.java
index a43360f..8913e13 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibScript.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibScript.java
@@ -98,11 +98,9 @@
@ApiModelProperty("涓婁紶鏍囪")
private Long isupload;
- /**
- * 涓婁紶鏍囪
- */
+
@ApiModelProperty("鏍囩")
- private String tag = "";
+ private List<SvyLibScriptTag> svyLibScriptTagList;
/**
* 涓婁紶鏃堕棿
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibScriptTag.java b/smartor/src/main/java/com/smartor/domain/SvyLibScriptTag.java
new file mode 100644
index 0000000..384c7d4
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibScriptTag.java
@@ -0,0 +1,98 @@
+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;
+
+/**
+ * 闂璇濇湳鏍囩搴撳璞� svy_lib_script_tag
+ *
+ * @author ruoyi
+ * @date 2024-07-24
+ */
+@Data
+@ApiModel(value = "SvyLibScriptTag", description = "闂璇濇湳鏍囩搴撳璞�")
+public class SvyLibScriptTag extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鑷ID
+ */
+ @ApiModelProperty(value = "鑷ID")
+ private Long id;
+
+ /**
+ * 鏍囩鍒嗙被ID
+ */
+ @ApiModelProperty(value = "鏍囩鍒嗙被ID")
+ private Long tagcategoryid;
+
+ /**
+ * ivr_liba_script 鐨勪富閿�
+ */
+ @ApiModelProperty(value = "ivr_liba_script 鐨勪富閿�")
+ private Long scriptid;
+
+ /**
+ * 鏍囩ID
+ */
+ @ApiModelProperty(value = "鏍囩ID")
+ private Long tagid;
+
+ /**
+ * 鏍囩鍚�
+ */
+ @ApiModelProperty(value = "鏍囩鍚�")
+ private String tagname;
+
+ /**
+ * 鏈烘瀯ID
+ */
+ @ApiModelProperty(value = "鏈烘瀯ID")
+ private String orgid;
+
+ /**
+ * 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
+ private String delFlag;
+
+ /**
+ * 涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛�
+ */
+ @ApiModelProperty(value = "涓婁紶鏍囧織")
+ private Long isupload;
+
+ /**
+ * 涓婁紶鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
+ private Date uploadTime;
+
+ /**
+ * 鐖禝D
+ */
+ @ApiModelProperty(value = "鐖禝D")
+ private Long pid;
+
+ /**
+ * GUID
+ */
+ @ApiModelProperty(value = "GUID")
+ private String guid;
+
+ /**
+ * 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎
+ */
+ @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
+ private Integer isoperation;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java
index bd92505..8153ea4 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java
@@ -170,6 +170,7 @@
*/
@ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
private Integer isoperation;
+
/**
* 绉戝鍚嶇О
*/
@@ -182,7 +183,7 @@
*/
@Excel(name = "鏍囩淇℃伅")
@ApiModelProperty("鏍囩淇℃伅")
- private String labelInfo = "";
+ private List<SvyLibTemplateTag> svyLibTemplateTagList;
/**
* 闄㈠尯
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTag.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTag.java
new file mode 100644
index 0000000..b5ae23c
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTag.java
@@ -0,0 +1,92 @@
+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;
+
+/**
+ * 妯℃澘鏍囩瀵硅薄 svy_lib_template_tag
+ *
+ * @author ruoyi
+ * @date 2024-07-24
+ */
+@Data
+@ApiModel(value = "SvyLibTemplateTag", description = "妯℃澘鏍囩瀵硅薄")
+public class SvyLibTemplateTag extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鑷ID
+ */
+ @ApiModelProperty(value = "涓婚敭")
+ private Long id;
+
+ /**
+ * 鏍囩鍒嗙被ID
+ */
+ @ApiModelProperty(value = "鏍囩鍒嗙被ID")
+ private Long tagcategoryid;
+
+ /**
+ * 妯℃澘ID
+ */
+ @ApiModelProperty(value = "妯℃澘ID")
+ private Long templateid;
+
+ /**
+ * 鏍囩ID
+ */
+ @ApiModelProperty(value = "鏍囩ID")
+ private Long tagid;
+
+ /**
+ * 鏍囩鍚�
+ */
+ @ApiModelProperty(value = "鏍囩鍚�")
+ private String tagname;
+
+ /**
+ * 鏈烘瀯ID
+ */
+ @ApiModelProperty(value = "鏈烘瀯ID")
+ private String orgid;
+
+ /**
+ * 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
+ private String delFlag;
+
+ /**
+ * 涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛�
+ */
+ @ApiModelProperty(value = "涓婁紶鏍囧織")
+ private Long isupload;
+
+ /**
+ * 涓婁紶鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
+ private Date uploadTime;
+
+ /**
+ * 鐖禝D
+ */
+ @ApiModelProperty(value = "鐖禝D")
+ private Long pid;
+
+ /**
+ * GUID
+ */
+ @ApiModelProperty(value = "GUID")
+ private String guid;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java
index 661a2b1..2d3c71f 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java
@@ -244,6 +244,12 @@
private Integer nextQuestion;
/**
+ * 涓嬩竴棰�
+ */
+ @ApiModelProperty(value = "閫夐」缂栧彿")
+ private Long optionNo;
+
+ /**
* 閫夐」鍥剧墖璺緞
*/
@ApiModelProperty(value = "閫夐」鍥剧墖璺緞")
diff --git a/smartor/src/main/java/com/smartor/mapper/SvyLibScriptTagMapper.java b/smartor/src/main/java/com/smartor/mapper/SvyLibScriptTagMapper.java
new file mode 100644
index 0000000..787d61a
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/SvyLibScriptTagMapper.java
@@ -0,0 +1,64 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.SvyLibScriptTag;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 闂璇濇湳鏍囩搴揗apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-07-24
+ */
+@Mapper
+public interface SvyLibScriptTagMapper
+{
+ /**
+ * 鏌ヨ闂璇濇湳鏍囩搴�
+ *
+ * @param id 闂璇濇湳鏍囩搴撲富閿�
+ * @return 闂璇濇湳鏍囩搴�
+ */
+ public SvyLibScriptTag selectSvyLibScriptTagById(Long id);
+
+ /**
+ * 鏌ヨ闂璇濇湳鏍囩搴撳垪琛�
+ *
+ * @param svyLibScriptTag 闂璇濇湳鏍囩搴�
+ * @return 闂璇濇湳鏍囩搴撻泦鍚�
+ */
+ public List<SvyLibScriptTag> selectSvyLibScriptTagList(SvyLibScriptTag svyLibScriptTag);
+
+ /**
+ * 鏂板闂璇濇湳鏍囩搴�
+ *
+ * @param svyLibScriptTag 闂璇濇湳鏍囩搴�
+ * @return 缁撴灉
+ */
+ public int insertSvyLibScriptTag(SvyLibScriptTag svyLibScriptTag);
+
+ /**
+ * 淇敼闂璇濇湳鏍囩搴�
+ *
+ * @param svyLibScriptTag 闂璇濇湳鏍囩搴�
+ * @return 缁撴灉
+ */
+ public int updateSvyLibScriptTag(SvyLibScriptTag svyLibScriptTag);
+
+ /**
+ * 鍒犻櫎闂璇濇湳鏍囩搴�
+ *
+ * @param id 闂璇濇湳鏍囩搴撲富閿�
+ * @return 缁撴灉
+ */
+ public int deleteSvyLibScriptTagById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎闂璇濇湳鏍囩搴�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteSvyLibScriptTagByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/SvyLibTemplateTagMapper.java b/smartor/src/main/java/com/smartor/mapper/SvyLibTemplateTagMapper.java
new file mode 100644
index 0000000..46eecd2
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/SvyLibTemplateTagMapper.java
@@ -0,0 +1,64 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.SvyLibTemplateTag;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 妯℃澘鏍囩Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-07-24
+ */
+@Mapper
+public interface SvyLibTemplateTagMapper
+{
+ /**
+ * 鏌ヨ妯℃澘鏍囩
+ *
+ * @param id 妯℃澘鏍囩涓婚敭
+ * @return 妯℃澘鏍囩
+ */
+ public SvyLibTemplateTag selectSvyLibTemplateTagById(Long id);
+
+ /**
+ * 鏌ヨ妯℃澘鏍囩鍒楄〃
+ *
+ * @param svyLibTemplateTag 妯℃澘鏍囩
+ * @return 妯℃澘鏍囩闆嗗悎
+ */
+ public List<SvyLibTemplateTag> selectSvyLibTemplateTagList(SvyLibTemplateTag svyLibTemplateTag);
+
+ /**
+ * 鏂板妯℃澘鏍囩
+ *
+ * @param svyLibTemplateTag 妯℃澘鏍囩
+ * @return 缁撴灉
+ */
+ public int insertSvyLibTemplateTag(SvyLibTemplateTag svyLibTemplateTag);
+
+ /**
+ * 淇敼妯℃澘鏍囩
+ *
+ * @param svyLibTemplateTag 妯℃澘鏍囩
+ * @return 缁撴灉
+ */
+ public int updateSvyLibTemplateTag(SvyLibTemplateTag svyLibTemplateTag);
+
+ /**
+ * 鍒犻櫎妯℃澘鏍囩
+ *
+ * @param id 妯℃澘鏍囩涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteSvyLibTemplateTagById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎妯℃澘鏍囩
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteSvyLibTemplateTagByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/service/ISvyLibScriptTagService.java b/smartor/src/main/java/com/smartor/service/ISvyLibScriptTagService.java
new file mode 100644
index 0000000..18fa399
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/ISvyLibScriptTagService.java
@@ -0,0 +1,61 @@
+package com.smartor.service;
+
+import com.smartor.domain.SvyLibScriptTag;
+
+import java.util.List;
+
+/**
+ * 闂璇濇湳鏍囩搴揝ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-07-24
+ */
+public interface ISvyLibScriptTagService {
+ /**
+ * 鏌ヨ闂璇濇湳鏍囩搴�
+ *
+ * @param id 闂璇濇湳鏍囩搴撲富閿�
+ * @return 闂璇濇湳鏍囩搴�
+ */
+ public SvyLibScriptTag selectSvyLibScriptTagById(Long id);
+
+ /**
+ * 鏌ヨ闂璇濇湳鏍囩搴撳垪琛�
+ *
+ * @param svyLibScriptTag 闂璇濇湳鏍囩搴�
+ * @return 闂璇濇湳鏍囩搴撻泦鍚�
+ */
+ public List<SvyLibScriptTag> selectSvyLibScriptTagList(SvyLibScriptTag svyLibScriptTag);
+
+ /**
+ * 鏂板闂璇濇湳鏍囩搴�
+ *
+ * @param svyLibScriptTag 闂璇濇湳鏍囩搴�
+ * @return 缁撴灉
+ */
+ public int insertSvyLibScriptTag(SvyLibScriptTag svyLibScriptTag);
+
+ /**
+ * 淇敼闂璇濇湳鏍囩搴�
+ *
+ * @param svyLibScriptTag 闂璇濇湳鏍囩搴�
+ * @return 缁撴灉
+ */
+ public int updateSvyLibScriptTag(SvyLibScriptTag svyLibScriptTag);
+
+ /**
+ * 鎵归噺鍒犻櫎闂璇濇湳鏍囩搴�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑闂璇濇湳鏍囩搴撲富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deleteSvyLibScriptTagByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎闂璇濇湳鏍囩搴撲俊鎭�
+ *
+ * @param id 闂璇濇湳鏍囩搴撲富閿�
+ * @return 缁撴灉
+ */
+ public int deleteSvyLibScriptTagById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/ISvyLibTemplateTagService.java b/smartor/src/main/java/com/smartor/service/ISvyLibTemplateTagService.java
new file mode 100644
index 0000000..5143393
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/ISvyLibTemplateTagService.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.SvyLibTemplateTag;
+
+import java.util.List;
+
+/**
+ * 妯℃澘鏍囩Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-07-24
+ */
+public interface ISvyLibTemplateTagService
+{
+ /**
+ * 鏌ヨ妯℃澘鏍囩
+ *
+ * @param id 妯℃澘鏍囩涓婚敭
+ * @return 妯℃澘鏍囩
+ */
+ public SvyLibTemplateTag selectSvyLibTemplateTagById(Long id);
+
+ /**
+ * 鏌ヨ妯℃澘鏍囩鍒楄〃
+ *
+ * @param svyLibTemplateTag 妯℃澘鏍囩
+ * @return 妯℃澘鏍囩闆嗗悎
+ */
+ public List<SvyLibTemplateTag> selectSvyLibTemplateTagList(SvyLibTemplateTag svyLibTemplateTag);
+
+ /**
+ * 鏂板妯℃澘鏍囩
+ *
+ * @param svyLibTemplateTag 妯℃澘鏍囩
+ * @return 缁撴灉
+ */
+ public int insertSvyLibTemplateTag(SvyLibTemplateTag svyLibTemplateTag);
+
+ /**
+ * 淇敼妯℃澘鏍囩
+ *
+ * @param svyLibTemplateTag 妯℃澘鏍囩
+ * @return 缁撴灉
+ */
+ public int updateSvyLibTemplateTag(SvyLibTemplateTag svyLibTemplateTag);
+
+ /**
+ * 鎵归噺鍒犻櫎妯℃澘鏍囩
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑妯℃澘鏍囩涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteSvyLibTemplateTagByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎妯℃澘鏍囩淇℃伅
+ *
+ * @param id 妯℃澘鏍囩涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteSvyLibTemplateTagById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java
index e8d3cea..e0d4d0d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java
@@ -6,8 +6,10 @@
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.SvyLibScript;
import com.smartor.domain.SvyLibScriptOption;
+import com.smartor.domain.SvyLibScriptTag;
import com.smartor.mapper.SvyLibScriptMapper;
import com.smartor.mapper.SvyLibScriptOptionMapper;
+import com.smartor.mapper.SvyLibScriptTagMapper;
import com.smartor.service.ISvyLibScriptService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -34,6 +36,9 @@
@Autowired
private SvyLibScriptOptionMapper svyLibScriptOptionMapper;
+ @Autowired
+ private SvyLibScriptTagMapper svyLibScriptTagMapper;
+
/**
* 鏌ヨ闂嵎棰樼洰
*
@@ -55,7 +60,6 @@
public List<SvyLibScript> selectSvyLibScriptList(SvyLibScript svyLibTopic) {
List<SvyLibScript> svyLibScripts = svyLibTopicMapper.selectSvyLibScriptList(svyLibTopic);
//鑾峰彇棰樼洰閫夐」
-
for (int j = 0; j < svyLibScripts.size(); j++) {
log.info("闂id涓猴細{}", svyLibScripts.get(j).getId());
if (StringUtils.isNotEmpty(svyLibScripts.get(j).getIcd10Name()))
@@ -71,6 +75,11 @@
//灏嗘煡璇㈠嚭鐨勯�夐」鐩斁鍒伴鐩腑
svyLibScripts.get(j).setSvyLibScriptOptions(svyLibTopicoptions);
}
+ //鑾峰彇tag
+ SvyLibScriptTag svyLibScriptTag = new SvyLibScriptTag();
+ svyLibScriptTag.setScriptid(svyLibScripts.get(j).getId());
+ List<SvyLibScriptTag> svyLibScriptTags = svyLibScriptTagMapper.selectSvyLibScriptTagList(svyLibScriptTag);
+ svyLibScripts.get(j).setSvyLibScriptTagList(svyLibScriptTags);
}
return svyLibScripts;
}
@@ -124,6 +133,25 @@
}
}
}
+ //鏍囩澶勭悊
+ if (CollectionUtils.isNotEmpty(svyLibTopic.getSvyLibScriptTagList())) {
+ for (SvyLibScriptTag svyLibScriptTag : svyLibTopic.getSvyLibScriptTagList()) {
+ if (svyLibScriptTag.getIsoperation() != null && svyLibScriptTag.getIsoperation() == 1) {
+ //鏂板
+ svyLibScriptTag.setScriptid(svyLibTopic.getId());
+ svyLibScriptTag.setCreateTime(new Date());
+ svyLibScriptTagMapper.insertSvyLibScriptTag(svyLibScriptTag);
+ } else if (svyLibScriptTag.getIsoperation() != null && svyLibScriptTag.getIsoperation() == 2) {
+ //淇敼
+ svyLibScriptTag.setScriptid(svyLibTopic.getId());
+ svyLibScriptTag.setUpdateTime(new Date());
+ svyLibScriptTagMapper.updateSvyLibScriptTag(svyLibScriptTag);
+ } else if (svyLibScriptTag.getIsoperation() != null && svyLibScriptTag.getIsoperation() == 3) {
+ //鍒犻櫎
+ svyLibScriptTagMapper.deleteSvyLibScriptTagById(svyLibScriptTag.getId());
+ }
+ }
+ }
return i;
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptTagServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptTagServiceImpl.java
new file mode 100644
index 0000000..90c77fe
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptTagServiceImpl.java
@@ -0,0 +1,97 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.SvyLibScriptTag;
+import com.smartor.mapper.SvyLibScriptTagMapper;
+import com.smartor.service.ISvyLibScriptTagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 闂璇濇湳鏍囩搴揝ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-07-24
+ */
+@Service
+public class SvyLibScriptTagServiceImpl implements ISvyLibScriptTagService
+{
+ @Autowired
+ private SvyLibScriptTagMapper svyLibScriptTagMapper;
+
+ /**
+ * 鏌ヨ闂璇濇湳鏍囩搴�
+ *
+ * @param id 闂璇濇湳鏍囩搴撲富閿�
+ * @return 闂璇濇湳鏍囩搴�
+ */
+ @Override
+ public SvyLibScriptTag selectSvyLibScriptTagById(Long id)
+ {
+ return svyLibScriptTagMapper.selectSvyLibScriptTagById(id);
+ }
+
+ /**
+ * 鏌ヨ闂璇濇湳鏍囩搴撳垪琛�
+ *
+ * @param svyLibScriptTag 闂璇濇湳鏍囩搴�
+ * @return 闂璇濇湳鏍囩搴�
+ */
+ @Override
+ public List<SvyLibScriptTag> selectSvyLibScriptTagList(SvyLibScriptTag svyLibScriptTag)
+ {
+ return svyLibScriptTagMapper.selectSvyLibScriptTagList(svyLibScriptTag);
+ }
+
+ /**
+ * 鏂板闂璇濇湳鏍囩搴�
+ *
+ * @param svyLibScriptTag 闂璇濇湳鏍囩搴�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertSvyLibScriptTag(SvyLibScriptTag svyLibScriptTag)
+ {
+ svyLibScriptTag.setCreateTime(DateUtils.getNowDate());
+ return svyLibScriptTagMapper.insertSvyLibScriptTag(svyLibScriptTag);
+ }
+
+ /**
+ * 淇敼闂璇濇湳鏍囩搴�
+ *
+ * @param svyLibScriptTag 闂璇濇湳鏍囩搴�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateSvyLibScriptTag(SvyLibScriptTag svyLibScriptTag)
+ {
+ svyLibScriptTag.setUpdateTime(DateUtils.getNowDate());
+ return svyLibScriptTagMapper.updateSvyLibScriptTag(svyLibScriptTag);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎闂璇濇湳鏍囩搴�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑闂璇濇湳鏍囩搴撲富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteSvyLibScriptTagByIds(Long[] ids)
+ {
+ return svyLibScriptTagMapper.deleteSvyLibScriptTagByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎闂璇濇湳鏍囩搴撲俊鎭�
+ *
+ * @param id 闂璇濇湳鏍囩搴撲富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteSvyLibScriptTagById(Long id)
+ {
+ return svyLibScriptTagMapper.deleteSvyLibScriptTagById(id);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
index 5948885..f90d53f 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
@@ -35,6 +35,8 @@
private SvyLibTemplateTargetoptionMapper svyLibTemplateTargetoptionMapper;
@Autowired
private TempDetpRelevanceMapper tempDetpRelevanceMapper;
+ @Autowired
+ private SvyLibTemplateTagMapper svyLibTemplateTagMapper;
/**
* 鏌ヨ闂嵎
@@ -84,6 +86,12 @@
tempDetpRelevance.setTempid(svyLibTemplates.get(i).getSvyid());
List<TempDetpRelevance> tempDetpRelevances = tempDetpRelevanceMapper.selectTempDetpRelevanceList(tempDetpRelevance);
svyLibTemplates.get(i).setTempDetpRelevances(CollectionUtils.isNotEmpty(tempDetpRelevances) ? tempDetpRelevances : new ArrayList<>());
+
+ //鑾峰彇鏍囩
+ SvyLibTemplateTag svyLibTemplateTag = new SvyLibTemplateTag();
+ svyLibTemplateTag.setTemplateid(svyLibTemplates.get(i).getSvyid());
+ List<SvyLibTemplateTag> svyLibTemplateTags = svyLibTemplateTagMapper.selectSvyLibTemplateTagList(svyLibTemplateTag);
+ svyLibTemplates.get(i).setSvyLibTemplateTagList(svyLibTemplateTags);
}
//鍏堝皢鐩稿悓鐨刬d鐨刬cdname,鏁寸悊鍒颁竴鍧�
@@ -170,6 +178,21 @@
}
}
+
+ //鏍囩澶勭悊
+ if (CollectionUtils.isNotEmpty(svyLibTemplate.getSvyLibTemplateTagList())) {
+ for (SvyLibTemplateTag svyLibTemplateTag : svyLibTemplate.getSvyLibTemplateTagList()) {
+ if (svyLibTemplateTag.getId() == null) {
+ //鏂板
+ svyLibTemplateTag.setTemplateid(svyLibTemplate.getSvyid());
+ svyLibTemplateTagMapper.insertSvyLibTemplateTag(svyLibTemplateTag);
+ } else {
+ svyLibTemplateTag.setTemplateid(svyLibTemplate.getSvyid());
+ svyLibTemplateTagMapper.updateSvyLibTemplateTag(svyLibTemplateTag);
+ }
+ }
+
+ }
return i;
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateTagServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateTagServiceImpl.java
new file mode 100644
index 0000000..fc0050d
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateTagServiceImpl.java
@@ -0,0 +1,97 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.SvyLibTemplateTag;
+import com.smartor.mapper.SvyLibTemplateTagMapper;
+import com.smartor.service.ISvyLibTemplateTagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 妯℃澘鏍囩Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-07-24
+ */
+@Service
+public class SvyLibTemplateTagServiceImpl implements ISvyLibTemplateTagService
+{
+ @Autowired
+ private SvyLibTemplateTagMapper svyLibTemplateTagMapper;
+
+ /**
+ * 鏌ヨ妯℃澘鏍囩
+ *
+ * @param id 妯℃澘鏍囩涓婚敭
+ * @return 妯℃澘鏍囩
+ */
+ @Override
+ public SvyLibTemplateTag selectSvyLibTemplateTagById(Long id)
+ {
+ return svyLibTemplateTagMapper.selectSvyLibTemplateTagById(id);
+ }
+
+ /**
+ * 鏌ヨ妯℃澘鏍囩鍒楄〃
+ *
+ * @param svyLibTemplateTag 妯℃澘鏍囩
+ * @return 妯℃澘鏍囩
+ */
+ @Override
+ public List<SvyLibTemplateTag> selectSvyLibTemplateTagList(SvyLibTemplateTag svyLibTemplateTag)
+ {
+ return svyLibTemplateTagMapper.selectSvyLibTemplateTagList(svyLibTemplateTag);
+ }
+
+ /**
+ * 鏂板妯℃澘鏍囩
+ *
+ * @param svyLibTemplateTag 妯℃澘鏍囩
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertSvyLibTemplateTag(SvyLibTemplateTag svyLibTemplateTag)
+ {
+ svyLibTemplateTag.setCreateTime(DateUtils.getNowDate());
+ return svyLibTemplateTagMapper.insertSvyLibTemplateTag(svyLibTemplateTag);
+ }
+
+ /**
+ * 淇敼妯℃澘鏍囩
+ *
+ * @param svyLibTemplateTag 妯℃澘鏍囩
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateSvyLibTemplateTag(SvyLibTemplateTag svyLibTemplateTag)
+ {
+ svyLibTemplateTag.setUpdateTime(DateUtils.getNowDate());
+ return svyLibTemplateTagMapper.updateSvyLibTemplateTag(svyLibTemplateTag);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎妯℃澘鏍囩
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑妯℃澘鏍囩涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteSvyLibTemplateTagByIds(Long[] ids)
+ {
+ return svyLibTemplateTagMapper.deleteSvyLibTemplateTagByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎妯℃澘鏍囩淇℃伅
+ *
+ * @param id 妯℃澘鏍囩涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteSvyLibTemplateTagById(Long id)
+ {
+ return svyLibTemplateTagMapper.deleteSvyLibTemplateTagById(id);
+ }
+}
diff --git a/smartor/src/main/resources/mapper/smartor/BaseTagcategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/BaseTagcategoryMapper.xml
index 81d2ab7..7d5efde 100644
--- a/smartor/src/main/resources/mapper/smartor/BaseTagcategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/BaseTagcategoryMapper.xml
@@ -120,16 +120,6 @@
<select id="baseTagCategoryByName" parameterType="java.lang.String"
resultType="com.smartor.domain.BaseTagcategory">
select a.tagcategoryid,
- a.orgid,
- a.update_by,
- a.update_time,
- a.pym,
- a.wbm,
- a.del_flag,
- a.create_by,
- a.create_time,
- a.isupload,
- a.upload_time,
a.categoryname,
count(b.tagid) as tagNum
from base_tagcategory a left join base_tag b
@@ -139,6 +129,6 @@
'%')
</if>
</where>
- GROUP BY a.categoryname
+ GROUP BY a.tagcategoryid,a.categoryname
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml
new file mode 100644
index 0000000..32e3dd1
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml
@@ -0,0 +1,136 @@
+<?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.SvyLibScriptTagMapper">
+
+ <resultMap type="com.smartor.domain.SvyLibScriptTag" id="SvyLibScriptTagResult">
+ <result property="id" column="id"/>
+ <result property="tagcategoryid" column="tagcategoryid"/>
+ <result property="scriptid" column="scriptid"/>
+ <result property="tagid" column="tagid"/>
+ <result property="tagname" column="tagname"/>
+ <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="selectSvyLibScriptTagVo">
+ select id,
+ tagcategoryid,
+ scriptid,
+ tagid,
+ tagname,
+ orgid,
+ del_flag,
+ update_by,
+ update_time,
+ create_by,
+ create_time,
+ isupload,
+ upload_time,
+ pid,
+ guid
+ from svy_lib_script_tag
+ </sql>
+
+ <select id="selectSvyLibScriptTagList" parameterType="com.smartor.domain.SvyLibScriptTag"
+ resultMap="SvyLibScriptTagResult">
+ <include refid="selectSvyLibScriptTagVo"/>
+ <where>
+ <if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
+ <if test="scriptid != null ">and scriptid = #{scriptid}</if>
+ <if test="tagid != null ">and tagid = #{tagid}</if>
+ <if test="tagname != null and tagname != ''">and tagname like concat('%', #{tagname}, '%')</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="pid != null ">and pid = #{pid}</if>
+ <if test="guid != null and guid != ''">and guid = #{guid}</if>
+ </where>
+ </select>
+
+ <select id="selectSvyLibScriptTagById" parameterType="Long" resultMap="SvyLibScriptTagResult">
+ <include refid="selectSvyLibScriptTagVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertSvyLibScriptTag" parameterType="com.smartor.domain.SvyLibScriptTag">
+ insert into svy_lib_script_tag
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="tagcategoryid != null">tagcategoryid,</if>
+ <if test="scriptid != null">scriptid,</if>
+ <if test="tagid != null">tagid,</if>
+ <if test="tagname != null">tagname,</if>
+ <if test="orgid != null">orgid,</if>
+ <if test="delFlag != null">del_flag,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="isupload != null">isupload,</if>
+ <if test="uploadTime != null">upload_time,</if>
+ <if test="pid != null">pid,</if>
+ <if test="guid != null">guid,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id},</if>
+ <if test="tagcategoryid != null">#{tagcategoryid},</if>
+ <if test="scriptid != null">#{scriptid},</if>
+ <if test="tagid != null">#{tagid},</if>
+ <if test="tagname != null">#{tagname},</if>
+ <if test="orgid != null">#{orgid},</if>
+ <if test="delFlag != null">#{delFlag},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="isupload != null">#{isupload},</if>
+ <if test="uploadTime != null">#{uploadTime},</if>
+ <if test="pid != null">#{pid},</if>
+ <if test="guid != null">#{guid},</if>
+ </trim>
+ </insert>
+
+ <update id="updateSvyLibScriptTag" parameterType="com.smartor.domain.SvyLibScriptTag">
+ update svy_lib_script_tag
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="tagcategoryid != null">tagcategoryid = #{tagcategoryid},</if>
+ <if test="scriptid != null">scriptid = #{scriptid},</if>
+ <if test="tagid != null">tagid = #{tagid},</if>
+ <if test="tagname != null">tagname = #{tagname},</if>
+ <if test="orgid != null">orgid = #{orgid},</if>
+ <if test="delFlag != null">del_flag = #{delFlag},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="isupload != null">isupload = #{isupload},</if>
+ <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+ <if test="pid != null">pid = #{pid},</if>
+ <if test="guid != null">guid = #{guid},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteSvyLibScriptTagById" parameterType="Long">
+ delete
+ from svy_lib_script_tag
+ where id = #{id}
+ </delete>
+
+ <delete id="deleteSvyLibScriptTagByIds" parameterType="String">
+ delete from svy_lib_script_tag where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
index 4ba8924..9771de5 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
@@ -27,7 +27,6 @@
<result property="isupload" column="isupload"/>
<result property="uploadTime" column="upload_time"/>
<result property="deptNames" column="dept_names"/>
- <result property="labelInfo" column="label_info"/>
<result property="campus" column="campus"/>
<result property="suitway" column="suitway"/>
<result property="otherdata" column="otherdata"/>
@@ -63,7 +62,6 @@
isupload,
upload_time,
dept_names,
- label_info,
campus,
suitway,
script_score,
@@ -97,7 +95,6 @@
a.upload_time,
a.dept_names,
a.value_type,
- a.label_info,
a.reply,
a.campus,
a.suitway,
@@ -151,7 +148,6 @@
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
<if test="deptNames != null">dept_names,</if>
- <if test="labelInfo != null">label_info,</if>
<if test="campus != null">campus,</if>
<if test="suitway != null">suitway,</if>
<if test="otherdata != null">otherdata,</if>
@@ -182,7 +178,6 @@
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="deptNames != null">#{deptNames},</if>
- <if test="labelInfo != null">#{labelInfo},</if>
<if test="campus != null">#{campus},</if>
<if test="suitway != null">#{suitway},</if>
<if test="otherdata != null">#{otherdata},</if>
@@ -217,7 +212,6 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="deptNames != null">dept_names=#{deptNames},</if>
- <if test="labelInfo != null">label_info=#{labelInfo},</if>
<if test="campus != null">campus=#{campus},</if>
<if test="suitway != null">suitway=#{suitway},</if>
<if test="otherdata != null">otherdata=#{otherdata},</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml
new file mode 100644
index 0000000..9504d90
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml
@@ -0,0 +1,135 @@
+<?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.SvyLibTemplateTagMapper">
+
+ <resultMap type="com.smartor.domain.SvyLibTemplateTag" id="SvyLibTemplateTagResult">
+ <result property="id" column="id"/>
+ <result property="tagcategoryid" column="tagcategoryid"/>
+ <result property="templateid" column="templateid"/>
+ <result property="tagid" column="tagid"/>
+ <result property="tagname" column="tagname"/>
+ <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="selectSvyLibTemplateTagVo">
+ select id,
+ tagcategoryid,
+ templateid,
+ tagid,
+ tagname,
+ orgid,
+ del_flag,
+ update_by,
+ update_time,
+ create_by,
+ create_time,
+ isupload,
+ upload_time,
+ pid,
+ guid
+ from svy_lib_template_tag
+ </sql>
+
+ <select id="selectSvyLibTemplateTagList" parameterType="com.smartor.domain.SvyLibTemplateTag"
+ resultMap="SvyLibTemplateTagResult">
+ <include refid="selectSvyLibTemplateTagVo"/>
+ <where>
+ <if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
+ <if test="templateid != null ">and templateid = #{templateid}</if>
+ <if test="tagid != null ">and tagid = #{tagid}</if>
+ <if test="tagname != null and tagname != ''">and tagname like concat('%', #{tagname}, '%')</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="pid != null ">and pid = #{pid}</if>
+ <if test="guid != null and guid != ''">and guid = #{guid}</if>
+ </where>
+ </select>
+
+ <select id="selectSvyLibTemplateTagById" parameterType="Long" resultMap="SvyLibTemplateTagResult">
+ <include refid="selectSvyLibTemplateTagVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertSvyLibTemplateTag" parameterType="com.smartor.domain.SvyLibTemplateTag" useGeneratedKeys="true"
+ keyProperty="id">
+ insert into svy_lib_template_tag
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="tagcategoryid != null">tagcategoryid,</if>
+ <if test="templateid != null">templateid,</if>
+ <if test="tagid != null">tagid,</if>
+ <if test="tagname != null">tagname,</if>
+ <if test="orgid != null">orgid,</if>
+ <if test="delFlag != null">del_flag,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="isupload != null">isupload,</if>
+ <if test="uploadTime != null">upload_time,</if>
+ <if test="pid != null">pid,</if>
+ <if test="guid != null">guid,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="tagcategoryid != null">#{tagcategoryid},</if>
+ <if test="templateid != null">#{templateid},</if>
+ <if test="tagid != null">#{tagid},</if>
+ <if test="tagname != null">#{tagname},</if>
+ <if test="orgid != null">#{orgid},</if>
+ <if test="delFlag != null">#{delFlag},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="isupload != null">#{isupload},</if>
+ <if test="uploadTime != null">#{uploadTime},</if>
+ <if test="pid != null">#{pid},</if>
+ <if test="guid != null">#{guid},</if>
+ </trim>
+ </insert>
+
+ <update id="updateSvyLibTemplateTag" parameterType="com.smartor.domain.SvyLibTemplateTag">
+ update svy_lib_template_tag
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="tagcategoryid != null">tagcategoryid = #{tagcategoryid},</if>
+ <if test="templateid != null">templateid = #{templateid},</if>
+ <if test="tagid != null">tagid = #{tagid},</if>
+ <if test="tagname != null">tagname = #{tagname},</if>
+ <if test="orgid != null">orgid = #{orgid},</if>
+ <if test="delFlag != null">del_flag = #{delFlag},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="isupload != null">isupload = #{isupload},</if>
+ <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+ <if test="pid != null">pid = #{pid},</if>
+ <if test="guid != null">guid = #{guid},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteSvyLibTemplateTagById" parameterType="Long">
+ delete
+ from svy_lib_template_tag
+ where id = #{id}
+ </delete>
+
+ <delete id="deleteSvyLibTemplateTagByIds" parameterType="String">
+ delete from svy_lib_template_tag where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
--
Gitblit v1.9.3