luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/feature/dev/vaccine_prarmeter' into feature/dev/vaccine_prarmeter 

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
master
wanggongfeng 3 years ago
parent
15b7d4006f de4cfa6997
commit
93c5904147
2 changed files with 32 additions and 17 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. 11
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java
  2. 38
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java

11
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java
View File

@ -13,18 +13,17 @@ 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.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.constants.ImportTaskConstants;
import com.epmet.dao.IcVaccinePrarmeterDao;
import com.epmet.dto.IcPointNucleicMonitoringDTO;
import com.epmet.dto.IcVaccinePrarmeterDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.form.IcVaccineCheckFormDTO;
import com.epmet.dto.form.ImportTaskCommonFormDTO;
import com.epmet.dto.form.VaccinePrarmeterListFormDTO;
import com.epmet.dto.result.ImportTaskCommonResultDTO;
import com.epmet.excel.IcPointNucleicMonitoringExcel;
import com.epmet.excel.IcVaccinePrarmeterExcel;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.service.IcPointNucleicMonitoringService;
import com.epmet.service.IcVaccinePrarmeterService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
@ -82,7 +81,7 @@ public class IcVaccinePrarmeterController {
}
@NoRepeatSubmit
@PutMapping("update")
@PostMapping("update")
public Result update(@RequestBody IcVaccinePrarmeterDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);

38
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
View File

@ -6,8 +6,9 @@ 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.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
import com.epmet.commons.tools.enums.RelationshipEnum;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.ExceptionUtils;
@ -15,9 +16,9 @@ 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.redis.common.bean.GridInfoCache;
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.commons.tools.utils.ExcelPoiUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constants.ImportTaskConstants;
@ -31,6 +32,9 @@ import com.epmet.dto.result.GridInfoByNameResultDTO;
import com.epmet.dto.result.IcHouseInfoCollectResultDTO;
import com.epmet.dto.result.UploadImgResultDTO;
import com.epmet.entity.*;
import com.epmet.entity.IcResiUserEntity;
import com.epmet.entity.IcUserChangeRecordEntity;
import com.epmet.entity.IcVaccinePrarmeterEntity;
import com.epmet.excel.IcVaccinePrarmeterImportExcel;
import com.epmet.excel.error.IcVaccinePrarmeterImportErrorModel;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@ -48,12 +52,12 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.lang3.StringUtils;
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@ -72,28 +76,28 @@ import java.util.stream.Collectors;
@Slf4j
public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrarmeterDao, IcVaccinePrarmeterEntity> implements IcVaccinePrarmeterService {
@Autowired
@Resource
private IcVaccinePrarmeterRedis icVaccinePrarmeterRedis;
@Autowired
@Resource
private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
@Autowired
@Resource
private OssFeignClient ossFeignClient;
@Autowired
@Resource
private GovOrgFeignClient govOrgFeignClient;
@Autowired
@Resource
private IcResiUserDao icResiUserDao;
@Autowired
@Resource
private IcUserChangeRecordService icUserChangeRecordService;
@Autowired
@Resource
private IcVaccineDao icVaccineDao;
@Autowired
@Resource
private IcVaccineRelationDao icVaccineRelationDao;
@Override
@ -142,14 +146,26 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
@Override
@Transactional(rollbackFor = Exception.class)
public void save(IcVaccinePrarmeterDTO dto) {
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
if (null == gridInfo) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格信息失败", "获取网格信息失败");
}
IcVaccinePrarmeterEntity entity = ConvertUtils.sourceToTarget(dto, IcVaccinePrarmeterEntity.class);
entity.setCustomerId(gridInfo.getCustomerId());
entity.setPids(gridInfo.getPids());
entity.setCheckState(NumConstant.ZERO_STR);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(IcVaccinePrarmeterDTO dto) {
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
if (null == gridInfo) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格信息失败", "获取网格信息失败");
}
IcVaccinePrarmeterEntity entity = ConvertUtils.sourceToTarget(dto, IcVaccinePrarmeterEntity.class);
entity.setPids(gridInfo.getPids());
updateById(entity);
}

Write Preview
Loading…
Cancel
Save