From b09e1a8b036553d1e161d127aa738a504593490a Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期三, 19 二月 2020 12:14:55 +0800
Subject: [PATCH] 优化巡检路线查询sql

---
 CommunityService/src/main/java/com/java110/community/smo/impl/UnitInnerServiceSMOImpl.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/CommunityService/src/main/java/com/java110/community/smo/impl/UnitInnerServiceSMOImpl.java b/CommunityService/src/main/java/com/java110/community/smo/impl/UnitInnerServiceSMOImpl.java
index f2726ec..686b6ea 100644
--- a/CommunityService/src/main/java/com/java110/community/smo/impl/UnitInnerServiceSMOImpl.java
+++ b/CommunityService/src/main/java/com/java110/community/smo/impl/UnitInnerServiceSMOImpl.java
@@ -1,14 +1,15 @@
 package com.java110.community.smo.impl;
 
 
-import com.java110.common.util.BeanConvertUtil;
+import com.java110.dto.unit.FloorAndUnitDto;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.community.dao.IUnitServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.unit.IUnitInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.UnitDto;
-import com.java110.dto.UserDto;
+import com.java110.dto.user.UserDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -34,7 +35,7 @@
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
 
     @Override
-    public List<UnitDto> queryUnits(@RequestBody  UnitDto unitDto) {
+    public List<UnitDto> queryUnits(@RequestBody UnitDto unitDto) {
 
         //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
 
@@ -42,8 +43,8 @@
 
         if (page != PageDto.DEFAULT_PAGE) {
             unitDto.setPage((page - 1) * unitDto.getRow());
-            unitDto.setRow(page * unitDto.getRow());
         }
+
 
         List<UnitDto> units = BeanConvertUtil.covertBeanList(unitServiceDaoImpl.getUnitInfo(BeanConvertUtil.beanCovertMap(unitDto)), UnitDto.class);
 
@@ -64,7 +65,7 @@
     /**
      * 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
      *
-     * @param unit 灏忓尯妤煎崟鍏冧俊鎭�
+     * @param unit  灏忓尯妤煎崟鍏冧俊鎭�
      * @param users 鐢ㄦ埛鍒楄〃
      */
     private void refreshUnit(UnitDto unit, List<UserDto> users) {
@@ -92,7 +93,21 @@
 
     @Override
     public int queryUnitsCount(@RequestBody UnitDto unitDto) {
-        return unitServiceDaoImpl.queryUnitsCount(BeanConvertUtil.beanCovertMap(unitDto));    }
+        return unitServiceDaoImpl.queryUnitsCount(BeanConvertUtil.beanCovertMap(unitDto));
+    }
+
+    @Override
+    public List<UnitDto> queryUnitsByCommunityId(@RequestBody UnitDto unitDto) {
+        List<UnitDto> units = BeanConvertUtil.covertBeanList(unitServiceDaoImpl.queryUnitsByCommunityId(BeanConvertUtil.beanCovertMap(unitDto)), UnitDto.class);
+        return units;
+    }
+
+    @Override
+    public List<FloorAndUnitDto> getFloorAndUnitInfo(@RequestBody FloorAndUnitDto floorAndUnitDto) {
+        List<FloorAndUnitDto> floors = BeanConvertUtil.covertBeanList(unitServiceDaoImpl.getFloorAndUnitInfo(BeanConvertUtil.beanCovertMap(floorAndUnitDto)), FloorAndUnitDto.class);
+        return floors;
+    }
+
 
     public IUnitServiceDao getUnitServiceDaoImpl() {
         return unitServiceDaoImpl;

--
Gitblit v1.8.0