|
@@ -1,10 +1,8 @@
|
|
|
package com.nokia.financeapi.service.house;
|
|
|
|
|
|
-import com.google.gson.Gson;
|
|
|
-import com.google.gson.reflect.TypeToken;
|
|
|
import com.nokia.financeapi.common.R;
|
|
|
import com.nokia.financeapi.config.HousePages;
|
|
|
-import com.nokia.financeapi.dao.house.AreaDao;
|
|
|
+import com.nokia.financeapi.dao.common.AreaDao;
|
|
|
import com.nokia.financeapi.dao.house.HouseResourceMapMapper;
|
|
|
import com.nokia.financeapi.pojo.dto.GetBuildingAreaStatDto;
|
|
|
import com.nokia.financeapi.pojo.dto.GetBuildingMapDto;
|
|
@@ -12,7 +10,8 @@ import com.nokia.financeapi.pojo.dto.GetBuildingOptionsDto;
|
|
|
import com.nokia.financeapi.pojo.dto.GetBuildingRepairStatDto;
|
|
|
import com.nokia.financeapi.pojo.dto.GetHouseNoticeDto;
|
|
|
import com.nokia.financeapi.pojo.dto.GetLandBuildingStatDto;
|
|
|
-import com.nokia.financeapi.pojo.po.AreaPo;
|
|
|
+import com.nokia.financeapi.pojo.dto.GetRentOutStatDto;
|
|
|
+import com.nokia.financeapi.pojo.po.common.AreaPo;
|
|
|
import com.nokia.financeapi.pojo.vo.GetBuildingAreaStatVo;
|
|
|
import com.nokia.financeapi.pojo.vo.GetBuildingMapVo;
|
|
|
import com.nokia.financeapi.pojo.vo.GetBuildingOptionsVo;
|
|
@@ -159,10 +158,10 @@ public class HouseResourceMapService {
|
|
|
|
|
|
public R<List<GetBuildingRepairStatVo>> getBuildingRepairStat(@Valid GetBuildingRepairStatDto dto) {
|
|
|
if (StringUtils. hasText(dto.getCity())) {
|
|
|
- List<GetBuildingRepairStatVo> vo = houseResourceMapMapper.getDistrictRepairStat(dto);
|
|
|
+ List<GetBuildingRepairStatVo> vo = houseResourceMapMapper.getThirdUnitRepairStat(dto);
|
|
|
return R.ok(vo);
|
|
|
}
|
|
|
- List<GetBuildingRepairStatVo> vo = houseResourceMapMapper.getCityRepairStat();
|
|
|
+ List<GetBuildingRepairStatVo> vo = houseResourceMapMapper.getSecondUnitRepairStat();
|
|
|
return R.ok(vo);
|
|
|
}
|
|
|
|
|
@@ -174,83 +173,13 @@ public class HouseResourceMapService {
|
|
|
return R.ok(vo);
|
|
|
}
|
|
|
|
|
|
- public R<List<GetRentOutStatVo>> getRentOutStat() {
|
|
|
- String s = """
|
|
|
- [
|
|
|
- {
|
|
|
- "unit": "石家庄",
|
|
|
- "income": "1639.60",
|
|
|
- "finishingRate": "88.32"
|
|
|
- },
|
|
|
- {
|
|
|
- "unit": "唐山",
|
|
|
- "income": "1781.84",
|
|
|
- "finishingRate": "81.10"
|
|
|
- },
|
|
|
- {
|
|
|
- "unit": "秦皇岛",
|
|
|
- "income": "629.82",
|
|
|
- "finishingRate": "99.68"
|
|
|
- },
|
|
|
- {
|
|
|
- "unit": "邯郸",
|
|
|
- "income": "767.15",
|
|
|
- "finishingRate": "78.85"
|
|
|
- },
|
|
|
- {
|
|
|
- "unit": "邢台",
|
|
|
- "income": "689.76",
|
|
|
- "finishingRate": "90.14"
|
|
|
- },
|
|
|
- {
|
|
|
- "unit": "保定",
|
|
|
- "income": "2082.43",
|
|
|
- "finishingRate": "105.01"
|
|
|
- },
|
|
|
- {
|
|
|
- "unit": "张家口",
|
|
|
- "income": "827.77",
|
|
|
- "finishingRate": "70.39"
|
|
|
- },
|
|
|
- {
|
|
|
- "unit": "承德",
|
|
|
- "income": "749.34",
|
|
|
- "finishingRate": "77.05"
|
|
|
- },
|
|
|
- {
|
|
|
- "unit": "廊坊",
|
|
|
- "income": "785.70",
|
|
|
- "finishingRate": "85.00"
|
|
|
- },
|
|
|
- {
|
|
|
- "unit": "沧州",
|
|
|
- "income": "1572.53",
|
|
|
- "finishingRate": "84.50"
|
|
|
- },
|
|
|
- {
|
|
|
- "unit": "衡水",
|
|
|
- "income": "574.86",
|
|
|
- "finishingRate": "82.00"
|
|
|
- },
|
|
|
- {
|
|
|
- "unit": "雄安",
|
|
|
- "income": "43.01",
|
|
|
- "finishingRate": "99.79"
|
|
|
- },
|
|
|
- {
|
|
|
- "unit": "省机动局",
|
|
|
- "income": "456.90",
|
|
|
- "finishingRate": "88.21"
|
|
|
- },
|
|
|
- {
|
|
|
- "unit": "省本部",
|
|
|
- "income": "1574.88",
|
|
|
- "finishingRate": "93.52"
|
|
|
- }
|
|
|
- ]
|
|
|
- """;
|
|
|
- return R.ok(new Gson().fromJson(s, new TypeToken<List<GetRentOutStatVo>>() {
|
|
|
- }.getType()));
|
|
|
+ public R<List<GetRentOutStatVo>> getRentOutStat(GetRentOutStatDto dto) {
|
|
|
+ if (StringUtils.hasText(dto.getCity())) {
|
|
|
+ List<GetRentOutStatVo> vo = houseResourceMapMapper.getThirdUnitRentOutIncomeStat(dto);
|
|
|
+ return R.ok(vo);
|
|
|
+ }
|
|
|
+ List<GetRentOutStatVo> vo = houseResourceMapMapper.getSecondUnitRentOutIncomeStat(dto);
|
|
|
+ return R.ok(vo);
|
|
|
}
|
|
|
|
|
|
public R<List<GetBuildingOptionsVo>> getBuildingOptions(GetBuildingOptionsDto dto, String token) {
|