q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jackson'

Browse Source
This commit is contained in:
Jerry Yan
2025-07-27 14:23:21 +08:00
parent 0ca7cd694e f8de4abd09
commit 9a6a90b58e
46 changed files with 805 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java
View File

@@ -1,6 +1,7 @@
package com.ycwl.basic.model.mobile.goods;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -42,6 +43,8 @@ public class GoodsDetailVO {
private Integer isFree;
private Integer parts;
private Integer sort;
@JsonProperty("sourceType")
public Integer getSourceType() {
return goodsType;
}

2
src/main/java/com/ycwl/basic/model/mobile/goods/VideoGoodsDetailVO.java
View File

@@ -1,6 +1,7 @@
package com.ycwl.basic.model.mobile.goods;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -56,6 +57,7 @@ public class VideoGoodsDetailVO {
private Integer width;
private BigDecimal duration;
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() {
if (slashPrice == null) {
return BigDecimal.ZERO;

3
src/main/java/com/ycwl/basic/model/mobile/order/IsBuyBatchRespVO.java
View File

@@ -1,5 +1,6 @@
package com.ycwl.basic.model.mobile.order;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -18,6 +19,7 @@ public class IsBuyBatchRespVO {
private BigDecimal couponPrice = BigDecimal.ZERO;
private BigDecimal slashPrice;
@JsonProperty("price")
public BigDecimal getPrice() {
if (origPrice == null) {
return BigDecimal.ZERO;
@@ -27,6 +29,7 @@ public class IsBuyBatchRespVO {
}
return origPrice.subtract(couponPrice);
}
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() {
if (slashPrice == null) {
return BigDecimal.ZERO;

3
src/main/java/com/ycwl/basic/model/mobile/order/IsBuyRespVO.java
View File

@@ -1,5 +1,6 @@
package com.ycwl.basic.model.mobile.order;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -17,6 +18,7 @@ public class IsBuyRespVO {
private BigDecimal couponPrice = BigDecimal.ZERO;
private BigDecimal slashPrice;
@JsonProperty("price")
public BigDecimal getPrice() {
if (origPrice == null) {
return BigDecimal.ZERO;
@@ -26,6 +28,7 @@ public class IsBuyRespVO {
}
return origPrice.subtract(couponPrice);
}
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() {
if (slashPrice == null) {
return BigDecimal.ZERO;

10
src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppStatisticsFunnelVO.java
View File

@@ -1,5 +1,6 @@
package com.ycwl.basic.model.mobile.statistic.resp;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -45,11 +46,13 @@ public class AppStatisticsFunnelVO {
private BigDecimal refundOfOrderAmount; // ro3
// 镜头检测游客数_扫码访问人数_转化率
@JsonProperty("csom_scaom")
public String getCsom_scaom() {
return "-"; // TODO: REAL
}
// 扫码访问人数_上传头像人数_转化率
@JsonProperty("scaom_ufom")
public String getScaom_ufom() {
if (uploadFaceOfMemberNum == 0 || scanCodeVisitorOfMemberNum == 0) {
return "0.00";
@@ -60,6 +63,7 @@ public class AppStatisticsFunnelVO {
.toString();
}
// 上传头像人数_推送订阅人数_转化率
@JsonProperty("ufom_pom")
public String getUfom_pom() {
if (pushOfMemberNum == 0 || uploadFaceOfMemberNum == 0) {
return "0.00";
@@ -70,6 +74,7 @@ public class AppStatisticsFunnelVO {
.toString();
}
// 推送订阅人数_生成视频人数_转化率
@JsonProperty("pom_cvom")
public String getPom_cvom() {
if (completeVideoOfMemberNum == 0 || pushOfMemberNum == 0) {
return "0.00";
@@ -80,6 +85,7 @@ public class AppStatisticsFunnelVO {
.toString();
}
// 生成视频人数_预览视频人数_转化率
@JsonProperty("cvom_pvom")
public String getCvom_pvom() {
if (previewVideoOfMemberNum == 0 || completeVideoOfMemberNum == 0) {
return "0.00";
@@ -90,6 +96,7 @@ public class AppStatisticsFunnelVO {
.toString();
}
// 预览视频人数_点击购买人数_转化率
@JsonProperty("pvom_cpom")
public String getPvom_cpom() {
if (clickOnPayOfMemberNum == 0 || previewVideoOfMemberNum == 0) {
return "0.00";
@@ -100,6 +107,7 @@ public class AppStatisticsFunnelVO {
.toString();
}
// 点击购买人数_支付订单人数_转化率
@JsonProperty("cpom_pom")
public String getCpom_pom() {
if (payOfMemberNum == 0 || clickOnPayOfMemberNum == 0) {
return "0.00";
@@ -112,6 +120,7 @@ public class AppStatisticsFunnelVO {
public BigDecimal payOfOrderAmount() {
return payOfOrderAmount;
}
@JsonProperty("payOfOrderAmount")
public String getPayOfOrderAmount() {
if (payOfOrderAmount == null) {
return "0.00";
@@ -121,6 +130,7 @@ public class AppStatisticsFunnelVO {
public BigDecimal refundOfOrderAmount() {
return refundOfOrderAmount;
}
@JsonProperty("refundOfOrderAmount")
public String getRefundOfOrderAmount() {
if (refundOfOrderAmount == null) {
return "0.00";

7
src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceConfigEntity.java
View File

@@ -1,6 +1,7 @@
package com.ycwl.basic.model.pc.device.entity;
import com.alibaba.fastjson.JSON;
import com.ycwl.basic.utils.JacksonUtil;
import com.fasterxml.jackson.core.type.TypeReference;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -73,10 +74,10 @@ public class DeviceConfigEntity {
return Collections.singletonList(new DeviceCropConfig());
}
if (StringUtils.startsWith(cropConfig, "{")) {
return Collections.singletonList(JSON.parseObject(cropConfig, DeviceCropConfig.class));
return Collections.singletonList(JacksonUtil.parseObject(cropConfig, DeviceCropConfig.class));
}
if (StringUtils.startsWith(cropConfig, "[")) {
return JSON.parseArray(cropConfig, DeviceCropConfig.class);
return JacksonUtil.parseObject(cropConfig, new TypeReference<List<DeviceCropConfig>>() {});
}
return Collections.singletonList(new DeviceCropConfig());
}

10
src/main/java/com/ycwl/basic/model/pc/faceDetectLog/entity/FaceDetectLog.java
View File

@@ -1,7 +1,7 @@
package com.ycwl.basic.model.pc.faceDetectLog.entity;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ycwl.basic.utils.JacksonUtil;
import com.fasterxml.jackson.core.type.TypeReference;
import com.aliyuncs.facebody.model.v20191230.SearchFaceRequest;
import com.aliyuncs.facebody.model.v20191230.SearchFaceResponse;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -54,7 +54,7 @@ public class FaceDetectLog {
}
public FaceDetectLog fillResponse(Object response) {
this.matchRawResult = JSONObject.toJSONString(response);
this.matchRawResult = JacksonUtil.toJSONString(response);
return this;
}
@@ -62,14 +62,14 @@ public class FaceDetectLog {
if (matchLocalRecord == null) {
return null;
}
return JSONArray.parseArray(matchLocalRecord, MatchLocalRecord.class);
return JacksonUtil.parseObject(matchLocalRecord, new TypeReference<List<MatchLocalRecord>>() {});
}
public void matchLocalRecord(List matchLocalRecord) {
if (matchLocalRecord == null) {
this.matchLocalRecord = null;
} else {
this.matchLocalRecord = JSONArray.toJSONString(matchLocalRecord);
this.matchLocalRecord = JacksonUtil.toJSONString(matchLocalRecord);
}
}

2
src/main/java/com/ycwl/basic/model/pc/order/entity/OrderEntity.java
View File

@@ -2,6 +2,7 @@ package com.ycwl.basic.model.pc.order.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -91,6 +92,7 @@ public class OrderEntity {
*/
private Date refundAt;
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() {
if (slashPrice == null) {
return BigDecimal.ZERO;

2
src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java
View File

@@ -1,6 +1,7 @@
package com.ycwl.basic.model.pc.order.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -88,6 +89,7 @@ public class OrderAppRespVO {
// 订单明细
private List<OrderItemVO> orderItemList;
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() {
if (slashPrice == null) {
return BigDecimal.ZERO;

2
src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java
View File

@@ -1,6 +1,7 @@
package com.ycwl.basic.model.pc.order.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycwl.basic.model.mobile.goods.GoodsDetailVO;
import com.ycwl.basic.model.pc.order.entity.OrderItemEntity;
import lombok.Data;
@@ -112,6 +113,7 @@ public class OrderRespVO {
private String scenicName;
private List<GoodsDetailVO> goodsList;
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() {
if (slashPrice == null) {
return BigDecimal.ZERO;

2
src/main/java/com/ycwl/basic/model/pc/video/resp/VideoRespVO.java
View File

@@ -1,6 +1,7 @@
package com.ycwl.basic.model.pc.video.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -62,6 +63,7 @@ public class VideoRespVO {
private Integer width;
private BigDecimal duration;
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() {
if (slashPrice == null) {
return BigDecimal.ZERO;

3
src/main/java/com/ycwl/basic/model/viid/entity/FacePositionObject.java
View File

@@ -1,5 +1,6 @@
package com.ycwl.basic.model.viid.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@Data
@@ -10,9 +11,11 @@ public class FacePositionObject {
private Integer ltY;
private Integer rbX;
private Integer rbY;
@JsonProperty("width")
public Integer getWidth(){
return rbX - ltX;
}
@JsonProperty("height")
public Integer getHeight(){
return rbY - ltY;
}