仪器新增 we200蓝牙连接 配置

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java

@@ -232,6 +232,21 @@ public class WxInstrument extends BaseEntity {
      */
     private String we200IotVersionUpgrade;
 
+    /**
+     * 蓝牙连接中标题
+     */
+    private String we200BluetoothConnectingTitle;
+
+    /**
+     * 蓝牙连接中图片
+     */
+    private String we200BluetoothConnecting;
+
+    /**
+     * 蓝牙连接中文案
+     */
+    private String we200BluetoothConnectingContent;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -575,4 +590,28 @@ public class WxInstrument extends BaseEntity {
     public String getNursingTimeStr() {
         return nursingTimeStr;
     }
+
+    public String getWe200BluetoothConnectingTitle() {
+        return we200BluetoothConnectingTitle;
+    }
+
+    public void setWe200BluetoothConnectingTitle(String we200BluetoothConnectingTitle) {
+        this.we200BluetoothConnectingTitle = we200BluetoothConnectingTitle;
+    }
+
+    public String getWe200BluetoothConnecting() {
+        return we200BluetoothConnecting;
+    }
+
+    public void setWe200BluetoothConnecting(String we200BluetoothConnecting) {
+        this.we200BluetoothConnecting = we200BluetoothConnecting;
+    }
+
+    public String getWe200BluetoothConnectingContent() {
+        return we200BluetoothConnectingContent;
+    }
+
+    public void setWe200BluetoothConnectingContent(String we200BluetoothConnectingContent) {
+        this.we200BluetoothConnectingContent = we200BluetoothConnectingContent;
+    }
 }

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java

@@ -245,6 +245,21 @@ public class WxInstrumentSaveReq {
      */
     private List<Integer> newModeIdList;
 
+    /**
+     * 蓝牙连接中标题
+     */
+    private String we200BluetoothConnectingTitle;
+
+    /**
+     * 蓝牙连接中图片
+     */
+    private String we200BluetoothConnecting;
+
+    /**
+     * 蓝牙连接中文案
+     */
+    private String we200BluetoothConnectingContent;
+
     public Long getId() {
         return id;
     }
@@ -580,4 +595,28 @@ public class WxInstrumentSaveReq {
     public void setWe200IotVersionUpgrade(String we200IotVersionUpgrade) {
         this.we200IotVersionUpgrade = we200IotVersionUpgrade;
     }
+
+    public String getWe200BluetoothConnectingTitle() {
+        return we200BluetoothConnectingTitle;
+    }
+
+    public void setWe200BluetoothConnectingTitle(String we200BluetoothConnectingTitle) {
+        this.we200BluetoothConnectingTitle = we200BluetoothConnectingTitle;
+    }
+
+    public String getWe200BluetoothConnecting() {
+        return we200BluetoothConnecting;
+    }
+
+    public void setWe200BluetoothConnecting(String we200BluetoothConnecting) {
+        this.we200BluetoothConnecting = we200BluetoothConnecting;
+    }
+
+    public String getWe200BluetoothConnectingContent() {
+        return we200BluetoothConnectingContent;
+    }
+
+    public void setWe200BluetoothConnectingContent(String we200BluetoothConnectingContent) {
+        this.we200BluetoothConnectingContent = we200BluetoothConnectingContent;
+    }
 }

flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml

@@ -52,10 +52,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="we200IotVersion"    column="we200_iot_version"    />
         <result property="we200IotUpgradeData"    column="we200_iot_upgrade_data"    />
         <result property="we200IotVersionUpgrade"    column="we200_iot_version_upgrade"    />
+        <result property="we200BluetoothConnectingTitle"    column="we200_bluetooth_connecting_title"    />
+        <result property="we200BluetoothConnectingContent"    column="we200_bluetooth_connecting_content"    />
+        <result property="we200BluetoothConnecting"    column="we200_bluetooth_connecting"    />
     </resultMap>
 
     <sql id="selectWxInstrumentVo">
-        select id, name, type, model, banner, logo, serial, guarantee, daily_clock_credit, is_extra_clock, binding_credit, extra_clock_credit, start_time, end_time, mini_tag_ids, mini_tag_names, wecom_tag_ids, wecom_tag_names, nursing_time, iot_version, iot_upgrade_data, is_scan_code, is_purchase, shopping_appid, shopping_path, bluetooth_connecting_title, bluetooth_connecting_content,bluetooth_connecting, bluetooth_closed_title, bluetooth_closed_content, bluetooth_closed, bluetooth_connect_fail_title, bluetooth_connect_fail_content, bluetooth_connect_fail, iot_version_upgrade, sort_no, status, manual_code_binding, scan_code_binding, create_by, create_time, update_by, update_time, remark, we200_iot_version, we200_iot_upgrade_data, we200_iot_version_upgrade from wx_instrument
+        select id, name, type, model, banner, logo, serial, guarantee, daily_clock_credit, is_extra_clock, binding_credit, extra_clock_credit, start_time, end_time, mini_tag_ids, mini_tag_names, wecom_tag_ids, wecom_tag_names, nursing_time, iot_version, iot_upgrade_data, is_scan_code, is_purchase, shopping_appid, shopping_path, bluetooth_connecting_title, bluetooth_connecting_content,bluetooth_connecting, bluetooth_closed_title, bluetooth_closed_content, bluetooth_closed, bluetooth_connect_fail_title, bluetooth_connect_fail_content, bluetooth_connect_fail, iot_version_upgrade, sort_no, status, manual_code_binding, scan_code_binding, create_by, create_time, update_by, update_time, remark, we200_iot_version, we200_iot_upgrade_data, we200_iot_version_upgrade, we200_bluetooth_connecting_title, we200_bluetooth_connecting_content, we200_bluetooth_connecting from wx_instrument
     </sql>
 
     <select id="selectWxInstrumentList" parameterType="WxInstrument" resultMap="WxInstrumentResult">
@@ -102,6 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="we200IotVersion != null  and we200IotVersion != ''"> and we200_iot_version = #{we200IotVersion}</if>
             <if test="we200IotUpgradeData != null  and we200IotUpgradeData != ''"> and we200_iot_upgrade_data = #{we200IotUpgradeData}</if>
             <if test="we200IotVersionUpgrade != null  and we200IotVersionUpgrade != ''"> and we200_iot_version_upgrade = #{we200IotVersionUpgrade}</if>
+            <if test="we200BluetoothConnectingTitle != null  and we200BluetoothConnectingTitle != ''"> and we200_bluetooth_connecting_title = #{we200BluetoothConnectingTitle}</if>
+            <if test="we200BluetoothConnectingContent != null  and we200BluetoothConnectingContent != ''"> and we200_bluetooth_connecting_content = #{we200BluetoothConnectingContent}</if>
+            <if test="we200BluetoothConnecting != null  and we200BluetoothConnecting != ''"> and we200_bluetooth_connecting = #{we200BluetoothConnecting}</if>
         </where>
         order by create_time desc
     </select>
@@ -207,6 +213,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="we200IotVersion != null">we200_iot_version,</if>
             <if test="we200IotUpgradeData != null">we200_iot_upgrade_data,</if>
             <if test="we200IotVersionUpgrade != null">we200_iot_version_upgrade,</if>
+            <if test="we200BluetoothConnectingTitle != null">we200_bluetooth_connecting_title,</if>
+            <if test="we200BluetoothConnectingContent != null">we200_bluetooth_connecting_Content,</if>
+            <if test="we200BluetoothConnecting != null">we200_bluetooth_connecting,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null and name != ''">#{name},</if>
@@ -255,6 +264,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="we200IotVersion != null">#{we200IotVersion},</if>
             <if test="we200IotUpgradeData != null">#{we200IotUpgradeData},</if>
             <if test="we200IotVersionUpgrade != null">#{we200IotVersionUpgrade},</if>
+            <if test="we200BluetoothConnectingTitle != null">#{we200BluetoothConnectingTitle},</if>
+            <if test="we200BluetoothConnectingContent != null">#{we200BluetoothConnectingContent},</if>
+            <if test="we200BluetoothConnecting != null">#{we200BluetoothConnecting},</if>
          </trim>
     </insert>
 
@@ -307,6 +319,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="we200IotVersion != null">we200_iot_version = #{we200IotVersion},</if>
             <if test="we200IotUpgradeData != null">we200_iot_upgrade_data = #{we200IotUpgradeData},</if>
             <if test="we200IotVersionUpgrade != null">we200_iot_version_upgrade = #{we200IotVersionUpgrade},</if>
+            <if test="we200BluetoothConnectingTitle != null">we200_bluetooth_connecting_title = #{we200BluetoothConnectingTitle},</if>
+            <if test="we200BluetoothConnectingContent != null">we200_bluetooth_connecting_content = #{we200BluetoothConnectingContent},</if>
+            <if test="we200BluetoothConnecting != null">we200_bluetooth_connecting = #{we200BluetoothConnecting},</if>
         </trim>
         where id = #{id}
     </update>

flossom-ui/src/views/system/instrument/index.vue

@@ -895,6 +895,47 @@
 						placeholder="请输入蓝牙断开连接文案"
 					/>
 				</el-form-item>
+        <!--  we200蓝牙链接图片      -->
+        <el-form-item
+          v-if="form.type == 2 && form.model === 'WL200'"
+          label="we200蓝牙连接中图片"
+          prop="we200BluetoothConnecting"
+        >
+          <el-upload
+            class="upload-demo"
+            :action="uploadUrl"
+            :headers="headers"
+            :limit="1"
+            :on-exceed="we200BluetoothConnectUploadExceed"
+            :on-success="we200BluetoothConnectUploadSuccess"
+            :on-error="uploadError"
+            :file-list="we200BluetoothConnectFile.fileList"
+            accept=".png,.jpg,.jpeg,.gif,.mpeg,.mp4,.avi,.mov,.wmv"
+          >
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传一个文件</div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item
+          v-if="form.type == 2 && form.model === 'WL200'"
+          label="we200蓝牙连接中标题"
+          prop="we200BluetoothConnectingTitle"
+        >
+          <el-input
+            v-model="form.we200BluetoothConnectingTitle"
+            placeholder="请输入we200蓝牙连接中标题"
+          />
+        </el-form-item>
+        <el-form-item
+          v-if="form.type == 2 && form.model === 'WL200'"
+          label="we200蓝牙连接中文案"
+          prop="we200BluetoothConnectingContent"
+        >
+          <el-input
+            v-model="form.we200BluetoothConnectingContent"
+            placeholder="请输入we200蓝牙连接中文案"
+          />
+        </el-form-item>
 				<el-form-item v-if="form.type == 2" label="IOT版本" prop="iotVersion">
 					<div style="position: relative">
 						<el-tooltip
@@ -962,7 +1003,7 @@
 				</el-form-item>
 				<!--  WE200      -->
 				<el-form-item
-					v-if="form.type == 2"
+					v-if="form.type == 2 && form.model === 'WL200'"
 					label="WE200IOT版本"
 					prop="we200IotVersion"
 				>
@@ -982,7 +1023,7 @@
 					/>
 				</el-form-item>
 				<el-form-item
-					v-if="form.type == 2"
+					v-if="form.type === 2 && form.model === 'WL200'"
 					label="WE200IOT升级数据文件"
 					prop="we200IotUpgradeData"
 				>
@@ -1011,7 +1052,7 @@
 					</el-upload>
 				</el-form-item>
 				<el-form-item
-					v-if="form.type == 2"
+					v-if="form.type == 2 && form.model === 'WL200'"
 					label="WE200IOT版本升级介绍"
 					prop="we200IotVersionUpgrade"
 				>
@@ -1429,6 +1470,11 @@ export default {
 				uploadHide: false,
 				fileList: [],
 			},
+      /* 蓝牙连接文件 */
+      we200BluetoothConnectFile: {
+        uploadHide: false,
+        fileList: [],
+      },
 			/* 小程序可见标签 */
 			miniProgramTag: {
 				instrumentId: null,
@@ -1652,6 +1698,9 @@ export default {
 				we200IotVersion: null,
 				we200IotUpgradeData: null,
 				we200IotVersionUpgrade: null,
+        we200BluetoothConnecting: null,
+        we200BluetoothConnectingTitle: null,
+        we200BluetoothConnectingContent: null,
 			}
 			/* 仪器封面 */
 			this.bannerFile = {
@@ -1844,6 +1893,15 @@ export default {
 						],
 					}
 				}
+        /* we200蓝牙连接文件 */
+        if (this.form.we200BluetoothConnecting != null) {
+          this.we200BluetoothConnectFile = {
+            uploadHide: true,
+            fileList: [
+              { name: 'we200蓝牙连接文件', url: this.form.we200BluetoothConnecting },
+            ],
+          }
+        }
 				// 额外打卡时间
 				if (this.form.isExtraClock == 1) {
 					this.form.extraClockTimeRange = response.data.extraClockTimeRange
@@ -2031,7 +2089,7 @@ export default {
 			if (response.code == 200) {
 				this.form.serial = response.data.url
 			} else {
-				this.$message.error('图片插入失败')
+				this.$message.error('文件上传失败')
 			}
 		},
 		/** 手写绑定介绍视频/图片 操作 */
@@ -2042,7 +2100,7 @@ export default {
 			if (response.code == 200) {
 				this.form.manualCodeBinding = response.data.url
 			} else {
-				this.$message.error('图片插入失败')
+				this.$message.error('文件上传失败')
 			}
 		},
 		/** 扫码绑定介绍视频/图片 操作 */
@@ -2053,7 +2111,7 @@ export default {
 			if (response.code == 200) {
 				this.form.scanCodeBinding = response.data.url
 			} else {
-				this.$message.error('图片插入失败')
+				this.$message.error('文件上传失败')
 			}
 		},
 		/*  iot升级数据文件 */
@@ -2064,7 +2122,7 @@ export default {
 			if (response.code == 200) {
 				this.form.iotUpgradeData = response.data.url
 			} else {
-				this.$message.error('图片插入失败')
+				this.$message.error('文件上传失败')
 			}
 		},
 		/*  iot升级数据文件 */
@@ -2075,7 +2133,7 @@ export default {
 			if (response.code == 200) {
 				this.form.we200IotUpgradeData = response.data.url
 			} else {
-				this.$message.error('图片插入失败')
+				this.$message.error('文件上传失败')
 			}
 		},
 		/*  蓝牙连接图片 */
@@ -2086,7 +2144,7 @@ export default {
 			if (response.code == 200) {
 				this.form.bluetoothConnecting = response.data.url
 			} else {
-				this.$message.error('图片插入失败')
+				this.$message.error('文件上传失败')
 			}
 		},
 		/*  蓝牙断开连接图片 */
@@ -2097,7 +2155,7 @@ export default {
 			if (response.code == 200) {
 				this.form.bluetoothConnectFail = response.data.url
 			} else {
-				this.$message.error('图片插入失败')
+				this.$message.error('文件上传失败')
 			}
 		},
 		/*  蓝牙断开连接图片 */
@@ -2108,9 +2166,20 @@ export default {
 			if (response.code == 200) {
 				this.form.bluetoothClosed = response.data.url
 			} else {
-				this.$message.error('图片插入失败')
+				this.$message.error('文件上传失败')
 			}
 		},
+    /*  we200蓝牙连接图片 */
+    we200BluetoothConnectUploadExceed(files, fileList) {
+      this.$message.warning(`您已上传了文件，如需更换，请先删除原上传的文件`)
+    },
+    we200BluetoothConnectUploadSuccess(response, file) {
+      if (response.code == 200) {
+        this.form.we200BluetoothConnecting = response.data.url
+      } else {
+        this.$message.error('文件上传失败')
+      }
+    },
 		/* 是否开启额外打卡奖励 */
 		isExtraClockChange() {
 			if (this.form.isExtraClock == 0) {
@@ -2152,6 +2221,16 @@ export default {
 				}
 				this.mode.modeIdsOptions = response.data
 			})
+      this.form.we200IotVersion = null;
+      this.form.we200IotUpgradeData = null;
+      this.form.we200IotVersionUpgrade = null;
+      this.we200BluetoothConnectFile = {
+        uploadHide: false,
+          fileList: [],
+      },
+      this.form.we200BluetoothConnecting = null;
+      this.form.we200BluetoothConnectingTitle = null;
+      this.form.we200BluetoothConnectingContent = null;
 		},
 		modelChange() {
 			/* 模式选项 */
@@ -2165,6 +2244,17 @@ export default {
 				}
 				this.mode.modeIdsOptions = response.data
 			})
+
+      this.form.we200IotVersion = null;
+      this.form.we200IotUpgradeData = null;
+      this.form.we200IotVersionUpgrade = null;
+      this.we200BluetoothConnectFile= {
+        uploadHide: false,
+          fileList: [],
+      },
+      this.form.we200BluetoothConnecting = null;
+      this.form.we200BluetoothConnectingTitle = null;
+      this.form.we200BluetoothConnectingContent = null;
 		},
 		/* 是否购买切换 */
 		isPurchaseChang() {