Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj

Browse Source
This commit is contained in:
xiezhijun
2021-08-20 15:58:09 +08:00
parent ad3b5be706 5a52f706df
commit a5a0da6cd2
18 changed files with 1184 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerPhysicalSigns.java
View File

@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.stdiet.common.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -62,7 +63,7 @@ public class SysCustomerPhysicalSigns {
* 客户体重（斤）
*/
@Excel(name = "客户体重", readConverterExp = "斤=")
private Integer weight;
private BigDecimal weight;
/**
* 客户病史体征id

7
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserInfo.java
View File

@ -1,9 +1,11 @@
package com.stdiet.custom.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.stdiet.common.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
@ -28,6 +30,11 @@ public class SysWxUserInfo {
private Integer age;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
private BigDecimal weight;
/**
* 昵称
*/

45
stdiet-custom/src/main/java/com/stdiet/custom/dto/response/VideoResponse.java
View File

@ -7,6 +7,7 @@ import lombok.Data;
import java.io.Serializable;
@Data
public class VideoResponse implements Serializable {
private static final long serialVersionUID = 1L;
@ -26,47 +27,11 @@ public class VideoResponse implements Serializable {
// 播放等级
private Integer playLevel;
public void setPlayLevel(Integer playLevel) {
this.playLevel = playLevel;
}
public Integer getPlayLevel() {
return playLevel;
}
public String getVideoId() {
return videoId;
}
public void setVideoId(String videoId) {
this.videoId = videoId;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getCoverUrl() {
if (StringUtils.isNotEmpty(this.coverUrl)) {
return AliyunOSSUtils.generatePresignedUrl(this.coverUrl);
public void setCoverUrl(String coverUrl) {
if (StringUtils.isNotEmpty(coverUrl)) {
this.coverUrl = AliyunOSSUtils.generatePresignedUrl(coverUrl);
} else {
return AliyunVideoUtils.getVideoCoverUrl(this.videoId);
this.coverUrl = AliyunVideoUtils.getVideoCoverUrl(this.videoId);
}
}
public void setCoverUrl(String coverUrl) {
this.coverUrl = coverUrl;
}
public Integer getPlayNum() {
return playNum;
}
public void setPlayNum(Integer playNum) {
this.playNum = playNum;
}
}

2
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerHeatStatisticsServiceImpl.java
View File

@ -208,7 +208,7 @@ public class SysCustomerHeatStatisticsServiceImpl implements ISysCustomerHeatSta
sysCustomerHealthy.setName(sysCustomerPhysicalSigns.getName());
sysCustomerHealthy.setTall(sysCustomerPhysicalSigns.getTall());
sysCustomerHealthy.setAge(sysCustomerPhysicalSigns.getAge().longValue());
sysCustomerHealthy.setWeight(BigDecimal.valueOf(sysCustomerPhysicalSigns.getWeight()));
sysCustomerHealthy.setWeight(sysCustomerPhysicalSigns.getWeight());
}
return sysCustomerHealthy;
}