From d66b069f8d609b9238efabd736b248f08dc8322c Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 30 四月 2021 13:09:35 +0800
Subject: [PATCH] bugfixed: 78759 78537 78791
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 40 +++++++++-----------
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 4 --
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java | 12 ++++++
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 1
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 3 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 2
10 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
index 52fb796..ac04a11 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -2,14 +2,10 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.neighbor.*;
-import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
-import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
-import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index 440f86e..a3b6b1e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -195,7 +195,7 @@
@ApiOperation(value = "家庭成员列表")
@GetMapping("listfamily")
- public R listFamily(@RequestParam(value = "pageNum") Long pageNum, @RequestParam("pageNum") Long pageSize) {
+ public R listFamily(@RequestParam(value = "pageNum") Long pageNum, @RequestParam("pageSize") Long pageSize) {
Long userId = this.getUserId();
return userService.listFamily(userId, pageNum, pageSize);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
index f978c39..3e1e5be 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -166,4 +166,7 @@
@ApiModelProperty("小程序首页是否显示公告(1.是 2.否)")
private Integer isTips;
+ @ApiModelProperty("是否已实名")
+ private Boolean isRealNamed;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 78939ac..28332d6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -216,7 +216,7 @@
@PostMapping("listfamily")
R listFamily(@RequestParam("userId")Long userId,
@RequestParam(value = "pageNum") Long pageNum,
- @RequestParam("pageNum") Long pageSize);
+ @RequestParam("pageSize") Long pageSize);
/**
* 新增家庭成员
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
index d98e2a1..f8a5e21 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -275,7 +275,7 @@
* @return 详情
*/
@PostMapping("infodynamic")
- public R infoYnamic(@RequestParam("id") Integer id){
+ public R infoYnamic(@RequestParam("id") Long id){
return comPbMemberService.infoYnamic(id);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java
index 5763b53..0bd1da2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java
@@ -69,4 +69,16 @@
IPage<PartyBuildingComPbDynVO> pageYnamic(Page page, @Param("partyBuildingComPbDynVO") PartyBuildingComPbDynVO partyBuildingComPbDynVO);
@Update("update com_pb_dyn set `status`=2 WHERE `status`=1 and TIMESTAMPDIFF(MINUTE,SYSDATE(),publish_at)<=0")
int timedTaskPartyBuildingStatus();
+ @Select("<script> " +
+ "SELECT\n" +
+ " distinct COUNT( u.id ) readingVolume,\n" +
+ " d.community_id, d.content, d.cover, d.cover_mode, d.create_at, d.create_by, d.dyn_type, d.id, d.publish_at, d.status, d.title, d.type, \n" +
+ " act.name as createByName " +
+ "FROM\n" +
+ "com_pb_dyn d LEFT JOIN com_act act ON d.community_id = act.community_id \n" +
+ "LEFT JOIN com_pb_dyn_user u ON d.id = u.dyn_id " +
+ "where d.id = #{id} " +
+ " group by d.id " +
+ "</script>")
+ PartyBuildingComPbDynVO selectVoById(@Param("id")Long id);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java
index 705c91d..6e3c047 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java
@@ -87,7 +87,7 @@
* @param id 动态主键
* @return 详情
*/
- R infoYnamic(Integer id);
+ R infoYnamic(Long id);
/**
* 分页查询党员动态
* @param partyBuildingComPbDynVO 查询参数
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
index 36d5144..6216b03 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -8,8 +8,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.user.SysUserVO;
+import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.RichTextUtil;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_dangjian.dao.*;
@@ -52,7 +54,6 @@
private ComPbDynDAO comPbDynDAO;
@Resource
private ComPbDynUserDAO comPbDynUserDAO;
-
private final String REDIS_ORG_ALL="ogrlist";
@@ -352,24 +353,23 @@
* @return 详情
*/
@Override
- public R infoYnamic(Integer id) {
- ComPbDynDO comPbDynDO = comPbDynDAO.selectById(id);
- if (ObjectUtils.isEmpty(comPbDynDO)) {
+ public R infoYnamic(Long id) {
+ PartyBuildingComPbDynVO comPbDynVO = comPbDynDAO.selectVoById(id);
+ if (ObjectUtils.isEmpty(comPbDynVO)) {
return R.fail("动态不存在");
}
- PartyBuildingComPbDynVO partyBuildingComPbDynVO=new PartyBuildingComPbDynVO();
- Long createBy = comPbDynDO.getCreateBy();
// ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectById(createBy);
- String name = comPbMemberDAO.selectNameByUserId(createBy);
- if (ObjectUtils.isEmpty(name)) {
+ //String name = comPbMemberDAO.selectNameByUserId(createBy);
+
+ if (ObjectUtils.isEmpty(comPbDynVO.getCreateByName())) {
// return R.fail("发布人不存在");
+ String name = comPbMemberDAO.selectNameByUserId(comPbDynVO.getCreateBy());
name="后台发布";
+ comPbDynVO.setCreateByName(name);
}
- Integer integer = comPbDynUserDAO.selectCount(new QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId, id));
- BeanUtils.copyProperties(comPbDynDO,partyBuildingComPbDynVO);
- partyBuildingComPbDynVO.setCreateByName(name);
- partyBuildingComPbDynVO.setReadingVolume(null==integer?0:integer);
- return R.ok(partyBuildingComPbDynVO);
+ //Integer integer = comPbDynUserDAO.selectCount(new QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId, id));
+ comPbDynVO.setReadingVolume(null==comPbDynVO.getReadingVolume()?0:comPbDynVO.getReadingVolume());
+ return R.ok(comPbDynVO);
}
/**
@@ -428,15 +428,11 @@
*/
@Override
public R addDynUser(ComPbDynUserVO comPbDynUserVO) {
- ComPbDynUserDO comPbDynUserDO = comPbDynUserDAO.selectOne(new QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId,comPbDynUserVO.getDynId()).eq(ComPbDynUserDO::getUserId,comPbDynUserVO.getUserId()));
- if (ObjectUtils.isEmpty(comPbDynUserDO)) {
- comPbDynUserDO=new ComPbDynUserDO();
- BeanUtils.copyProperties(comPbDynUserVO,comPbDynUserDO);
- int insert = comPbDynUserDAO.insert(comPbDynUserDO);
- if (insert>0) {
- return R.ok();
- }
- return R.fail();
+ ComPbDynUserDO comPbDynUserDO=new ComPbDynUserDO();
+ BeanUtils.copyProperties(comPbDynUserVO,comPbDynUserDO);
+ int insert = comPbDynUserDAO.insert(comPbDynUserDO);
+ if (insert>0) {
+ return R.ok();
}
return R.fail();
}
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 eac7344..7620f8d 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
@@ -270,7 +270,7 @@
@PostMapping("listfamily")
public R listFamily(@RequestParam("userId") Long userId,
@RequestParam(value = "pageNum") Long pageNum,
- @RequestParam("pageNum") Long pageSize) {
+ @RequestParam("pageSize") Long pageSize) {
return userService.listFamily(userId, pageNum, pageSize);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index e4f9c9d..bcb4fd7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -194,6 +194,7 @@
loginUserInfoVO.setStatus(sysUserDO.getStatus());
loginUserInfoVO.setAccount(name);
loginUserInfoVO.setType(sysUserDO.getType());
+ loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard()!=null);//暂时 身份证判断实名制
List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
Set<String> set = new HashSet<>();
if (!ObjectUtils.isEmpty(roleDOList)) {
--
Gitblit v1.7.1