bug修复

huanghongfa

2021-01-20 823c2372822a7d1cb06bab9a577744ba34201168

bug修复

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,15 +23,10 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -411,7 +406,7 @@
      <workItem from="1610934956567" duration="1325000" />
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="22881000" />
      <workItem from="1611019208339" duration="26626000" />
    </task>
    <servers />
  </component>
@@ -463,54 +458,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
    <state width="1031" height="289" key="GridCell.Tab.0.bottom" timestamp="1611048700306">
    <state width="1031" height="485" key="GridCell.Tab.0.bottom" timestamp="1611106955772">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="289" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611048700306" />
    <state width="1031" height="289" key="GridCell.Tab.0.center" timestamp="1611048700306">
    <state width="1031" height="485" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.0.center" timestamp="1611106955772">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="289" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611048700306" />
    <state width="1031" height="289" key="GridCell.Tab.0.left" timestamp="1611048700306">
    <state width="1031" height="485" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.0.left" timestamp="1611106955772">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="289" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611048700306" />
    <state width="1031" height="289" key="GridCell.Tab.0.right" timestamp="1611048700306">
    <state width="1031" height="485" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.0.right" timestamp="1611106955772">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="289" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611048700306" />
    <state width="1031" height="289" key="GridCell.Tab.1.bottom" timestamp="1611048700306">
    <state width="1031" height="485" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.1.bottom" timestamp="1611106955772">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="289" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611048700306" />
    <state width="1031" height="289" key="GridCell.Tab.1.center" timestamp="1611048700306">
    <state width="1031" height="485" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.1.center" timestamp="1611106955772">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="289" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611048700306" />
    <state width="1031" height="289" key="GridCell.Tab.1.left" timestamp="1611048700306">
    <state width="1031" height="485" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.1.left" timestamp="1611106955772">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="289" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611048700306" />
    <state width="1031" height="289" key="GridCell.Tab.1.right" timestamp="1611048700306">
    <state width="1031" height="485" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.1.right" timestamp="1611106955772">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="289" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611048700306" />
    <state width="1031" height="289" key="GridCell.Tab.2.bottom" timestamp="1611048700306">
    <state width="1031" height="485" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.2.bottom" timestamp="1611106955773">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="289" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611048700306" />
    <state width="1031" height="289" key="GridCell.Tab.2.center" timestamp="1611048700306">
    <state width="1031" height="485" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611106955773" />
    <state width="1031" height="485" key="GridCell.Tab.2.center" timestamp="1611106955773">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="289" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611048700306" />
    <state width="1031" height="289" key="GridCell.Tab.2.left" timestamp="1611048700306">
    <state width="1031" height="485" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611106955773" />
    <state width="1031" height="485" key="GridCell.Tab.2.left" timestamp="1611106955773">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="289" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611048700306" />
    <state width="1031" height="289" key="GridCell.Tab.2.right" timestamp="1611048700306">
    <state width="1031" height="485" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611106955773" />
    <state width="1031" height="485" key="GridCell.Tab.2.right" timestamp="1611106955773">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="289" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611048700306" />
    <state width="1031" height="485" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611106955773" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -531,10 +526,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611044794794" />
    <state x="233" y="42" width="766" height="782" key="find.popup" timestamp="1611048724421">
    <state x="233" y="42" width="766" height="782" key="find.popup" timestamp="1611107322963">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="233" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611048724421" />
    <state x="233" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611107322963" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java

@@ -49,8 +49,14 @@
    @ApiOperation(value = "社区动态详情",response = ComActDynVO.class)
    @GetMapping("detaildynamic")
    @ApiImplicitParam(name ="id",value = "社区动态主键",required = true)
    public R detailDynamic(@RequestParam("id") Long id){//todo 增加微信分享接口
        return communityService.detailDynamic(id);
    public R detailDynamic(@RequestParam("id") Long id){
        Long userId = this.getUserId();
        R r = communityService.detailDynamic(id);
        if (R.isOk(r)) {
            //增加浏览记录
            communityService.addDynamicUser(id,userId);
        }
        return r;
    }

    @ApiOperation(value = "分页查询社区活动",response = ComActActivityVO.class)
@@ -107,16 +113,16 @@
        return communityService.listActivitySign(activitySignVO);
    }

    @ApiOperation(value = "新增社区动态浏览记录")
    @PostMapping("dynamicuser")
    public R addDynamicUser(@RequestBody ComActDynVO comActDynVO){
        Long id = comActDynVO.getId();
        if (null==id||id==0) {
            return R.fail("社区动态不存在");
        }
        Long userId = this.getUserId();
        return communityService.addDynamicUser(id,userId);
    }
//    @ApiOperation(value = "新增社区动态浏览记录")
//    @PostMapping("dynamicuser")
//    public R addDynamicUser(@RequestBody ComActDynVO comActDynVO){
//        Long id = comActDynVO.getId();
//        if (null==id||id==0) {
//            return R.fail("社区动态不存在");
//        }
//        Long userId = this.getUserId();
//        return communityService.addDynamicUser(id,userId);
//    }

    @ApiOperation(value = "志愿者申请")
    @PostMapping("volunteer")

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java

@@ -358,6 +358,15 @@
            sysUserNoticeVO.setBusinessTime(date);
            sysUserNoticeVO.setStatus(0);
            if (state==2) {//通过
//                修改用户志愿者审核状态
                String phone = comMngVolunteerMngVO1.getPhone();
                R r3 = userService.putUserIsVolunteer(phone,1);
                if (R.isOk(r3)) {
                    log.info("修改手机号【{}】的支援者状态为否",phone);
                }else{
                    log.info("手机号【{}】没有小程序用户",phone);
                }

                sysUserNoticeVO.setTitle("志愿者申请通过审核");
                sysUserNoticeVO.setBusinessContent("恭喜你！你已经是一名志愿者了，感谢你对社区的贡献，我们共同创造和谐家园");
                sysUserNoticeVO.setBusinessStatus(2);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java

@@ -95,7 +95,15 @@
            "s.create_at DESC")
    IPage<ComActActivityVO> pageMyActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);

    @Select("select t.activity_name,t.id,t.end_at,t.cover,t.status from com_act_act_sign s  join sys_user u on s.user_id=u.user_id and u.phone=#{phone} and s.is_volunteer=1 " +
    @Select("select " +
            "t.activity_name," +
            "t.id," +
            "t.end_at," +
            "t.begin_at," +
            "t.cover," +
            "t.status " +
            "from com_act_act_sign s  " +
            "join sys_user u on s.user_id=u.user_id and u.phone=#{phone} and s.is_volunteer=1 " +
            "join com_act_activity t on s.activity_id=t.id and t.status=5")
    List<ComActActivityVO> listActivityByPhone(String phone);
    @Select("select t.id from (\n" +