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; 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); } 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; } 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); /** * 新增家庭成员 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); } 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); } 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 查询参数 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(); } 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); }
@@ -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)) {
