building

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java

@@ -112,16 +112,62 @@ public class BuildingOwnerInfoController extends BaseController {
         return responseBean;
     }
 
-    @ApiOperation(value = "查询 楼栋/单元/楼层/户号", notes = "查询 楼栋/单元/楼层/户号")
+    @ApiOperation(value = "查询 期区", notes = "查询 期区")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "building楼层;" +
-                    "unit单元;level楼层") // ;roomNo户号
     })
-    @RequestMapping(value = "/building/address",method = RequestMethod.POST)
-    public ResponseBean buildingUnitNumber(@RequestBody String parameter, HttpSession session){
+    @RequestMapping(value = "/building/phase",method = RequestMethod.GET)
+    public ResponseBean getPhaseList(HttpSession session){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfoService.getBuildingOrUnitOrNumber(parameter, userElement.getCommunityId());
+        responseBean = iBuildingOwnerInfoService.getPhaseList(userElement.getCommunityId());
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "查询 期区", notes = "查询 期区")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", name = "phaseId",value = "期区ID")
+    })
+    @RequestMapping(value = "/building/building",method = RequestMethod.GET)
+    public ResponseBean getBuildingList(@RequestParam Integer phaseId, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getBuildingList(phaseId,userElement.getCommunityId());
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "查询 期区", notes = "查询 期区")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", name = "buildingId",value = "楼栋ID")
+    })
+    @RequestMapping(value = "/building/unit",method = RequestMethod.GET)
+    public ResponseBean getUnitList(@RequestParam Integer buildingId,HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getUnitList(buildingId,userElement.getCommunityId());
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "查询 期区", notes = "查询 期区")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", name = "unitId",value = "单元ID")
+    })
+    @RequestMapping(value = "/building/level",method = RequestMethod.GET)
+    public ResponseBean getLevelList(@RequestParam Integer unitId,HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getLevelList(unitId,userElement.getCommunityId());
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "查询 期区", notes = "查询 期区")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", name = "levelId",value = "楼层ID")
+    })
+    @RequestMapping(value = "/building/roomno",method = RequestMethod.GET)
+    public ResponseBean getRoomNoList(@RequestParam Integer levelId,HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getRoomNoList(levelId,userElement.getCommunityId());
         return responseBean;
     }
     

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java

@@ -59,11 +59,10 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      *
      *   楼栋是根据 小区ID查询
      *
-     * @param parameter
      * @param communityId
      * @return
      */
-    ResponseBean getBuildingOrUnitOrNumber(String parameter, Integer communityId);
+    ResponseBean getPhaseList(Integer communityId);
     
     /**
      * 上传excel里面的内容
@@ -118,4 +117,36 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @return
      */
     ResponseBean downloadExcel(UserElement userElement);
+    
+    /**
+     * 获取楼栋信息
+     * @param phaseId
+     * @param communityId
+     * @return
+     */
+    ResponseBean getBuildingList(Integer phaseId, Integer communityId);
+    
+    /**
+     * 获取单元信息
+     * @param buildingId
+     * @param communityId
+     * @return
+     */
+    ResponseBean getUnitList(Integer buildingId, Integer communityId);
+    
+    /**
+     * 获取楼层信息
+     * @param unitId
+     * @param communityId
+     * @return
+     */
+    ResponseBean getLevelList(Integer unitId, Integer communityId);
+    
+    /**
+     * 获取室号信息
+     * @param levelId
+     * @param communityId
+     * @return
+     */
+    ResponseBean getRoomNoList(Integer levelId, Integer communityId);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -67,10 +67,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     @Autowired
     private TaSysUserRoleMapper taSysUserRoleMapper;
-
-    @Autowired
-    private ITaUserService iTaUserService;
-
+    
     @Autowired
     private BillInvoiceMapper billInvoiceMapper;
 
@@ -83,6 +80,18 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
     
+    @Autowired
+    private TpPhaseMapper tpPhaseMapper;
+    
+    @Autowired
+    private TpBuildingMapper tpBuildingMapper;
+    
+    @Autowired
+    private TpUnitMapper tpUnitMapper;
+    
+    @Autowired
+    private TpLevelMapper tpLevelMapper;
+    
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
     @Override
@@ -377,47 +386,21 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     }
 
     @Override
-    public ResponseBean getBuildingOrUnitOrNumber(String parameter,Integer communityId) {
+    public ResponseBean getPhaseList(Integer communityId) {
 
         ResponseBean responseBean = new ResponseBean();
         if (null == communityId || "".equals(communityId)) {
             throw new WisdomException("编号:%s 小区不存在!", communityId);
         }
 
-        TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
-
         Map<String, Object> map = Maps.newHashMap();
-
         // 小区
         map.put("community_id", communityId);
-        map.put("owner_status", "1");
-        // 期
-        //map.put("phase", tpBuildingOwnerInfo.getPhaseName());
-        // 栋
-        //map.put("building", tpBuildingOwnerInfo.getBuildingName());
-        // 单元
-        //map.put("unit", tpBuildingOwnerInfo.getUnitName());
-        // 楼层
-        //map.put("level", tpBuildingOwnerInfo.getLevelName());
-
-        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<TpPhase> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map, false);
-
-        /**
-         * 1.如果 楼栋值不存在表示根据小区Id查询时查询楼栋!
-         * 2.如果 楼栋存在表示查询单元
-         * 3.如果 单元存在表示查询楼层
-         * 4.如果 楼层存在表示查询户号
-         *
-         * 查询户号, 依赖于前面的查询条件成立!
-         *
-         * 这里的查询都依赖于, 前面的查询条件成立! 比如 要使用条件2, 那么条件1 必须成立!
-         *
-         */
-
-        List<TpBuildingOwnerInfo> selectList = tpBuildingOwnerInfoMapper.selectList(queryWrapper);
-
-        responseBean.addSuccess(selectList);
+    
+        List<TpPhase> tpPhaseList = tpPhaseMapper.selectList(queryWrapper);
+        responseBean.addSuccess(tpPhaseList);
 
         return responseBean;
     }
@@ -948,4 +931,52 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         responseBean.addSuccess(workbook);
         return responseBean;
     }
+    
+    /**
+     * 获取楼栋信息
+     *
+     * @param phaseId
+     * @param communityId
+     * @return
+     */
+    @Override
+    public ResponseBean getBuildingList(Integer phaseId, Integer communityId) {
+        return null;
+    }
+    
+    /**
+     * 获取单元信息
+     *
+     * @param buildingId
+     * @param communityId
+     * @return
+     */
+    @Override
+    public ResponseBean getUnitList(Integer buildingId, Integer communityId) {
+        return null;
+    }
+    
+    /**
+     * 获取楼层信息
+     *
+     * @param unitId
+     * @param communityId
+     * @return
+     */
+    @Override
+    public ResponseBean getLevelList(Integer unitId, Integer communityId) {
+        return null;
+    }
+    
+    /**
+     * 获取室号信息
+     *
+     * @param levelId
+     * @param communityId
+     * @return
+     */
+    @Override
+    public ResponseBean getRoomNoList(Integer levelId, Integer communityId) {
+        return null;
+    }
 }

VUECODE/smart-property-manage/src/api/buildingOwnerInfo.js

@@ -1,19 +1,48 @@
 import request from '@/utils/request'
 
 //  查询 楼栋/单元/楼层/户号
-export function buildingAddress(data) {
-  const config = {
-    url: '/building/address',
-    method: 'post',
-    data: {
-      phase: data.phase,
-      building: data.building,
-      unit: data.unit,
-      level: data.level,
-      roomNo: data.roomNo
-    }
-  }
-  return request(config)
+export function getPhaseList(data) {
+  return request({
+    url: '/building/phase',
+    method: 'get',
+    params: data
+  })
+}
+
+//  查询 楼栋/单元/楼层/户号
+export function getBuildingList(data) {
+  return request({
+    url: '/building/building',
+    method: 'get',
+    params: data
+  })
+}
+
+//  查询 楼栋/单元/楼层/户号
+export function getUnitList(data) {
+  return request({
+    url: '/building/unit',
+    method: 'get',
+    params: data
+  })
+}
+
+//  查询 楼栋/单元/楼层/户号
+export function getLevelList(data) {
+  return request({
+    url: '/building/level',
+    method: 'get',
+    params: data
+  })
+}
+
+//  查询 楼栋/单元/楼层/户号
+export function getRoomNoList(data) {
+  return request({
+    url: '/building/roomno',
+    method: 'get',
+    params: data
+  })
 }
 
 // 获取楼栋业主信息列表

VUECODE/smart-property-manage/src/store/modules/buildingOwnerInfo.js

@@ -1,5 +1,5 @@
 
-import { buildingAddress, buildingList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId, userPassCertification, updataPassCertification, communityBuildinglist, buildingHouse, communityBuildingAdd, buildingDownloadExcel } from '@/api/buildingOwnerInfo'
+import { getPhaseList, getBuildingList, getUnitList, getLevelList, getRoomNoList, buildingList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId, userPassCertification, updataPassCertification, communityBuildinglist, buildingHouse, communityBuildingAdd, buildingDownloadExcel } from '@/api/buildingOwnerInfo'
 
 const buildingOwnerInfo = {
   state: {
@@ -11,9 +11,49 @@ const buildingOwnerInfo = {
     }
   },
   actions: {
-    BuildingAddress({ commit }, data) { // 查询 楼栋/单元/楼层/户号
+    GetPhaseList({ commit }, data) { // 查询 楼栋/单元/楼层/户号
       return new Promise((resolve, reject) => {
-        buildingAddress(data).then(response => {
+        getPhaseList(data).then(response => {
+          // console.log('查询 楼栋/单元/楼层/户号: ', response)
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    GetBuildingList({ commit }, data) { // 查询 楼栋/单元/楼层/户号
+      return new Promise((resolve, reject) => {
+        getBuildingList(data).then(response => {
+          // console.log('查询 楼栋/单元/楼层/户号: ', response)
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    GetUnitList({ commit }, data) { // 查询 楼栋/单元/楼层/户号
+      return new Promise((resolve, reject) => {
+        getUnitList(data).then(response => {
+          // console.log('查询 楼栋/单元/楼层/户号: ', response)
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    GetLevelList({ commit }, data) { // 查询 楼栋/单元/楼层/户号
+      return new Promise((resolve, reject) => {
+        getLevelList(data).then(response => {
+          // console.log('查询 楼栋/单元/楼层/户号: ', response)
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    GetRoomNoList({ commit }, data) { // 查询 楼栋/单元/楼层/户号
+      return new Promise((resolve, reject) => {
+        getRoomNoList(data).then(response => {
           // console.log('查询 楼栋/单元/楼层/户号: ', response)
           resolve(response)
         }).catch(error => {

VUECODE/smart-property-manage/src/views/building/index.vue

@@ -3,45 +3,45 @@
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item label="楼盘库">
-        <el-select v-model="listQuery.phase" placeholder="期/区" @change="buildSelectChange(0)">
+        <el-select v-model="listQuery.phaseId" placeholder="期/区" @change="buildSelectChange(0)">
           <!--<el-option label="选择楼栋" value="-1" />-->
           <el-option
             v-for="item in phaseList"
             :key="item.id"
-            :label="item.phase"
-            :value="item.phase"/>
+            :label="item.name"
+            :value="item.id"/>
         </el-select>
-        <el-select v-model="listQuery.building" placeholder="栋" @change="buildSelectChange(1)">
+        <el-select v-model="listQuery.buildingId" placeholder="栋" @change="buildSelectChange(1)">
           <!--<el-option label="选择楼栋" value="-1" />-->
           <el-option
             v-for="item in buildingList"
             :key="item.id"
-            :label="item.building"
-            :value="item.building"/>
+            :label="item.name"
+            :value="item.id"/>
         </el-select>
-        <el-select v-model="listQuery.unit" placeholder="单元" @change="buildSelectChange(2)">
+        <el-select v-model="listQuery.unitId" placeholder="单元" @change="buildSelectChange(2)">
           <!--<el-option label="选择单元" value="-1" />-->
           <el-option
             v-for="item in unitList"
             :key="item.id"
-            :label="item.unit"
-            :value="item.unit"/>
+            :label="item.name"
+            :value="item.id"/>
         </el-select>
-        <el-select v-model="listQuery.level" placeholder="楼层" @change="buildSelectChange(3)">
+        <el-select v-model="listQuery.levelId" placeholder="楼层" @change="buildSelectChange(3)">
           <!--<el-option label="选择楼层" value="-1" />-->
           <el-option
             v-for="item in levelList"
             :key="item.id"
-            :label="item.level"
-            :value="item.level"/>
+            :label="item.name"
+            :value="item.id"/>
         </el-select>
-        <el-select v-model="listQuery.roomNo" placeholder="户号">
+        <el-select v-model="listQuery.roomNoId" placeholder="户号">
           <!--<el-option label="选择户号" value="-1" />-->
           <el-option
             v-for="item in roomNoList"
             :key="item.id"
-            :label="item.roomNo"
-            :value="item.roomNo"/>
+            :label="item.name"
+            :value="item.id"/>
         </el-select>
         <el-form-item label="业主名称">
           <el-input v-model="listQuery.ownerName" placeholder="业主名称" />
@@ -105,11 +105,11 @@ export default {
   data() {
     return {
       listQuery: {
-        phase: '',
-        building: '',
-        unit: '',
-        level: '',
-        roomNo: '',
+        phaseId: '',
+        buildingId: '',
+        unitId: '',
+        levelId: '',
+        roomNoId: '',
         ownerName: '',
         pageNum: 1,
         pageSize: 10
@@ -156,7 +156,11 @@ export default {
   },
   methods: {
     ...mapActions('buildingOwnerInfo', [
-      'BuildingAddress',
+      'GetPhaseList',
+      'GetBuildingList',
+      'GetUnitList',
+      'GetLevelList',
+      'GetRoomNoList',
       'BuildingInfoList'
     ]),
     handleSizeChange(val) {
@@ -185,15 +189,15 @@ export default {
     },
     getPhase() { // 获取期
       this.listQuery.phase = ''
-      this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
+      this.$store.dispatch('GetPhaseList', this.listQuery).then((res) => {
         this.phaseList = res.data
       }).catch(() => {
         console.log('error phase BuildingAddress')
       })
     },
     getBuild() { // 获取楼栋
-      this.listQuery.building = ''
-      this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
+      this.listQuery.buildingId = ''
+      this.$store.dispatch('GetBuildingList', this.listQuery).then((res) => {
         this.buildingList = res.data
       }).catch(() => {
         console.log('error building BuildingAddress')
@@ -201,7 +205,7 @@ export default {
     },
     getUnit() { // 获取单元
       this.listQuery.unit = ''
-      this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
+      this.$store.dispatch('GetUnitList', this.listQuery).then((res) => {
         this.unitList = res.data
       }).catch(() => {
         console.log('error unit BuildingAddress')
@@ -209,7 +213,7 @@ export default {
     },
     getLevel() { // 获取楼层
       this.listQuery.level = ''
-      this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
+      this.$store.dispatch('GetLevelList', this.listQuery).then((res) => {
         this.levelList = res.data
       }).catch(() => {
         console.log('error level BuildingAddress')
@@ -217,7 +221,7 @@ export default {
     },
     getRoomNo() { // 获取户号
       this.listQuery.roomNo = ''
-      this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
+      this.$store.dispatch('GetRoomNoList', this.listQuery).then((res) => {
         this.roomNoList = res.data
       }).catch(() => {
         console.log('error roomNo BuildingAddress')