Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-03-30 0edab788f512d3c269c6b5caa62682dc1ef396f4

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

@@ -3,11 +3,10 @@
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.service.ComMngCarService;
import com.panzhihua.service_community.service.ComMngProvinceService;
import com.panzhihua.service_community.service.ComMngRealAssetsService;
import com.panzhihua.service_community.service.ComMngRealCompanyService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -34,6 +33,9 @@

    @Resource
    private ComMngProvinceService comMngProvinceService;
    @Resource
    private ComMngPopulationService comMngPopulationService;


    /**
     * 小程序用户车辆登记
@@ -130,6 +132,10 @@
        return comMngRealCompanyService.detailComMngRealCompany(id);
    }

    @GetMapping("/company/belongs")
    public R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO) {
        return comMngRealCompanyService.belongsComMngRealCompany(comMngRealCompanyBelongsDTO);
    }
    /**
     * 社区后台导入实有单位
     * @param list 车实有单位列表
@@ -246,4 +252,46 @@
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode){
        return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode);
    }

    /**
     * 社区后台实有人口管理列表
     * @param comMngPopulationVO 查询参数
     * @return  实有人口分页查询结果
     */
    @PostMapping("/population/page")
    public R pagePopulation(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
        return comMngPopulationService.pagePopulation(comMngPopulationVO);
    }

    /**
     * 社区后台导入实有人口
     * @param list 数据
     * @param communityId 社区编号
     * @return
     */
    @PostMapping("/population/import")
    @Transactional(rollbackFor = Exception.class)
    public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
        return comMngPopulationService.listSavePopulation(list,communityId);
    }

    /**
     * 根据实有人口id查询详情
     * @param populationId 实有人口id
     * @return  实有人口详情查询结果
     */
    @PostMapping("/population/detail")
    public R detailPopulation(@RequestParam(value = "populationId") Long populationId) {
        return comMngPopulationService.detailPopulation(populationId);
    }

    /**
     * 根据实有人口id修改标签列表
     * @param populationTagDTO 请求参数
     * @return  修改结果
     */
    @PostMapping("/population/editTag")
    public R editTagPopulation(@RequestBody ComMngPopulationTagDTO populationTagDTO) {
        return comMngPopulationService.editTagPopulation(populationTagDTO);
    }
}