From cdfecf607ff29f08cd8e02e56304edc2091728e2 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Tue, 16 Jan 2024 17:42:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E5=99=A8=E7=AE=A1=E7=90=86-=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BB=AA=E5=99=A8=E7=BB=91=E5=AE=9A=E7=A7=AF=E5=88=86?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E5=9C=BA=E6=99=AF=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/WxInstrument.java | 41 ++++++------------- .../core/domain/req/WxInstrumentSaveReq.java | 38 ++++++----------- .../resources/mapper/WxInstrumentMapper.xml | 16 +++----- .../src/views/system/instrument/index.vue | 20 ++++++++- 4 files changed, 50 insertions(+), 65 deletions(-) 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 6ef167c..1f56092 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 @@ -72,6 +72,11 @@ public class WxInstrument extends BaseEntity { */ private Long isExtraClock; + /** + * 仪器绑定积分 + */ + private Integer bindingCredit; + /** * 额外打卡时间开始 */ @@ -104,16 +109,6 @@ public class WxInstrument extends BaseEntity { */ private String wecomTagNames; - /** - * 场景ID(xxxx,xxxx,xxx) - */ - private String sceneIds; - - /** - * 场景名称(xxx,xxx,xxx) - */ - private String sceneNames; - /** * 护理时长 */ @@ -313,22 +308,6 @@ public class WxInstrument extends BaseEntity { 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(LocalTime nursingTime) { this.nursingTime = nursingTime; } @@ -449,6 +428,14 @@ public class WxInstrument extends BaseEntity { this.isExtraClock = isExtraClock; } + public Integer getBindingCredit() { + return bindingCredit; + } + + public void setBindingCredit(Integer bindingCredit) { + this.bindingCredit = bindingCredit; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -468,8 +455,6 @@ public class WxInstrument extends BaseEntity { .append("miniTagNames", getMiniTagNames()) .append("wecomTagIds", getWecomTagIds()) .append("wecomTagNames", getWecomTagNames()) - .append("sceneIds", getSceneIds()) - .append("sceneNames", getSceneNames()) .append("nursingTime", getNursingTime()) .append("iotVersion", getIotVersion()) .append("iotUpgradeData", getIotUpgradeData()) 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 c7638d4..009b2f6 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 @@ -88,6 +88,10 @@ public class WxInstrumentSaveReq { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private List extraClockTimeRange; + /** + * 仪器绑定积分 + */ + private Integer bindingCredit; /** * 标签ID(xxxx,xxxx,xxx) @@ -99,16 +103,6 @@ public class WxInstrumentSaveReq { */ private String wecomTagIds; - /** - * 场景ID(xxxx,xxxx,xxx) - */ - private String sceneIds; - - /** - * 场景名称(xxx,xxx,xxx) - */ - private String sceneNames; - /** * 护理时长 */ @@ -285,22 +279,6 @@ public class WxInstrumentSaveReq { this.extraClockTimeRange = extraClockTimeRange; } - public String getSceneIds() { - return sceneIds; - } - - public void setSceneIds(String sceneIds) { - this.sceneIds = sceneIds; - } - - public String getSceneNames() { - return sceneNames; - } - - public void setSceneNames(String sceneNames) { - this.sceneNames = sceneNames; - } - public LocalTime getNursingTime() { return nursingTime; } @@ -436,4 +414,12 @@ public class WxInstrumentSaveReq { public void setWecomTagIds(String wecomTagIds) { this.wecomTagIds = wecomTagIds; } + + public Integer getBindingCredit() { + return bindingCredit; + } + + public void setBindingCredit(Integer bindingCredit) { + this.bindingCredit = bindingCredit; + } } 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 6df2ceb..0c6403d 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 @@ -16,14 +16,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - - @@ -46,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, name, type, model, banner, logo, serial, guarantee, daily_clock_credit, is_extra_clock, 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, is_scan_code, is_purchase, 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 + 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, 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