From 9c5072716aa77d3502d035791bc2497a2a209cd9 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Sat, 6 Jan 2024 16:57:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E5=99=A8=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/domain/entity/WxInstrument.java      | 480 ++++++++++++++++++
 .../core/domain/req/WxInstrumentReq.java      |  65 +++
 .../core/mapper/WxInstrumentMapper.java       |  66 +++
 .../resources/mapper/WxInstrumentMapper.xml   | 237 +++++++++
 .../controller/WxInstrumentController.java    |  87 ++++
 .../system/service/IWxInstrumentService.java  |  70 +++
 .../service/impl/WxInstrumentServiceImpl.java |  97 ++++
 flossom-ui/src/api/system/instrument.js       |  44 ++
 .../src/views/system/instrument/index.vue     | 450 ++++++++++++++++
 9 files changed, 1596 insertions(+)
 create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java
 create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentReq.java
 create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentMapper.java
 create mode 100644 flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
 create mode 100644 flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java
 create mode 100644 flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentService.java
 create mode 100644 flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
 create mode 100644 flossom-ui/src/api/system/instrument.js
 create mode 100644 flossom-ui/src/views/system/instrument/index.vue

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java
new file mode 100644
index 0000000..68fb841
--- /dev/null
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java
@@ -0,0 +1,480 @@
+package com.flossom.common.core.domain.entity;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 仪器列对象 wx_instrument
+ *
+ * @author flossom
+ * @date 2024-01-06
+ */
+public class WxInstrument extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 仪器ID
+     */
+    private Long id;
+
+    /**
+     * 仪器名称
+     */
+    private String name;
+
+    /**
+     * 仪器：1、普通仪器 2、iot仪器
+     */
+    private Integer type;
+
+    /**
+     * iot仪器特有：仪器型号
+     */
+    private String model;
+
+    /**
+     * 仪器封面（图片地址）
+     */
+    private String banner;
+
+    /**
+     * 仪器logo图（图片地址）
+     */
+    private String logo;
+
+    /**
+     * 序列号位置图片（图片地址）
+     */
+    private String serial;
+
+    /**
+     * 保修日期
+     */
+    private Long guarantee;
+
+    /**
+     * 日常打卡获得积分
+     */
+    private Long dailyClockCredit;
+
+    /**
+     * 额外打卡奖励积分
+     */
+    private Long extraClockCredit;
+
+    /**
+     * 额外打卡时间开始
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    /**
+     * 额外打卡时间结束
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+    /**
+     * 标签ID(xxxx,xxxx,xxx)
+     */
+    private String miniTagIds;
+
+    /**
+     * 标签名字(xxx,xxx,xxx)
+     */
+    private String miniTagNames;
+
+    /**
+     * 标签ID(xxxx,xxxx,xxx)
+     */
+    private String wecomTagIds;
+
+    /**
+     * 标签名称(xxx,xxx,xxx)
+     */
+    private String wecomTagNames;
+
+    /**
+     * 场景ID(xxxx,xxxx,xxx)
+     */
+    private String sceneIds;
+
+    /**
+     * 场景名称(xxx,xxx,xxx)
+     */
+    private String sceneNames;
+
+    /**
+     * 护理时长
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date nursingTime;
+
+    /**
+     * iot版本
+     */
+    private String iotVersion;
+
+    /**
+     * iot升级数据文件
+     */
+    private String iotUpgradeData;
+
+    /**
+     * 是否开启扫机身码：0、关闭 1、开启
+     */
+    private Integer isScanCode;
+
+    /**
+     * 是否支持购买：0、不支持 1、支持
+     */
+    private Integer isPurchase;
+
+    /**
+     * 商城小程序appid
+     */
+    private String shoppingAppid;
+
+    /**
+     * 商城小程序path
+     */
+    private String shoppingPath;
+
+    /**
+     * 蓝牙连接中图片
+     */
+    private String bluetoothConnecting;
+
+    /**
+     * 蓝牙关闭图片
+     */
+    private String bluetoothClosed;
+
+    /**
+     * iot版本升级说明
+     */
+    private String iotVersionUpgrade;
+
+    /**
+     * 排序:值越大，排序越前
+     */
+    private Long sortNo;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private Long status;
+
+    /**
+     * 手动绑定介绍图片
+     */
+    private String manualCodeBinding;
+
+    /**
+     * 扫码绑定介绍图片
+     */
+    private String scanCodeBinding;
+
+    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 setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setBanner(String banner) {
+        this.banner = banner;
+    }
+
+    public String getBanner() {
+        return banner;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setSerial(String serial) {
+        this.serial = serial;
+    }
+
+    public String getSerial() {
+        return serial;
+    }
+
+    public void setGuarantee(Long guarantee) {
+        this.guarantee = guarantee;
+    }
+
+    public Long getGuarantee() {
+        return guarantee;
+    }
+
+    public void setDailyClockCredit(Long dailyClockCredit) {
+        this.dailyClockCredit = dailyClockCredit;
+    }
+
+    public Long getDailyClockCredit() {
+        return dailyClockCredit;
+    }
+
+    public void setExtraClockCredit(Long extraClockCredit) {
+        this.extraClockCredit = extraClockCredit;
+    }
+
+    public Long getExtraClockCredit() {
+        return extraClockCredit;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setMiniTagIds(String miniTagIds) {
+        this.miniTagIds = miniTagIds;
+    }
+
+    public String getMiniTagIds() {
+        return miniTagIds;
+    }
+
+    public void setMiniTagNames(String miniTagNames) {
+        this.miniTagNames = miniTagNames;
+    }
+
+    public String getMiniTagNames() {
+        return miniTagNames;
+    }
+
+    public void setWecomTagIds(String wecomTagIds) {
+        this.wecomTagIds = wecomTagIds;
+    }
+
+    public String getWecomTagIds() {
+        return wecomTagIds;
+    }
+
+    public void setWecomTagNames(String wecomTagNames) {
+        this.wecomTagNames = wecomTagNames;
+    }
+
+    public String getWecomTagNames() {
+        return wecomTagNames;
+    }
+
+    public void setSceneIds(String sceneIds) {
+        this.sceneIds = sceneIds;
+    }
+
+    public String getSceneIds() {
+        return sceneIds;
+    }
+
+    public void setSceneNames(String sceneNames) {
+        this.sceneNames = sceneNames;
+    }
+
+    public String getSceneNames() {
+        return sceneNames;
+    }
+
+    public void setNursingTime(Date nursingTime) {
+        this.nursingTime = nursingTime;
+    }
+
+    public Date getNursingTime() {
+        return nursingTime;
+    }
+
+    public void setIotVersion(String iotVersion) {
+        this.iotVersion = iotVersion;
+    }
+
+    public String getIotVersion() {
+        return iotVersion;
+    }
+
+    public void setIotUpgradeData(String iotUpgradeData) {
+        this.iotUpgradeData = iotUpgradeData;
+    }
+
+    public String getIotUpgradeData() {
+        return iotUpgradeData;
+    }
+
+    public void setIsScanCode(Integer isScanCode) {
+        this.isScanCode = isScanCode;
+    }
+
+    public Integer getIsScanCode() {
+        return isScanCode;
+    }
+
+    public void setIsPurchase(Integer isPurchase) {
+        this.isPurchase = isPurchase;
+    }
+
+    public Integer getIsPurchase() {
+        return isPurchase;
+    }
+
+    public void setShoppingAppid(String shoppingAppid) {
+        this.shoppingAppid = shoppingAppid;
+    }
+
+    public String getShoppingAppid() {
+        return shoppingAppid;
+    }
+
+    public void setShoppingPath(String shoppingPath) {
+        this.shoppingPath = shoppingPath;
+    }
+
+    public String getShoppingPath() {
+        return shoppingPath;
+    }
+
+    public void setBluetoothConnecting(String bluetoothConnecting) {
+        this.bluetoothConnecting = bluetoothConnecting;
+    }
+
+    public String getBluetoothConnecting() {
+        return bluetoothConnecting;
+    }
+
+    public void setBluetoothClosed(String bluetoothClosed) {
+        this.bluetoothClosed = bluetoothClosed;
+    }
+
+    public String getBluetoothClosed() {
+        return bluetoothClosed;
+    }
+
+    public void setIotVersionUpgrade(String iotVersionUpgrade) {
+        this.iotVersionUpgrade = iotVersionUpgrade;
+    }
+
+    public String getIotVersionUpgrade() {
+        return iotVersionUpgrade;
+    }
+
+    public void setSortNo(Long sortNo) {
+        this.sortNo = sortNo;
+    }
+
+    public Long getSortNo() {
+        return sortNo;
+    }
+
+    public void setStatus(Long status) {
+        this.status = status;
+    }
+
+    public Long getStatus() {
+        return status;
+    }
+
+    public void setManualCodeBinding(String manualCodeBinding) {
+        this.manualCodeBinding = manualCodeBinding;
+    }
+
+    public String getManualCodeBinding() {
+        return manualCodeBinding;
+    }
+
+    public void setScanCodeBinding(String scanCodeBinding) {
+        this.scanCodeBinding = scanCodeBinding;
+    }
+
+    public String getScanCodeBinding() {
+        return scanCodeBinding;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("type", getType())
+                .append("model", getModel())
+                .append("banner", getBanner())
+                .append("logo", getLogo())
+                .append("serial", getSerial())
+                .append("guarantee", getGuarantee())
+                .append("dailyClockCredit", getDailyClockCredit())
+                .append("extraClockCredit", getExtraClockCredit())
+                .append("startTime", getStartTime())
+                .append("endTime", getEndTime())
+                .append("miniTagIds", getMiniTagIds())
+                .append("miniTagNames", getMiniTagNames())
+                .append("wecomTagIds", getWecomTagIds())
+                .append("wecomTagNames", getWecomTagNames())
+                .append("sceneIds", getSceneIds())
+                .append("sceneNames", getSceneNames())
+                .append("nursingTime", getNursingTime())
+                .append("iotVersion", getIotVersion())
+                .append("iotUpgradeData", getIotUpgradeData())
+                .append("isScanCode", getIsScanCode())
+                .append("isPurchase", getIsPurchase())
+                .append("shoppingAppid", getShoppingAppid())
+                .append("shoppingPath", getShoppingPath())
+                .append("bluetoothConnecting", getBluetoothConnecting())
+                .append("bluetoothClosed", getBluetoothClosed())
+                .append("iotVersionUpgrade", getIotVersionUpgrade())
+                .append("sortNo", getSortNo())
+                .append("status", getStatus())
+                .append("manualCodeBinding", getManualCodeBinding())
+                .append("scanCodeBinding", getScanCodeBinding())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
+    }
+}
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentReq.java
new file mode 100644
index 0000000..22106f2
--- /dev/null
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentReq.java
@@ -0,0 +1,65 @@
+package com.flossom.common.core.domain.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 仪器列对象 wx_instrument 查询对象
+ *
+ * @author flossom
+ * @date 2024-01-06
+ */
+public class WxInstrumentReq {
+
+    /**
+     * 仪器ID
+     */
+    private Long id;
+
+    /**
+     * 仪器名称
+     */
+    private String name;
+
+    /**
+     * 仪器：1、普通仪器 2、iot仪器
+     */
+    private Integer type;
+
+    public WxInstrumentReq() {
+    }
+
+    public WxInstrumentReq(Long id, String name, Integer type) {
+        this.id = id;
+        this.name = name;
+        this.type = type;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+}
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentMapper.java
new file mode 100644
index 0000000..c2ad68b
--- /dev/null
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentMapper.java
@@ -0,0 +1,66 @@
+package com.flossom.common.core.mapper;
+
+import com.flossom.common.core.domain.entity.WxInstrument;
+import com.flossom.common.core.domain.req.WxInstrumentReq;
+
+import java.util.List;
+
+/**
+ * 仪器列Mapper接口
+ *
+ * @author flossom
+ * @date 2024-01-06
+ */
+public interface WxInstrumentMapper {
+    /**
+     * 查询仪器列
+     *
+     * @param id 仪器列主键
+     * @return 仪器列
+     */
+    public WxInstrument selectWxInstrumentById(Long id);
+
+    /**
+     * 查询仪器列列表
+     *
+     * @param wxInstrument 仪器列
+     * @return 仪器列集合
+     */
+    public List<WxInstrument> selectWxInstrumentList(WxInstrument wxInstrument);
+
+    List<WxInstrument> selectWxInstrumentPage(WxInstrumentReq wxInstrumentReq);
+
+    /**
+     * 新增仪器列
+     *
+     * @param wxInstrument 仪器列
+     * @return 结果
+     */
+    public int insertWxInstrument(WxInstrument wxInstrument);
+
+    /**
+     * 修改仪器列
+     *
+     * @param wxInstrument 仪器列
+     * @return 结果
+     */
+    public int updateWxInstrument(WxInstrument wxInstrument);
+
+    /**
+     * 删除仪器列
+     *
+     * @param id 仪器列主键
+     * @return 结果
+     */
+    public int deleteWxInstrumentById(Long id);
+
+    /**
+     * 批量删除仪器列
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteWxInstrumentByIds(Long[] ids);
+
+
+}
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
new file mode 100644
index 0000000..9815d6c
--- /dev/null
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
@@ -0,0 +1,237 @@
+<?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.flossom.common.core.mapper.WxInstrumentMapper">
+    
+    <resultMap type="WxInstrument" id="WxInstrumentResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="type"    column="type"    />
+        <result property="model"    column="model"    />
+        <result property="banner"    column="banner"    />
+        <result property="logo"    column="logo"    />
+        <result property="serial"    column="serial"    />
+        <result property="guarantee"    column="guarantee"    />
+        <result property="dailyClockCredit"    column="daily_clock_credit"    />
+        <result property="extraClockCredit"    column="extra_clock_credit"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="endTime"    column="end_time"    />
+        <result property="miniTagIds"    column="mini_tag_ids"    />
+        <result property="miniTagNames"    column="mini_tag_names"    />
+        <result property="wecomTagIds"    column="wecom_tag_ids"    />
+        <result property="wecomTagNames"    column="wecom_tag_names"    />
+        <result property="sceneIds"    column="scene_ids"    />
+        <result property="sceneNames"    column="scene_names"    />
+        <result property="nursingTime"    column="nursing_time"    />
+        <result property="iotVersion"    column="iot_version"    />
+        <result property="iotUpgradeData"    column="iot_upgrade_data"    />
+        <result property="isScanCode"    column="isScanCode"    />
+        <result property="isPurchase"    column="isPurchase"    />
+        <result property="shoppingAppid"    column="shopping_appid"    />
+        <result property="shoppingPath"    column="shopping_path"    />
+        <result property="bluetoothConnecting"    column="bluetooth_connecting"    />
+        <result property="bluetoothClosed"    column="bluetooth_closed"    />
+        <result property="iotVersionUpgrade"    column="iot_version_upgrade"    />
+        <result property="sortNo"    column="sort_no"    />
+        <result property="status"    column="status"    />
+        <result property="manualCodeBinding"    column="manual_code_binding"    />
+        <result property="scanCodeBinding"    column="scan_code_binding"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectWxInstrumentVo">
+        select id, name, type, model, banner, logo, serial, guarantee, daily_clock_credit, extra_clock_credit, start_time, end_time, mini_tag_ids, mini_tag_names, wecom_tag_ids, wecom_tag_names, scene_ids, scene_names, nursing_time, iot_version, iot_upgrade_data, isScanCode, isPurchase, shopping_appid, shopping_path, bluetooth_connecting, bluetooth_closed, iot_version_upgrade, sort_no, status, manual_code_binding, scan_code_binding, create_by, create_time, update_by, update_time, remark from wx_instrument
+    </sql>
+
+    <select id="selectWxInstrumentList" parameterType="WxInstrument" resultMap="WxInstrumentResult">
+        <include refid="selectWxInstrumentVo"/>
+        <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="model != null  and model != ''"> and model = #{model}</if>
+            <if test="banner != null  and banner != ''"> and banner = #{banner}</if>
+            <if test="logo != null  and logo != ''"> and logo = #{logo}</if>
+            <if test="serial != null  and serial != ''"> and serial = #{serial}</if>
+            <if test="guarantee != null "> and guarantee = #{guarantee}</if>
+            <if test="dailyClockCredit != null "> and daily_clock_credit = #{dailyClockCredit}</if>
+            <if test="extraClockCredit != null "> and extra_clock_credit = #{extraClockCredit}</if>
+            <if test="startTime != null "> and start_time = #{startTime}</if>
+            <if test="endTime != null "> and end_time = #{endTime}</if>
+            <if test="miniTagIds != null  and miniTagIds != ''"> and mini_tag_ids = #{miniTagIds}</if>
+            <if test="miniTagNames != null  and miniTagNames != ''"> and mini_tag_names = #{miniTagNames}</if>
+            <if test="wecomTagIds != null  and wecomTagIds != ''"> and wecom_tag_ids = #{wecomTagIds}</if>
+            <if test="wecomTagNames != null  and wecomTagNames != ''"> and wecom_tag_names = #{wecomTagNames}</if>
+            <if test="sceneIds != null  and sceneIds != ''"> and scene_ids = #{sceneIds}</if>
+            <if test="sceneNames != null  and sceneNames != ''"> and scene_names = #{sceneNames}</if>
+            <if test="nursingTime != null "> and nursing_time = #{nursingTime}</if>
+            <if test="iotVersion != null  and iotVersion != ''"> and iot_version = #{iotVersion}</if>
+            <if test="iotUpgradeData != null  and iotUpgradeData != ''"> and iot_upgrade_data = #{iotUpgradeData}</if>
+            <if test="isScanCode != null "> and isScanCode = #{isScanCode}</if>
+            <if test="isPurchase != null "> and isPurchase = #{isPurchase}</if>
+            <if test="shoppingAppid != null  and shoppingAppid != ''"> and shopping_appid = #{shoppingAppid}</if>
+            <if test="shoppingPath != null  and shoppingPath != ''"> and shopping_path = #{shoppingPath}</if>
+            <if test="bluetoothConnecting != null  and bluetoothConnecting != ''"> and bluetooth_connecting = #{bluetoothConnecting}</if>
+            <if test="bluetoothClosed != null  and bluetoothClosed != ''"> and bluetooth_closed = #{bluetoothClosed}</if>
+            <if test="iotVersionUpgrade != null  and iotVersionUpgrade != ''"> and iot_version_upgrade = #{iotVersionUpgrade}</if>
+            <if test="sortNo != null "> and sort_no = #{sortNo}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="manualCodeBinding != null  and manualCodeBinding != ''"> and manual_code_binding = #{manualCodeBinding}</if>
+            <if test="scanCodeBinding != null  and scanCodeBinding != ''"> and scan_code_binding = #{scanCodeBinding}</if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectWxInstrumentPage" parameterType="WxInstrumentReq" resultMap="WxInstrumentResult">
+        <include refid="selectWxInstrumentVo"/>
+        <where>
+            <if test="id != null"> and id like concat('%', #{id}, '%')</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="type != null "> and type = #{type}</if>
+        </where>
+        order by create_time desc
+    </select>
+    
+    <select id="selectWxInstrumentById" parameterType="Long" resultMap="WxInstrumentResult">
+        <include refid="selectWxInstrumentVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertWxInstrument" parameterType="WxInstrument" useGeneratedKeys="true" keyProperty="id">
+        insert into wx_instrument
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null and name != ''">name,</if>
+            <if test="type != null">type,</if>
+            <if test="model != null and model != ''">model,</if>
+            <if test="banner != null and banner != ''">banner,</if>
+            <if test="logo != null and logo != ''">logo,</if>
+            <if test="serial != null and serial != ''">serial,</if>
+            <if test="guarantee != null">guarantee,</if>
+            <if test="dailyClockCredit != null">daily_clock_credit,</if>
+            <if test="extraClockCredit != null">extra_clock_credit,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="miniTagIds != null">mini_tag_ids,</if>
+            <if test="miniTagNames != null">mini_tag_names,</if>
+            <if test="wecomTagIds != null">wecom_tag_ids,</if>
+            <if test="wecomTagNames != null">wecom_tag_names,</if>
+            <if test="sceneIds != null and sceneIds != ''">scene_ids,</if>
+            <if test="sceneNames != null">scene_names,</if>
+            <if test="nursingTime != null">nursing_time,</if>
+            <if test="iotVersion != null">iot_version,</if>
+            <if test="iotUpgradeData != null">iot_upgrade_data,</if>
+            <if test="isScanCode != null">isScanCode,</if>
+            <if test="isPurchase != null">isPurchase,</if>
+            <if test="shoppingAppid != null">shopping_appid,</if>
+            <if test="shoppingPath != null">shopping_path,</if>
+            <if test="bluetoothConnecting != null">bluetooth_connecting,</if>
+            <if test="bluetoothClosed != null">bluetooth_closed,</if>
+            <if test="iotVersionUpgrade != null">iot_version_upgrade,</if>
+            <if test="sortNo != null">sort_no,</if>
+            <if test="status != null">status,</if>
+            <if test="manualCodeBinding != null and manualCodeBinding != ''">manual_code_binding,</if>
+            <if test="scanCodeBinding != null and scanCodeBinding != ''">scan_code_binding,</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>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null and name != ''">#{name},</if>
+            <if test="type != null">#{type},</if>
+            <if test="model != null and model != ''">#{model},</if>
+            <if test="banner != null and banner != ''">#{banner},</if>
+            <if test="logo != null and logo != ''">#{logo},</if>
+            <if test="serial != null and serial != ''">#{serial},</if>
+            <if test="guarantee != null">#{guarantee},</if>
+            <if test="dailyClockCredit != null">#{dailyClockCredit},</if>
+            <if test="extraClockCredit != null">#{extraClockCredit},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="miniTagIds != null">#{miniTagIds},</if>
+            <if test="miniTagNames != null">#{miniTagNames},</if>
+            <if test="wecomTagIds != null">#{wecomTagIds},</if>
+            <if test="wecomTagNames != null">#{wecomTagNames},</if>
+            <if test="sceneIds != null and sceneIds != ''">#{sceneIds},</if>
+            <if test="sceneNames != null">#{sceneNames},</if>
+            <if test="nursingTime != null">#{nursingTime},</if>
+            <if test="iotVersion != null">#{iotVersion},</if>
+            <if test="iotUpgradeData != null">#{iotUpgradeData},</if>
+            <if test="isScanCode != null">#{isScanCode},</if>
+            <if test="isPurchase != null">#{isPurchase},</if>
+            <if test="shoppingAppid != null">#{shoppingAppid},</if>
+            <if test="shoppingPath != null">#{shoppingPath},</if>
+            <if test="bluetoothConnecting != null">#{bluetoothConnecting},</if>
+            <if test="bluetoothClosed != null">#{bluetoothClosed},</if>
+            <if test="iotVersionUpgrade != null">#{iotVersionUpgrade},</if>
+            <if test="sortNo != null">#{sortNo},</if>
+            <if test="status != null">#{status},</if>
+            <if test="manualCodeBinding != null and manualCodeBinding != ''">#{manualCodeBinding},</if>
+            <if test="scanCodeBinding != null and scanCodeBinding != ''">#{scanCodeBinding},</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>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateWxInstrument" parameterType="WxInstrument">
+        update wx_instrument
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="model != null and model != ''">model = #{model},</if>
+            <if test="banner != null and banner != ''">banner = #{banner},</if>
+            <if test="logo != null and logo != ''">logo = #{logo},</if>
+            <if test="serial != null and serial != ''">serial = #{serial},</if>
+            <if test="guarantee != null">guarantee = #{guarantee},</if>
+            <if test="dailyClockCredit != null">daily_clock_credit = #{dailyClockCredit},</if>
+            <if test="extraClockCredit != null">extra_clock_credit = #{extraClockCredit},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="miniTagIds != null">mini_tag_ids = #{miniTagIds},</if>
+            <if test="miniTagNames != null">mini_tag_names = #{miniTagNames},</if>
+            <if test="wecomTagIds != null">wecom_tag_ids = #{wecomTagIds},</if>
+            <if test="wecomTagNames != null">wecom_tag_names = #{wecomTagNames},</if>
+            <if test="sceneIds != null and sceneIds != ''">scene_ids = #{sceneIds},</if>
+            <if test="sceneNames != null">scene_names = #{sceneNames},</if>
+            <if test="nursingTime != null">nursing_time = #{nursingTime},</if>
+            <if test="iotVersion != null">iot_version = #{iotVersion},</if>
+            <if test="iotUpgradeData != null">iot_upgrade_data = #{iotUpgradeData},</if>
+            <if test="isScanCode != null">isScanCode = #{isScanCode},</if>
+            <if test="isPurchase != null">isPurchase = #{isPurchase},</if>
+            <if test="shoppingAppid != null">shopping_appid = #{shoppingAppid},</if>
+            <if test="shoppingPath != null">shopping_path = #{shoppingPath},</if>
+            <if test="bluetoothConnecting != null">bluetooth_connecting = #{bluetoothConnecting},</if>
+            <if test="bluetoothClosed != null">bluetooth_closed = #{bluetoothClosed},</if>
+            <if test="iotVersionUpgrade != null">iot_version_upgrade = #{iotVersionUpgrade},</if>
+            <if test="sortNo != null">sort_no = #{sortNo},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="manualCodeBinding != null and manualCodeBinding != ''">manual_code_binding = #{manualCodeBinding},</if>
+            <if test="scanCodeBinding != null and scanCodeBinding != ''">scan_code_binding = #{scanCodeBinding},</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>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteWxInstrumentById" parameterType="Long">
+        delete from wx_instrument where id = #{id}
+    </delete>
+
+    <delete id="deleteWxInstrumentByIds" parameterType="String">
+        delete from wx_instrument where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java
new file mode 100644
index 0000000..7dde24e
--- /dev/null
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java
@@ -0,0 +1,87 @@
+package com.flossom.system.controller;
+
+import com.flossom.common.core.domain.entity.WxInstrument;
+import com.flossom.common.core.domain.req.WxInstrumentReq;
+import com.flossom.common.core.web.controller.BaseController;
+import com.flossom.common.core.web.domain.AjaxResult;
+import com.flossom.common.core.web.page.TableDataInfo;
+import com.flossom.common.log.annotation.Log;
+import com.flossom.common.log.enums.BusinessType;
+import com.flossom.common.security.annotation.RequiresPermissions;
+import com.flossom.system.service.IWxInstrumentService;
+import org.springframework.beans.BeanUtils;
+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 java.util.List;
+
+/**
+ * 仪器列Controller
+ *
+ * @author flossom
+ * @date 2024-01-06
+ */
+@RestController
+@RequestMapping("/instrument")
+public class WxInstrumentController extends BaseController {
+
+    @Autowired
+    private IWxInstrumentService wxInstrumentService;
+
+    /**
+     * 查询仪器列列表
+     */
+    @RequiresPermissions("system:instrument:list")
+    @GetMapping("/list")
+    public TableDataInfo list(WxInstrumentReq wxInstrumentReq) {
+        startPage();
+        List<WxInstrument> list = wxInstrumentService.selectWxInstrumentPage(wxInstrumentReq);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取仪器列详细信息
+     */
+    @RequiresPermissions("system:instrument:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(wxInstrumentService.selectWxInstrumentById(id));
+    }
+
+    /**
+     * 新增仪器列
+     */
+    @RequiresPermissions("system:instrument:add")
+    @Log(title = "仪器列", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody WxInstrument wxInstrument) {
+        return toAjax(wxInstrumentService.insertWxInstrument(wxInstrument));
+    }
+
+    /**
+     * 修改仪器列
+     */
+    @RequiresPermissions("system:instrument:edit")
+    @Log(title = "仪器列", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody WxInstrument wxInstrument) {
+        return toAjax(wxInstrumentService.updateWxInstrument(wxInstrument));
+    }
+
+    /**
+     * 删除仪器列
+     */
+    @RequiresPermissions("system:instrument:remove")
+    @Log(title = "仪器列", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(wxInstrumentService.deleteWxInstrumentByIds(ids));
+    }
+}
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentService.java
new file mode 100644
index 0000000..af37334
--- /dev/null
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentService.java
@@ -0,0 +1,70 @@
+package com.flossom.system.service;
+
+import com.flossom.common.core.domain.entity.WxInstrument;
+import com.flossom.common.core.domain.req.WxInstrumentReq;
+
+import java.util.List;
+
+
+/**
+ * 仪器列Service接口
+ *
+ * @author flossom
+ * @date 2024-01-06
+ */
+public interface IWxInstrumentService {
+    /**
+     * 查询仪器列
+     *
+     * @param id 仪器列主键
+     * @return 仪器列
+     */
+    public WxInstrument selectWxInstrumentById(Long id);
+
+    /**
+     * 查询仪器列列表
+     *
+     * @param wxInstrument 仪器列
+     * @return 仪器列集合
+     */
+    public List<WxInstrument> selectWxInstrumentList(WxInstrument wxInstrument);
+
+    /**
+     * 查询仪器列列表
+     *
+     * @return 仪器列集合
+     */
+    public List<WxInstrument> selectWxInstrumentPage(WxInstrumentReq wxInstrumentReq);
+
+    /**
+     * 新增仪器列
+     *
+     * @param wxInstrument 仪器列
+     * @return 结果
+     */
+    public int insertWxInstrument(WxInstrument wxInstrument);
+
+    /**
+     * 修改仪器列
+     *
+     * @param wxInstrument 仪器列
+     * @return 结果
+     */
+    public int updateWxInstrument(WxInstrument wxInstrument);
+
+    /**
+     * 批量删除仪器列
+     *
+     * @param ids 需要删除的仪器列主键集合
+     * @return 结果
+     */
+    public int deleteWxInstrumentByIds(Long[] ids);
+
+    /**
+     * 删除仪器列信息
+     *
+     * @param id 仪器列主键
+     * @return 结果
+     */
+    public int deleteWxInstrumentById(Long id);
+}
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
new file mode 100644
index 0000000..5547f71
--- /dev/null
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
@@ -0,0 +1,97 @@
+package com.flossom.system.service.impl;
+
+import java.util.List;
+
+import com.flossom.common.core.domain.entity.WxInstrument;
+import com.flossom.common.core.domain.req.WxInstrumentReq;
+import com.flossom.common.core.mapper.WxInstrumentMapper;
+import com.flossom.common.core.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.flossom.system.service.IWxInstrumentService;
+
+/**
+ * 仪器列Service业务层处理
+ *
+ * @author flossom
+ * @date 2024-01-06
+ */
+@Service
+public class WxInstrumentServiceImpl implements IWxInstrumentService {
+
+    @Autowired
+    private WxInstrumentMapper wxInstrumentMapper;
+
+    /**
+     * 查询仪器列
+     *
+     * @param id 仪器列主键
+     * @return 仪器列
+     */
+    @Override
+    public WxInstrument selectWxInstrumentById(Long id) {
+        return wxInstrumentMapper.selectWxInstrumentById(id);
+    }
+
+    /**
+     * 查询仪器列列表
+     *
+     * @param wxInstrument 仪器列
+     * @return 仪器列
+     */
+    @Override
+    public List<WxInstrument> selectWxInstrumentList(WxInstrument wxInstrument) {
+        return wxInstrumentMapper.selectWxInstrumentList(wxInstrument);
+    }
+
+    @Override
+    public List<WxInstrument> selectWxInstrumentPage(WxInstrumentReq wxInstrumentReq) {
+        return wxInstrumentMapper.selectWxInstrumentPage(wxInstrumentReq);
+    }
+
+    /**
+     * 新增仪器列
+     *
+     * @param wxInstrument 仪器列
+     * @return 结果
+     */
+    @Override
+    public int insertWxInstrument(WxInstrument wxInstrument) {
+        wxInstrument.setCreateTime(DateUtils.getNowDate());
+        return wxInstrumentMapper.insertWxInstrument(wxInstrument);
+    }
+
+    /**
+     * 修改仪器列
+     *
+     * @param wxInstrument 仪器列
+     * @return 结果
+     */
+    @Override
+    public int updateWxInstrument(WxInstrument wxInstrument) {
+        wxInstrument.setUpdateTime(DateUtils.getNowDate());
+        return wxInstrumentMapper.updateWxInstrument(wxInstrument);
+    }
+
+    /**
+     * 批量删除仪器列
+     *
+     * @param ids 需要删除的仪器列主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWxInstrumentByIds(Long[] ids) {
+        return wxInstrumentMapper.deleteWxInstrumentByIds(ids);
+    }
+
+    /**
+     * 删除仪器列信息
+     *
+     * @param id 仪器列主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWxInstrumentById(Long id) {
+        return wxInstrumentMapper.deleteWxInstrumentById(id);
+    }
+}
diff --git a/flossom-ui/src/api/system/instrument.js b/flossom-ui/src/api/system/instrument.js
new file mode 100644
index 0000000..ef515ff
--- /dev/null
+++ b/flossom-ui/src/api/system/instrument.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询仪器列列表
+export function listInstrument(query) {
+  return request({
+    url: '/system/instrument/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询仪器列详细
+export function getInstrument(id) {
+  return request({
+    url: '/system/instrument/' + id,
+    method: 'get'
+  })
+}
+
+// 新增仪器列
+export function addInstrument(data) {
+  return request({
+    url: '/system/instrument',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改仪器列
+export function updateInstrument(data) {
+  return request({
+    url: '/system/instrument',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除仪器列
+export function delInstrument(id) {
+  return request({
+    url: '/system/instrument/' + id,
+    method: 'delete'
+  })
+}
diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue
new file mode 100644
index 0000000..97ed532
--- /dev/null
+++ b/flossom-ui/src/views/system/instrument/index.vue
@@ -0,0 +1,450 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="仪器类型" prop="model">
+        <el-select v-model="queryParams.type" @keyup.enter.native="handleQuery" style="width: 50%">
+          <el-option label="全部" :value="null"></el-option>
+          <el-option label="非IOT仪器" :value="1"></el-option>
+          <el-option label="IOT仪器" :value="2"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仪器名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入仪器名称进行搜索"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仪器ID" prop="id">
+        <el-input
+          v-model="queryParams.id"
+          placeholder="请输入仪器ID进行搜索"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:instrument:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="instrumentList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" fixed="left" width="55" align="center" />
+      <el-table-column label="升序排序" align="center" prop="sortNo" />
+      <el-table-column label="仪器ID" align="center" prop="id" />
+      <el-table-column label="仪器类型" align="center" prop="type" >
+        <template slot-scope="scope">
+          <span v-show="scope.row.type == 1">普通仪器</span>
+          <span v-show="scope.row.type == 2">iot仪器</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="仪器封面" align="center" prop="banner" width="150px">
+        <template slot-scope="scope">
+          <el-avatar shape="square" :size="100" :src="scope.row.banner"></el-avatar>
+        </template>
+      </el-table-column>
+      <el-table-column label="仪器LOGO" align="center" prop="logo" width="150px">
+        <template slot-scope="scope">
+          <el-avatar shape="square" :size="100" :src="scope.row.logo"></el-avatar>
+        </template>
+      </el-table-column>
+      <el-table-column label="仪器名称" align="center" prop="name" width="150px"/>
+      <el-table-column label="仪器型号" align="center" prop="model" />
+      <el-table-column label="保修日期" align="center" prop="guarantee" >
+        <template slot-scope="scope">
+          <span v-show="scope.row.guarantee != null">{{scope.row.guarantee}}年</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="小程序标签" align="center" prop="miniTagNames" width="150px">
+        <template slot-scope="scope">
+          <el-tag v-for="item in scope.row.miniTagNames.split(',')">
+            {{ item }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="企微标签" align="center" prop="wecomTagNames" width="150px">
+        <template slot-scope="scope">
+          <el-tag v-for="item in scope.row.wecomTagNames.split(',')">
+            {{ item }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="日常打卡奖励" align="center" prop="dailyClockCredit" />
+      <el-table-column label="额外打卡奖励" align="center" prop="extraClockCredit" />
+      <el-table-column label="操作" align="center" width="200px" fixed="right" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:instrument:edit']"
+          >编辑</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+          >设置小程序可见标签</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+          >设置微信可见标签</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+          >正品控名称配置</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+          >配置说明书</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:instrument:remove']"
+          >隐藏</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改仪器列对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="仪器名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入仪器名称" />
+        </el-form-item>
+        <el-form-item label="iot仪器特有：仪器型号" prop="model">
+          <el-input v-model="form.model" placeholder="请输入iot仪器特有：仪器型号" />
+        </el-form-item>
+        <el-form-item label="仪器封面" prop="banner">
+          <el-input v-model="form.banner" placeholder="请输入仪器封面" />
+        </el-form-item>
+        <el-form-item label="仪器logo图" prop="logo">
+          <el-input v-model="form.logo" placeholder="请输入仪器logo图" />
+        </el-form-item>
+        <el-form-item label="序列号位置图片" prop="serial">
+          <el-input v-model="form.serial" placeholder="请输入序列号位置图片" />
+        </el-form-item>
+        <el-form-item label="保修日期" prop="guarantee">
+          <el-input v-model="form.guarantee" placeholder="请输入保修日期" />
+        </el-form-item>
+        <el-form-item label="日常打卡获得积分" prop="dailyClockCredit">
+          <el-input v-model="form.dailyClockCredit" placeholder="请输入日常打卡获得积分" />
+        </el-form-item>
+        <el-form-item label="额外打卡奖励积分" prop="extraClockCredit">
+          <el-input v-model="form.extraClockCredit" placeholder="请输入额外打卡奖励积分" />
+        </el-form-item>
+        <el-form-item label="额外打卡时间开始" prop="startTime">
+          <el-date-picker clearable
+            v-model="form.startTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择额外打卡时间开始">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="额外打卡时间结束" prop="endTime">
+          <el-date-picker clearable
+            v-model="form.endTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择额外打卡时间结束">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="标签ID(xxxx,xxxx,xxx)" prop="miniTagIds">
+          <el-input v-model="form.miniTagIds" placeholder="请输入标签ID(xxxx,xxxx,xxx)" />
+        </el-form-item>
+        <el-form-item label="标签名字(xxx,xxx,xxx)" prop="miniTagNames">
+          <el-input v-model="form.miniTagNames" placeholder="请输入标签名字(xxx,xxx,xxx)" />
+        </el-form-item>
+        <el-form-item label="标签ID(xxxx,xxxx,xxx)" prop="wecomTagIds">
+          <el-input v-model="form.wecomTagIds" placeholder="请输入标签ID(xxxx,xxxx,xxx)" />
+        </el-form-item>
+        <el-form-item label="标签名称(xxx,xxx,xxx)" prop="wecomTagNames">
+          <el-input v-model="form.wecomTagNames" placeholder="请输入标签名称(xxx,xxx,xxx)" />
+        </el-form-item>
+        <el-form-item label="场景ID(xxxx,xxxx,xxx)" prop="sceneIds">
+          <el-input v-model="form.sceneIds" placeholder="请输入场景ID(xxxx,xxxx,xxx)" />
+        </el-form-item>
+        <el-form-item label="场景名称(xxx,xxx,xxx)" prop="sceneNames">
+          <el-input v-model="form.sceneNames" placeholder="请输入场景名称(xxx,xxx,xxx)" />
+        </el-form-item>
+        <el-form-item label="护理时长" prop="nursingTime">
+          <el-date-picker clearable
+            v-model="form.nursingTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择护理时长">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="iot版本" prop="iotVersion">
+          <el-input v-model="form.iotVersion" placeholder="请输入iot版本" />
+        </el-form-item>
+        <el-form-item label="iot升级数据文件" prop="iotUpgradeData">
+          <el-input v-model="form.iotUpgradeData" placeholder="请输入iot升级数据文件" />
+        </el-form-item>
+        <el-form-item label="是否开启扫机身码：0、关闭 1、开启" prop="isScanCode">
+          <el-input v-model="form.isScanCode" placeholder="请输入是否开启扫机身码：0、关闭 1、开启" />
+        </el-form-item>
+        <el-form-item label="是否支持购买：0、不支持 1、支持" prop="isPurchase">
+          <el-input v-model="form.isPurchase" placeholder="请输入是否支持购买：0、不支持 1、支持" />
+        </el-form-item>
+        <el-form-item label="商城小程序appid" prop="shoppingAppid">
+          <el-input v-model="form.shoppingAppid" placeholder="请输入商城小程序appid" />
+        </el-form-item>
+        <el-form-item label="商城小程序path" prop="shoppingPath">
+          <el-input v-model="form.shoppingPath" placeholder="请输入商城小程序path" />
+        </el-form-item>
+        <el-form-item label="蓝牙连接中图片" prop="bluetoothConnecting">
+          <el-input v-model="form.bluetoothConnecting" placeholder="请输入蓝牙连接中图片" />
+        </el-form-item>
+        <el-form-item label="蓝牙关闭图片" prop="bluetoothClosed">
+          <el-input v-model="form.bluetoothClosed" placeholder="请输入蓝牙关闭图片" />
+        </el-form-item>
+        <el-form-item label="iot版本升级说明" prop="iotVersionUpgrade">
+          <el-input v-model="form.iotVersionUpgrade" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="排序:值越大，排序越前" prop="sortNo">
+          <el-input v-model="form.sortNo" placeholder="请输入排序:值越大，排序越前" />
+        </el-form-item>
+        <el-form-item label="手动绑定介绍图片" prop="manualCodeBinding">
+          <el-input v-model="form.manualCodeBinding" placeholder="请输入手动绑定介绍图片" />
+        </el-form-item>
+        <el-form-item label="扫码绑定介绍图片" prop="scanCodeBinding">
+          <el-input v-model="form.scanCodeBinding" placeholder="请输入扫码绑定介绍图片" />
+        </el-form-item>
+        <el-form-item label="${comment}" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入${comment}" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listInstrument, getInstrument, delInstrument, addInstrument, updateInstrument } from "@/api/system/instrument";
+
+export default {
+  name: "Instrument",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 仪器列表格数据
+      instrumentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        name: null,
+        type: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "仪器名称不能为空", trigger: "blur" }
+        ],
+        model: [
+          { required: true, message: "iot仪器特有：仪器型号不能为空", trigger: "blur" }
+        ],
+        banner: [
+          { required: true, message: "仪器封面不能为空", trigger: "blur" }
+        ],
+        logo: [
+          { required: true, message: "仪器logo图不能为空", trigger: "blur" }
+        ],
+        serial: [
+          { required: true, message: "序列号位置图片不能为空", trigger: "blur" }
+        ],
+        guarantee: [
+          { required: true, message: "保修日期不能为空", trigger: "blur" }
+        ],
+        sceneIds: [
+          { required: true, message: "场景ID(xxxx,xxxx,xxx)不能为空", trigger: "blur" }
+        ],
+        nursingTime: [
+          { required: true, message: "护理时长不能为空", trigger: "blur" }
+        ],
+        manualCodeBinding: [
+          { required: true, message: "手动绑定介绍图片不能为空", trigger: "blur" }
+        ],
+        scanCodeBinding: [
+          { required: true, message: "扫码绑定介绍图片不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询仪器列列表 */
+    getList() {
+      this.loading = true;
+      listInstrument(this.queryParams).then(response => {
+        this.instrumentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        type: null,
+        model: null,
+        banner: null,
+        logo: null,
+        serial: null,
+        guarantee: null,
+        dailyClockCredit: null,
+        extraClockCredit: null,
+        startTime: null,
+        endTime: null,
+        miniTagIds: null,
+        miniTagNames: null,
+        wecomTagIds: null,
+        wecomTagNames: null,
+        sceneIds: null,
+        sceneNames: null,
+        nursingTime: null,
+        iotVersion: null,
+        iotUpgradeData: null,
+        isScanCode: null,
+        isPurchase: null,
+        shoppingAppid: null,
+        shoppingPath: null,
+        bluetoothConnecting: null,
+        bluetoothClosed: null,
+        iotVersionUpgrade: null,
+        sortNo: null,
+        status: null,
+        manualCodeBinding: null,
+        scanCodeBinding: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加仪器列";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getInstrument(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改仪器列";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateInstrument(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addInstrument(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除仪器列编号为"' + ids + '"的数据项？').then(function() {
+        return delInstrument(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+  }
+};
+</script>