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 index e365cfc..15e458e 100644 --- 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 @@ -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; } } diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java index 71dac62..efb29a3 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java @@ -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 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; + } } 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 index a288dfa..9b86309 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml @@ -49,10 +49,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - 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 @@ -198,6 +204,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, remark, + we200_iot_version, + we200_iot_upgrade_data, + we200_iot_version_upgrade, #{name}, @@ -243,6 +252,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, + #{we200IotVersion}, + #{we200IotUpgradeData}, + #{we200IotVersionUpgrade}, @@ -292,6 +304,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + we200_iot_version = #{we200IotVersion}, + we200_iot_upgrade_data = #{we200IotUpgradeData}, + we200_iot_version_upgrade = #{we200IotVersionUpgrade}, where id = #{id} diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java index 371bb80..095af44 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java @@ -80,6 +80,8 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { @Override public List bindingInstrumentList() { + // TODO: 仪器隐藏???? + /* 绑定了的仪器 不受 "可见小程序标签/可见外部标签" 影响 */ return wxInstrumentMapper.selectBindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); } @@ -87,6 +89,8 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { public List unbindingInstrumentInfoList() { List returnList = new ArrayList<>(); List 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 不立即绑定仪器,页面需要询问用户是否绑定 + *

+ * 绑定流程中仪器 不受 "可见小程序标签/可见外部标签" 影响 */ @Override @Transactional diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue index 4f63d37..a38995b 100644 --- a/flossom-ui/src/views/system/instrument/index.vue +++ b/flossom-ui/src/views/system/instrument/index.vue @@ -571,48 +571,6 @@ > - -

- - - -
- - - -
- - - -
- - 点击上传 -
只能上传一个文件
-
-
+ +
+ + + +
+ +
+ +
+ + + +
+ + 点击上传 +
只能上传一个文件
+
+
+ + +
+ + + +
+ +
+ +
+ + + +
+ + 点击上传 +
只能上传一个文件
+
+
+ +
+ + + +
+ +