Browse Source

党群服务新增

dev_shibei_match
zxc 4 years ago
parent
commit
7e50856ea7
  1. 80
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPartyServiceCenterFormDTO.java
  2. 12
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/PartyServiceCenterConstant.java
  3. 17
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java
  4. 11
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java
  5. 61
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java

80
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPartyServiceCenterFormDTO.java

@ -0,0 +1,80 @@
package com.epmet.dto.form;
import com.epmet.dto.IcPartyServiceCenterMatterDTO;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.List;
/**
* @Author zxc
* @DateTime 2021/11/22 9:05 上午
* @DESC
*/
@Data
public class AddPartyServiceCenterFormDTO implements Serializable {
private static final long serialVersionUID = -230856877756036529L;
public interface AddPartyServiceCenterForm{}
/**
* 中心名称
*/
@NotBlank(message = "centerName不能为空",groups = AddPartyServiceCenterForm.class)
private String centerName;
/**
* 社区地址
*/
@NotBlank(message = "address不能为空",groups = AddPartyServiceCenterForm.class)
private String address;
/**
* 办公电话
*/
@NotBlank(message = "workPhone不能为空",groups = AddPartyServiceCenterForm.class)
private String workPhone;
/**
* 上午开始时间
*/
@NotBlank(message = "amStartTime不能为空",groups = AddPartyServiceCenterForm.class)
private String amStartTime;
/**
* 上午结束时间
*/
@NotBlank(message = "amEndTime不能为空",groups = AddPartyServiceCenterForm.class)
private String amEndTime;
/**
* 下午开始时间
*/
@NotBlank(message = "pmStartTime不能为空",groups = AddPartyServiceCenterForm.class)
private String pmStartTime;
/**
* 下午结束时间
*/
@NotBlank(message = "pmEndTime不能为空",groups = AddPartyServiceCenterForm.class)
private String pmEndTime;
/**
* 经度
*/
@NotBlank(message = "longitude不能为空",groups = AddPartyServiceCenterForm.class)
private String longitude;
/**
* 纬度
*/
@NotBlank(message = "latitude不能为空",groups = AddPartyServiceCenterForm.class)
private String latitude;
/**
* 可预约事项
*/
private List<IcPartyServiceCenterMatterDTO> matterList;
}

12
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/PartyServiceCenterConstant.java

@ -0,0 +1,12 @@
package com.epmet.constant;
/**
* @Author zxc
* @DateTime 2021/11/22 9:29 上午
* @DESC
*/
public interface PartyServiceCenterConstant {
String ORG_TYPE_AGENCY = "agency";
}

17
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java

@ -17,7 +17,9 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
@ -26,6 +28,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.dto.IcPartyServiceCenterDTO;
import com.epmet.dto.form.AddPartyServiceCenterFormDTO;
import com.epmet.excel.IcPartyServiceCenterExcel;
import com.epmet.service.IcPartyServiceCenterService;
import org.springframework.beans.factory.annotation.Autowired;
@ -91,4 +94,18 @@ public class IcPartyServiceCenterController {
ExcelUtils.exportExcelToTarget(response, null, list, IcPartyServiceCenterExcel.class);
}
/**
* @Description 新增党群服务中心
* @param formDTO
* @param tokenDto
* @author zxc
* @date 2021/11/22 9:13 上午
*/
@PostMapping("addpartyservicecenter")
public Result addPartyServiceCenter(@RequestBody AddPartyServiceCenterFormDTO formDTO, @LoginUser TokenDto tokenDto){
ValidatorUtils.validateEntity(formDTO, AddPartyServiceCenterFormDTO.AddPartyServiceCenterForm.class);
icPartyServiceCenterService.addPartyServiceCenter(formDTO,tokenDto);
return new Result();
}
}

11
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java

@ -19,7 +19,9 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.dto.IcPartyServiceCenterDTO;
import com.epmet.dto.form.AddPartyServiceCenterFormDTO;
import com.epmet.entity.IcPartyServiceCenterEntity;
import java.util.List;
@ -92,4 +94,13 @@ public interface IcPartyServiceCenterService extends BaseService<IcPartyServiceC
* @date 2021-11-18
*/
void delete(String[] ids);
/**
* @Description 新增党群服务中心
* @param formDTO
* @param tokenDto
* @author zxc
* @date 2021/11/22 9:13 上午
*/
void addPartyServiceCenter(AddPartyServiceCenterFormDTO formDTO, TokenDto tokenDto);
}

61
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java

@ -17,16 +17,31 @@
package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.constant.PartyServiceCenterConstant;
import com.epmet.dao.IcPartyServiceCenterDao;
import com.epmet.dto.IcPartyServiceCenterDTO;
import com.epmet.dto.form.AddPartyServiceCenterFormDTO;
import com.epmet.entity.IcPartyServiceCenterEntity;
import com.epmet.entity.IcPartyServiceCenterMatterEntity;
import com.epmet.service.IcPartyServiceCenterMatterService;
import com.epmet.service.IcPartyServiceCenterService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -45,6 +60,9 @@ import java.util.Map;
@Service
public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServiceCenterDao, IcPartyServiceCenterEntity> implements IcPartyServiceCenterService {
@Autowired
private IcPartyServiceCenterMatterService matterService;
@Override
public PageData<IcPartyServiceCenterDTO> page(Map<String, Object> params) {
IPage<IcPartyServiceCenterEntity> page = baseDao.selectPage(
@ -97,4 +115,47 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* @Description 新增党群服务中心
* @param formDTO
* @param tokenDto
* @author zxc
* @date 2021/11/22 9:13 上午
*/
@Override
public void addPartyServiceCenter(AddPartyServiceCenterFormDTO formDTO, TokenDto tokenDto) {
String customerId = tokenDto.getCustomerId();
LambdaQueryWrapper<IcPartyServiceCenterEntity> l = new LambdaQueryWrapper<>();
l.eq(IcPartyServiceCenterEntity::getCenterName,formDTO.getCenterName())
.eq(IcPartyServiceCenterEntity::getCustomerId,customerId)
.eq(BaseEpmetEntity::getDelFlag, NumConstant.ZERO);
IcPartyServiceCenterEntity record = baseDao.selectOne(l);
if (null != record){
throw new RenException(EpmetErrorCode.PARTY_SERVICE_CENTER_ERROR.getCode());
}
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, tokenDto.getUserId());
if (null == staffInfo){
throw new RenException(String.format("查询人员{%s}信息失败",tokenDto.getUserId()));
}
IcPartyServiceCenterEntity centerEntity = ConvertUtils.sourceToTarget(formDTO, IcPartyServiceCenterEntity.class);
centerEntity.setCustomerId(customerId);
centerEntity.setOrgId(staffInfo.getAgencyId());
centerEntity.setOrgType(PartyServiceCenterConstant.ORG_TYPE_AGENCY);
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
if (null == agencyInfo){
throw new RenException(String.format("查询组织信息失败%s",staffInfo.getAgencyId()));
}
centerEntity.setPid(agencyInfo.getPid());
centerEntity.setPids(agencyInfo.getPids());
baseDao.insert(centerEntity);
if (CollectionUtils.isNotEmpty(formDTO.getMatterList())){
List<IcPartyServiceCenterMatterEntity> matters = ConvertUtils.sourceToTarget(formDTO.getMatterList(), IcPartyServiceCenterMatterEntity.class);
matters.forEach(m -> {
m.setCustomerId(customerId);
m.setPartyServiceCenterId(centerEntity.getId());
});
matterService.insertBatch(matters);
}
}
}
Loading…
Cancel
Save