diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java index f48aa85..c1e5f61 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java @@ -1,9 +1,12 @@ package com.flossom.common.core.domain.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.web.domain.BaseEntity; import java.time.LocalTime; +import java.util.Date; +import java.util.List; /** * 用户护理日志对象 wx_nursing_log @@ -57,9 +60,9 @@ public class WxNursingLog extends BaseEntity { private String modeName; /** - * 护理总时长 + * 护理时长 */ - @Excel(name = "护理总时长") + @Excel(name = "护理时长") private LocalTime nursingTime; /** @@ -78,6 +81,21 @@ public class WxNursingLog extends BaseEntity { @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private Long status; + /** + * 后管展示使用 + */ + private String headimg; + private String nickname; + private String mobile; + private String wecomTagListStr; + private String miniProgramTagListStr; + /* 用户注册时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date userMemberCreateTime; + /* 仪器绑定时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date instrumentBindingTime; + public void setId(Long id) { this.id = id; } @@ -174,4 +192,60 @@ public class WxNursingLog extends BaseEntity { public void setInstrumentType(Integer instrumentType) { this.instrumentType = instrumentType; } + + public String getHeadimg() { + return headimg; + } + + public void setHeadimg(String headimg) { + this.headimg = headimg; + } + + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getWecomTagListStr() { + return wecomTagListStr; + } + + public void setWecomTagListStr(String wecomTagListStr) { + this.wecomTagListStr = wecomTagListStr; + } + + public String getMiniProgramTagListStr() { + return miniProgramTagListStr; + } + + public void setMiniProgramTagListStr(String miniProgramTagListStr) { + this.miniProgramTagListStr = miniProgramTagListStr; + } + + public Date getUserMemberCreateTime() { + return userMemberCreateTime; + } + + public void setUserMemberCreateTime(Date userMemberCreateTime) { + this.userMemberCreateTime = userMemberCreateTime; + } + + public Date getInstrumentBindingTime() { + return instrumentBindingTime; + } + + public void setInstrumentBindingTime(Date instrumentBindingTime) { + this.instrumentBindingTime = instrumentBindingTime; + } } diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/UserNursingLogReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/UserNursingLogReq.java new file mode 100644 index 0000000..024b06e --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/UserNursingLogReq.java @@ -0,0 +1,178 @@ +package com.flossom.common.core.domain.req; + +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.List; + +/** + * 用户护理日志查询对象 + * + * @author flossom + * @date 2024-01-29 + */ +public class UserNursingLogReq { + + /** + * 多个用户编号,','隔开 + */ + private String userIdList; + + /** + * 单个会员昵称 + */ + private String nickname; + + /** + * 多个手机号码,','隔开 + */ + private String mobile; + + /** + * 省 + */ + private String provinceId; + + /** + * 市 + */ + private String cityId; + + /** + * 区 + */ + private String areaId; + + /** + * 外部标签ID列表 + */ + private List wecomTagList; + + /** + * 仪器ID列表 + */ + private List instrumentIdList; + + /** + * 小程序标签ID列表 + */ + private List miniProgramTagList; + + /** + * 模式ID列表 + */ + private List modeIdList; + + /** + * 最新护理时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private List updateTimeRange; + + /** + * 护理时长 + */ + @DateTimeFormat(pattern = "HH:mm:ss") + private List nursingTimeRange; + + + public UserNursingLogReq() { + } + + public String getUserIdList() { + return userIdList; + } + + public void setUserIdList(String userIdList) { + this.userIdList = userIdList; + } + + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public List getWecomTagList() { + return wecomTagList; + } + + public void setWecomTagList(List wecomTagList) { + this.wecomTagList = wecomTagList; + } + + public List getInstrumentIdList() { + return instrumentIdList; + } + + public void setInstrumentIdList(List instrumentIdList) { + this.instrumentIdList = instrumentIdList; + } + + public List getMiniProgramTagList() { + return miniProgramTagList; + } + + public void setMiniProgramTagList(List miniProgramTagList) { + this.miniProgramTagList = miniProgramTagList; + } + + public List getModeIdList() { + return modeIdList; + } + + public void setModeIdList(List modeIdList) { + this.modeIdList = modeIdList; + } + + public List getUpdateTimeRange() { + return updateTimeRange; + } + + public void setUpdateTimeRange(List updateTimeRange) { + this.updateTimeRange = updateTimeRange; + } + + public List getNursingTimeRange() { + return nursingTimeRange; + } + + public void setNursingTimeRange(List nursingTimeRange) { + this.nursingTimeRange = nursingTimeRange; + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/UserNursingLogVm.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/UserNursingLogVm.java new file mode 100644 index 0000000..c35a07d --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/UserNursingLogVm.java @@ -0,0 +1,100 @@ +package com.flossom.common.core.domain.req; + +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.List; + +/** + * 用户护理日志数据库查询对象 + * + * @author flossom + * @date 2024-01-29 + */ +public class UserNursingLogVm { + + /** + * 多个用户编号,','隔开 + */ + private List userIdList; + + /** + * 仪器ID列表 + */ + private List instrumentIdList; + + /** + * 小程序标签ID列表 + */ + private List miniProgramTagList; + + /** + * 模式ID列表 + */ + private List modeIdList; + + /** + * 最新护理时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private List updateTimeRange; + + /** + * 护理时长 + */ + @DateTimeFormat(pattern = "HH:mm:ss") + private List nursingTimeRange; + + + public UserNursingLogVm() { + } + + public List getUserIdList() { + return userIdList; + } + + public void setUserIdList(List userIdList) { + this.userIdList = userIdList; + } + + public List getInstrumentIdList() { + return instrumentIdList; + } + + public void setInstrumentIdList(List instrumentIdList) { + this.instrumentIdList = instrumentIdList; + } + + public List getMiniProgramTagList() { + return miniProgramTagList; + } + + public void setMiniProgramTagList(List miniProgramTagList) { + this.miniProgramTagList = miniProgramTagList; + } + + public List getModeIdList() { + return modeIdList; + } + + public void setModeIdList(List modeIdList) { + this.modeIdList = modeIdList; + } + + public List getUpdateTimeRange() { + return updateTimeRange; + } + + public void setUpdateTimeRange(List updateTimeRange) { + this.updateTimeRange = updateTimeRange; + } + + public List getNursingTimeRange() { + return nursingTimeRange; + } + + public void setNursingTimeRange(List nursingTimeRange) { + this.nursingTimeRange = nursingTimeRange; + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java index d444b26..bf3e83e 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java @@ -18,15 +18,15 @@ import java.time.LocalTime; public class WxNursingLogReq { /** - * 设备id + * 仪器id */ - @NotNull(message = "请选择设备") + @NotNull(message = "请选择仪器") private Long instrumentId; /** - * 设备名称 + * 仪器名称 */ - @NotNull(message = "请选择设备") + @NotNull(message = "请选择仪器") private String instrumentName; /** diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java index 95867fa..ed1c58e 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java @@ -5,13 +5,9 @@ import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.domain.entity.WxModeCombineInfo; import com.flossom.common.core.domain.entity.WxModeOpenSource; import com.flossom.common.core.domain.entity.WxModeServiceInfo; -import com.flossom.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import java.time.LocalTime; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -88,6 +84,12 @@ public class WxModeRet { @Excel(name = "模式时长", width = 30, dateFormat = "HH:mm:ss") private LocalTime modeTime; + /** + * 模式时长格式化 + */ + @Excel(name = "模式时长", width = 30) + private String modeTimeStr; + /** * 准备视频 */ @@ -330,4 +332,12 @@ public class WxModeRet { public void setIsNew(Integer isNew) { this.isNew = isNew; } + + public String getModeTimeStr() { + return modeTimeStr; + } + + public void setModeTimeStr(String modeTimeStr) { + this.modeTimeStr = modeTimeStr; + } } diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxNursingLogMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxNursingLogMapper.java index 968d90b..6cd9fe0 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxNursingLogMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxNursingLogMapper.java @@ -1,6 +1,7 @@ package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.WxNursingLog; +import com.flossom.common.core.domain.req.UserNursingLogVm; import java.util.List; @@ -27,6 +28,8 @@ public interface WxNursingLogMapper { */ public List selectWxNursingLogList(WxNursingLog wxNursingLog); + public List selectNursingLogListByVm(UserNursingLogVm userNursingLogVm); + /** * 新增用户护理日志 * diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml index 118b7b9..da19433 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +