From a12e09a5bc73672dcd4665d35a1ef8c9d1c534b0 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 16 十月 2023 18:47:11 +0800
Subject: [PATCH] 修改三说会堂
---
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuide.java | 4 ++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 3 ++-
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml | 11 +++++++++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java | 3 +++
5 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java
index ecfe4a7..d4cca51 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java
@@ -47,5 +47,8 @@
@ApiModelProperty(value = "组件json数据")
private String jsonObject;
+ @ApiModelProperty(value = "是否在线 （0 不在线 1在线）")
+ private String isOnLine;
+
private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
index d3bd245..ae7dd15 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
@@ -62,5 +62,8 @@
@ApiModelProperty(value = "组件json数据")
private String jsonObject;
+ @ApiModelProperty(value = "是否在线 （0 不在线 1在线）")
+ private String isOnLine;
+
private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuide.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuide.java
index 311d0e4..d39604d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuide.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuide.java
@@ -77,6 +77,10 @@
@ApiModelProperty(value = "组件json数据")
private String jsonObject;
+
+ @ApiModelProperty(value = "是否在线 （0 不在线 1在线）")
+ private String isOnLine;
+
@TableField(exist = false)
private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml
index 8b524bf..facbed7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml
@@ -20,12 +20,14 @@
<result column="community_id" property="communityId" />
<result column="area_code" property="areaCode" />
<result column="json_object" property="jsonObject" />
+ <result column="is_on_line" property="isOnLine" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, title, content, classify, time_at, address, phone, lon, lat, create_at, create_by, update_at, update_by,community_id
+ id, title, content, classify, time_at, address, phone, lon, lat, create_at, create_by,
+ update_at, update_by,community_id,is_on_line
</sql>
@@ -41,7 +43,8 @@
phone,
create_at,
json_object,
- community_id
+ community_id,
+ is_on_line
from jinhui_com_act_work_guide
<where>
<if test='pageActWorkGuideDTO.classify != null'>
@@ -52,6 +55,9 @@
</if>
<if test='pageActWorkGuideDTO.title != null and pageActWorkGuideDTO.title.trim() != ""'>
and title like concat('%',#{pageActWorkGuideDTO.title},'%')
+ </if>
+ <if test='pageActWorkGuideDTO.isOnLine != null and pageActWorkGuideDTO.isOnLine != ""'>
+ and is_on_line=#{isOnLine}
</if>
</where>
order by update_at desc
@@ -68,6 +74,7 @@
phone,
create_at,
json_object,
+ is_on_line,
community_id
from jinhui_com_act_work_guide
where classify = #{classifyId}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 278d4b4..b1d9ac5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -257,7 +257,8 @@
*/
@PostMapping("detailuser")
public R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId) {
- return userService.detailUser(userId);
+// return userService.detailUser(userId);
+ return userService.getUserInfo(userId+"");
}
/**
--
Gitblit v1.7.1