314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

we200升级数据包

Browse Source
master
382696293@qq.com 2 years ago
parent bca678dfa2
commit 8544a48f99
5 changed files with 243 additions and 82 deletions
Show Stats Download Patch File Download Diff File

75
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java
Unescape Escape View File

@ -215,6 +215,21 @@ public class WxInstrument extends BaseEntity {
*/
private String scanCodeBinding;
/**
* we200iot版本
*/
private String we200IotVersion;
/**
* we200iot升级数据文件
*/
private String we200IotUpgradeData;
/**
* we200iot版本升级说明
*/
private String we200IotVersionUpgrade;
public void setId(Long id) {
this.id = id;
}
@ -527,45 +542,27 @@ public class WxInstrument extends BaseEntity {
this.bluetoothConnectFailContent = bluetoothConnectFailContent;
}
public String getWe200IotVersion() {
return we200IotVersion;
}
public void setWe200IotVersion(String we200IotVersion) {
this.we200IotVersion = we200IotVersion;
}
public String getWe200IotUpgradeData() {
return we200IotUpgradeData;
}
public void setWe200IotUpgradeData(String we200IotUpgradeData) {
this.we200IotUpgradeData = we200IotUpgradeData;
}
public String getWe200IotVersionUpgrade() {
return we200IotVersionUpgrade;
}
@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("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();
public void setWe200IotVersionUpgrade(String we200IotVersionUpgrade) {
this.we200IotVersionUpgrade = we200IotVersionUpgrade;
}
}

39
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java
Unescape Escape View File

@ -208,6 +208,21 @@ public class WxInstrumentSaveReq {
*/
private String scanCodeBinding;
/**
* we200iot版本
*/
private String we200IotVersion;
/**
* we200iot升级数据文件
*/
private String we200IotUpgradeData;
/**
* we200iot版本升级说明
*/
private String we200IotVersionUpgrade;
/**
* 初次护理介绍视频/图片
@ -541,4 +556,28 @@ public class WxInstrumentSaveReq {
public void setNewModeIdList(List<Integer> newModeIdList) {
this.newModeIdList = newModeIdList;
}
public String getWe200IotVersion() {
return we200IotVersion;
}
public void setWe200IotVersion(String we200IotVersion) {
this.we200IotVersion = we200IotVersion;
}
public String getWe200IotUpgradeData() {
return we200IotUpgradeData;
}
public void setWe200IotUpgradeData(String we200IotUpgradeData) {
this.we200IotUpgradeData = we200IotUpgradeData;
}
public String getWe200IotVersionUpgrade() {
return we200IotVersionUpgrade;
}
public void setWe200IotVersionUpgrade(String we200IotVersionUpgrade) {
this.we200IotVersionUpgrade = we200IotVersionUpgrade;
}
}

17
flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
Unescape Escape View File

@ -49,10 +49,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="we200IotVersion" column="we200_iot_version" />
<result property="we200IotUpgradeData" column="we200_iot_upgrade_data" />
<result property="we200IotVersionUpgrade" column="we200_iot_version_upgrade" />
</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 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 from wx_instrument
</sql>
<select id="selectWxInstrumentList" parameterType="WxInstrument" resultMap="WxInstrumentResult">
@ -96,6 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<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>
</where>
order by create_time desc
</select>
@ -198,6 +204,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<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>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null and name != ''">#{name},</if>
@ -243,6 +252,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="we200IotVersion != null">#{we200IotVersion},</if>
<if test="we200IotUpgradeData != null">#{we200IotUpgradeData},</if>
<if test="we200IotVersionUpgrade != null">#{we200IotVersionUpgrade},</if>
</trim>
</insert>
@ -292,6 +304,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<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>
</trim>
where id = #{id}
</update>

6
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
Unescape Escape View File

@ -80,6 +80,8 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
@Override
public List<WxInstrument> bindingInstrumentList() {
// TODO: 仪器隐藏？？？？
/* 绑定了的仪器 不受 "可见小程序标签/可见外部标签" 影响 */
return wxInstrumentMapper.selectBindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
}
@ -87,6 +89,8 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
public List<WxInstrument> unbindingInstrumentInfoList() {
List<WxInstrument> returnList = new ArrayList<>();
List<WxInstrument> wxInstrumentList = wxInstrumentMapper.selectUnbindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
// TODO: 仪器隐藏？？？？
/* 未绑定的仪器 受 "可见小程序标签/可见外部标签" 影响，需要用户拥有全部对应的标签才可见 */
if (wxInstrumentList != null && wxInstrumentList.size() > 0) {
// 用户拥有的标签
WxUserTag wxUserTag = new WxUserTag();
@ -134,6 +138,8 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
* @param serial 序列号
* @param serialImage 序列号图片
* @param isImmediatelyBinding 不立即绑定仪器，页面需要询问用户是否绑定
* <p>
* 绑定流程中仪器 不受 "可见小程序标签/可见外部标签" 影响
*/
@Override
@Transactional

188
flossom-ui/src/views/system/instrument/index.vue
Unescape Escape View File

@ -571,48 +571,6 @@
>
</el-time-picker>
</el-form-item>
<el-form-item v-if="form.type == 2" label="IOT版本" prop="iotVersion">
<div style="position: relative">
<el-tooltip
class="item"
effect="dark"
content="此项仅研发可以配置，其他用户勿操作"
placement="top-start"
>
<i class="iotVersion-absolute-info el-icon-info"></i>
</el-tooltip>
</div>
<el-input v-model="form.iotVersion" placeholder="请输入IOT版本" />
</el-form-item>
<el-form-item
v-if="form.type == 2"
label="IOT升级数据文件"
prop="iotUpgradeData"
>
<div style="position: relative">
<el-tooltip
class="item"
effect="dark"
content="此项仅研发可以配置，其他用户勿操作"
placement="top-start"
>
<i class="iotUpgradeData-absolute-info el-icon-info"></i>
</el-tooltip>
</div>
<el-upload
class="upload-demo"
:action="uploadUrl"
:headers="headers"
:limit="1"
:on-exceed="iotUpgradeUploadExceed"
:on-success="iotUpgradeUploadSuccess"
:on-error="uploadError"
:file-list="iotUpgradeFile.fileList"
>
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传一个文件</div>
</el-upload>
</el-form-item>
<el-form-item label="扫机身码" prop="isScanCode">
<el-switch
v-model="form.isScanCode"
@ -918,6 +876,48 @@
placeholder="请输入蓝牙断开连接文案"
/>
</el-form-item>
<el-form-item v-if="form.type == 2" label="IOT版本" prop="iotVersion">
<div style="position: relative">
<el-tooltip
class="item"
effect="dark"
content="此项仅研发可以配置，其他用户勿操作"
placement="top-start"
>
<i class="iotVersion-absolute-info el-icon-info"></i>
</el-tooltip>
</div>
<el-input v-model="form.iotVersion" placeholder="请输入IOT版本" />
</el-form-item>
<el-form-item
v-if="form.type == 2"
label="IOT升级数据文件"
prop="iotUpgradeData"
>
<div style="position: relative">
<el-tooltip
class="item"
effect="dark"
content="此项仅研发可以配置，其他用户勿操作"
placement="top-start"
>
<i class="iotUpgradeData-absolute-info el-icon-info"></i>
</el-tooltip>
</div>
<el-upload
class="upload-demo"
:action="uploadUrl"
:headers="headers"
:limit="1"
:on-exceed="iotUpgradeUploadExceed"
:on-success="iotUpgradeUploadSuccess"
:on-error="uploadError"
:file-list="iotUpgradeFile.fileList"
>
<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"
label="IOT版本升级介绍"
@ -939,6 +939,70 @@
:min-height="192"
/>
</el-form-item>
<!-- WE200 -->
<el-form-item v-if="form.type == 2" label="WE200IOT版本" prop="we200IotVersion">
<div style="position: relative">
<el-tooltip
class="item"
effect="dark"
content="此项仅研发可以配置，其他用户勿操作"
placement="top-start"
>
<i class="we200-iotVersion-absolute-info el-icon-info"></i>
</el-tooltip>
</div>
<el-input v-model="form.we200IotVersion" placeholder="请输入WE200IOT版本" />
</el-form-item>
<el-form-item
v-if="form.type == 2"
label="WE200IOT升级数据文件"
prop="we200IotUpgradeData"
>
<div style="position: relative">
<el-tooltip
class="item"
effect="dark"
content="此项仅研发可以配置，其他用户勿操作"
placement="top-start"
>
<i class="we200-iotUpgradeData-absolute-info el-icon-info"></i>
</el-tooltip>
</div>
<el-upload
class="upload-demo"
:action="uploadUrl"
:headers="headers"
:limit="1"
:on-exceed="we200IotUpgradeUploadExceed"
:on-success="we200IotUpgradeUploadSuccess"
:on-error="uploadError"
:file-list="we200IotUpgradeFile.fileList"
>
<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"
label="WE200IOT版本升级介绍"
prop="we200IotVersionUpgrade"
>
<div style="position: relative">
<el-tooltip
class="item"
effect="dark"
content="此项仅研发可以配置，其他用户勿操作"
placement="top-start"
>
<i class="we200-absolute-info el-icon-info"></i>
</el-tooltip>
</div>
<editor
v-model="form.we200IotVersionUpgrade"
placeholder="请输入内容"
:min-height="192"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -1278,6 +1342,11 @@ export default {
uploadHide: false,
fileList: [],
},
/* we200iot升级数据文件 */
we200IotUpgradeFile: {
uploadHide: false,
fileList: [],
},
/* 蓝牙连接文件 */
bluetoothConnectFile: {
uploadHide: false,
@ -1510,6 +1579,9 @@ export default {
introduceList: null,
modeIdsValue: [],
newModeIdList: [],
we200IotVersion: null,
we200IotUpgradeData: null,
we200IotVersionUpgrade: null,
}
/* 仪器封面 */
this.bannerFile = {
@ -1878,6 +1950,17 @@ export default {
this.$message.error('图片插入失败')
}
},
/* iot升级数据文件 */
we200IotUpgradeUploadExceed(files, fileList) {
this.$message.warning(`您已上传了文件，如需更换，请先删除原上传的文件`)
},
we200IotUpgradeUploadSuccess(response, file) {
if (response.code == 200) {
this.form.we200IotUpgradeData = response.data.url
} else {
this.$message.error('图片插入失败')
}
},
/* 蓝牙连接图片 */
bluetoothConnectUploadExceed(files, fileList) {
this.$message.warning(`您已上传了文件，如需更换，请先删除原上传的文件`)
@ -2351,4 +2434,25 @@ video {
left: -140px;
color: #FAAD14;
}
.we200-absolute-info {
position: absolute;
top: 10px;
left: -183px;
color: #FAAD14;
}
.we200-iotVersion-absolute-info {
position: absolute;
top: 10px;
left: -128px;
color: #FAAD14;
}
.we200-iotUpgradeData-absolute-info {
position: absolute;
top: 10px;
left: -184px;
color: #FAAD14;
}
</style>

Write Preview
Loading…
Cancel
Save