From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java
index d80f98e..90f9096 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java
@@ -1,5 +1,14 @@
package com.panzhihua.service_community.service.impl;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngStructAreaCityVO;
@@ -8,13 +17,6 @@
import com.panzhihua.service_community.dao.ComMngStructAreaDistrictDAO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDistrictDO;
import com.panzhihua.service_community.service.ComMngStructAreaDistrictService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -30,29 +32,32 @@
/**
* 查询城市下属所有地区列表
*
- * @param cityAdcode 城市地址编码
+ * @param cityAdcode
+ * 城市地址编码
* @return 地区列表
*/
@Override
public R listAreaDistrict(Long cityAdcode) {
- List<ComMngStructAreaProvinceVO> comMngStructAreaProvinceVOS=new ArrayList<>();
- ComMngStructAreaProvinceVO comMngStructAreaProvinceVO=new ComMngStructAreaProvinceVO();
+ List<ComMngStructAreaProvinceVO> comMngStructAreaProvinceVOS = new ArrayList<>();
+ ComMngStructAreaProvinceVO comMngStructAreaProvinceVO = new ComMngStructAreaProvinceVO();
comMngStructAreaProvinceVO.setId(23);
comMngStructAreaProvinceVO.setProvinceAdcode(510000);
comMngStructAreaProvinceVO.setProvinceName("四川省");
- List<ComMngStructAreaCityVO> comMngStructAreaCityVOS=new ArrayList<>();
- ComMngStructAreaCityVO comMngStructAreaCityVO=new ComMngStructAreaCityVO();
+ List<ComMngStructAreaCityVO> comMngStructAreaCityVOS = new ArrayList<>();
+ ComMngStructAreaCityVO comMngStructAreaCityVO = new ComMngStructAreaCityVO();
comMngStructAreaCityVO.setCityAdcode(510400);
comMngStructAreaCityVO.setCityName("攀枝花市");
comMngStructAreaCityVO.setId(256);
comMngStructAreaCityVO.setProvinceAdcode(510000);
comMngStructAreaCityVO.setProvinceId(23);
- List<ComMngStructAreaDistrictDO> comMngStructAreaDistrictDOS = comMngStructAreaDistrictDAO.selectList(new QueryWrapper<ComMngStructAreaDistrictDO>().lambda().eq(ComMngStructAreaDistrictDO::getCityAdcode, cityAdcode));
- List<ComMngStructAreaDistrictVO>comMngStructAreaDistrictVOS=new ArrayList<>();
+ List<ComMngStructAreaDistrictDO> comMngStructAreaDistrictDOS =
+ comMngStructAreaDistrictDAO.selectList(new QueryWrapper<ComMngStructAreaDistrictDO>().lambda()
+ .eq(ComMngStructAreaDistrictDO::getCityAdcode, cityAdcode));
+ List<ComMngStructAreaDistrictVO> comMngStructAreaDistrictVOS = new ArrayList<>();
if (!ObjectUtils.isEmpty(comMngStructAreaDistrictDOS)) {
comMngStructAreaDistrictDOS.forEach(comMngStructAreaDistrictDO -> {
- ComMngStructAreaDistrictVO comMngStructAreaDistrictVO=new ComMngStructAreaDistrictVO();
- BeanUtils.copyProperties(comMngStructAreaDistrictDO,comMngStructAreaDistrictVO);
+ ComMngStructAreaDistrictVO comMngStructAreaDistrictVO = new ComMngStructAreaDistrictVO();
+ BeanUtils.copyProperties(comMngStructAreaDistrictDO, comMngStructAreaDistrictVO);
comMngStructAreaDistrictVOS.add(comMngStructAreaDistrictVO);
});
}
@@ -62,6 +67,5 @@
comMngStructAreaProvinceVOS.add(comMngStructAreaProvinceVO);
return R.ok(comMngStructAreaDistrictVOS);
}
-
}
--
Gitblit v1.7.1