From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期五, 08 九月 2023 11:16:35 +0800 Subject: [PATCH] 优化 --- ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 99 insertions(+), 8 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java index 206eee6..fe4001a 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java +++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java @@ -1,14 +1,16 @@ package com.ycl.entity.caseHandler; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.Version; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ycl.vo.casePool.ViolationsVO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.*; + +import java.io.Serializable; +import java.time.LocalDateTime; /** * <p> @@ -24,6 +26,7 @@ @Builder @AllArgsConstructor @NoArgsConstructor +@ApiModel(value = "妗堜欢鍩烘湰淇℃伅") public class BaseCase implements Serializable { private static final long serialVersionUID = 1L; @@ -32,113 +35,201 @@ * id */ @TableId(value = "id", type = IdType.AUTO) - private Integer id; + @ApiModelProperty(value = "id") + private Long id; /** * 浜嬩欢缂栧彿 */ @TableField("code") + @ApiModelProperty(value = "浜嬩欢缂栧彿") private String code; /** * 浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏) */ @TableField("event_source") + @ApiModelProperty(value = "浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏)") private Integer eventSource; /** * 闂绫诲埆锛�1-杩濊 2-杩濆缓锛� */ @TableField("category") + @ApiModelProperty(value = "闂绫诲埆锛�1-杩濊 2-杩濆缓锛�") private Integer category; + /** + * 闂绫诲埆鏂囨湰 + */ + @TableField(value = "category_text", exist = false) + @ApiModelProperty(value = "闂绫诲埆鏂囨湰") + private String categoryText; /** * 鎵�灞炶閬� */ @TableField("street_id") + @ApiModelProperty(value = "鎵�灞炶閬�") private Integer streetId; + /** + * 鎵�灞炶閬撴枃鏈� + */ + @TableField(value = "street_text", exist = false) + @ApiModelProperty(value = "鎵�灞炵ぞ鍖哄悕绉�") + private String streetText; /** * 鎵�灞炵ぞ鍖� */ @TableField("community_id") + @ApiModelProperty(value = "鎵�灞炵ぞ鍖�") private Integer communityId; + + /** + * 鎵�灞炵ぞ鍖烘枃鏈� + */ + @TableField(value = "community_text", exist = false) + @ApiModelProperty(value = "鎵�灞炵ぞ鍖烘枃鏈�") + private String communityText; /** * 鎶ヨ鐐逛綅 浜嬪彂鍦扮偣 */ @TableField("site") + @ApiModelProperty(value = "鎶ヨ鐐逛綅 浜嬪彂鍦扮偣") private String site; /** * 瀹氫綅淇℃伅 */ @TableField("longitude") + @ApiModelProperty(value = "瀹氫綅淇℃伅") private Double longitude; /** * 瀹氫綅-绾害 */ @TableField("latitude") + @ApiModelProperty(value = "瀹氫綅-绾害") private Double latitude; /** * 鎶ヨ鏃堕棿 */ @TableField("alarm_time") + @ApiModelProperty(value = "鎶ヨ鏃堕棿") private LocalDateTime alarmTime; /** * 鐧昏浜� */ @TableField("create_user") - private Integer createUser; + @ApiModelProperty(value = "鐧昏浜�") + private Long createUser; + + /** + * 鐧昏浜烘枃鏈� + */ + @TableField(value = "create_user_text", exist = false) + @ApiModelProperty(value = "鐧昏浜烘枃鏈�") + private String createUserText; + /** * 澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴) */ @TableField("state") + @ApiModelProperty(value = "澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴)") private Integer state; /** * 澶勭悊鎰忚 */ @TableField("handling_opinion") + @ApiModelProperty(value = "澶勭悊鎰忚") private String handlingOpinion; /** * 澶囨敞 */ @TableField("remark") + @ApiModelProperty(value = "澶囨敞") private String remark; /** * 瀹℃牳鎰忚 */ @TableField("audit_opinion") + @ApiModelProperty(value = "瀹℃牳鎰忚") private String auditOpinion; /** * 缁撴鎰忚 */ @TableField("final_opinion") + @ApiModelProperty(value = "缁撴鎰忚") private String finalOpinion; /** * 鍒涘缓鏃堕棿 */ @TableField("create_time") + @ApiModelProperty(value = "鍒涘缓鏃堕棿") private LocalDateTime createTime; /** * 甯傚钩鍙扮紪鐮� */ @TableField("task_code") + @ApiModelProperty(value = "甯傚钩鍙扮紪鐮�") private String taskCode; + + + /** + * 甯傚钩鍙扮紪鐮� + */ + @TableField("pic") + @ApiModelProperty(value = "妗堜欢涓婃姤鍥剧墖") + private String url; /** * 缁撴潫鏃堕棿 */ @TableField("close_time") + @ApiModelProperty(value = "缁撴潫鏃堕棿") private LocalDateTime closeTime; + + @TableField(value = "grid_id") + @ApiModelProperty(value = "缃戞牸id") + private Long gridId; + + /** + * 杩濊浜嬩欢 + */ + @TableField(value = "violations", exist = false) + @ApiModelProperty(value = "杩濊浜嬩欢") + private ViolationsVO violationsVO; + + /** + * 杩濆缓浜嬩欢 + */ + @TableField(value = "illegalBuilding", exist = false) + @ApiModelProperty(value = "杩濆缓浜嬩欢") + private IllegalBuilding illegalBuilding; + + /** + * 璋冨害淇℃伅 + */ + @TableField(value = "dispatchInfo", exist = false) + @ApiModelProperty(value = "璋冨害淇℃伅") + private DispatchInfo dispatchInfo; + + @TableField("pic") + @ApiModelProperty(value = "鍥剧墖") + private String pic; + + @TableField("media") + @ApiModelProperty(value = "瑙嗛") + private String media; + } \ No newline at end of file -- Gitblit v1.8.0