springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -1,11 +1,15 @@ package com.panzhihua.applets.api; import cn.binarywang.wx.miniapp.api.WxMaSecCheckService; import com.netflix.discovery.converters.Auto; import com.panzhihua.applets.config.WxMaConfiguration; import com.panzhihua.common.constants.FtpConstants; import com.panzhihua.common.constants.UserConstants; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.area.AreaInfoVo; import com.panzhihua.common.model.vos.user.UserPhoneVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.SFTPUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,6 +29,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Base64; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -58,6 +63,8 @@ @Resource private WxMaConfiguration wxMaConfiguration; @Resource private CommunityService communityService; @ApiOperation(value = "上传照片") @PostMapping(value = "uploadimage",consumes = "multipart/*",headers = "content-type=multipart/form-date") @@ -110,6 +117,7 @@ return R.ok(nextInt); } public static void main(String[] args) { // int nextInt = RandomUtils.nextInt(99999, 1000000); // System.out.println(nextInt); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
@@ -14,9 +14,9 @@ import org.springframework.util.ObjectUtils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import sun.security.krb5.internal.crypto.Aes256; import javax.servlet.http.HttpServletRequest; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -35,6 +35,7 @@ /** * 获取登录对象信息 * * @return 对象userid */ public Long getUserId(){ @@ -45,6 +46,7 @@ /** * 获取登录对象所在社区id * * @return 社区id */ public Long getCommunityId(){ @@ -58,6 +60,7 @@ /** * 获取登录对象所在小区 * * @return 小区id */ public Long getAreaId(){ @@ -71,6 +74,7 @@ /** * 获取登录token * * @return token */ public String getToken(){ @@ -81,6 +85,7 @@ /** * 获取登录对象所有信息 * * @return 所有信息 */ @SneakyThrows springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCityVO.java
@@ -1,8 +1,11 @@ package com.panzhihua.common.model.vos.community; import com.google.common.collect.Lists; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel("城市") @@ -15,5 +18,4 @@ /**城市行政区划代码*/ @ApiModelProperty("城市行政区划代码") private Integer cityAdcode; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngProvinceVO.java
@@ -1,8 +1,11 @@ package com.panzhihua.common.model.vos.community; import com.google.common.collect.Lists; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel("省份") @@ -13,4 +16,5 @@ @ApiModelProperty("省份行政区划代码") private Integer provinceAdcode; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java
@@ -149,8 +149,8 @@ /** * create_at */ @DateTimeFormat(pattern = "yyyy/MM/dd HH:mm:ss") @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("发布人名字") private String userName; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -8,7 +8,6 @@ import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.user.UserPhoneVO; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -836,11 +835,11 @@ /** * 查询城市下属所有地区列表 * @param cityAdcode 城市地址编码 * @param provinceAdcode 城市地址编码 * @return 地区列表 */ @PostMapping("listareadistrict") R listAreaDistrict(@RequestParam("cityAdcode") Long cityAdcode); @GetMapping("/common/data/city") R listAreaDistrict(@RequestParam("provinceAdcode") Long provinceAdcode); /** * 首页图表数据汇总 @@ -1308,4 +1307,44 @@ */ @GetMapping("/common/data/district") R getDistrictByCityCode(@RequestParam(value = "cityAdcode") Integer cityAdcode); /** * 查询省下所有区域 tree结构 * @param provinceAdcode * @return */ @GetMapping("/common/data/area/all") R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode); /** * 分页查询街道 * @param pageComStreetDTO * @return */ @PostMapping("/liststreet") R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO); /** * 新增街道 * @param comStreetVOO * @return */ @PostMapping("/addstreet") R pageStreet(@RequestBody ComStreetVO comStreetVOO); /** * 删除街道 * @param Ids * @return */ @PostMapping("/deletestreet") R delectStreat(@RequestBody List<Long> Ids); /** * 查询街道 * @param comStreetVO * @return */ @PostMapping("/liststreet") R listStreet(ComStreetVO comStreetVO); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java
@@ -314,6 +314,7 @@ /** * 设置居民标签 * * @param inputUserTagsDTO 标签信息 * @return 设置结果 */ @@ -402,6 +403,7 @@ /** * 新增或修改特殊群体标签 * * @param comMngTagVO * @return */ @@ -415,6 +417,7 @@ /** * 删除特殊群体标签 * * @param id * @return */ @@ -635,6 +638,7 @@ /** * 查询所有省份 * * @return */ @ApiOperation(value = "查询所有省份" ,response = ComMngProvinceVO.class) @@ -645,6 +649,7 @@ /** * 查询省份下所有的城市 * * @param provinceAdcode * @return */ @@ -656,6 +661,7 @@ /** * 查询城市下所有的区县 * * @param cityAdcode * @return */ @@ -664,4 +670,10 @@ R getDistrictByCityCode(@ApiParam(name = "城市编码", required = true) @RequestParam(value = "cityAdcode") Integer cityAdcode){ return communityService.getDistrictByCityCode(cityAdcode); } @ApiOperation(value = "获取树结构区域信息") @GetMapping(value = "arealist") public R getAllArea(@ApiParam(name = "城市编码:四川510000", required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) { return communityService.getCityTreeByProvinceCode(provinceAdcode); } } springcloud_k8s_panzhihuazhihuishequ/service_community/pom.xml
@@ -14,7 +14,6 @@ <description>社区</description> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> @@ -69,6 +68,11 @@ <groupId>org.springframework.data</groupId> <artifactId>spring-data-redis</artifactId> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>2.6</version> </dependency> </dependencies>
@@ -236,4 +236,14 @@ R getDistrictByCityCode(@RequestParam(value = "cityAdcode") Integer cityAdcode){ return comMngProvinceService.getDistrictByCityCode(cityAdcode); } /** * 查询特定省下所有区域 tree结构 * @param provinceAdcode * @return */ @GetMapping("/area/all") R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode){ return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngProvinceService.java
@@ -29,4 +29,11 @@ * @return */ R getDistrictByCityCode(Integer cityAdcode); /** * 获取省下的所有区域 tree结构 * @param provinceAdcode * @return */ R getCityTreeByProvinceCode(Integer provinceAdcode); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngAreaVO; import com.panzhihua.common.model.vos.community.ComMngCityVO; import com.panzhihua.common.model.vos.community.ComMngDistrictVO; import com.panzhihua.common.model.vos.community.ComMngProvinceVO; @@ -18,6 +19,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @Service public class ComMngProvinceServiceImpl implements ComMngProvinceService { @@ -56,6 +58,7 @@ return R.ok(vos); } @Override public R getDistrictByCityCode(Integer cityAdcode) { List<ComMngDistrictDO> comMngDistrictDOS = comMngDistrictDAO.selectList(new QueryWrapper<ComMngDistrictDO>().lambda().eq(ComMngDistrictDO::getCityAdcode,cityAdcode)); @@ -67,4 +70,29 @@ }); return R.ok(vos); } @Override public R getCityTreeByProvinceCode(Integer provinceAdcode) { List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(new QueryWrapper<ComMngProvinceDO>().lambda().eq(ComMngProvinceDO::getProvinceAdcode, provinceAdcode)); List<ComMngCityDO> cityDOS = comMngCityDAO.selectList(null); List<ComMngDistrictDO> districtDOS = comMngDistrictDAO.selectList(null); List<ComMngAreaVO> vos = new ArrayList<>(); provinceDOS.forEach(p -> { ComMngAreaVO pvo = new ComMngAreaVO(p.getProvinceAdcode(), p.getProvinceName()); vos.add(pvo); List<ComMngCityDO> citys = cityDOS.stream().filter(city -> city.getProvinceAdcode().equals(p.getProvinceAdcode())).collect(Collectors.toList()); citys.forEach(c -> { ComMngAreaVO cityVo = new ComMngAreaVO(c.getCityAdcode(), c.getCityName()); BeanUtils.copyProperties(c, cityVo); pvo.getChildren().add(cityVo); List<ComMngDistrictDO> districts = districtDOS.stream().filter(district -> district.getCityAdcode().equals(c.getCityAdcode())).collect(Collectors.toList()); districts.forEach(d -> { ComMngAreaVO districtVo = new ComMngAreaVO(d.getDistrictAdcode(), d.getDistrictName()); BeanUtils.copyProperties(d, districtVo); cityVo.getChildren().add(districtVo); }); }); }); return R.ok(vos); } }
