Browse Source

Merge branch 'dev_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

dev
jianjun 4 years ago
parent
commit
f422097208
  1. 48
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingController.java
  2. 147
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcHouseExcel.java
  3. 24
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
  4. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

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

@ -18,20 +18,16 @@
package com.epmet.controller; package com.epmet.controller;
import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.IcBuildingDTO;
import com.epmet.service.IcBuildingService; import com.epmet.service.IcBuildingService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; 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 java.util.List; import java.util.List;
import java.util.Map;
/** /**
@ -47,42 +43,6 @@ public class IcBuildingController {
@Autowired @Autowired
private IcBuildingService icBuildingService; private IcBuildingService icBuildingService;
@GetMapping("page")
public Result<PageData<IcBuildingDTO>> page(@RequestParam Map<String, Object> params){
PageData<IcBuildingDTO> page = icBuildingService.page(params);
return new Result<PageData<IcBuildingDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<IcBuildingDTO> get(@PathVariable("id") String id){
IcBuildingDTO data = icBuildingService.get(id);
return new Result<IcBuildingDTO>().ok(data);
}
@PostMapping
public Result save(@RequestBody IcBuildingDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
icBuildingService.save(dto);
return new Result();
}
@PutMapping
public Result update(@RequestBody IcBuildingDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
icBuildingService.update(dto);
return new Result();
}
@DeleteMapping
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
icBuildingService.delete(ids);
return new Result();
}
/** /**
* @Description 获取小区内的楼栋 * @Description 获取小区内的楼栋
* @Param dto * @Param dto

147
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcHouseExcel.java

@ -1,147 +0,0 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.epmet.util.ExcelVerifyInfo;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 房屋信息
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-10-27
*/
@Data
public class IcHouseExcel extends ExcelVerifyInfo implements Serializable {
/*@Excel(name = "房屋主键")
private String id;
@Excel(name = "客户id")
private String customerId;
@Excel(name = "小区id")
private String neighborHoodId;
@Excel(name = "片区id,neighbor_hood_part.id,可为空。")
private String partId;
@Excel(name = "所属楼栋id")
private String buildingId;
@Excel(name = "所属单元id")
private String buildingUnitId;
@Excel(name = "房屋名字后台插入时生成")
private String houseName;
@Excel(name = "门牌号")
private String doorName;
@Excel(name = "房屋类型,这里存储字典value就可以")
private String houseType;
@Excel(name = "存储字典value")
private String purpose;
@Excel(name = "1出租;0未出租")
private Integer rentFlag;
@Excel(name = "房主姓名")
private String ownerName;
@Excel(name = "房主电话")
private String ownerPhone;
@Excel(name = "房主身份证号")
private String ownerIdCard;
@Excel(name = "删除标识 0未删除、1已删除")
private String delFlag;
@Excel(name = "乐观锁")
private Integer revision;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;*/
@Excel(name = "所属组织")
@NotBlank(message = "不能为空")
private String agencyName;
@Excel(name = "所属网格")
@NotBlank(message = "不能为空")
private String gridName;
@Excel(name = "所属小区")
@NotBlank(message = "不能为空")
@Length(max=50,message = "不能超过50个字")
private String neighborHoodName;
@Excel(name = "所属楼栋")
@NotBlank(message = "不能为空")
private String buildingName;
@Excel(name = "单元号")
@NotNull(message = "不能为空")
private Integer buildingUnit;
@Excel(name = "门牌号")
@NotBlank(message = "不能为空")
private String doorName;
@Excel(name = "房屋类型")
@NotBlank(message = "不能为空")
private String houseType;
@Excel(name = "房屋用途")
@NotBlank(message = "不能为空")
private String purpose;
@Excel(name = "出租")
@NotBlank(message = "不能为空")
private String rentFlag;
@Excel(name = "房主姓名")
@NotBlank(message = "不能为空")
private String ownerName;
@Excel(name = "房主电话")
@NotBlank(message = "不能为空")
private String ownerPhone;
@Excel(name = "房主身份证")
@NotBlank(message = "不能为空")
private String ownerIdCard;
}

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

@ -23,7 +23,10 @@ import com.epmet.dao.*;
import com.epmet.dto.BuildingTreeLevelDTO; import com.epmet.dto.BuildingTreeLevelDTO;
import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.IcBuildingDTO;
import com.epmet.dto.form.*; import com.epmet.dto.form.*;
import com.epmet.dto.result.*; import com.epmet.dto.result.BuildingResultDTO;
import com.epmet.dto.result.BuildingResultPagedDTO;
import com.epmet.dto.result.IcBuildingListResultDTO;
import com.epmet.dto.result.ImportTaskCommonResultDTO;
import com.epmet.entity.*; import com.epmet.entity.*;
import com.epmet.enums.BuildingTypeEnums; import com.epmet.enums.BuildingTypeEnums;
import com.epmet.excel.IcBuildingExcel; import com.epmet.excel.IcBuildingExcel;
@ -31,7 +34,10 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.model.BuildingInfoModel; import com.epmet.model.BuildingInfoModel;
import com.epmet.model.ImportBuildingInfoListener; import com.epmet.model.ImportBuildingInfoListener;
import com.epmet.redis.IcHouseRedis; import com.epmet.redis.IcHouseRedis;
import com.epmet.service.*; import com.epmet.service.BuildingService;
import com.epmet.service.IcBuildingService;
import com.epmet.service.IcBuildingUnitService;
import com.epmet.service.IcNeighborHoodService;
import com.epmet.util.ExcelPoiUtils; import com.epmet.util.ExcelPoiUtils;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -44,7 +50,6 @@ import org.springframework.util.CollectionUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.*; import java.util.*;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
@ -60,15 +65,10 @@ public class BuildingServiceImpl implements BuildingService {
private IcBuildingService icBuildingService; private IcBuildingService icBuildingService;
@Resource @Resource
private IcBuildingDao icBuildingDao; private IcBuildingDao icBuildingDao;
@Autowired @Autowired
private IcBuildingUnitService icBuildingUnitService; private IcBuildingUnitService icBuildingUnitService;
@Resource @Resource
private IcHouseDao icHouseDao; private IcHouseDao icHouseDao;
@Autowired
private IcHouseService icHouseService;
@Resource @Resource
private CustomerAgencyDao customerAgencyDao; private CustomerAgencyDao customerAgencyDao;
@Resource @Resource
@ -76,8 +76,6 @@ public class BuildingServiceImpl implements BuildingService {
@Resource @Resource
private IcNeighborHoodDao icNeighborHoodDao; private IcNeighborHoodDao icNeighborHoodDao;
@Resource @Resource
private CustomerStaffAgencyDao customerStaffAgencyDao;
@Resource
private IcBuildingUnitDao icBuildingUnitDao; private IcBuildingUnitDao icBuildingUnitDao;
@Autowired @Autowired
private IcHouseRedis icHouseRedis; private IcHouseRedis icHouseRedis;
@ -112,7 +110,7 @@ public class BuildingServiceImpl implements BuildingService {
icBuildingUnit.setUnitNum(String.valueOf(i+1)); icBuildingUnit.setUnitNum(String.valueOf(i+1));
unitList.add(icBuildingUnit); unitList.add(icBuildingUnit);
} }
icBuildingUnitService.insertBatch(unitList); icBuildingUnitService.insertBatch(unitList, NumConstant.ONE_HUNDRED);
} }
@ -428,12 +426,12 @@ public class BuildingServiceImpl implements BuildingService {
* 3. 选中小区可导入该小区下所有楼宇信息房屋信息没有匹配的楼宇均新增 * 3. 选中小区可导入该小区下所有楼宇信息房屋信息没有匹配的楼宇均新增
* 4. 选中楼宇可导入该楼宇下所有房屋信息 * 4. 选中楼宇可导入该楼宇下所有房屋信息
* @param formDTO * @param formDTO
* @param file * @param inputStream
* @author zxc * @author zxc
* @date 2022/2/13 10:15 上午 * @date 2022/2/13 10:15 上午
*/ */
@Override @Override
public Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream,Result<ImportTaskCommonResultDTO> importTask) throws IOException { public Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream,Result<ImportTaskCommonResultDTO> importTask) {
executorService.submit(() -> { executorService.submit(() -> {
ExcelReader excelReader = null; ExcelReader excelReader = null;
try { try {

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

@ -33,10 +33,8 @@ import com.epmet.dto.result.HouseInfoDTO;
import com.epmet.dto.result.IcHouseListResultDTO; import com.epmet.dto.result.IcHouseListResultDTO;
import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO;
import com.epmet.dto.result.NeighborHoodManageDelResultDTO; import com.epmet.dto.result.NeighborHoodManageDelResultDTO;
import com.epmet.entity.IcHouseEntity;
import com.epmet.enums.HousePurposeEnums; import com.epmet.enums.HousePurposeEnums;
import com.epmet.enums.HouseTypeEnums; import com.epmet.enums.HouseTypeEnums;
import com.epmet.excel.IcHouseExcel;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient;

Loading…
Cancel
Save