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/entity/WxInstrumentInstructions.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentInstructions.java new file mode 100644 index 0000000..c8aba42 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentInstructions.java @@ -0,0 +1,98 @@ +package com.flossom.common.core.domain.entity; + +import com.flossom.common.core.annotation.Excel; +import com.flossom.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 仪器说明书对象 wx_instrument_instructions + * + * @author flossom + * @date 2024-01-16 + */ +public class WxInstrumentInstructions extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * $column.columnComment + */ + private Long id; + + /** + * 设备id + */ + @Excel(name = "设备id") + private Long instrumentId; + + /** + * 说明书名称 + */ + @Excel(name = "说明书名称") + private String name; + + /** + * 说明书链接 + */ + @Excel(name = "说明书链接") + private String link; + + /** + * 状态(0正常 1停用) + */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private Long status; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setInstrumentId(Long instrumentId) { + this.instrumentId = instrumentId; + } + + public Long getInstrumentId() { + return instrumentId; + } + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setLink(String link) { + this.link = link; + } + + public String getLink() { + return link; + } + + public void setStatus(Long status) { + this.status = status; + } + + public Long getStatus() { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("instrumentId", getInstrumentId()) + .append("name", getName()) + .append("link", getLink()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .toString(); + } +} 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/java/com/flossom/common/core/mapper/WxInstrumentInstructionsMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentInstructionsMapper.java new file mode 100644 index 0000000..7a1b4e0 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentInstructionsMapper.java @@ -0,0 +1,62 @@ +package com.flossom.common.core.mapper; + +import com.flossom.common.core.domain.entity.WxInstrumentInstructions; + +import java.util.List; + + +/** + * 仪器说明书Mapper接口 + * + * @author flossom + * @date 2024-01-16 + */ +public interface WxInstrumentInstructionsMapper { + /** + * 查询仪器说明书 + * + * @param id 仪器说明书主键 + * @return 仪器说明书 + */ + public WxInstrumentInstructions selectWxInstrumentInstructionsById(Long id); + + /** + * 查询仪器说明书列表 + * + * @param wxInstrumentInstructions 仪器说明书 + * @return 仪器说明书集合 + */ + public List selectWxInstrumentInstructionsList(WxInstrumentInstructions wxInstrumentInstructions); + + /** + * 新增仪器说明书 + * + * @param wxInstrumentInstructions 仪器说明书 + * @return 结果 + */ + public int insertWxInstrumentInstructions(WxInstrumentInstructions wxInstrumentInstructions); + + /** + * 修改仪器说明书 + * + * @param wxInstrumentInstructions 仪器说明书 + * @return 结果 + */ + public int updateWxInstrumentInstructions(WxInstrumentInstructions wxInstrumentInstructions); + + /** + * 删除仪器说明书 + * + * @param id 仪器说明书主键 + * @return 结果 + */ + public int deleteWxInstrumentInstructionsById(Long id); + + /** + * 批量删除仪器说明书 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWxInstrumentInstructionsByIds(Long[] ids); +} diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentInstructionsMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentInstructionsMapper.xml new file mode 100644 index 0000000..7cf35ab --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentInstructionsMapper.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + select id, instrument_id, name, link, status, create_by, create_time from wx_instrument_instructions + + + + + + + + insert into wx_instrument_instructions + + instrument_id, + name, + link, + status, + create_by, + create_time, + + + #{instrumentId}, + #{name}, + #{link}, + #{status}, + #{createBy}, + #{createTime}, + + + + + update wx_instrument_instructions + + instrument_id = #{instrumentId}, + name = #{name}, + link = #{link}, + status = #{status}, + create_by = #{createBy}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from wx_instrument_instructions where id = #{id} + + + + delete from wx_instrument_instructions where id in + + #{id} + + + \ No newline at end of file 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