Skip to content

cfld-region-outline
cfld-region-outline
Commit 485f138d authored by lixinglin's avatar lixinglin
Browse files
Options

经纬度信息填充， 

载体 字段weight类型bug修复
parent 698b272f
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 56 deletions
src/main/java/com/lyy/admin/domain/carrierinfo/CarrierInfo.java
View file @ 485f138d
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
......@@ -14,10 +15,9 @@ import lombok.Data;
import javax.validation.constraints.NotNull;
/**
*
* @TableName carrier_info 载体主表
*/
@TableName(value ="carrier_info")
@TableName(value = "carrier_info")
@Data
public class CarrierInfo implements Serializable {
......@@ -155,7 +155,7 @@ public class CarrierInfo implements Serializable {
private String imgUrl;
@ApiModelProperty(value = "承重")
private String weight;
private Double weight;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
......
src/main/java/com/lyy/admin/domain/developmentinfo/DevelopmentInfo.java
View file @ 485f138d
......@@ -485,4 +485,9 @@ public class DevelopmentInfo implements Serializable {
@TableField(exist = false)
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "经度")
private BigDecimal longitude;
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
}
\ No newline at end of file
src/main/java/com/lyy/admin/domain/parkinfo/ParkInfo.java
View file @ 485f138d
......@@ -480,4 +480,9 @@ public class ParkInfo implements Serializable {
@TableField(exist = false)
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "经度")
private BigDecimal longitude;
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
}
\ No newline at end of file
src/main/java/com/lyy/admin/service/developmentinfo/impl/DevelopmentInfoServiceImpl.java
View file @ 485f138d
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lyy.admin.VO.*;
import com.lyy.admin.common.utils.BusinessService;
import com.lyy.admin.domain.FileSource;
import com.lyy.admin.enumerate.*;
import com.lyy.admin.common.exception.APIException;
......@@ -33,6 +34,8 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
......@@ -675,6 +678,39 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
}
return result;
}
@Resource
BusinessService businessService;
@Override
public boolean saveOrUpdate(DevelopmentInfo developmentInfo) {
aSyncUpateLocation(developmentInfo);
return super.saveOrUpdate(developmentInfo);
}
public void aSyncUpateLocation(DevelopmentInfo entity) {
String address = entity.getAddress();
String city = entity.getCityName();
if (!StringUtils.isEmpty(address)) {
try {
String userIdetify = businessService.getUserIdetify(address, city);
if (!StringUtils.isEmpty(userIdetify)) {
String[] split = userIdetify.split(",");
if (split.length == 2) {
String longitudeStr = split[0];
BigDecimal longitude = new BigDecimal(longitudeStr);
String latitudeStr = split[1];
BigDecimal latitude = new BigDecimal(latitudeStr);
entity.setLongitude(longitude);
entity.setLatitude(latitude);
super.saveOrUpdate(entity);
}
}
} catch (Exception e) {
// throw new RuntimeException(e);
}
}
}
}
......
src/main/java/com/lyy/admin/service/parkinfo/impl/ParkInfoServiceImpl.java
View file @ 485f138d
......@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lyy.admin.VO.*;
import com.lyy.admin.common.utils.BusinessService;
import com.lyy.admin.domain.FileSource;
import com.lyy.admin.domain.carrierinfo.CarrierInfo;
import com.lyy.admin.enumerate.*;
......@@ -40,6 +41,7 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
......@@ -118,7 +120,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
@Autowired
FileSourceService fileSourceService;
// @Cache(cacheByUser = false)
// @Cache(cacheByUser = false)
public List<ParkInfo> selectParkInfoListVO(ParkInfoParam parkInfoParam) {
String coverArea = parkInfoParam.getCoverArea();
if (ObjectUtils.isNotEmpty(coverArea)) {
......@@ -192,7 +194,6 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
}
public List<ParkInfo> selectParkInfoDraftListVO(ParkInfoParam parkInfoParam) {
String coverArea = parkInfoParam.getCoverArea();
if (ObjectUtils.isNotEmpty(coverArea)) {
......@@ -262,7 +263,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
public List<ParkInfo> selectHotParkInfoListVO() {
QueryWrapper<ParkInfo> ParkInfoQW = new QueryWrapper<>();
ParkInfoQW.ge("is_hot_park",ParkInfoEnum.HOT_PARK.getCode());
ParkInfoQW.ge("is_hot_park", ParkInfoEnum.HOT_PARK.getCode());
ParkInfoQW.orderByAsc("is_hot_park");
List<ParkInfo> parkInfos = parkInfoMapper.selectList(ParkInfoQW);
return parkInfos;
......@@ -276,14 +277,14 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
ParkInfoAllVO parkInfoAllVO = new ParkInfoAllVO();
//获取园区基本信息
ParkInfo parkInfo = parkInfoMapper.selectById(id);
parkInfo.setFloorArea(parkInfo.getFloorArea() == null ? new BigDecimal(0.0) : NumberUtil.div(parkInfo.getFloorArea(),10000,4) );
parkInfo.setFloorArea(parkInfo.getFloorArea() == null ? new BigDecimal(0.0) : NumberUtil.div(parkInfo.getFloorArea(), 10000, 4));
if (parkInfo == null) {
throw new APIException(APIExceptionEnum.NOTEXISTS_EXCEPTION);
}
boolean isOwner = false;
Integer userId1 = parkInfo.getUserId();
if(userId.equals(userId1)){
if (userId.equals(userId1)) {
flag = true;
isOwner = true;
}
......@@ -315,10 +316,10 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
List<ParkTrafficInfo> parkTrafficInfos = parkTrafficInfoMapper.selectList(PTIWrapper);
Map<String, List<ParkTrafficInfo>> parkTrafficInfoVOs = parkTrafficInfos.stream().collect(Collectors.groupingBy(ParkTrafficInfo::getType));
JSONArray parkTrafficInfosJsonArray = new JSONArray();
for(Map.Entry<String, List<ParkTrafficInfo>> entry: parkTrafficInfoVOs.entrySet()){
for (Map.Entry<String, List<ParkTrafficInfo>> entry : parkTrafficInfoVOs.entrySet()) {
JSONObject jsonObject = new JSONObject();
jsonObject.putOpt("typeName",entry.getKey());
jsonObject.putOpt("info",entry.getValue());
jsonObject.putOpt("typeName", entry.getKey());
jsonObject.putOpt("info", entry.getValue());
parkTrafficInfosJsonArray.add(jsonObject);
}
parkInfoAllVO.setParkTrafficInfoVOs(parkTrafficInfosJsonArray);
......@@ -329,7 +330,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
List<CarrierInfo> list = carrierInfoService.list(CIQuery);
List<CarrierInfo> collect = list.stream().
collect(Collectors.collectingAndThen(
Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(CarrierInfo::getType))), ArrayList::new));
Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(CarrierInfo::getType))), ArrayList::new));
List<CarrierInfoTypeListVO> carrierInfoVOS = Convert.toList(CarrierInfoTypeListVO.class, collect);
parkInfoAllVO.setCarrierInfoVO(carrierInfoVOS);
//获取污水处理能力信息
......@@ -337,7 +338,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
PSIWrapper.eq("park_id", id);
List<ParkSewageInfo> parkSewageInfos = parkSewageInfoMapper.selectList(PSIWrapper);
// parkInfoAllVO.setParkSewageInfo(parkSewageInfos);
Map<String, BigDecimal> map = parkSewageInfos.stream().filter(e-> StringUtils.isNotBlank(e.getType())).collect(Collectors.toMap(ParkSewageInfo::getType, ParkSewageInfo::getPrice, (key1, key2) -> key1));
Map<String, BigDecimal> map = parkSewageInfos.stream().filter(e -> StringUtils.isNotBlank(e.getType())).collect(Collectors.toMap(ParkSewageInfo::getType, ParkSewageInfo::getPrice, (key1, key2) -> key1));
ParkInfoVO parkInfoVO = new ParkInfoVO();
BeanUtils.copyProperties(parkInfo, parkInfoVO);
......@@ -373,7 +374,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
}
if (ObjectUtils.isNotEmpty(userId)) {
//是否收藏
if (isExistInfo( userId, parkInfoAllVO.getParkInfoVO().getId())) {
if (isExistInfo(userId, parkInfoAllVO.getParkInfoVO().getId())) {
parkInfoAllVO.getParkInfoVO().setIsCollection(ParkInfoEnum.IS_COLLECTION_1.getCode());
} else {
parkInfoAllVO.getParkInfoVO().setIsCollection(ParkInfoEnum.IS_COLLECTION_0.getCode());
......@@ -406,13 +407,13 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
public Boolean updateParkInfo(ParkInfoAllSaveVO parkInfoAllVO, Integer userId, String userName) {
ParkInfo parkInfo = new ParkInfo();
BeanUtils.copyProperties(parkInfoAllVO.getParkInfo(),parkInfo);
if(parkInfoAllVO.getCarouselUrls()!=null && parkInfoAllVO.getCarouselUrls().size()>0){
BeanUtils.copyProperties(parkInfoAllVO.getParkInfo(), parkInfo);
if (parkInfoAllVO.getCarouselUrls() != null && parkInfoAllVO.getCarouselUrls().size() > 0) {
parkInfo.setImgUrl(parkInfoAllVO.getCarouselUrls().get(0));
}
parkInfo.setSubstationLevel(String.join(",",parkInfoAllVO.getParkInfo().getSubstationLevel()));
parkInfo.setIndustryResources(String.join(",",parkInfoAllVO.getParkInfo().getIndustryResources()));
parkInfo.setSpecialIndicators(String.join(",",parkInfoAllVO.getParkInfo().getSpecialIndicators()));
parkInfo.setSubstationLevel(String.join(",", parkInfoAllVO.getParkInfo().getSubstationLevel()));
parkInfo.setIndustryResources(String.join(",", parkInfoAllVO.getParkInfo().getIndustryResources()));
parkInfo.setSpecialIndicators(String.join(",", parkInfoAllVO.getParkInfo().getSpecialIndicators()));
parkInfo.setUserId(userId);
// parkInfo.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_0.getCode());
ParkInfo parkInfo1 = parkInfoMapper.selectById(parkInfo.getId());
......@@ -420,9 +421,9 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
parkInfo.setIsSystem(parkInfo1.getIsSystem());
//系统预录入
if(parkInfo.getIsSystem() == ParkInfoEnum.IS_SYSTEM_1.getCode()){
if (parkInfo.getIsSystem() == ParkInfoEnum.IS_SYSTEM_1.getCode()) {
//校验数据是否已经被认证，如果被认证则直接自动退回
if(parkInfoAllVO.getParkInfo().getStatus() == ParkInfoEnum.STATUS_RZZ.getCode()) {
if (parkInfoAllVO.getParkInfo().getStatus() == ParkInfoEnum.STATUS_RZZ.getCode()) {
ParkInfo parkInfo2 = parkInfoMapper.selectById(parkInfo.getMirrorId());
if (parkInfo2.getStatus() == ParkInfoEnum.STATUS_ZF.getCode()) {
parkInfo.setStatus(ParkInfoEnum.STATUS_ZF.getCode());
......@@ -431,7 +432,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
}
}
if(parkInfoAllVO.getParkInfo().getStatus() == DevelopmentStatusEnum.STATUS_RZZ.getCode()){
if (parkInfoAllVO.getParkInfo().getStatus() == DevelopmentStatusEnum.STATUS_RZZ.getCode()) {
parkInfo.setSubmitTime(new Date());
}
this.saveOrUpdate(parkInfo);
......@@ -447,25 +448,25 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
public Boolean saveParkInfo(ParkInfoAllSaveVO parkInfoAllVO, Integer userId, String userName) {
ParkInfo parkInfo = new ParkInfo();
if(ObjectUtils.isNotEmpty(parkInfoAllVO.getParkInfo().getId())){
if (ObjectUtils.isNotEmpty(parkInfoAllVO.getParkInfo().getId())) {
parkInfoAllVO.getParkInfo().setIsSystem(ParkInfoEnum.IS_SYSTEM_1.getCode());
}
BeanUtils.copyProperties(parkInfoAllVO.getParkInfo(),parkInfo);
if(parkInfoAllVO.getCarouselUrls()!=null && parkInfoAllVO.getCarouselUrls().size()>0){
BeanUtils.copyProperties(parkInfoAllVO.getParkInfo(), parkInfo);
if (parkInfoAllVO.getCarouselUrls() != null && parkInfoAllVO.getCarouselUrls().size() > 0) {
parkInfo.setImgUrl(parkInfoAllVO.getCarouselUrls().get(0));
}
parkInfo.setSubstationLevel(String.join(",",parkInfoAllVO.getParkInfo().getSubstationLevel()));
parkInfo.setIndustryResources(String.join(",",parkInfoAllVO.getParkInfo().getIndustryResources()));
parkInfo.setSpecialIndicators(String.join(",",parkInfoAllVO.getParkInfo().getSpecialIndicators()));
parkInfo.setSubstationLevel(String.join(",", parkInfoAllVO.getParkInfo().getSubstationLevel()));
parkInfo.setIndustryResources(String.join(",", parkInfoAllVO.getParkInfo().getIndustryResources()));
parkInfo.setSpecialIndicators(String.join(",", parkInfoAllVO.getParkInfo().getSpecialIndicators()));
parkInfo.setUserId(userId);
// parkInfo.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_0.getCode());
//系统预录入
if(parkInfoAllVO.getParkInfo().getIsSystem() == ParkInfoEnum.IS_SYSTEM_1.getCode()){
if (parkInfoAllVO.getParkInfo().getIsSystem() == ParkInfoEnum.IS_SYSTEM_1.getCode()) {
parkInfo.setId(null);
parkInfo.setMirrorId(parkInfoAllVO.getParkInfo().getId());
//校验数据是否已经被认证，如果被认证则直接自动退回
if(parkInfoAllVO.getParkInfo().getStatus() == ParkInfoEnum.STATUS_RZZ.getCode()) {
if (parkInfoAllVO.getParkInfo().getStatus() == ParkInfoEnum.STATUS_RZZ.getCode()) {
ParkInfo parkInfo1 = parkInfoMapper.selectById(parkInfoAllVO.getParkInfo().getId());
if (parkInfo1.getStatus() == ParkInfoEnum.STATUS_ZF.getCode()) {
parkInfo.setStatus(ParkInfoEnum.STATUS_ZF.getCode());
......@@ -474,7 +475,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
}
}
if(parkInfoAllVO.getParkInfo().getStatus() == DevelopmentStatusEnum.STATUS_RZZ.getCode()){
if (parkInfoAllVO.getParkInfo().getStatus() == DevelopmentStatusEnum.STATUS_RZZ.getCode()) {
parkInfo.setSubmitTime(new Date());
}
......@@ -490,22 +491,57 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
return true;
}
@Resource
BusinessService businessService;
@Override
public boolean saveOrUpdate(ParkInfo entity) {
aSyncUpateLocation(entity);
return super.saveOrUpdate(entity);
}
public void aSyncUpateLocation(ParkInfo entity) {
String address = entity.getAddress();
String city = entity.getCityName();
if (!StringUtils.isEmpty(address)) {
try {
String userIdetify = businessService.getUserIdetify(address, city);
if (!StringUtils.isEmpty(userIdetify)) {
String[] split = userIdetify.split(",");
if (split.length == 2) {
String longitudeStr = split[0];
BigDecimal longitude = new BigDecimal(longitudeStr);
String latitudeStr = split[1];
BigDecimal latitude = new BigDecimal(latitudeStr);
entity.setLongitude(longitude);
entity.setLatitude(latitude);
super.saveOrUpdate(entity);
}
}
} catch (Exception e) {
// throw new RuntimeException(e);
}
public void saveOrUpdateCommon(ParkInfoAllSaveVO parkInfoAllVO, Integer id){
}
}
public void saveOrUpdateCommon(ParkInfoAllSaveVO parkInfoAllVO, Integer id) {
//招商方向
QueryWrapper<ParkInvestmentDirectionInfo> pidiQW = new QueryWrapper<>();
QueryWrapper<ParkInvestmentDirectionInfo> pidiQW = new QueryWrapper<>();
pidiQW.eq("park_id", id);
parkInvestmentDirectionInfoService.remove(pidiQW);
//产业政策
QueryWrapper<ParkPolicyInfo> ppiQW = new QueryWrapper<>();
QueryWrapper<ParkPolicyInfo> ppiQW = new QueryWrapper<>();
ppiQW.eq("park_id", id);
parkPolicyInfoService.remove(ppiQW);
//载体信息
QueryWrapper<CarrierInfo> ciQW = new QueryWrapper<>();
QueryWrapper<CarrierInfo> ciQW = new QueryWrapper<>();
ciQW.eq("park_id", id);
carrierInfoService.remove(ciQW);
//污水处理类型 污水处理价格
QueryWrapper<ParkSewageInfo> psiQW = new QueryWrapper<>();
QueryWrapper<ParkSewageInfo> psiQW = new QueryWrapper<>();
psiQW.eq("park_id", id);
parkSewageInfoService.remove(psiQW);
//开发区图片
......@@ -542,9 +578,9 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
parkSewageInfoService.saveBatch(parkSewageInfos);
//开发区图片
sysCarouselInfoService.saveCarouselInfo(id,parkInfoAllVO.getCarouselUrls(), CarouselTypeEnum.YUANQU);
sysCarouselInfoService.saveCarouselInfo(id, parkInfoAllVO.getCarouselUrls(), CarouselTypeEnum.YUANQU);
//政策文件上传
fileSourceService.saveFileSource(id,parkInfoAllVO.getPolicyUrls(), FileSourceObjectTypeEnum.PARK);
fileSourceService.saveFileSource(id, parkInfoAllVO.getPolicyUrls(), FileSourceObjectTypeEnum.PARK);
// if (parkInfoAllVO.getParkInfo().getStatus() == ParkInfoEnum.STATUS_RZZ.getCode()) {
// SubmitExamineLog submitExamineLog = new SubmitExamineLog();
......@@ -577,41 +613,41 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
}
@Override
public Boolean isAlreadyAuthentication(Integer id){
public Boolean isAlreadyAuthentication(Integer id) {
ParkInfo parkInfo = parkInfoMapper.selectById(id);
return isAlreadyAuthentication(parkInfo);
}
@Override
public ParkInfoAllSaveVO getParkSaveInfo(Integer id){
public ParkInfoAllSaveVO getParkSaveInfo(Integer id) {
ParkInfoAllSaveVO parkInfoAllSaveVO = new ParkInfoAllSaveVO();
ParkInfoSaveVO parkInfoSaveVO = new ParkInfoSaveVO();
ParkInfo parkInfo = parkInfoMapper.selectById(id);
BeanUtils.copyProperties(parkInfo,parkInfoSaveVO);
parkInfoSaveVO.setSubstationLevel(StringUtils.isNotBlank(parkInfo.getSubstationLevel())?parkInfo.getSubstationLevel().split(","): new String[]{});
parkInfoSaveVO.setIndustryResources(StringUtils.isNotBlank(parkInfo.getIndustryResources())?parkInfo.getIndustryResources().split(","): new String[]{});
parkInfoSaveVO.setSpecialIndicators(StringUtils.isNotBlank(parkInfo.getSpecialIndicators())?parkInfo.getSpecialIndicators().split(","): new String[]{});
BeanUtils.copyProperties(parkInfo, parkInfoSaveVO);
parkInfoSaveVO.setSubstationLevel(StringUtils.isNotBlank(parkInfo.getSubstationLevel()) ? parkInfo.getSubstationLevel().split(",") : new String[]{});
parkInfoSaveVO.setIndustryResources(StringUtils.isNotBlank(parkInfo.getIndustryResources()) ? parkInfo.getIndustryResources().split(",") : new String[]{});
parkInfoSaveVO.setSpecialIndicators(StringUtils.isNotBlank(parkInfo.getSpecialIndicators()) ? parkInfo.getSpecialIndicators().split(",") : new String[]{});
parkInfoAllSaveVO.setParkInfo(parkInfoSaveVO);
QueryWrapper<ParkInvestmentDirectionInfo> pidiQW = new QueryWrapper<>();
QueryWrapper<ParkInvestmentDirectionInfo> pidiQW = new QueryWrapper<>();
pidiQW.eq("park_id", id);
List<ParkInvestmentDirectionInfo> list = parkInvestmentDirectionInfoService.list(pidiQW);
parkInfoAllSaveVO.setParkInvestmentDirectionInfos(list);
//产业政策
QueryWrapper<ParkPolicyInfo> ppiQW = new QueryWrapper<>();
QueryWrapper<ParkPolicyInfo> ppiQW = new QueryWrapper<>();
ppiQW.eq("park_id", id);
List<ParkPolicyInfo> list1 = parkPolicyInfoService.list(ppiQW);
parkInfoAllSaveVO.setParkPolicyInfos(list1);
//载体信息
QueryWrapper<CarrierInfo> ciQW = new QueryWrapper<>();
QueryWrapper<CarrierInfo> ciQW = new QueryWrapper<>();
ciQW.eq("park_id", id);
List<CarrierInfo> list2 = carrierInfoService.list(ciQW);
parkInfoAllSaveVO.setCarrierInfos(list2);
//污水处理类型 污水处理价格
QueryWrapper<ParkSewageInfo> psiQW = new QueryWrapper<>();
QueryWrapper<ParkSewageInfo> psiQW = new QueryWrapper<>();
psiQW.eq("park_id", id);
List<ParkSewageInfo> list3 = parkSewageInfoService.list(psiQW);
if(list3 != null && list3.size() > 0){
if (list3 != null && list3.size() > 0) {
ParkSewageInfo parkSewageInfo = list3.get(0);
parkInfoSaveVO.setSewageWaterPrice(parkSewageInfo.getPrice());
parkInfoSaveVO.setSewageWaterType(parkSewageInfo.getType());
......@@ -626,7 +662,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
// return e.getImgUrl();
// }).collect(Collectors.toList());
List<String> imgUrls = sysCarouselInfoService.getImgUrls(CarouselTypeEnum.YUANQU, id);
if(StringUtils.isNotBlank(parkInfo.getImgUrl())){
if (StringUtils.isNotBlank(parkInfo.getImgUrl())) {
imgUrls.add(parkInfo.getImgUrl());
imgUrls = imgUrls.stream().distinct().collect(Collectors.toList());
}
......@@ -650,17 +686,18 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
/**
* 保存提交、编辑之前的校验逻辑
*
* <p>
* 对于系统提前预录入去认证的数据：
* 若其中某一条数据已经认证（status=3），认证中的数据全部置为作废(status=9)；
* 保存草稿未提交的数据进行判断，若原始数据已经作废，则这条数据也不允许再次编辑或者提交。
*
* @param parkInfo
*/
public boolean isAlreadyAuthentication(ParkInfo parkInfo){
public boolean isAlreadyAuthentication(ParkInfo parkInfo) {
boolean flag = false;
if(ObjectUtils.isNotEmpty(parkInfo.getMirrorId()) || parkInfo.getIsSystem() == ParkInfoEnum.IS_SYSTEM_1.getCode()){
if (ObjectUtils.isNotEmpty(parkInfo.getMirrorId()) || parkInfo.getIsSystem() == ParkInfoEnum.IS_SYSTEM_1.getCode()) {
ParkInfo parkInfoSource = parkInfoMapper.selectById(parkInfo.getMirrorId());
if(parkInfoSource.getStatus() == DevelopmentStatusEnum.STATUS_ZF.getCode()){
if (parkInfoSource.getStatus() == DevelopmentStatusEnum.STATUS_ZF.getCode()) {
// throw new APIException(APIExceptionEnum.ALREADY_AUTH);
flag = true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment