From 2be6f4497960e08b0221af71716bec2c8cdbd19a Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 18 十一月 2021 12:10:08 +0800
Subject: [PATCH] 物业宣传修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyPublicityApi.java | 3 ++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyPublicityMapper.xml | 2 --
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyPublicityApi.java | 3 ++-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyPublicityVO.java | 4 ++--
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPropertyPublicityDO.java | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyPublicityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyPublicityApi.java
index bd452ac..3b24f86 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyPublicityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyPublicityApi.java
@@ -1,6 +1,7 @@
package com.panzhihua.applets.api;
import javax.annotation.Resource;
+import javax.validation.Valid;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -43,7 +44,7 @@
@ApiOperation(value = "分页物业宣传信息", response = ComPropertyPublicityVO.class)
@PostMapping("/page")
- public R pageComPropertyPublicity(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO) {
+ public R pageComPropertyPublicity(@RequestBody @Valid PageComPropertyPublicityDTO pageComPropertyPublicityDTO) {
if (isNull(pageComPropertyPublicityDTO.getCommunityId())) {
return R.fail("社区id不能为空");
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyPublicityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyPublicityVO.java
index 4614d5d..748181d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyPublicityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyPublicityVO.java
@@ -26,7 +26,7 @@
private String title;
@ApiModelProperty("宣传类型（0.其他 1.停水通知 2.停电通知 3.停气通知 4.物业公告 5.优秀业主）")
- private String publicityType;
+ private Integer publicityType;
@ApiModelProperty("其他类型自定义名称")
private String other;
@@ -35,7 +35,7 @@
private String cover;
@ApiModelProperty("内容形式（1.文章链接 2.自定义内容）")
- private String contentType;
+ private Integer contentType;
@ApiModelProperty("文章链接")
private String articleUrl;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyPublicityApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyPublicityApi.java
index 2bfa009..1c80e1c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyPublicityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyPublicityApi.java
@@ -1,6 +1,7 @@
package com.panzhihua.community_backstage.api;
import javax.annotation.Resource;
+import javax.validation.Valid;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -46,7 +47,7 @@
@ApiOperation(value = "分页物业宣传信息", response = ComPropertyPublicityVO.class)
@PostMapping("/page")
- public R pageComPropertyPublicity(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO) {
+ public R pageComPropertyPublicity(@RequestBody @Valid PageComPropertyPublicityDTO pageComPropertyPublicityDTO) {
LoginUserInfoVO loginUserInfo = getLoginUserInfo();
pageComPropertyPublicityDTO.setCommunityId(loginUserInfo.getCommunityId());
pageComPropertyPublicityDTO.setUserId(loginUserInfo.getUserId());
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPropertyPublicityDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPropertyPublicityDO.java
index 93d3134..9f6778f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPropertyPublicityDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPropertyPublicityDO.java
@@ -36,7 +36,7 @@
/**
* 宣传类型（0.其他 1.停水通知 2.停电通知 3.停气通知 4.物业公告 5.优秀业主
*/
- private String publicityType;
+ private Integer publicityType;
/**
* 其他类型自定义名称
@@ -51,7 +51,7 @@
/**
* 内容形式（1.文章链接 2.自定义内容）
*/
- private String contentType;
+ private Integer contentType;
/**
* 文章链接
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyPublicityMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyPublicityMapper.xml
index 721004a..954dbe8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyPublicityMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyPublicityMapper.xml
@@ -64,6 +64,4 @@
AND p.area_id = #{pageComPropertyPublicityDTO.villageId}
</if>
</select>
-
-
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1