安卓demo接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/BasicLibraryController.java

@@ -1,7 +1,6 @@
 package com.ruoyi.web.controller.platform;
 
 
-import com.github.pagehelper.Page;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -9,7 +8,7 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.BasicLibrary;
-import com.ruoyi.system.service.IBasicLibraryService;
+import com.ruoyi.system.service.BasicLibraryService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,15 +24,14 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/platform/v1/base")
-public class BasicLibraryController extends BaseController
-{
+public class BasicLibraryController extends BaseController {
     @Autowired
-    private IBasicLibraryService basicLibraryService;
+    private BasicLibraryService basicLibraryService;
 
     /**
-     * 查询红外遥控基础库管理列表
+     * 查询基础库管理列表
      */
-    @ApiOperation("查询红外遥控基础库管理列表")
+    @ApiOperation("查询基础库管理列表")
     @PreAuthorize("@ss.hasPermi('platform:base:list')")
     @GetMapping("/list")
     public TableDataInfo list(BasicLibrary basicLibrary)
@@ -45,7 +43,7 @@ public class BasicLibraryController extends BaseController
 
 
     // TODO: 2023/7/13  这里做分页测试
-    @GetMapping("/list")
+    @GetMapping("/test")
     public R<List<BasicLibrary>> test(BasicLibrary basicLibrary)
     {
 //        Page<List<BasicLibrary>> list2 = basicLibraryService.selectBasicLibraryList(basicLibrary);
@@ -66,8 +64,8 @@ public class BasicLibraryController extends BaseController
     /**
      * 新增红外遥控基础库管理
      */
-    @PreAuthorize("@ss.hasPermi('platform:base:add')")
-    @Log(title = "红外遥控基础库管理", businessType = BusinessType.INSERT)
+//    @PreAuthorize("@ss.hasPermi('platform:base:add')")
+//    @Log(title = "红外遥控基础库管理", businessType = BusinessType.INSERT)
     @PostMapping("add")
     public AjaxResult add(@RequestBody BasicLibrary basicLibrary)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/ComponentsLibraryController.java

@@ -1,92 +1,91 @@
-//package com.ruoyi.web.controller.platform;
-//
-//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 com.ruoyi.common.annotation.Log;
-//import com.ruoyi.common.core.controller.BaseController;
-//import com.ruoyi.common.core.domain.AjaxResult;
-//import com.ruoyi.common.enums.BusinessType;
-//import com.ruoyi.system.domain.ComponentsLibrary;
-//import com.ruoyi.system.service.IComponentsLibraryService;
-//import com.ruoyi.common.utils.poi.ExcelUtil;
-//import com.ruoyi.common.core.page.TableDataInfo;
-//
-///**
-// * 红外遥控组件库Controller
-// *
-// * @author liming
-// * @date 2023-07-12
-// */
-//@RestController
-//@RequestMapping("/platform/v1/init")
-//public class ComponentsLibraryController extends BaseController
-//{
-//    @Autowired
-//    private IComponentsLibraryService componentsLibraryService;
-//
-//    /**
-//     * 查询红外遥控组件库列表
-//     */
-//    @PreAuthorize("@ss.hasPermi('platform:components:list')")
-//    @GetMapping("/list")
-//    public TableDataInfo list(ComponentsLibrary componentsLibrary)
-//    {
-//        startPage();
-//        List<ComponentsLibrary> list = componentsLibraryService.selectComponentsLibraryList(componentsLibrary);
-//        return getDataTable(list);
-//    }
-//
-//
-//    /**
-//     * 获取红外遥控组件库详细信息
-//     */
-//    @PreAuthorize("@ss.hasPermi('platform:components:query')")
-//    @GetMapping(value = "/{id}")
-//    public AjaxResult getInfo(@PathVariable("id") Long id)
-//    {
-//        return success(componentsLibraryService.selectComponentsLibraryById(id));
-//    }
-//
-//    /**
-//     * 新增红外遥控组件库
-//     */
-//    @PreAuthorize("@ss.hasPermi('platform:components:add')")
-//    @Log(title = "红外遥控组件库", businessType = BusinessType.INSERT)
-//    @PostMapping
-//    public AjaxResult add(@RequestBody ComponentsLibrary componentsLibrary)
-//    {
-//        return toAjax(componentsLibraryService.insertComponentsLibrary(componentsLibrary));
-//    }
-//
-//    /**
-//     * 修改红外遥控组件库
-//     */
-//    @PreAuthorize("@ss.hasPermi('platform:components:edit')")
-//    @Log(title = "红外遥控组件库", businessType = BusinessType.UPDATE)
-//    @PutMapping
-//    public AjaxResult edit(@RequestBody ComponentsLibrary componentsLibrary)
-//    {
-//        return toAjax(componentsLibraryService.updateComponentsLibrary(componentsLibrary));
-//    }
-//
-//    /**
-//     * 删除红外遥控组件库
-//     */
-//    @PreAuthorize("@ss.hasPermi('platform:components:remove')")
-//    @Log(title = "红外遥控组件库", businessType = BusinessType.DELETE)
-//	@DeleteMapping("/{ids}")
-//    public AjaxResult remove(@PathVariable Long[] ids)
-//    {
-//        return toAjax(componentsLibraryService.deleteComponentsLibraryByIds(ids));
-//    }
-//}
+package com.ruoyi.web.controller.platform;
+
+import java.util.List;
+
+import com.ruoyi.system.domain.ComponentsLibrary;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.service.ComponentsLibraryService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 红外遥控组件库Controller
+ *
+ * @author liming
+ * @date 2023-07-12
+ */
+@RestController
+@RequestMapping("/platform/v1/init")
+public class ComponentsLibraryController extends BaseController
+{
+    @Autowired
+    private ComponentsLibraryService componentsLibraryService;
+
+    /**
+     * 查询红外遥控组件库列表
+     */
+    @PreAuthorize("@ss.hasPermi('platform:components:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ComponentsLibrary componentsLibrary)
+    {
+        startPage();
+        List<ComponentsLibrary> list = componentsLibraryService.selectComponentsLibraryList(componentsLibrary);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取红外遥控组件库详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('platform:components:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(componentsLibraryService.selectComponentsLibraryById(id));
+    }
+
+    /**
+     * 新增红外遥控组件库
+     */
+    @PreAuthorize("@ss.hasPermi('platform:components:add')")
+    @Log(title = "红外遥控组件库", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ComponentsLibrary componentsLibrary)
+    {
+        return toAjax(componentsLibraryService.insertComponentsLibrary(componentsLibrary));
+    }
+
+    /**
+     * 修改红外遥控组件库
+     */
+    @PreAuthorize("@ss.hasPermi('platform:components:edit')")
+    @Log(title = "红外遥控组件库", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ComponentsLibrary componentsLibrary)
+    {
+        return toAjax(componentsLibraryService.updateComponentsLibrary(componentsLibrary));
+    }
+
+    /**
+     * 删除红外遥控组件库
+     */
+    @PreAuthorize("@ss.hasPermi('platform:components:remove')")
+    @Log(title = "红外遥控组件库", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(componentsLibraryService.deleteComponentsLibraryByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/QrLibraryController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.web.controller.platform;
 
 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;
@@ -17,8 +17,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.QrLibrary;
-import com.ruoyi.system.service.IQrLibraryService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.QrLibraryService;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
@@ -32,7 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class QrLibraryController extends BaseController
 {
     @Autowired
-    private IQrLibraryService qrLibraryService;
+    private QrLibraryService qrLibraryService;
 
     /**
      * 查询红外遥控二维码列表

ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/TemplateLibraryController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.web.controller.platform;
 
 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;
@@ -17,8 +17,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.TemplateLibrary;
-import com.ruoyi.system.service.ITemplateLibraryService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.TemplateLibraryService;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
@@ -32,7 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class TemplateLibraryController extends BaseController
 {
     @Autowired
-    private ITemplateLibraryService templateLibraryService;
+    private TemplateLibraryService templateLibraryService;
 
     /**
      * 查询红外遥控模板库列表

ruoyi-system/src/main/java/com/ruoyi/system/domain/BasicLibrary.java

@@ -1,208 +0,0 @@
-package com.ruoyi.system.domain;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 红外遥控基础库管理对象 t_basic_library
- * 
- * @author liming
- * @date 2023-07-12
- */
-public class BasicLibrary extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 基本库id */
-    private Long id;
-
-    /** 基本库名 */
-    @Excel(name = "基本库名")
-    private String name;
-
-    /** 引导码-高电平 */
-    @Excel(name = "引导码-高电平")
-    private Long bootCodeHigh;
-
-    /** 引导码-低电平 */
-    @Excel(name = "引导码-低电平")
-    private Long bootCodeLow;
-
-    /** 引导码-发送次数 */
-    @Excel(name = "引导码-发送次数")
-    private Long bootCodeSendNum;
-
-    /** 同步码间隔时间-高电平 */
-    @Excel(name = "同步码间隔时间-高电平")
-    private Long syncCodeIntervalHigh;
-
-    /** 同步码间隔时间-低电平 */
-    @Excel(name = "同步码间隔时间-低电平")
-    private Long syncCodeIntervalLow;
-
-    /** 数据0-高电平 */
-    @Excel(name = "数据0-高电平")
-    private Long data0High;
-
-    /** 数据0-低电平 */
-    @Excel(name = "数据0-低电平")
-    private Long data0Low;
-
-    /** 数据1-高电平 */
-    @Excel(name = "数据1-高电平")
-    private Long data1High;
-
-    /** 数据1-低电平 */
-    @Excel(name = "数据1-低电平")
-    private Long data1Low;
-
-    /** 状态（0使用中 1未使用） */
-    @Excel(name = "状态", readConverterExp = "0=使用中,1=未使用")
-    private String status;
-
-    /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setBootCodeHigh(Long bootCodeHigh) 
-    {
-        this.bootCodeHigh = bootCodeHigh;
-    }
-
-    public Long getBootCodeHigh() 
-    {
-        return bootCodeHigh;
-    }
-    public void setBootCodeLow(Long bootCodeLow) 
-    {
-        this.bootCodeLow = bootCodeLow;
-    }
-
-    public Long getBootCodeLow() 
-    {
-        return bootCodeLow;
-    }
-    public void setBootCodeSendNum(Long bootCodeSendNum) 
-    {
-        this.bootCodeSendNum = bootCodeSendNum;
-    }
-
-    public Long getBootCodeSendNum() 
-    {
-        return bootCodeSendNum;
-    }
-    public void setSyncCodeIntervalHigh(Long syncCodeIntervalHigh) 
-    {
-        this.syncCodeIntervalHigh = syncCodeIntervalHigh;
-    }
-
-    public Long getSyncCodeIntervalHigh() 
-    {
-        return syncCodeIntervalHigh;
-    }
-    public void setSyncCodeIntervalLow(Long syncCodeIntervalLow) 
-    {
-        this.syncCodeIntervalLow = syncCodeIntervalLow;
-    }
-
-    public Long getSyncCodeIntervalLow() 
-    {
-        return syncCodeIntervalLow;
-    }
-    public void setData0High(Long data0High) 
-    {
-        this.data0High = data0High;
-    }
-
-    public Long getData0High() 
-    {
-        return data0High;
-    }
-    public void setData0Low(Long data0Low) 
-    {
-        this.data0Low = data0Low;
-    }
-
-    public Long getData0Low() 
-    {
-        return data0Low;
-    }
-    public void setData1High(Long data1High) 
-    {
-        this.data1High = data1High;
-    }
-
-    public Long getData1High() 
-    {
-        return data1High;
-    }
-    public void setData1Low(Long data1Low) 
-    {
-        this.data1Low = data1Low;
-    }
-
-    public Long getData1Low() 
-    {
-        return data1Low;
-    }
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
-
-    public String getStatus() 
-    {
-        return status;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("bootCodeHigh", getBootCodeHigh())
-            .append("bootCodeLow", getBootCodeLow())
-            .append("bootCodeSendNum", getBootCodeSendNum())
-            .append("syncCodeIntervalHigh", getSyncCodeIntervalHigh())
-            .append("syncCodeIntervalLow", getSyncCodeIntervalLow())
-            .append("data0High", getData0High())
-            .append("data0Low", getData0Low())
-            .append("data1High", getData1High())
-            .append("data1Low", getData1Low())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/ComponentsLibrary.java

@@ -1,166 +0,0 @@
-package com.ruoyi.system.domain;
-
-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;
-
-/**
- * 红外遥控组件库对象 t_components_library
- * 
- * @author liming
- * @date 2023-07-12
- */
-public class ComponentsLibrary extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 组件id */
-    private Long id;
-
-    /** 组件名称 */
-    @Excel(name = "组件名称")
-    private String name;
-
-    /** 组件类型   1开关型  2加减形 */
-    @Excel(name = "组件类型   1开关型  2加减形")
-    private Long typeNum;
-
-    /** 加减型  最大值 */
-    @Excel(name = "加减型  最大值")
-    private Long addSubMax;
-
-    /** 加减型  最小值 */
-    @Excel(name = "加减型  最小值")
-    private Long addSubMin;
-
-    /** 命令参数 */
-    @Excel(name = "命令参数")
-    private String dictateParameter;
-
-    /** 默认值 */
-    @Excel(name = "默认值")
-    private String defValue;
-
-    /** 重复码 */
-    @Excel(name = "重复码")
-    private Long repeatCode;
-
-    /** 状态（0使用中 1未使用） */
-    @Excel(name = "状态", readConverterExp = "0=使用中,1=未使用")
-    private String status;
-
-    /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setTypeNum(Long typeNum) 
-    {
-        this.typeNum = typeNum;
-    }
-
-    public Long getTypeNum() 
-    {
-        return typeNum;
-    }
-    public void setAddSubMax(Long addSubMax) 
-    {
-        this.addSubMax = addSubMax;
-    }
-
-    public Long getAddSubMax() 
-    {
-        return addSubMax;
-    }
-    public void setAddSubMin(Long addSubMin) 
-    {
-        this.addSubMin = addSubMin;
-    }
-
-    public Long getAddSubMin() 
-    {
-        return addSubMin;
-    }
-    public void setDictateParameter(String dictateParameter) 
-    {
-        this.dictateParameter = dictateParameter;
-    }
-
-    public String getDictateParameter() 
-    {
-        return dictateParameter;
-    }
-    public void setDefValue(String defValue) 
-    {
-        this.defValue = defValue;
-    }
-
-    public String getDefValue() 
-    {
-        return defValue;
-    }
-    public void setRepeatCode(Long repeatCode) 
-    {
-        this.repeatCode = repeatCode;
-    }
-
-    public Long getRepeatCode() 
-    {
-        return repeatCode;
-    }
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
-
-    public String getStatus() 
-    {
-        return status;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("typeNum", getTypeNum())
-            .append("addSubMax", getAddSubMax())
-            .append("addSubMin", getAddSubMin())
-            .append("dictateParameter", getDictateParameter())
-            .append("defValue", getDefValue())
-            .append("repeatCode", getRepeatCode())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/QrLibrary.java

@@ -1,18 +1,23 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+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;
 
+import java.util.Date;
+
 /**
  * 红外遥控二维码对象 t_qr_library
  * 
  * @author liming
  * @date 2023-07-12
  */
-public class QrLibrary extends BaseEntity
-{
+@Data
+@TableName("t_qr_library")
+public class QrLibrary {
     private static final long serialVersionUID = 1L;
 
     /** 二维码id */
@@ -33,64 +38,15 @@ public class QrLibrary extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setUrl(String url) 
-    {
-        this.url = url;
-    }
-
-    public String getUrl() 
-    {
-        return url;
-    }
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
+    /** 创建者 */
+    private String createBy;
 
-    public String getStatus() 
-    {
-        return status;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
+    /** 创建时间 */
+    private Date createTime;
 
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
+    /** 更新者 */
+    private String updateBy;
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("url", getUrl())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
+    /** 更新时间 */
+    private Date updateTime;
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/TemplateLibrary.java

@@ -1,18 +1,24 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
 
+import java.util.Date;
+
 /**
  * 红外遥控模板库对象 t_template_library
  * 
  * @author liming
  * @date 2023-07-12
  */
-public class TemplateLibrary extends BaseEntity
-{
+@Data
+@TableName("t_template_library")
+public class TemplateLibrary  {
     private static final long serialVersionUID = 1L;
 
     /** 模板id */
@@ -28,7 +34,7 @@ public class TemplateLibrary extends BaseEntity
 
     /** 关联组件id */
     @Excel(name = "关联组件id")
-    private String componentsId;
+    private String components;
 
     /** 状态（0使用中 1未使用） */
     @Excel(name = "状态", readConverterExp = "0=使用中,1=未使用")
@@ -37,74 +43,16 @@ public class TemplateLibrary extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setBaseId(Long baseId) 
-    {
-        this.baseId = baseId;
-    }
-
-    public Long getBaseId() 
-    {
-        return baseId;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setComponentsId(String componentsId) 
-    {
-        this.componentsId = componentsId;
-    }
+    /** 创建者 */
+    private String createBy;
 
-    public String getComponentsId() 
-    {
-        return componentsId;
-    }
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
+    /** 创建时间 */
+    private Date createTime;
 
-    public String getStatus() 
-    {
-        return status;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
+    /** 更新者 */
+    private String updateBy;
 
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
+    /** 更新时间 */
+    private Date updateTime;
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("baseId", getBaseId())
-            .append("name", getName())
-            .append("componentsId", getComponentsId())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BasicLibraryMapper.java

@@ -2,7 +2,9 @@ package com.ruoyi.system.mapper;
 
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.BasicLibrary;
+import com.ruoyi.system.domain.ComponentsLibrary;
 
 import java.util.List;
 
@@ -12,8 +14,7 @@ import java.util.List;
  * @author liming
  * @date 2023-07-12
  */
-public interface BasicLibraryMapper
-{
+public interface BasicLibraryMapper extends BaseMapper<BasicLibrary> {
     /**
      * 查询红外遥控基础库管理
      * 
@@ -61,4 +62,6 @@ public interface BasicLibraryMapper
      * @return 结果
      */
     public int deleteBasicLibraryByIds(Long[] ids);
+
+    List<BasicLibrary> getList();
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ComponentsLibraryMapper.java

@@ -1,61 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import java.util.List;
-import com.ruoyi.system.domain.ComponentsLibrary;
-
-/**
- * 红外遥控组件库Mapper接口
- * 
- * @author liming
- * @date 2023-07-12
- */
-public interface ComponentsLibraryMapper 
-{
-    /**
-     * 查询红外遥控组件库
-     * 
-     * @param id 红外遥控组件库主键
-     * @return 红外遥控组件库
-     */
-    public ComponentsLibrary selectComponentsLibraryById(Long id);
-
-    /**
-     * 查询红外遥控组件库列表
-     * 
-     * @param componentsLibrary 红外遥控组件库
-     * @return 红外遥控组件库集合
-     */
-    public List<ComponentsLibrary> selectComponentsLibraryList(ComponentsLibrary componentsLibrary);
-
-    /**
-     * 新增红外遥控组件库
-     * 
-     * @param componentsLibrary 红外遥控组件库
-     * @return 结果
-     */
-    public int insertComponentsLibrary(ComponentsLibrary componentsLibrary);
-
-    /**
-     * 修改红外遥控组件库
-     * 
-     * @param componentsLibrary 红外遥控组件库
-     * @return 结果
-     */
-    public int updateComponentsLibrary(ComponentsLibrary componentsLibrary);
-
-    /**
-     * 删除红外遥控组件库
-     * 
-     * @param id 红外遥控组件库主键
-     * @return 结果
-     */
-    public int deleteComponentsLibraryById(Long id);
-
-    /**
-     * 批量删除红外遥控组件库
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteComponentsLibraryByIds(Long[] ids);
-}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/QrLibraryMapper.java

@@ -1,6 +1,9 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.domain.ComponentsLibrary;
 import com.ruoyi.system.domain.QrLibrary;
 
 /**
@@ -9,8 +12,7 @@ import com.ruoyi.system.domain.QrLibrary;
  * @author liming
  * @date 2023-07-12
  */
-public interface QrLibraryMapper 
-{
+public interface QrLibraryMapper  extends BaseMapper<QrLibrary> {
     /**
      * 查询红外遥控二维码
      * 

ruoyi-system/src/main/java/com/ruoyi/system/mapper/TemplateLibraryMapper.java

@@ -1,6 +1,9 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.domain.ComponentsLibrary;
 import com.ruoyi.system.domain.TemplateLibrary;
 
 /**
@@ -9,8 +12,7 @@ import com.ruoyi.system.domain.TemplateLibrary;
  * @author liming
  * @date 2023-07-12
  */
-public interface TemplateLibraryMapper 
-{
+public interface TemplateLibraryMapper extends BaseMapper<TemplateLibrary> {
     /**
      * 查询红外遥控模板库
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/IBasicLibraryService.java

@@ -1,7 +1,9 @@
 package com.ruoyi.system.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.BasicLibrary;
+import com.ruoyi.system.domain.ComponentsLibrary;
 
 import java.util.List;
 
@@ -11,11 +13,10 @@ import java.util.List;
  * @author liming
  * @date 2023-07-12
  */
-public interface IBasicLibraryService 
-{
+public interface BasicLibraryService extends IService<BasicLibrary> {
     /**
      * 查询红外遥控基础库管理
-     * 
+     *
      * @param id 红外遥控基础库管理主键
      * @return 红外遥控基础库管理
      */
@@ -23,7 +24,7 @@ public interface IBasicLibraryService
 
     /**
      * 查询红外遥控基础库管理列表
-     * 
+     *
      * @param basicLibrary 红外遥控基础库管理
      * @return 红外遥控基础库管理集合
      */
@@ -31,7 +32,7 @@ public interface IBasicLibraryService
 
     /**
      * 新增红外遥控基础库管理
-     * 
+     *
      * @param basicLibrary 红外遥控基础库管理
      * @return 结果
      */
@@ -39,7 +40,7 @@ public interface IBasicLibraryService
 
     /**
      * 修改红外遥控基础库管理
-     * 
+     *
      * @param basicLibrary 红外遥控基础库管理
      * @return 结果
      */
@@ -47,7 +48,7 @@ public interface IBasicLibraryService
 
     /**
      * 批量删除红外遥控基础库管理
-     * 
+     *
      * @param ids 需要删除的红外遥控基础库管理主键集合
      * @return 结果
      */
@@ -55,9 +56,12 @@ public interface IBasicLibraryService
 
     /**
      * 删除红外遥控基础库管理信息
-     * 
+     *
      * @param id 红外遥控基础库管理主键
      * @return 结果
      */
     public int deleteBasicLibraryById(Long id);
+
+    List<BasicLibrary> getList();
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IComponentsLibraryService.java

@@ -1,16 +1,17 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.ComponentsLibrary;
 
+import java.util.List;
+
 /**
  * 红外遥控组件库Service接口
  * 
  * @author liming
  * @date 2023-07-12
  */
-public interface IComponentsLibraryService 
-{
+public interface ComponentsLibraryService extends IService<ComponentsLibrary> {
     /**
      * 查询红外遥控组件库
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/IQrLibraryService.java

@@ -1,6 +1,9 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.domain.ComponentsLibrary;
 import com.ruoyi.system.domain.QrLibrary;
 
 /**
@@ -9,8 +12,7 @@ import com.ruoyi.system.domain.QrLibrary;
  * @author liming
  * @date 2023-07-12
  */
-public interface IQrLibraryService 
-{
+public interface QrLibraryService  extends IService<QrLibrary> {
     /**
      * 查询红外遥控二维码
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/ITemplateLibraryService.java

@@ -1,6 +1,9 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.domain.ComponentsLibrary;
 import com.ruoyi.system.domain.TemplateLibrary;
 
 /**
@@ -9,8 +12,7 @@ import com.ruoyi.system.domain.TemplateLibrary;
  * @author liming
  * @date 2023-07-12
  */
-public interface ITemplateLibraryService 
-{
+public interface TemplateLibraryService  extends IService<TemplateLibrary> {
     /**
      * 查询红外遥控模板库
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BasicLibraryServiceImpl.java

@@ -1,10 +1,13 @@
 package com.ruoyi.system.service.impl;
 
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.BasicLibrary;
+import com.ruoyi.system.domain.ComponentsLibrary;
 import com.ruoyi.system.mapper.BasicLibraryMapper;
-import com.ruoyi.system.service.IBasicLibraryService;
+import com.ruoyi.system.mapper.ComponentsLibraryMapper;
+import com.ruoyi.system.service.BasicLibraryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,8 +20,7 @@ import java.util.List;
  * @date 2023-07-12
  */
 @Service
-public class BasicLibraryServiceImpl implements IBasicLibraryService
-{
+public class BasicLibraryServiceImpl  extends ServiceImpl<BasicLibraryMapper, BasicLibrary> implements BasicLibraryService {
     @Autowired
     private BasicLibraryMapper basicLibraryMapper;
 
@@ -95,4 +97,9 @@ public class BasicLibraryServiceImpl implements IBasicLibraryService
     {
         return basicLibraryMapper.deleteBasicLibraryById(id);
     }
+
+    @Override
+    public List<BasicLibrary> getList() {
+        return basicLibraryMapper.getList();
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ComponentsLibraryServiceImpl.java

@@ -1,12 +1,14 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.ComponentsLibrary;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ComponentsLibraryMapper;
-import com.ruoyi.system.domain.ComponentsLibrary;
-import com.ruoyi.system.service.IComponentsLibraryService;
+import com.ruoyi.system.service.ComponentsLibraryService;
 
 /**
  * 红外遥控组件库Service业务层处理
@@ -15,8 +17,7 @@ import com.ruoyi.system.service.IComponentsLibraryService;
  * @date 2023-07-12
  */
 @Service
-public class ComponentsLibraryServiceImpl implements IComponentsLibraryService 
-{
+public class ComponentsLibraryServiceImpl extends ServiceImpl<ComponentsLibraryMapper, ComponentsLibrary> implements ComponentsLibraryService {
     @Autowired
     private ComponentsLibraryMapper componentsLibraryMapper;
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/QrLibraryServiceImpl.java

@@ -1,12 +1,16 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.ComponentsLibrary;
+import com.ruoyi.system.mapper.ComponentsLibraryMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.QrLibraryMapper;
 import com.ruoyi.system.domain.QrLibrary;
-import com.ruoyi.system.service.IQrLibraryService;
+import com.ruoyi.system.service.QrLibraryService;
 
 /**
  * 红外遥控二维码Service业务层处理
@@ -15,8 +19,7 @@ import com.ruoyi.system.service.IQrLibraryService;
  * @date 2023-07-12
  */
 @Service
-public class QrLibraryServiceImpl implements IQrLibraryService 
-{
+public class QrLibraryServiceImpl  extends ServiceImpl<QrLibraryMapper, QrLibrary> implements QrLibraryService {
     @Autowired
     private QrLibraryMapper qrLibraryMapper;
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TemplateLibraryServiceImpl.java

@@ -1,12 +1,16 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.ComponentsLibrary;
+import com.ruoyi.system.mapper.ComponentsLibraryMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.TemplateLibraryMapper;
 import com.ruoyi.system.domain.TemplateLibrary;
-import com.ruoyi.system.service.ITemplateLibraryService;
+import com.ruoyi.system.service.TemplateLibraryService;
 
 /**
  * 红外遥控模板库Service业务层处理
@@ -15,7 +19,7 @@ import com.ruoyi.system.service.ITemplateLibraryService;
  * @date 2023-07-12
  */
 @Service
-public class TemplateLibraryServiceImpl implements ITemplateLibraryService 
+public class TemplateLibraryServiceImpl  extends ServiceImpl<TemplateLibraryMapper, TemplateLibrary> implements TemplateLibraryService
 {
     @Autowired
     private TemplateLibraryMapper templateLibraryMapper;

ruoyi-system/src/main/resources/mapper/system/platform/BasicLibraryMapper.xml

@@ -1,126 +0,0 @@
-<?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.ruoyi.system.mapper.BasicLibraryMapper">
-    
-    <resultMap type="BasicLibrary" id="BasicLibraryResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="bootCodeHigh"    column="boot_code_high"    />
-        <result property="bootCodeLow"    column="boot_code_low"    />
-        <result property="bootCodeSendNum"    column="boot_code_send_num"    />
-        <result property="syncCodeIntervalHigh"    column="sync_code_interval_high"    />
-        <result property="syncCodeIntervalLow"    column="sync_code_interval_low"    />
-        <result property="data0High"    column="data0_high"    />
-        <result property="data0Low"    column="data0_low"    />
-        <result property="data1High"    column="data1_high"    />
-        <result property="data1Low"    column="data1_low"    />
-        <result property="status"    column="status"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectBasicLibraryVo">
-        select id, name, boot_code_high, boot_code_low, boot_code_send_num, sync_code_interval_high, sync_code_interval_low, data0_high, data0_low, data1_high, data1_low, status, del_flag, create_by, create_time, update_by, update_time from t_basic_library
-    </sql>
-
-    <select id="selectBasicLibraryList" parameterType="BasicLibrary" resultMap="BasicLibraryResult">
-        <include refid="selectBasicLibraryVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="bootCodeHigh != null "> and boot_code_high = #{bootCodeHigh}</if>
-            <if test="bootCodeLow != null "> and boot_code_low = #{bootCodeLow}</if>
-            <if test="bootCodeSendNum != null "> and boot_code_send_num = #{bootCodeSendNum}</if>
-            <if test="syncCodeIntervalHigh != null "> and sync_code_interval_high = #{syncCodeIntervalHigh}</if>
-            <if test="syncCodeIntervalLow != null "> and sync_code_interval_low = #{syncCodeIntervalLow}</if>
-            <if test="data0High != null "> and data0_high = #{data0High}</if>
-            <if test="data0Low != null "> and data0_low = #{data0Low}</if>
-            <if test="data1High != null "> and data1_high = #{data1High}</if>
-            <if test="data1Low != null "> and data1_low = #{data1Low}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-        </where>
-    </select>
-    
-    <select id="selectBasicLibraryById" parameterType="Long" resultMap="BasicLibraryResult">
-        <include refid="selectBasicLibraryVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertBasicLibrary" parameterType="BasicLibrary" useGeneratedKeys="true" keyProperty="id">
-        insert into t_basic_library
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null">name,</if>
-            <if test="bootCodeHigh != null">boot_code_high,</if>
-            <if test="bootCodeLow != null">boot_code_low,</if>
-            <if test="bootCodeSendNum != null">boot_code_send_num,</if>
-            <if test="syncCodeIntervalHigh != null">sync_code_interval_high,</if>
-            <if test="syncCodeIntervalLow != null">sync_code_interval_low,</if>
-            <if test="data0High != null">data0_high,</if>
-            <if test="data0Low != null">data0_low,</if>
-            <if test="data1High != null">data1_high,</if>
-            <if test="data1Low != null">data1_low,</if>
-            <if test="status != null">status,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null">#{name},</if>
-            <if test="bootCodeHigh != null">#{bootCodeHigh},</if>
-            <if test="bootCodeLow != null">#{bootCodeLow},</if>
-            <if test="bootCodeSendNum != null">#{bootCodeSendNum},</if>
-            <if test="syncCodeIntervalHigh != null">#{syncCodeIntervalHigh},</if>
-            <if test="syncCodeIntervalLow != null">#{syncCodeIntervalLow},</if>
-            <if test="data0High != null">#{data0High},</if>
-            <if test="data0Low != null">#{data0Low},</if>
-            <if test="data1High != null">#{data1High},</if>
-            <if test="data1Low != null">#{data1Low},</if>
-            <if test="status != null">#{status},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasicLibrary" parameterType="BasicLibrary">
-        update t_basic_library
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null">name = #{name},</if>
-            <if test="bootCodeHigh != null">boot_code_high = #{bootCodeHigh},</if>
-            <if test="bootCodeLow != null">boot_code_low = #{bootCodeLow},</if>
-            <if test="bootCodeSendNum != null">boot_code_send_num = #{bootCodeSendNum},</if>
-            <if test="syncCodeIntervalHigh != null">sync_code_interval_high = #{syncCodeIntervalHigh},</if>
-            <if test="syncCodeIntervalLow != null">sync_code_interval_low = #{syncCodeIntervalLow},</if>
-            <if test="data0High != null">data0_high = #{data0High},</if>
-            <if test="data0Low != null">data0_low = #{data0Low},</if>
-            <if test="data1High != null">data1_high = #{data1High},</if>
-            <if test="data1Low != null">data1_low = #{data1Low},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBasicLibraryById" parameterType="Long">
-        delete from t_basic_library where id = #{id}
-    </delete>
-
-    <delete id="deleteBasicLibraryByIds" parameterType="String">
-        delete from t_basic_library where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/src/main/resources/mapper/system/platform/ComponentsLibraryMapper.xml

@@ -1,111 +0,0 @@
-<?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.ruoyi.system.mapper.ComponentsLibraryMapper">
-    
-    <resultMap type="ComponentsLibrary" id="ComponentsLibraryResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="typeNum"    column="type_num"    />
-        <result property="addSubMax"    column="add_sub_max"    />
-        <result property="addSubMin"    column="add_sub_min"    />
-        <result property="dictateParameter"    column="dictate_parameter"    />
-        <result property="defValue"    column="def_value"    />
-        <result property="repeatCode"    column="repeat_code"    />
-        <result property="status"    column="status"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectComponentsLibraryVo">
-        select id, name, type_num, add_sub_max, add_sub_min, dictate_parameter, def_value, repeat_code, status, del_flag, create_by, create_time, update_by, update_time from t_components_library
-    </sql>
-
-    <select id="selectComponentsLibraryList" parameterType="ComponentsLibrary" resultMap="ComponentsLibraryResult">
-        <include refid="selectComponentsLibraryVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="typeNum != null "> and type_num = #{typeNum}</if>
-            <if test="addSubMax != null "> and add_sub_max = #{addSubMax}</if>
-            <if test="addSubMin != null "> and add_sub_min = #{addSubMin}</if>
-            <if test="dictateParameter != null  and dictateParameter != ''"> and dictate_parameter = #{dictateParameter}</if>
-            <if test="defValue != null  and defValue != ''"> and def_value = #{defValue}</if>
-            <if test="repeatCode != null "> and repeat_code = #{repeatCode}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-        </where>
-    </select>
-    
-    <select id="selectComponentsLibraryById" parameterType="Long" resultMap="ComponentsLibraryResult">
-        <include refid="selectComponentsLibraryVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertComponentsLibrary" parameterType="ComponentsLibrary" useGeneratedKeys="true" keyProperty="id">
-        insert into t_components_library
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null">name,</if>
-            <if test="typeNum != null">type_num,</if>
-            <if test="addSubMax != null">add_sub_max,</if>
-            <if test="addSubMin != null">add_sub_min,</if>
-            <if test="dictateParameter != null">dictate_parameter,</if>
-            <if test="defValue != null">def_value,</if>
-            <if test="repeatCode != null">repeat_code,</if>
-            <if test="status != null">status,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null">#{name},</if>
-            <if test="typeNum != null">#{typeNum},</if>
-            <if test="addSubMax != null">#{addSubMax},</if>
-            <if test="addSubMin != null">#{addSubMin},</if>
-            <if test="dictateParameter != null">#{dictateParameter},</if>
-            <if test="defValue != null">#{defValue},</if>
-            <if test="repeatCode != null">#{repeatCode},</if>
-            <if test="status != null">#{status},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updateComponentsLibrary" parameterType="ComponentsLibrary">
-        update t_components_library
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null">name = #{name},</if>
-            <if test="typeNum != null">type_num = #{typeNum},</if>
-            <if test="addSubMax != null">add_sub_max = #{addSubMax},</if>
-            <if test="addSubMin != null">add_sub_min = #{addSubMin},</if>
-            <if test="dictateParameter != null">dictate_parameter = #{dictateParameter},</if>
-            <if test="defValue != null">def_value = #{defValue},</if>
-            <if test="repeatCode != null">repeat_code = #{repeatCode},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteComponentsLibraryById" parameterType="Long">
-        delete from t_components_library where id = #{id}
-    </delete>
-
-    <delete id="deleteComponentsLibraryByIds" parameterType="String">
-        delete from t_components_library where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/src/main/resources/mapper/system/platform/TemplateLibraryMapper.xml

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="baseId"    column="base_id"    />
         <result property="name"    column="name"    />
-        <result property="componentsId"    column="components_id"    />
+        <result property="components"    column="components"    />
         <result property="status"    column="status"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />