luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'remotes/origin/dev' into dev_house_resi_export

dev
jianjun 4 years ago
parent
f13582b5aa 216fb26c86
commit
64e2f6e195
12 changed files with 105 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
  2. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
  3. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
  4. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
  5. 3
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
  6. 2
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
  7. 7
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
  8. 22
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java
  9. 39
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
  10. 14
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java
  11. 35
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java
  12. BIN
      epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
View File

@ -87,4 +87,6 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
* @date 2022/4/28 09:10
*/
void delProperty(@Param("neighborHoodIds")List<String> neighborHoodIds);
void updateOneNeighborHood(ImportGeneralDTO info);
}

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
View File

@ -227,13 +227,14 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
buildingInfos = null == buildingInfos ? getBuildingInfos(dto.getAgencyId()) : buildingInfos;
Object cacheBuilding = icHouseRedis.getTemporaryCacheBuilding(formDTO.getCustomerId(), formDTO.getUserId(), dto.getNeighborHoodId() + "_" + dto.getBuildingName());
dto.setBuildingId(null == cacheBuilding ? "" : cacheBuilding.toString());
if (StringUtils.isNotBlank(dto.getBuildingId())){
/*if (StringUtils.isNotBlank(dto.getBuildingId())){
// 说明数据库已存在此楼栋，不需添加
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
}else {
needDisposeList.add(dto);
}
}*/
needDisposeList.add(dto);
}else {
needDisposeList.add(dto);
}

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
View File

@ -88,12 +88,6 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
info = data;
num = num + NumConstant.ONE;
info.setNum(num);
if (StringUtils.isBlank(data.getNeighborHoodName()) ||
StringUtils.isBlank(data.getGridName()) || StringUtils.isBlank(data.getAgencyName()) || StringUtils.isBlank(data.getAddress())){
nums.add(num);
disposeErrorMsg(info,NEIGHBORHOOD_TYPE_ERROR);
return;
}
if(StringUtils.isBlank(data.getAgencyName())){
nums.add(num);
disposeErrorMsg(info, "所属组织的值未填写");
@ -109,7 +103,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
disposeErrorMsg(info,"小区名称的值未填写");
return;
}
if(StringUtils.isBlank(data.getNeighborHoodName())){
if(StringUtils.isBlank(data.getAddress())){
nums.add(num);
disposeErrorMsg(info,"详细地址的值未填写");
return;

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
View File

@ -567,6 +567,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
IcNeighborHoodEntity entity = baseDao.selectOne(wrapper);
if (null != entity) {
info.setNeighborHoodExistStatus(true);
baseDao.updateOneNeighborHood(info);
return entity.getId();
}
entity = new IcNeighborHoodEntity();

3
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
View File

@ -51,6 +51,7 @@
BUILDING_LEADER_NAME = #{buildingLeaderName},
BUILDING_LEADER_MOBILE = #{buildingLeaderMobile},
SORT = #{sort},
TYPE = #{type},
UPDATED_TIME = NOW()
WHERE ID = #{buildingId}
</update>
@ -91,7 +92,7 @@
c.ORGANIZATION_NAME as agencyName,
d.ID as gridId,
d.GRID_NAME as gridName,
a.SORT as sort,
IFNULL(a.SORT,0) as sort,
a.LONGITUDE as longitude,
a.LATITUDE as latitude,
a.TYPE as buildingTypeKey,

2
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
View File

@ -112,7 +112,7 @@
ag.ORGANIZATION_NAME agencyName,
c.GRID_ID as gridId,
gr.GRID_NAME,
a.sort
IFNULL(a.sort,0) as sort
from ic_house a
LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'

7
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
View File

@ -67,6 +67,13 @@
</foreach>
)
</update>
<update id="updateOneNeighborHood">
update ic_neighbor_hood
set ADDRESS = #{address},
REMARK = #{remark},
UPDATED_TIME = NOW()
where id = #{neighborHoodId}
</update>
<!-- 删除物业关系 -->
<delete id="delProperty">

22
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java
View File

@ -0,0 +1,22 @@
package com.epmet.resi.partymember.dto.partymember.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 党员风采列表接口参数
*
* @author work@yujt.net.cn
* @date 2022/5/9/0009 14:22
*/
@Data
public class StyleShowListResiFormDTO extends StyleShowListFormDTO implements Serializable {
private static final long serialVersionUID = -7548077165302515633L;
@NotBlank(message = "所属组织不能为空")
private String agencyId;
}

39
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
View File

@ -40,6 +40,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleService;
import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.FilenameUtils;
@ -75,27 +76,27 @@ import java.util.stream.Collectors;
@RestController
@RequestMapping("icpartymemberstyle")
public class IcPartymemberStyleController {
@Autowired
private IcPartymemberStyleService icPartymemberStyleService;
@Autowired
private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
@GetMapping("page")
public Result<PageData<IcPartymemberStyleDTO>> page(@RequestParam Map<String, Object> params){
public Result<PageData<IcPartymemberStyleDTO>> page(@RequestParam Map<String, Object> params) {
PageData<IcPartymemberStyleDTO> page = icPartymemberStyleService.page(params);
return new Result<PageData<IcPartymemberStyleDTO>>().ok(page);
}
@PostMapping("detail")
public Result<IcPartymemberStyleDTO> get(@RequestBody IcPartymemberStyleDTO dto){
public Result<IcPartymemberStyleDTO> get(@RequestBody IcPartymemberStyleDTO dto) {
IcPartymemberStyleDTO data = icPartymemberStyleService.get(dto.getId());
return new Result<IcPartymemberStyleDTO>().ok(data);
}
@PostMapping("save")
@NoRepeatSubmit
public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto){
public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
icPartymemberStyleService.save(tokenDto, dto);
@ -103,7 +104,7 @@ public class IcPartymemberStyleController {
}
@PostMapping("delete")
public Result delete(@RequestBody IcPartymemberStyleDTO dto){
public Result delete(@RequestBody IcPartymemberStyleDTO dto) {
//效验数据
icPartymemberStyleService.delete(dto.getId());
return new Result();
@ -156,7 +157,7 @@ public class IcPartymemberStyleController {
InputStream inputStream = null;
try {
inputStream = file.getInputStream();
}catch (Exception e){
} catch (Exception e) {
ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
input.setOperatorId(tokenDto.getUserId());
input.setTaskId(result.getData().getTaskId());
@ -172,23 +173,43 @@ public class IcPartymemberStyleController {
/**
* 数据分析-党员风采列表查询
*
* @param tokenDto
* @return
*/
@PostMapping("showlist")
public Result<PageData<IcPartymemberStyleDTO>> showList(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListFormDTO formDTO){
public Result<PageData<IcPartymemberStyleDTO>> showList(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO,StyleShowListFormDTO.AddUserInternalGroup.class);
ValidatorUtils.validateEntity(formDTO, StyleShowListFormDTO.AddUserInternalGroup.class);
return new Result<PageData<IcPartymemberStyleDTO>>().ok(icPartymemberStyleService.showList(formDTO));
}
/**
* 党员风采列表
*
* @param tokenDto 登录用户
* @param formDto 查询条件
* @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO>>
* @author work@yujt.net.cn
* @date 2022/5/9/0009 14:23
*/
@PostMapping("showlistbyagency")
public Result<PageData<IcPartymemberStyleDTO>> showListByAgency(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListResiFormDTO formDto) {
formDto.setCustomerId(tokenDto.getCustomerId());
// 此接口不包含userId相关业务处理
formDto.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDto, StyleShowListFormDTO.AddUserInternalGroup.class);
return new Result().ok(icPartymemberStyleService.showListByAgency(formDto));
}
/**
* 下载党员风采导入模板
*
* @param response
* @throws IOException
*/
@RequestMapping(value = "import/template-download" ,method = {RequestMethod.GET, RequestMethod.POST})
@RequestMapping(value = "import/template-download", method = {RequestMethod.GET, RequestMethod.POST})
public void downloadTemplate(HttpServletResponse response) throws IOException {
response.setCharacterEncoding("UTF-8");
response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition");

14
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java
View File

@ -25,6 +25,7 @@ import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity;
import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@ -93,6 +94,7 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
/**
* 查询列表
*
* @Param formDTO
* @Return {@link PageData<IcPartymemberStyleDTO>}
* @Author zhaoqifeng
@ -102,6 +104,7 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
/**
* 导入数据
*
* @Param tokenDto
* @Param response
* @Param file
@ -113,8 +116,19 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
/**
* 数据分析-党员风采列表查询
*
* @param formDTO
* @return
*/
PageData<IcPartymemberStyleDTO> showList(StyleShowListFormDTO formDTO);
/**
* 党员风采列表查询
*
* @param formDto
* @return com.epmet.commons.tools.page.PageData<com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO>
* @author work@yujt.net.cn
* @date 2022/5/9/0009 14:22
*/
PageData<IcPartymemberStyleDTO> showListByAgency(StyleShowListResiFormDTO formDto);
}

35
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java
View File

@ -60,6 +60,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleService;
import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
@ -72,10 +73,8 @@ import org.apache.http.entity.ContentType;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.annotation.Resource;
@ -131,7 +130,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
dtoList.forEach(item -> {
if (StringUtils.isNotBlank(item.getGridId())) {
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
if(gridInfo == null) {
if (gridInfo == null) {
log.warn("未找到网格信息:{}", item.getGridId());
return;
}
@ -145,8 +144,8 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
return dtoList;
}
private QueryWrapper<IcPartymemberStyleEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
private QueryWrapper<IcPartymemberStyleEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<IcPartymemberStyleEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@ -168,7 +167,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
IcPartymemberStyleEntity entity = ConvertUtils.sourceToTarget(dto, IcPartymemberStyleEntity.class);
entity.setCustomerId(tokenDto.getCustomerId());
// CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(dto.getGridId());
GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(dto.getGridId());
entity.setAgencyId(gridInfoCache.getPid());
entity.setGridPids(gridInfoCache.getPids());
@ -225,7 +224,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
wrapper.eq(StringUtils.isNotBlank(formDTO.getGridId()), IcPartymemberStyleEntity::getGridId, formDTO.getGridId());
wrapper.like(StringUtils.isNotBlank(formDTO.getName()), IcPartymemberStyleEntity::getName, formDTO.getName());
wrapper.like(StringUtils.isNotBlank(formDTO.getMainDeed()), IcPartymemberStyleEntity::getMainDeed, formDTO.getMainDeed());
wrapper.eq(StringUtils.isNotBlank(formDTO.getCategoryId()),IcPartymemberStyleEntity::getCategoryId,formDTO.getCategoryId());
wrapper.eq(StringUtils.isNotBlank(formDTO.getCategoryId()), IcPartymemberStyleEntity::getCategoryId, formDTO.getCategoryId());
wrapper.orderByDesc(IcPartymemberStyleEntity::getCreatedTime);
List<IcPartymemberStyleEntity> list = baseDao.selectList(wrapper);
PageInfo<IcPartymemberStyleEntity> pageInfo = new PageInfo<>(list);
@ -289,13 +288,13 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
//获取组织下网格信息
GridOptionFormDTO formDTO = new GridOptionFormDTO();
formDTO.setAgencyId(staffInfoCache.getAgencyId());
Result<List<CustomerGridDTO>> gridOptionResult = govOrgOpenFeignClient.getGridIListByAgency(staffInfoCache.getAgencyId());
Result<List<CustomerGridDTO>> gridOptionResult = govOrgOpenFeignClient.getGridIListByAgency(staffInfoCache.getAgencyId());
if (!gridOptionResult.success()) {
throw new EpmetException(gridOptionResult.getCode(), gridOptionResult.getMsg());
}
Map<String, String> gridMap = gridOptionResult.getData().stream().collect(Collectors.toMap(CustomerGridDTO::getGridName, CustomerGridDTO::getId));
//获取党员风采所有分类:key:分类名称；
Map<String,IcPartymemberStyleCategoryDictEntity> categoryDictMap=icPartymemberStyleCategoryDictService.getCategoryDictMap(tokenDto.getCustomerId());
Map<String, IcPartymemberStyleCategoryDictEntity> categoryDictMap = icPartymemberStyleCategoryDictService.getCategoryDictMap(tokenDto.getCustomerId());
//1.数据校验 只允许导入当前组织下的网格的数据
//网格名称不一样的数据舍弃或者分类名称不存在也舍弃
Iterator<IcPartymemberStyleImportExcel> iterator = result.iterator();
@ -346,7 +345,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
}
entity.setName(item.getName());
entity.setMainDeed(item.getMainDeed());
IcPartymemberStyleCategoryDictEntity dictEntity=categoryDictMap.get(item.getCategoryName());
IcPartymemberStyleCategoryDictEntity dictEntity = categoryDictMap.get(item.getCategoryName());
entity.setCategoryId(null == dictEntity ? StrConstant.EPMETY_STR : dictEntity.getId());
entity.setCategoryCode(null == dictEntity ? StrConstant.EPMETY_STR : dictEntity.getCategoryCode());
AtomicInteger i = new AtomicInteger();
@ -420,6 +419,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
}
return url;
}
/**
* @Author sun
* @Description 党员风采导入修改导入任务状态
@ -451,11 +451,21 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
*/
@Override
public PageData<IcPartymemberStyleDTO> showList(StyleShowListFormDTO formDTO) {
CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
String customerId = formDTO.getCustomerId();
CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(customerId, formDTO.getUserId());
if (null == staff || StringUtils.isBlank(staff.getAgencyId())) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前工作人员缓存信息失败", "查询用户信息异常");
}
PageInfo<IcPartymemberStyleDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectShowList(staff.getAgencyId(), formDTO.getCustomerId()));
return showListByAgency(formDTO.getPageNo(), formDTO.getPageSize(), staff.getAgencyId(), customerId);
}
@Override
public PageData<IcPartymemberStyleDTO> showListByAgency(StyleShowListResiFormDTO formDto) {
return showListByAgency(formDto.getPageNo(), formDto.getPageSize(), formDto.getAgencyId(), formDto.getCustomerId());
}
private PageData<IcPartymemberStyleDTO> showListByAgency(int pageNo, int pageSize, String agencyId, String customerId) {
PageInfo<IcPartymemberStyleDTO> pageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> baseDao.selectShowList(agencyId, customerId));
if (CollectionUtils.isNotEmpty(pageInfo.getList())) {
//赋值网格名称
for (IcPartymemberStyleDTO dto : pageInfo.getList()) {
@ -468,5 +478,4 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
}
return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
}
}

BIN
epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save