Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

yanghui

2022-11-04 954a6a14814b4467d223ad7a782149627912ceea

Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java

@@ -101,4 +101,6 @@
    private Integer choice;
    @ApiModelProperty("排序方式 正序 ASC")
    private String sort;

    private String appId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingComPbDynVO.java

@@ -102,4 +102,6 @@

    @ApiModelProperty("排序方式 正序 ASC")
    private String sort;

    private String appId;
}

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

@@ -11,6 +11,8 @@
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHatchStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
import com.panzhihua.common.service.partybuilding.PartyBuildingWestService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -77,7 +79,6 @@
import com.panzhihua.common.model.vos.community.switchs.StreetAllAppletsVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
import com.panzhihua.common.model.vos.screen.ScreenDrawEventPopulationTotalVO;
import com.panzhihua.common.model.vos.screen.ScreenDrawEventVO;
@@ -107,6 +108,8 @@
    private UserService userService;
    @Resource
    private PartyBuildingService partyBuildingService;
    @Resource
    private PartyBuildingWestService partyBuildingWestService;

    @ApiOperation(value = "大屏测试接口")
    @GetMapping("/test/noToken")
@@ -385,7 +388,8 @@
    @PostMapping("/comprehensive/partydyn")
    public R<BigScreenStatisticPartyOrg> partydyn(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
        partyBuildingComPbDynVO.setType(1);
        return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
        partyBuildingComPbDynVO.setAppId(this.getAppId());
        return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO);
    }
    /**
     * 首页二级页面-便民商家

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -208,4 +208,13 @@

    @Select("SELECT  caa.community_id FROM com_act caa WHERE caa.`name` = ( select ca.`name` FROM com_act ca WHERE ca.community_id =#{id})")
    List<Long> selectIds(@Param("id") Long id);

    /**
     * 根据区域名称查询社区id
     * @param area
     * @return
     */
    @Select("select distinct community_id from com_area_town_community where area=#{area}")
    List<Long> selectDistinctCommunityId(@Param("area") String area);

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java

@@ -574,6 +574,12 @@
                communityIds.add(communityId);
            }
            partyBuildingComPbDynVO.setCommunityIds(communityIds);
        }else {
            //西区大屏
            if (CollUtil.isEmpty(partyBuildingComPbDynVO.getCommunityIds()) || "wx0cef797390444b75".equals(partyBuildingComPbDynVO.getAppId())){
                List<Long> selectDistinctCommunityId = comPbMemberDAO.selectDistinctCommunityId("西区");
                partyBuildingComPbDynVO.setCommunityIds(selectDistinctCommunityId);
            }
        }
        IPage<PartyBuildingComPbDynVO> iPage = comPbDynDAO.pageYnamic(page, partyBuildingComPbDynVO);
        List<PartyBuildingComPbDynVO> records = iPage.getRecords();

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

@@ -283,13 +283,13 @@
                noLoginUrl.add("/api/applets/renting/houses/houseList");
                noLoginUrl.add("/api/applets/renting/houses/getConfig");
                noLoginUrl.add("/api/applets/comActRaffle/queryAll");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/street/list");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/population");
                noLoginUrl.add("/api/communitybackstage/screen/getWestScreenStatics");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/governance");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/partydyn");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/pagedynamic");
                noLoginUrl.add("/api/communitybackstage/screen/get/community/password");
                noLoginUrl.add("/api/huacheng-communitybackstage/screen/comprehensive/street/list");
                noLoginUrl.add("/api/huacheng-communitybackstage/screen/comprehensive/population");
                noLoginUrl.add("/api/huacheng-communitybackstage/screen/getWestScreenStatics");
                noLoginUrl.add("/api/huacheng-communitybackstage/screen/comprehensive/governance");
                noLoginUrl.add("/api/huacheng-communitybackstage/screen/comprehensive/partydyn");
                noLoginUrl.add("/api/huacheng-communitybackstage/screen/comprehensive/pagedynamic");
                noLoginUrl.add("/api/huacheng-communitybackstage/screen/get/community/password");
                noLoginUrl.add("/api/shopbackstage/microcommercialstreet/verifyCode");
                noLoginUrl.add("/api/shopbackstage/mcsOrder/wxNotify");
                noLoginUrl.add("/api/shopbackstage/microcommercialstreet/bindPhone");