Skip to content

Y
yichengstreet-be
Commit 3e45feb2 authored by luben's avatar luben
Browse files
Options

fix

parent aa21b137
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 1 deletion
ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java
View file @ 3e45feb2
......@@ -67,7 +67,11 @@ public class RegionController extends BaseController {
@RequestParam("pageSize") Integer pageSize) {
try {
AjaxResult result = new AjaxResult();
gridRegionFacadeService.getRoles(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result);
if(wgType.equals("0")){
gridRegionFacadeService.getRolesWhereTypeZero(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result);
}else {
gridRegionFacadeService.getRoles(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result);
}
return JSON.toJSONString(result);
} catch (Exception e) {
e.printStackTrace();
......
ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionFacadeService.java
View file @ 3e45feb2
......@@ -794,6 +794,7 @@ public class GridRegionFacadeService {
secondNode.setName(gridRegion.getWgName());
secondNode.setWgArea(gridRegion.getWgArea());
secondNode.setLevel(gridRegion.getLevel());
secondNode.setStatus(gridRegion.getStatus());
List<GridTreeNode> childrenDocTypes = convertRegionFromWgCodeByParent(gridRegionList, gridRegion.getWgCode());
secondNode.setChild(childrenDocTypes);
models.add(secondNode);
......@@ -804,6 +805,7 @@ public class GridRegionFacadeService {
secondNode.setName(gridRegion.getWgName());
secondNode.setWgArea(gridRegion.getWgArea());
secondNode.setLevel(gridRegion.getLevel());
secondNode.setStatus(gridRegion.getStatus());
List<GridTreeNode> childrenDocTypes = convertRegionFromWgCodeByParent(gridRegionList, gridRegion.getWgCode());
secondNode.setChild(childrenDocTypes);
models.add(secondNode);
......@@ -826,6 +828,7 @@ public class GridRegionFacadeService {
secondNode.setName(gridRegion.getWgName());
secondNode.setWgArea(gridRegion.getWgArea());
secondNode.setLevel(gridRegion.getLevel());
secondNode.setStatus(gridRegion.getStatus());
List<GridTreeNode> childrenDocTypes = convertRegionFromWgCodeByParent(gridRegionList, gridRegion.getWgCode());
secondNode.setChild(childrenDocTypes);
models.add(secondNode);
......@@ -1172,26 +1175,31 @@ public class GridRegionFacadeService {
secondFiveTreeNode1.setName("楼宇");
secondFiveTreeNode1.setChild(new ArrayList<>());
secondFiveTreeNode1.setStatus("2");
secondFiveTreeNode1.setLevel("2.5");
GridTreeNode secondFiveTreeNode4 = new GridTreeNode();
secondFiveTreeNode4.setId(UUID.randomUUID().toString());
secondFiveTreeNode4.setName("道路");
secondFiveTreeNode4.setChild(new ArrayList<>());
secondFiveTreeNode4.setStatus("2");
secondFiveTreeNode1.setLevel("2.5");
GridTreeNode secondFiveTreeNode5 = new GridTreeNode();
secondFiveTreeNode5.setId(UUID.randomUUID().toString());
secondFiveTreeNode5.setName("街区");
secondFiveTreeNode5.setChild(new ArrayList<>());
secondFiveTreeNode5.setStatus("2");
secondFiveTreeNode1.setLevel("2.5");
GridTreeNode secondFiveTreeNode6 = new GridTreeNode();
secondFiveTreeNode6.setId(UUID.randomUUID().toString());
secondFiveTreeNode6.setName("综合体");
secondFiveTreeNode6.setChild(new ArrayList<>());
secondFiveTreeNode6.setStatus("2");
secondFiveTreeNode1.setLevel("2.5");
GridTreeNode secondFiveTreeNode7 = new GridTreeNode();
secondFiveTreeNode7.setId(UUID.randomUUID().toString());
secondFiveTreeNode7.setName("市场");
secondFiveTreeNode7.setChild(new ArrayList<>());
secondFiveTreeNode7.setStatus("2");
secondFiveTreeNode1.setLevel("2.5");
secondFiveTree.add(secondFiveTreeNode1);
secondFiveTree.add(secondFiveTreeNode4);
secondFiveTree.add(secondFiveTreeNode5);
......@@ -1248,4 +1256,101 @@ public class GridRegionFacadeService {
return firstNode;
}
public void getRolesWhereTypeZero(String wgName, String wgCode, String wgType, String level, String purpose, Integer pageNum, Integer pageSize, AjaxResult result) {
if (null == pageNum || pageNum <= 0) {
pageNum = 1;
}
if (null == pageSize || pageSize <= 0) {
pageSize = 10;
}
ZQTPageModel<GridRegionWithCompanyItem> appPageModel = new ZQTPageModel<>();
appPageModel.setRecordCount(0);
appPageModel.setPageCount(0);
appPageModel.setCurPage(pageNum);
appPageModel.setItemList(new ArrayList<>());
//
// GridRegionExample example = new GridRegionExample();
// GridRegionExample.Criteria criteria = example.createCriteria();
// criteria.andIsValidEqualTo("1");
// if (StringUtils.isNotEmpty(wgName)) {
// criteria.andWgNameLike("%" + wgName + "%");
// }
//// if (StringUtils.isNotEmpty(wgType)) {
//// criteria.andWgTypeEqualTo(wgType);
//// }
// if (StringUtils.isNotEmpty(level)) {
// criteria.andLevelEqualTo(level);
// }
// if (StringUtils.isNotBlank(purpose)) {
// criteria.andWgPurposeEqualTo(purpose);
// }
// if (StringUtils.isNotEmpty(wgCode)) {
// if ("zswg".equals(wgCode)) {
// criteria.andWgTypeEqualTo("2");//查询所有专属网格
// } else {
// criteria.andWgParentIdEqualTo(wgCode);
// }
// }
//
// //加上2.5级的
// int count = gridRegionService.countByExample(example);
// if (count <= 0) {
// result.buildSuccess("success", appPageModel);
// return;
// }
// example.setOrderByClause(" wg_code");
int count = 25;
List<GridRegion> roles = new ArrayList<>();
List<String> type = new ArrayList<>();
type.add("1");
type.add("4");
type.add("5");
type.add("6");
type.add("7");
List<String> name = new ArrayList<>();
name.add("楼宇");
name.add("道路");
name.add("街区");
name.add("综合体");
name.add("市场");
for(int i=0;i<5;i++){
for(int j=0;j<5;j++){
GridRegion gridRegion = new GridRegion();
gridRegion.setWgCode(wgCode);
gridRegion.setStatus("2");
gridRegion.setId(UUID.randomUUID().toString());
gridRegion.setWgType(type.get(i));
gridRegion.setLevel("2.5");
gridRegion.setWgName(name.get(j));
gridRegion.setIsValid("1");
roles.add(gridRegion);
}
}
// List<GridRegion> roles = gridRegionService.selectByExampleWithBLOBsForStartPage(example, pageNum, pageSize);
// if (null == roles || roles.isEmpty()) {
// result.buildSuccess("success", appPageModel);
// return;
// }
appPageModel.setCurPage(pageNum);
appPageModel.setRecordCount(count);
appPageModel.setPageCount((long) Math.ceil(1.0 * count / pageSize));
List<GridRegionWithCompanyItem> itemList = BeanCopyUtil.bathToBean(roles, GridRegionWithCompanyItem.class);
itemList.forEach( e -> {
GridCompanyLandExample gridCompanyLandExample = new GridCompanyLandExample();
GridCompanyLandExample.Criteria gridCompanyLandExampleCriteria = gridCompanyLandExample.createCriteria();
gridCompanyLandExampleCriteria.andLandIdEqualTo(e.getId());
gridCompanyLandExampleCriteria.andIsValidEqualTo("1");
e.setCompanyCount(companyLandService.countByExample(gridCompanyLandExample));
});
appPageModel.setItemList(itemList);
result.buildSuccess("success", appPageModel);
}
}
ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml
View file @ 3e45feb2
......@@ -22,6 +22,7 @@
<result column="ylzd4" jdbcType="VARCHAR" property="ylzd4" />
<result column="ylzd5" jdbcType="VARCHAR" property="ylzd5" />
<result column="wg_purpose" jdbcType="VARCHAR" property="wgPurpose" />
<result column="status" jdbcType="VARCHAR" property="status" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.ruoyi.system.domain.grid.GridRegion">
<result column="wg_coordinate" jdbcType="LONGVARCHAR" property="wgCoordinate" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment