Merge branch 'yantai_zhengwu_master' into dev

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 根据小区，楼宇，单元名称校验是否存在
+ * @Author wgf
+ * @Date 2022/8/24 9:03
+ */
+@Data
+public class HouseCountPictureFormDTO implements Serializable {
+    private static final long serialVersionUID = 2636608477324780974L;
+
+    private String orgIdPath;
+
+    private Date timeStart;
+
+    private Date timeEnd;
+
+    private Integer pageSize;
+
+    private Integer pageNo;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: lichao
+ * @Date: 2023/4/11 15:05
+ */
+@NoArgsConstructor
+@Data
+public class HouseCountPictureResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2063032844842070847L;
+
+    private Integer total;
+
+    private List<HouseCountPictureCount> list;
+
+    @Data
+    public static class HouseCountPictureCount{
+
+        private String type;
+
+        private Integer count;
+    }
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HousePictureListResultDTO.java

@@ -0,0 +1,33 @@
+package com.epmet.dto.result;
+
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: lichao
+ * @Date: 2023/4/11 14:41
+ */
+@NoArgsConstructor
+@Data
+public class HousePictureListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2063032844842070847L;
+
+    private String houseId;
+
+    private String districtName;
+
+    private String neighborName;
+
+    private String gridName;
+
+    private String houseName;
+
+    private String purpose;
+
+    private Integer rentFlag;
+}

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

@@ -26,11 +26,9 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.CheckHouseInfoFormDTO;
+import com.epmet.dto.form.HouseCountPictureFormDTO;
 import com.epmet.dto.form.HouseFormDTO;
-import com.epmet.dto.result.HouseAgencyInfoResultDTO;
-import com.epmet.dto.result.HouseInfoDTO;
-import com.epmet.dto.result.HouseListResultDTO;
-import com.epmet.dto.result.HousesNameResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.service.IcHouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -161,4 +159,38 @@ public class IcHouseController {
         return icHouseService.checkHomeInfo(formDTO);
     }
 
+    /**
+     * @Description: 房屋画像-用途统计
+     * @param dto:
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.HouseCountPictureResultDTO>
+     * @Author: lichao
+     * @Date: 2023/4/11 15:08
+     */
+    @PostMapping("getHousePurposeCount")
+    public Result<HouseCountPictureResultDTO> getHousePurposeCount(@RequestBody HouseCountPictureFormDTO dto){
+        return new Result<HouseCountPictureResultDTO>().ok(icHouseService.getHousePurposeCount(dto));
+    }
+
+
+    /**
+     * @Description: 房屋画像-状态统计
+     * @param dto:
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.HouseCountPictureResultDTO>
+     * @Author: lichao
+     * @Date: 2023/4/11 15:07
+     */
+    @PostMapping("getHouseStatusCount")
+    public Result<HouseCountPictureResultDTO> getHouseStatusCount(@RequestBody HouseCountPictureFormDTO dto){
+        return new Result<HouseCountPictureResultDTO>().ok(icHouseService.getHouseStatusCount(dto));
+    }
+
+    /**
+     * 房屋画像-列表
+     * @param dto
+     * @return
+     */
+    @PostMapping("getHousePictureList")
+    public Result<List<HousePictureListResultDTO>> getHousePictureList(@RequestBody HouseCountPictureFormDTO dto){
+        return new Result<List<HousePictureListResultDTO>>().ok(icHouseService.getHousePictureList(dto));
+    }
 }

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

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
@@ -218,4 +219,8 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      * @return
      */
     List<GroupRentHouseResultDTO> selectGroupRentHouseList(GroupRentHouseFormDTO formDTO);
+
+    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);
 }

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

@@ -8,6 +8,7 @@ import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.CheckHouseInfoFormDTO;
 import com.epmet.dto.form.DetailByTypeFormDTO;
+import com.epmet.dto.form.HouseCountPictureFormDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcHouseEntity;
@@ -139,4 +140,9 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
     Result checkHomeInfo(CheckHouseInfoFormDTO formDTO);
 
 
+    HouseCountPictureResultDTO getHousePurposeCount(HouseCountPictureFormDTO dto);
+
+    HouseCountPictureResultDTO getHouseStatusCount(HouseCountPictureFormDTO dto);
+
+    List<HousePictureListResultDTO> getHousePictureList(HouseCountPictureFormDTO dto);
 }

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

@@ -1227,6 +1227,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         result.setOrgLevel(rootAgency.getAgencyId().concat("-").concat(rootAgency.getLevel()));
         result.setLongitude(rootAgency.getLongitude());
         result.setLatitude(rootAgency.getLatitude());
+        result.setOrgIdPath(rootAgency.getOrgIdPath());
 
         String orgTreeCacheKey = RedisKeys.getOrgTreeCacheKey(rootAgency.getAgencyId(),customerId);
         Object o = redisUtils.get(orgTreeCacheKey);

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

@@ -23,6 +23,7 @@ import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.CheckHouseInfoFormDTO;
+import com.epmet.dto.form.HouseCountPictureFormDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcBuildingEntity;
@@ -405,4 +406,41 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
 
         return new Result<CheckHomeInfoResultInfo>().ok(checkHomeInfoResultInfo);
     }
+
+    @Override
+    public HouseCountPictureResultDTO getHousePurposeCount(HouseCountPictureFormDTO dto) {
+
+        HouseCountPictureResultDTO resultDTO = new HouseCountPictureResultDTO();
+
+        resultDTO.setTotal(0);
+
+        resultDTO.setList(baseDao.getHousePurposeCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd()));
+
+        resultDTO.getList().forEach(
+                result->resultDTO.setTotal(resultDTO.getTotal()+result.getCount())
+        );
+
+        return resultDTO;
+    }
+
+    @Override
+    public HouseCountPictureResultDTO getHouseStatusCount(HouseCountPictureFormDTO dto) {
+
+        HouseCountPictureResultDTO resultDTO = new HouseCountPictureResultDTO();
+
+        resultDTO.setTotal(0);
+
+        resultDTO.setList(baseDao.getHouseStatusCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd()));
+
+        resultDTO.getList().forEach(
+                result->resultDTO.setTotal(resultDTO.getTotal()+result.getCount())
+        );
+
+        return resultDTO;
+    }
+
+    @Override
+    public List<HousePictureListResultDTO> getHousePictureList(HouseCountPictureFormDTO dto) {
+        return null;
+    }
 }

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

@@ -213,7 +213,7 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
         if (StringUtils.isBlank(formDTO.getOrgId())) {
             CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId());
             formDTO.setOrgId(staffInfoCacheResult.getAgencyId());
-            formDTO.setLevel(staffInfoCacheResult.getLevel());
+            // formDTO.setLevel(staffInfoCacheResult.getLevel());
         }
         if (formDTO.getIsPage()) {
             PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());

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

@@ -776,4 +776,34 @@
             CONVERT ( ih.DOOR_NAME USING gbk ),
             ih.SORT ASC
     </select>
+    <select id="getHousePurposeCount" resultType="com.epmet.dto.result.HouseCountPictureResultDTO">
+
+        select count (*) as count , PURPOSE as type
+        from ic_house
+        where DEL_FLAG = 0
+        and
+            ORG_ID_PATH like concat(#{orgId},'%')
+        <if test="timeStart != null">
+            and CREATED_TIME &gt;= #{timeStart}
+        </if>
+        <if test="timeEnd != null">
+            and CREATED_TIME &lt;= #{timeEnd}
+        </if>
+        group by PURPOSE
+
+    </select>
+    <select id="getHouseStatusCount" resultType="com.epmet.dto.result.HouseCountPictureResultDTO">
+        select count (*) as count , RENT_FLAG as type
+        from ic_house
+        where DEL_FLAG = 0
+          and
+            ORG_ID_PATH like concat(#{orgId},'%')
+        <if test="timeStart != null">
+            and CREATED_TIME &gt;= #{timeStart}
+        </if>
+        <if test="timeEnd != null">
+            and CREATED_TIME &lt;= #{timeEnd}
+        </if>
+        group by RENT_FLAG
+    </select>
 </mapper>