bug修改

puhanshu

2022-07-29 de5fcac8be303c53453a930803b02ca3a69e1ffd

bug修改

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

@@ -2,6 +2,8 @@

import java.util.List;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,7 +19,8 @@
public class ComMngStructAreaCityVO {

    @ApiModelProperty("自增 id")
    private Integer id;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("城市名称")
    private String cityName;
@@ -29,7 +32,7 @@
    private Integer provinceAdcode;

    @ApiModelProperty("省份 id")
    private Integer provinceId;
    private Long provinceId;

    @ApiModelProperty("下属区县")
    private List<ComMngStructAreaDistrictVO> comMngStructAreaDistrictVOS;

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

@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,7 +16,8 @@
@ApiModel("区县")
public class ComMngStructAreaDistrictVO {
    @ApiModelProperty("自增 id")
    private Integer id;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("区县名称")
    private String districtName;
@@ -26,11 +29,11 @@
    private Integer cityAdcode;

    @ApiModelProperty("城市 id")
    private Integer cityId;
    private Long cityId;

    @ApiModelProperty("省份行政区划代码")
    private Integer provinceAdcode;

    @ApiModelProperty("省份 id")
    private Integer provinceId;
    private Long provinceId;
}

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

@@ -2,6 +2,8 @@

import java.util.List;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,7 +19,8 @@
public class ComMngStructAreaProvinceVO {

    @ApiModelProperty("自增 id")
    private Integer id;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("省份名称")
    private String provinceName;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java

@@ -319,7 +319,7 @@
     * @return
     */
    @GetMapping("/area/all")
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
    public R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
                                @RequestParam(value = "areaCode", required = false) String areaCode) {
        return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode, areaCode);
    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoMember.java

@@ -4,6 +4,8 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -33,6 +35,7 @@
    private static final long serialVersionUID = 309168056104824588L;

    @TableId(type = IdType.ASSIGN_ID)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**

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

@@ -11,7 +11,7 @@
public class ComMngCityDO {
    /** 自增 id */
    @TableId(type = IdType.ASSIGN_ID)
    private Integer id;
    private Long id;

    /** 城市名称 */
    private String cityName;
@@ -23,5 +23,5 @@
    private Integer provinceAdcode;

    /** 省份 id */
    private Integer provinceId;
    private Long provinceId;
}

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

@@ -11,7 +11,7 @@
public class ComMngDistrictDO {
    /** 自增 id */
    @TableId(type = IdType.ASSIGN_ID)
    private Integer id;
    private Long id;

    /** 区县名称 */
    private String districtName;
@@ -23,11 +23,11 @@
    private Integer cityAdcode;

    /** 城市 id */
    private Integer cityId;
    private Long cityId;

    /** 省份行政区划代码 */
    private Integer provinceAdcode;

    /** 省份 id */
    private Integer provinceId;
    private Long provinceId;
}

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

@@ -11,7 +11,7 @@
public class ComMngProvinceDO {
    /** 自增 id */
    @TableId(type = IdType.ASSIGN_ID)
    private Integer id;
    private Long id;

    /** 省份名称 */
    private String provinceName;

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

@@ -24,7 +24,7 @@
     * 自增 id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Integer id;
    private Long id;

    /**
     * 区县名称
@@ -44,7 +44,7 @@
    /**
     * 城市 id
     */
    private Integer cityId;
    private Long cityId;

    /**
     * 省份行政区划代码
@@ -54,5 +54,5 @@
    /**
     * 省份 id
     */
    private Integer provinceId;
    private Long provinceId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java

@@ -40,16 +40,16 @@
    public R listAreaDistrict(Long cityAdcode) {
        List<ComMngStructAreaProvinceVO> comMngStructAreaProvinceVOS = new ArrayList<>();
        ComMngStructAreaProvinceVO comMngStructAreaProvinceVO = new ComMngStructAreaProvinceVO();
        comMngStructAreaProvinceVO.setId(23);
        comMngStructAreaProvinceVO.setId(23L);
        comMngStructAreaProvinceVO.setProvinceAdcode(510000);
        comMngStructAreaProvinceVO.setProvinceName("四川省");
        List<ComMngStructAreaCityVO> comMngStructAreaCityVOS = new ArrayList<>();
        ComMngStructAreaCityVO comMngStructAreaCityVO = new ComMngStructAreaCityVO();
        comMngStructAreaCityVO.setCityAdcode(510400);
        comMngStructAreaCityVO.setCityName("攀枝花市");
        comMngStructAreaCityVO.setId(256);
        comMngStructAreaCityVO.setId(256L);
        comMngStructAreaCityVO.setProvinceAdcode(510000);
        comMngStructAreaCityVO.setProvinceId(23);
        comMngStructAreaCityVO.setProvinceId(23L);
        List<ComMngStructAreaDistrictDO> comMngStructAreaDistrictDOS =
            comMngStructAreaDistrictDAO.selectList(new QueryWrapper<ComMngStructAreaDistrictDO>().lambda()
                .eq(ComMngStructAreaDistrictDO::getCityAdcode, cityAdcode));