修改bug

huanghongfa

2021-05-28 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java

@@ -1,18 +1,13 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.model.vos.community.ComStreetVO;
import com.panzhihua.service_community.service.ComMngVillageService;
import com.panzhihua.service_community.service.ComStreetService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.validation.Valid;
@@ -37,7 +32,7 @@
    @PostMapping("addvillage")
    @Transactional(rollbackFor = Exception.class)
    public R addVillage(@Valid  @RequestBody ComMngVillageVO comMngVillageVO) {
        R r = comMngVillageService.addComMngVillage(comMngVillageVO);
        R r = comMngVillageService.addComActVillage(comMngVillageVO);
        return R.ok(r);
    }

@@ -48,7 +43,7 @@
     */
    @PostMapping("pagevillage")
    public R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO) {
        R r = comMngVillageService.pageComMngVillage(pageComMngVillageDTO);
        R r = comMngVillageService.pageComActVillage(pageComMngVillageDTO);
        return R.ok(r);
    }

@@ -59,7 +54,7 @@
     */
    @PostMapping("listvillage")
    public R listVillage(@RequestBody ComMngVillageVO comMngVillageVO) {
        R r = comMngVillageService.listComMngVillage(comMngVillageVO);
        R r = comMngVillageService.listComActVillage(comMngVillageVO);
        return R.ok(r);
    }

@@ -71,8 +66,44 @@
    @PostMapping("deletevillage")
    @Transactional(rollbackFor = Exception.class)
    public R delectVillage(@RequestBody List<Long> Ids) {
        R r = comMngVillageService.delecComMngVillage(Ids);
        R r = comMngVillageService.delecComActVillage(Ids);
        return R.ok(r);
    }


    /**
     * 社区后台导入实有房屋
     * @param list 数据
     * @param communityId 社区编号
     * @return
     */
    @PostMapping("/village/import")
    @Transactional(rollbackFor = Exception.class)
    public R listSaveMngCarExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
        return comMngVillageService.listSaveVillage(list,communityId);
    }


    /**
     * 编辑实有房屋
     * @param villageId 动态id
     * @return 删除结果
     */
    @PostMapping("editvillage/{villageId}")
    @Transactional(rollbackFor = Exception.class)
    public R editvillage(@PathVariable("villageId")Long villageId,@Valid @RequestBody ComMngVillageVO comMngVillageVO) {
        return comMngVillageService.editVillage(villageId,comMngVillageVO);
    }

    /**
     * 小区详情
     * @param villageId 小区id
     * @return  小区详情
     */
    @PostMapping("/village/getVillage")
    public R getVillage(@RequestParam("villageId") Long villageId) {
        return comMngVillageService.getVillage(villageId);
    }


}