#feat 修改

yanghui

2022-11-08 55566310fe6d8276a188913ef8cee959681ba29f

#feat 修改

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java

@@ -235,10 +235,10 @@
    }


    @GetMapping("/communityList")
    @GetMapping("/getAllCommunityList")
    @ApiOperation(value = "获取当前账号下的社区/村落列表",response = StreetVO.class)
    public R communityList(){
        return userService.communityList(this.getLoginUserInfo().getAccount(),this.getUserId());
        return userService.getAllCommunityList();
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientElevatingPointDTO.java

@@ -42,10 +42,6 @@
    @NotBlank(groups = {AddGroup.class}, message = "微信账号不能为空")
    private String wechatAccount;

    @ApiModelProperty("所属地区")
    @NotBlank(groups = {AddGroup.class}, message = "所属地区不能为空")
    private String region;

    @ApiModelProperty("详细地址")
    @NotBlank(groups = {AddGroup.class}, message = "详细地址不能为空")
    private String address;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java

@@ -37,11 +37,6 @@
    @ApiModelProperty("社区名称")
    private String communityName;
    /**
     * 所属地区
     */
    @ApiModelProperty("所属地区")
    private String region;
    /**
     * 提货点地址
     */
    @ApiModelProperty("提货点地址")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -1305,7 +1305,6 @@
     R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO);



    /**
     * 是否为专家登陆小程序
     * */
@@ -1323,4 +1322,12 @@
     * */
    @PostMapping("/feedBackReply")
    R updateFeedBack(@RequestBody SysUserFeedbackVO sysUserFeedbackVO);

    /**
     * 获取所有社区等
     * @return
     */
    @GetMapping("/getAllCommunityList")
    R getAllCommunityList();

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientElevatingPointDO.java

@@ -37,10 +37,6 @@
     */
    private String communityName;
    /**
     * 所属地区
     */
    private String region;
    /**
     * 提货点地址
     */
    private String address;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComConvenientElevatingPointMapper.xml

@@ -7,7 +7,6 @@
        <result column="name" jdbcType="VARCHAR" property="name"/>
        <result column="community_id" jdbcType="BIGINT" property="communityId"/>
        <result column="community_name" jdbcType="VARCHAR" property="communityName"/>
        <result column="region" jdbcType="VARCHAR" property="region"/>
        <result column="address" jdbcType="VARCHAR" property="address"/>
        <result column="contacts" jdbcType="VARCHAR" property="contacts"/>
        <result column="phone" jdbcType="VARCHAR" property="phone"/>
@@ -25,7 +24,7 @@
        <result column="updated_by" jdbcType="BIGINT" property="updatedBy"/>
    </resultMap>
    <sql id="Base_Column_List">
        id, `name`, community_id, community_name, region, address, contacts, phone, wechat_account,
        id, `name`, community_id, community_name, address, contacts, phone, wechat_account,
        lat, lon, `business_status`, cumulative_goods_num, prepare_goods_num, already_goods_num, is_del,
        created_at, created_by, updated_at, updated_by
    </sql>

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -1457,6 +1457,11 @@
        return userService.getCommunityList(name,id);
    }

    @GetMapping("/getAllCommunityList")
    public R getAllCommunityList(){
        return userService.getAllCommunityList();
    }

    @GetMapping("/resetPasswordAccount")
    public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId){
        return userService.resetPassword(type,account,appId);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -916,6 +916,12 @@
    R getCommunityList(String name,Long id);

    /**
     * 获取所有城镇或村落列表
     * @return
     */
    R getAllCommunityList();

    /**
     * 重置密码
     * @param type
     * @param account

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -3707,6 +3707,27 @@
    }

    @Override
    public R getAllCommunityList() {
        List<Integer> areaList = areaCodeList();
        List<AreaVOS> areaVOList = new ArrayList<>();
        for (Integer code : areaList) {
            AreaVOS areaVO = new AreaVOS();
            areaVO.setId(code);
            areaVO.setName(areaCodeToName(code.longValue()));
            List<StreetVOS> streetVOS = userDao.selectStreetByAreaCode(code);
            Iterator<StreetVOS> iterator = streetVOS.listIterator();
            while (iterator.hasNext()) {
                StreetVOS vo = iterator.next();
                List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), 3);
                vo.setChildList(communityVOS);

            }
            areaVO.setChildList(streetVOS);
            areaVOList.add(areaVO);
        }
        return R.ok(areaVOList);
    }
    @Override
    public R getCommunityList(String name, Long id) {
        //区级账号名
        String[] streetList = {"bingcaogangjiedao", "donghuajiedao", "nongnongpingjiedao", "dadukoujiedaojiedao", "guazipingjiedao",
@@ -3714,7 +3735,7 @@
                "jingjiangzhen", "renhezhen", "pingdizhen", "datianzhen", "tongdezhen", "futianzhen", "qianjinzhen", "panlianzhen", "binguzhen", "baimazhen",
                "salianzhen", "puweizhen", "deshizhen", "wanqiuyizuxiang", "caochangzhen", "xinshanlisuzuxiang", "tongzilinzhen", "yongxingzhen", "yumenzhen",
                "honggezhen", "hongguoyizuxiang"};
        List<Integer> ids = userDao.selectIdsByAccount(streetList);
//        List<Integer> ids = userDao.selectIdsByAccount(streetList);
        //村或社区账号
        Integer type = isVilliage(name);
        //是否为市级账号