From c5c62241b310530f1994043a2f7ed83b97662ded Mon Sep 17 00:00:00 2001 From: peihao <1280253838@qq.com> Date: Tue, 29 Jun 2021 15:24:23 +0800 Subject: [PATCH] =?UTF-8?q?1.0.0=20=E4=BF=AE=E6=94=B9=E6=8B=9F=E6=8C=82?= =?UTF-8?q?=E7=89=8C=E5=9C=B0=E5=9D=97=E5=8F=91=E9=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/air/common/Constant.java | 44 +--- .../land/controller/LandToListController.java | 6 +- .../java/com/air/land/entity/LandListed.java | 3 + .../java/com/air/land/entity/LandToList.java | 5 +- .../land/service/LandToListSendService.java | 23 ++ .../impl/LandToListSendServiceImpl.java | 203 ++++++++++++++++++ .../java/com/air/land/vo/LandListedVo.java | 3 + .../java/com/air/land/vo/LandToListVo.java | 3 + 8 files changed, 248 insertions(+), 42 deletions(-) create mode 100644 air/src/main/java/com/air/land/service/LandToListSendService.java create mode 100644 air/src/main/java/com/air/land/service/impl/LandToListSendServiceImpl.java diff --git a/air/src/main/java/com/air/common/Constant.java b/air/src/main/java/com/air/common/Constant.java index 0ea0d1f..340e3e2 100644 --- a/air/src/main/java/com/air/common/Constant.java +++ b/air/src/main/java/com/air/common/Constant.java @@ -10,61 +10,25 @@ public class Constant { public static final String COMMON_STATUS_1000 = "1000"; /** - * 拟挂牌地块状态 未公示 + * 拟挂牌地块状态 未发送 **/ public static final String LAND_TO_STATUS_1000 = "1000"; /** - * 拟挂牌地块状态 已公示 + * 拟挂牌地块状态 已发送 **/ public static final String LAND_TO_STATUS_1100 = "1100"; /** - * 拟挂牌地块状态 未公示 + * 已挂牌地块状态 待处理 **/ public static final String LAND_STATUS_1000 = "1000"; /** - * 拟挂牌地块状态 已公示 + * 已挂牌地块状态 已处理 **/ public static final String LAND_STATUS_1100 = "1100"; - /******************************百度推送*******************************/ - /** - * 内部请求结果码（自定义参数，用于辨识调用结果）——成功 - */ - public static final int FLAG_INNER_REQUEST_CODE_SUCCEED = 100; - - /** - * 内部请求结果码（自定义参数，用于辨识调用结果）——失败 - */ - public static final int FLAG_INNER_REQUEST_CODE_FAIL = 101; - /** - * 客户端平台操作系统-Android端 - */ - public static final String CLIENT_TERMINAL_OS_ANDROID = "Android"; - /** - * 客户端平台操作系统-iOS端 - */ - public static final String CLIENT_TERMINAL_OS_IOS = "iOS"; - /** - * 操作系统类型标志——Android - */ - public static final int OS_TYPE_TAG_ANDROID = 3; - - /** - * 操作系统类型标志——iOS - */ - public static final int OS_TYPE_TAG_IOS = 4; - - public static String androidApiKey = "wpVkUOv2nwnCT2yf2g2ctXnF"; - public static String androidSecretKey = "GW9NmVfS2EcbmhCDFcBGeBi7v3hsSXzZ"; - - public static String iOSApiKey = "CoQl1PaCMdXgY17BlYTAcPBy"; - public static String iOSSecretKey = "KpQxDwXHHSIMQh9ODuZ0mQ24DDK1GTDG"; - - /******************************百度推送*******************************/ - } \ No newline at end of file diff --git a/air/src/main/java/com/air/land/controller/LandToListController.java b/air/src/main/java/com/air/land/controller/LandToListController.java index 23f99e8..2988a52 100644 --- a/air/src/main/java/com/air/land/controller/LandToListController.java +++ b/air/src/main/java/com/air/land/controller/LandToListController.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.air.common.Constant; import com.air.land.entity.LandToList; +import com.air.land.service.LandToListSendService; import com.air.land.service.LandToListService; import com.air.land.vo.LandListedPageVo; import com.air.land.vo.LandToListPageVo; @@ -46,6 +47,9 @@ public class LandToListController { @Autowired private LandToListService landToListService; + @Autowired + private LandToListSendService landToListSendService; + @Value("${minio.url}") private String minioUrl; @@ -166,7 +170,7 @@ public class LandToListController { @ApiOperation(value = "发送到已挂牌", notes = "发送到已挂牌") @PostMapping("/sendLandList") public R sendLandList(@RequestParam String proposedseriaId) { - return landToListService.sendLandList(proposedseriaId); + return landToListSendService.landToListSendLandListed(proposedseriaId); } /** diff --git a/air/src/main/java/com/air/land/entity/LandListed.java b/air/src/main/java/com/air/land/entity/LandListed.java index 30a6c85..b12c26a 100644 --- a/air/src/main/java/com/air/land/entity/LandListed.java +++ b/air/src/main/java/com/air/land/entity/LandListed.java @@ -236,6 +236,9 @@ public class LandListed extends Model { @ApiModelProperty(value = "航拍图片") private String aerialPhoto; + @ApiModelProperty(value = "航拍链接") + private String aerialLink; + @ApiModelProperty(value = "拍地记录") private String recordTaken; diff --git a/air/src/main/java/com/air/land/entity/LandToList.java b/air/src/main/java/com/air/land/entity/LandToList.java index d1a92c2..6bee4b2 100644 --- a/air/src/main/java/com/air/land/entity/LandToList.java +++ b/air/src/main/java/com/air/land/entity/LandToList.java @@ -48,7 +48,7 @@ public class LandToList extends Model { @ApiModelProperty(value = "是否挂牌") private String isList; - @ApiModelProperty(value = "公告id，主键，以土地网爬取数据为准，不自增") + @ApiModelProperty(value = "公告id,公告编号") private String annoId; @ApiModelProperty(value = "地块编号") @@ -258,6 +258,9 @@ public class LandToList extends Model { @ApiModelProperty(value = "航拍图片") private String aerialPhoto; + @ApiModelProperty(value = "航拍链接") + private String aerialLink; + @ApiModelProperty(value = "拍地记录") private String recordTaken; diff --git a/air/src/main/java/com/air/land/service/LandToListSendService.java b/air/src/main/java/com/air/land/service/LandToListSendService.java new file mode 100644 index 0000000..1bc314b --- /dev/null +++ b/air/src/main/java/com/air/land/service/LandToListSendService.java @@ -0,0 +1,23 @@ +package com.air.land.service; + +import com.cinderella.framework.common.core.util.R; + +/** + * 拟挂牌地块发送至已挂牌服务 + * + * @author peihao + * @date 2021-05-18 09:40:09 + */ +public interface LandToListSendService { + + + /** + * 拟挂牌地块数据发送到已挂牌地块 + * @author peihao + * @param proposedseriaId 拟挂牌数据id + * @date 2021/6/29 + * @return + **/ + R landToListSendLandListed(String proposedseriaId); + +} diff --git a/air/src/main/java/com/air/land/service/impl/LandToListSendServiceImpl.java b/air/src/main/java/com/air/land/service/impl/LandToListSendServiceImpl.java new file mode 100644 index 0000000..5b3b174 --- /dev/null +++ b/air/src/main/java/com/air/land/service/impl/LandToListSendServiceImpl.java @@ -0,0 +1,203 @@ +package com.air.land.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import com.air.common.Constant; +import com.air.land.entity.*; +import com.air.land.service.*; +import com.cinderella.framework.common.core.util.R; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.air.utils.DateUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +/** + * 拟挂牌地块发送至已挂牌服务 + * + * @author peihao + * @date 2021-06-28 + **/ +@Slf4j +@Service +@AllArgsConstructor +public class LandToListSendServiceImpl implements LandToListSendService { + + private LandToListService landToListService; + + private LandListedService landListedService; + + private LandListedLonLatService listedLonLatService; + + private LandToListAttachmentService toListAttachmentService; + + private LandToListLonLatService landToListLonLatService; + + private LandAttachmentService attachmentService; + + private LandToListConductEnterpriseService landToListConductEnterpriseService; + + private LandListedConductEnterpriseService landListedConductEnterpriseService; + + private LandToListConstructionPlanService landToListConstructionPlanService; + + private LandListedConstructionPlanService landListedConstructionPlanService; + + @Transactional(rollbackFor = Exception.class) + @Override + public R landToListSendLandListed(String proposedseriaId) { + LandToList landToList = landToListService.getById(proposedseriaId); + if (null == landToList) { + return R.failed("未查询到数据"); + } + //判断已挂牌是否已经存在次公告id + LandListed land = landListedService.getOne(Wrappers.query().lambda().eq(LandListed::getAnnoId, landToList.getAnnoId())); + LandListed landListed = new LandListed(); + BeanUtil.copyProperties(landToList, landListed); + landListed.setStatusCd(Constant.LAND_STATUS_1000); + if (land == null) { + //不存在 直接copy主表及从表数据 + landListed.setLandListedId(DateUtil.landListedIdfromDate(LocalDateTime.now(), "yyyyMMddHHmmssSSS")); + landListedService.save(landListed); + //copy经纬度 + saveLandListedLonLat(proposedseriaId, landListed.getLandListedId()); + //copy文件信息 + saveLandListAttachment(proposedseriaId, landListed.getLandListedId()); + //copy地块关联经营企业 + saveLandListConductEnterprise(proposedseriaId, landListed.getLandListedId()); + //copy地块关联建设规划 + saveLandListConstructionPlan(proposedseriaId, landListed.getLandListedId()); + return R.ok(); + } + //存在 判断存在的数据状态是否为已处理 + if (Constant.LAND_STATUS_1100.equals(land.getStatusCd())) { + //已处理，发送失败 + return R.failed("数据已处理，发送失败"); + } + //待处理，更新所有已挂牌数据 + landListed.setLandListedId(land.getLandListedId()); + landListedService.removeById(land); + landListedService.save(landListed); + //更新经纬度数据 + listedLonLatService.remove(Wrappers.query().lambda().eq(LandListedLonLat::getLandListedId, landListed.getLandListedId())); + saveLandListedLonLat(proposedseriaId, landListed.getLandListedId()); + //更新文件信息 + attachmentService.remove(Wrappers.query().lambda().eq(LandAttachment::getLandListedId, landListed.getLandListedId())); + saveLandListAttachment(proposedseriaId, landListed.getLandListedId()); + //更新地块关联经营企业 + landListedConductEnterpriseService.remove(Wrappers.query().lambda().eq(LandListedConductEnterprise::getLandListedId, landListed.getLandListedId())); + saveLandListConductEnterprise(proposedseriaId, landListed.getLandListedId()); + //更新地块关联建设规划 + landListedConstructionPlanService.remove(Wrappers.query().lambda().eq(LandListedConstructionPlan::getLandListedId, landListed.getLandListedId())); + saveLandListConstructionPlan(proposedseriaId, landListed.getLandListedId()); + return R.ok(); + } + + + /** + * 保存地块经纬度 + * @author peihao + * @param proposedseriaId 拟挂牌地块id + * @param landListedId 已挂牌地块id + * @date 2021/6/29 + * @return + **/ + @Transactional(rollbackFor = Exception.class) + public boolean saveLandListedLonLat(String proposedseriaId, String landListedId) { + List landToListLonLats = landToListLonLatService.list(Wrappers.query().lambda() + .eq(LandToListLonLat::getProposedseriaId, proposedseriaId)); + if (CollectionUtil.isNotEmpty(landToListLonLats)) { + List landListedLonLats = new ArrayList<>(landToListLonLats.size()); + landToListLonLats.forEach(landToListLonLat -> { + LandListedLonLat landListedLonLat = new LandListedLonLat(); + BeanUtil.copyProperties(landToListLonLat, landListedLonLat); + landListedLonLat.setLandListedId(landListedId); + landListedLonLats.add(landListedLonLat); + }); + return listedLonLatService.saveBatch(landListedLonLats); + } + return true; + } + + /** + * 保存地块文件信息 + * @author peihao + * @param proposedseriaId 拟挂牌地块id + * @param landListedId 已挂牌地块id + * @date 2021/6/29 + * @return + **/ + @Transactional(rollbackFor = Exception.class) + public boolean saveLandListAttachment(String proposedseriaId, String landListedId) { + List toListAttachments = toListAttachmentService.list(Wrappers.query().lambda() + .eq(LandToListAttachment::getProposedseriaId, proposedseriaId)); + if (CollectionUtil.isNotEmpty(toListAttachments)) { + List landAttachments = new ArrayList<>(toListAttachments.size()); + toListAttachments.forEach(landToListAttachment -> { + LandAttachment attachment = new LandAttachment(); + BeanUtil.copyProperties(landToListAttachment, attachment); + attachment.setLandListedId(landListedId); + landAttachments.add(attachment); + }); + return attachmentService.saveBatch(landAttachments); + } + return true; + } + + /** + * 保存地块关联经营企业 + * @author peihao + * @param proposedseriaId 拟挂牌地块id + * @param landListedId 已挂牌地块id + * @date 2021/6/29 + * @return + **/ + @Transactional(rollbackFor = Exception.class) + public boolean saveLandListConductEnterprise(String proposedseriaId, String landListedId) { + List landToListConductEnterprises = landToListConductEnterpriseService.list(Wrappers.query() + .lambda().eq(LandToListConductEnterprise::getProposedseriaId, proposedseriaId)); + if (CollectionUtil.isNotEmpty(landToListConductEnterprises)) { + List landListedConductEnterprises = new ArrayList<>(landToListConductEnterprises.size()); + landToListConductEnterprises.forEach(landToListConductEnterprise -> { + LandListedConductEnterprise landListedConductEnterprise = new LandListedConductEnterprise(); + BeanUtil.copyProperties(landToListConductEnterprise, landListedConductEnterprise); + landListedConductEnterprise.setLandListedId(landListedId); + landListedConductEnterprises.add(landListedConductEnterprise); + }); + return landListedConductEnterpriseService.saveBatch(landListedConductEnterprises); + } + return true; + } + + /** + * 保存地块关联建设规划 + * @author peihao + * @param proposedseriaId 拟挂牌地块id + * @param landListedId 已挂牌地块id + * @date 2021/6/29 + * @return + **/ + @Transactional(rollbackFor = Exception.class) + public boolean saveLandListConstructionPlan(String proposedseriaId, String landListedId) { + List landToListConstructionPlans = landToListConstructionPlanService.list(Wrappers.query() + .lambda().eq(LandToListConstructionPlan::getProposedseriaId, proposedseriaId)); + if (CollectionUtil.isNotEmpty(landToListConstructionPlans)) { + List landListedConstructionPlans = new ArrayList<>(landToListConstructionPlans.size()); + landToListConstructionPlans.forEach(landToListConstructionPlan -> { + LandListedConstructionPlan landListedConstructionPlan = new LandListedConstructionPlan(); + BeanUtil.copyProperties(landToListConstructionPlan, landListedConstructionPlan); + landListedConstructionPlan.setLandListedId(landListedId); + landListedConstructionPlans.add(landListedConstructionPlan); + }); + return landListedConstructionPlanService.saveBatch(landListedConstructionPlans); + } + return true; + } + + +} diff --git a/air/src/main/java/com/air/land/vo/LandListedVo.java b/air/src/main/java/com/air/land/vo/LandListedVo.java index 48b85a8..8cfe83a 100644 --- a/air/src/main/java/com/air/land/vo/LandListedVo.java +++ b/air/src/main/java/com/air/land/vo/LandListedVo.java @@ -231,6 +231,9 @@ public class LandListedVo { @ApiModelProperty(value = "航拍图片") private String aerialPhoto; + @ApiModelProperty(value = "航拍链接") + private String aerialLink; + @ApiModelProperty(value = "拍地记录") private String recordTaken; diff --git a/air/src/main/java/com/air/land/vo/LandToListVo.java b/air/src/main/java/com/air/land/vo/LandToListVo.java index 9e3e3f5..14288e7 100644 --- a/air/src/main/java/com/air/land/vo/LandToListVo.java +++ b/air/src/main/java/com/air/land/vo/LandToListVo.java @@ -244,6 +244,9 @@ public class LandToListVo { @ApiModelProperty(value = "航拍图片") private String aerialPhoto; + @ApiModelProperty(value = "航拍链接") + private String aerialLink; + @ApiModelProperty(value = "拍地记录") private String recordTaken;