From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java | 69 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 17 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java
index dd4f919..c4e3023 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java
@@ -1,57 +1,92 @@
package com.doumee.dao.business.web.response;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.io.IOException;
/**
* @author T14
*/
@Data
+@ApiModel("楠戣璁板綍杩斿洖绫�")
public class MiniProgrammeDTO {
@ApiModelProperty("涓婚〉涓婚")
- private String projectName;
+ private String projectName = "";
@ApiModelProperty("鏈嶅姟鐢佃瘽")
- private String serverPhone;
+ private String serverPhone = "";
- @ApiModelProperty("鎶奸噾閲戦")
- private String rentDeposit;
+ @ApiModelProperty("鎶奸噾閲戦(鍏冿級")
+ private String rentDeposit = "";
@ApiModelProperty("钀ヤ笟鏃堕棿璧峰")
- private String businessStarttime;
+ private String businessStarttime = "";
@ApiModelProperty("钀ヤ笟鏃堕棿缁撴潫")
- private String businessEndtime;
+ private String businessEndtime = "";
@ApiModelProperty("鍏嶈垂楠戣鏃堕暱")
- private String freeRentTime;
+ private String freeRentTime = "";
@ApiModelProperty("婊¤冻棰勮鏈�灏忓��")
- private String warnMin;
+ private String warnMin = "";
@ApiModelProperty("婊¤冻棰勮鏈�澶у��")
- private String warnMax;
+ private String warnMax = "";
@ApiModelProperty("灏忕▼搴忛璀﹂拤閽夌兢鍦板潃")
- private String warnDingdingUrl;
+ private String warnDingdingUrl = "";
@ApiModelProperty("绉熻祦娴佺▼瑙嗛")
- private String rentTipsVideo;
+ private String rentTipsVideo = "";
@ApiModelProperty("楠戣溅閫氱煡鍐呭")
- private String rentNotice;
+ private String rentNotice = "";
@ApiModelProperty("鏄惁鍋滄鏈嶅姟")
- private String isStopServe;
+ private String isStopServe = "";
@ApiModelProperty("鍋滄鏈嶅姟鎻愮ず")
- private String stopServeTips;
-
+ private String stopServeTips = "";
@ApiModelProperty("鍋滄鏈嶅姟寮�濮�")
- private String stopServeStarttime;
+ private String stopServeStarttime = "";
@ApiModelProperty("鍋滄鏈嶅姟缁撴潫")
- private String stopServeEndtime;
+ private String stopServeEndtime = "";
+
+ @ApiModelProperty("鍋滄鏈嶅姟缁撴潫")
+ private String leaseNotice = "";
+
+ @ApiModelProperty("鍋滄鏈嶅姟缁撴潫")
+ private String leaseNoticeUrl = "";
+
+ /**
+ * 瀵硅薄椹煎嘲灞炴�ц浆涓嬪垝绾�
+ * @param object
+ * @return
+ * @throws JsonProcessingException
+ */
+ public static String toUnderlineJSONString(Object object) throws JsonProcessingException {
+ ObjectMapper mapper = new ObjectMapper();
+ mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+ mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+ String reqJson = mapper.writeValueAsString(object);
+ return reqJson;
+ }
+
+
+ public static <T> T toSnakeObject(String json, Class<T> clazz) throws IOException {
+ ObjectMapper mapper = new ObjectMapper();
+ mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+ T reqJson = mapper.readValue(json, clazz);
+ return reqJson;
+ }
}
--
Gitblit v1.9.3