Browse Source

房屋柱状图

dev
lichao 2 years ago
parent
commit
a9547f5e7b
  1. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
  2. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
  3. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
  4. 13
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
  5. 5
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java

@ -21,6 +21,7 @@ import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.annotation.MaskResponse;
import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.dto.form.PageFormDTO;
import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.ValidatorUtils;
@ -190,7 +191,7 @@ public class IcHouseController {
* @return * @return
*/ */
@PostMapping("getHousePictureList") @PostMapping("getHousePictureList")
public Result<List<HousePictureListResultDTO>> getHousePictureList(@RequestBody HouseCountPictureFormDTO dto){ public Result<PageData<HousePictureListResultDTO>> getHousePictureList(@RequestBody HouseCountPictureFormDTO dto){
return new Result<List<HousePictureListResultDTO>>().ok(icHouseService.getHousePictureList(dto)); return new Result<PageData<HousePictureListResultDTO>>().ok(icHouseService.getHousePictureList(dto));
} }
} }

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@ -223,4 +223,6 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
List<HouseCountPictureResultDTO.HouseCountPictureCount> getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); List<HouseCountPictureResultDTO.HouseCountPictureCount> getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
List<HouseCountPictureResultDTO.HouseCountPictureCount> getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); List<HouseCountPictureResultDTO.HouseCountPictureCount> getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
List<HousePictureListResultDTO> getHousePictureList(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
} }

3
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java

@ -2,6 +2,7 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.IcHouseDTO; import com.epmet.dto.IcHouseDTO;
@ -144,5 +145,5 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
HouseCountPictureResultDTO getHouseStatusCount(HouseCountPictureFormDTO dto); HouseCountPictureResultDTO getHouseStatusCount(HouseCountPictureFormDTO dto);
List<HousePictureListResultDTO> getHousePictureList(HouseCountPictureFormDTO dto); PageData<HousePictureListResultDTO> getHousePictureList(HouseCountPictureFormDTO dto);
} }

13
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@ -9,6 +9,7 @@ import com.epmet.commons.tools.dto.result.OptionResultDTO;
import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.dto.TokenDto;
@ -25,6 +26,7 @@ import com.epmet.dto.ImportGeneralDTO;
import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO;
import com.epmet.dto.form.HouseCountPictureFormDTO; import com.epmet.dto.form.HouseCountPictureFormDTO;
import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.form.HouseFormDTO;
import com.epmet.dto.region.LogOperationResultDTO;
import com.epmet.dto.result.*; import com.epmet.dto.result.*;
import com.epmet.entity.IcBuildingEntity; import com.epmet.entity.IcBuildingEntity;
import com.epmet.entity.IcBuildingUnitEntity; import com.epmet.entity.IcBuildingUnitEntity;
@ -38,6 +40,8 @@ import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.feign.OperCustomizeOpenFeignClient;
import com.epmet.redis.IcHouseRedis; import com.epmet.redis.IcHouseRedis;
import com.epmet.service.IcHouseService; import com.epmet.service.IcHouseService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -440,7 +444,12 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
} }
@Override @Override
public List<HousePictureListResultDTO> getHousePictureList(HouseCountPictureFormDTO dto) { public PageData<HousePictureListResultDTO> getHousePictureList(HouseCountPictureFormDTO dto) {
return null; // 列表/导出查询
PageHelper.startPage(dto.getPageNo(), dto.getPageSize());
List<HousePictureListResultDTO> list = baseDao.getHousePictureList(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd());
PageInfo<HousePictureListResultDTO> pageInfo = new PageInfo<>(list);
return new PageData<>(list,pageInfo.getTotal());
} }
} }

5
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@ -776,7 +776,7 @@
CONVERT ( ih.DOOR_NAME USING gbk ), CONVERT ( ih.DOOR_NAME USING gbk ),
ih.SORT ASC ih.SORT ASC
</select> </select>
<select id="getHousePurposeCount" resultType="com.epmet.dto.result.HouseCountPictureResultDTO"> <select id="getHousePurposeCount" resultType="com.epmet.dto.result.HouseCountPictureResultDTO.HouseCountPictureCount">
select count (*) as count , PURPOSE as type select count (*) as count , PURPOSE as type
from ic_house from ic_house
@ -792,7 +792,7 @@
group by PURPOSE group by PURPOSE
</select> </select>
<select id="getHouseStatusCount" resultType="com.epmet.dto.result.HouseCountPictureResultDTO"> <select id="getHouseStatusCount" resultType="com.epmet.dto.result.HouseCountPictureResultDTO.HouseCountPictureCount">
select count (*) as count , RENT_FLAG as type select count (*) as count , RENT_FLAG as type
from ic_house from ic_house
where DEL_FLAG = 0 where DEL_FLAG = 0
@ -806,4 +806,5 @@
</if> </if>
group by RENT_FLAG group by RENT_FLAG
</select> </select>
<select id="getHousePictureList" resultType="com.epmet.dto.result.HousePictureListResultDTO"></select>
</mapper> </mapper>

Loading…
Cancel
Save