添加处理场所地址

liujun001
1 parent c0bed285
Showing 9 changed files with 567 additions and 2 deletions
trash-garbage/src/main/java/com/trash/garbage/mapper/GarDisposalSiteMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/DisposalSiteEntity.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/DisposalSiteVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/service/DisposalSiteService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchDisposalService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarDisposalSiteServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchDisposalServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
+package com.trash.garbage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.trash.garbage.pojo.domain.DisposalSiteEntity;
+
+public interface GarDisposalSiteMapper extends BaseMapper<DisposalSiteEntity> {
+}
+package com.trash.garbage.pojo.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * @author liujun
+ * @date 2024年06月18日 10:53
+ */
+@TableName(value = "disposal_site")
+public class DisposalSiteEntity implements java.io.Serializable {
+
+
+    private static final long serialVersionUID = 5844957797707384456L;
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * 建筑垃圾处理场所名称
+     */
+    private String name;
+
+    /**
+     * 证书编号
+     */
+    private String certificateNumber;
+
+    /**
+     * 所在地址
+     */
+    private String address;
+
+//    /**
+//     * 消纳（回填）场所工程性质
+//     */
+//    private String engineeringProperty;
+//
+//    /**
+//     * 建筑垃圾处理场所类型
+//     */
+//    private String siteType;
+//
+    /**
+     * 所在区域
+     */
+    private String localArea;
+
+    /**
+     * 作业区域
+     */
+    private String operatingArea;
+//
+//    /**
+//     * 可受纳建筑垃圾类型
+//     */
+//    private String trashType;
+//
+//    /**
+//     * 建设（施工）单位名称
+//     */
+//    private String constructionUnit;
+//
+//    /**
+//     * 建设（施工）单位责任人
+//     */
+//    private String constructionUnitPerson;
+//
+    /**
+     * 责任人联系电话
+     */
+    private String constructionUnitPersonPhone;
+//
+//    /**
+//     * 有限期开始时间
+//     */
+//    private Date validityBeginDate;
+//
+//    /**
+//     * 有限期结束时间
+//     */
+//    private Date validityEndDate;
+//
+//    /**
+//     * 审批方量(m³)
+//     */
+//    private String squareMeasure;
+//
+//    /**
+//     * 剩余方量
+//     */
+//    private String surplusSquareMeasure;
+//
+//    /**
+//     * 洗车作业设施
+//     */
+//    private String carWashingFacilities;
+//
+//    /**
+//     * 出口道路状况
+//     */
+//    private String exitRoadCondition;
+//
+//    /**
+//     * 照明设施
+//     */
+//    private String lightingFacility;
+//
+//    /**
+//     * 视频监控设施
+//     */
+//    private String videoSurveillanceFacility;
+//
+//    /**
+//     * 填表人
+//     */
+//    private String preparer;
+//
+//    /**
+//     * 办理意见
+//     */
+//    private String handlingAdvice;
+//
+//    /**
+//     * 消纳来源
+//     */
+//    private String absorbSource;
+//
+//    /**
+//     * 电子围栏
+//     */
+//    private String electronicFence;
+//
+//    /**
+//     * 信用状态
+//     */
+//    private String creditStatus;
+//
+//    /**
+//     * 批准文件
+//     */
+//    private String approvalDocument;
+//
+//    /**
+//     * 审批资料
+//     */
+//    private String approvalData;
+//
+//    /**
+//     * 现场照片
+//     */
+//    private String scenePhoto;
+//
+//    /**
+//     * 洗车设施照片
+//     */
+//    private String carWashingFacilitiesImage;
+//
+//    /**
+//     * 期限范围
+//     */
+//    private String termRange;
+//
+//    /**
+//     * 安全评估报告
+//     */
+//    private String safetyAssessmentReport;
+//
+//    /**
+//     * 环评报告及环保部门批复
+//     */
+//    private String environmentalApproval;
+//
+//    /**
+//     * 签署消纳合同授权委托书
+//     */
+//    private String authorization;
+//
+//    /**
+//     * 其他资料
+//     */
+//    private String otherInformation;
+//
+//    /**
+//     * 运输企业
+//     */
+//    private String companyIds;
+//
+//    /**
+//     * 审批状态,0=审批中,1=审批通过,2=被驳回
+//     */
+//    private Integer status;
+//
+//    /**
+//     * 二维码
+//     */
+//    private String qrCode;
+//
+//    /**
+//     * 审核情况
+//     */
+//    private String auditStatus;
+
+    /**
+     * 经度
+     */
+    private Double longitude;
+    /**
+     * 纬度
+     */
+    private Double latitude;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCertificateNumber() {
+        return certificateNumber;
+    }
+
+    public void setCertificateNumber(String certificateNumber) {
+        this.certificateNumber = certificateNumber;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+
+    public Double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(Double longitude) {
+        this.longitude = longitude;
+    }
+
+    public Double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(Double latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getLocalArea() {
+        return localArea;
+    }
+
+    public void setLocalArea(String localArea) {
+        this.localArea = localArea;
+    }
+
+    public String getOperatingArea() {
+        return operatingArea;
+    }
+
+    public void setOperatingArea(String operatingArea) {
+        this.operatingArea = operatingArea;
+    }
+
+    public String getConstructionUnitPersonPhone() {
+        return constructionUnitPersonPhone;
+    }
+
+    public void setConstructionUnitPersonPhone(String constructionUnitPersonPhone) {
+        this.constructionUnitPersonPhone = constructionUnitPersonPhone;
+    }
+}
+package com.trash.garbage.pojo.vo;
+
+import java.util.Objects;
+
+/**
+ * @author liujun
+ * @date 2024年06月18日 11:02
+ */
+public class DisposalSiteVo implements java.io.Serializable {
+
+    private static final long serialVersionUID = 3485370958002241712L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * 建筑垃圾处理场所名称
+     */
+    private String name;
+
+    /**
+     * 证书编号
+     */
+    private String certificateNumber;
+
+    /**
+     * 所在地址
+     */
+    private String address;
+
+    /**
+     * 所在区域
+     */
+    private String localArea;
+
+    /**
+     * 作业区域
+     */
+    private String operatingArea;
+
+    /**
+     * 经度
+     */
+    private Double longitude;
+    /**
+     * 纬度
+     */
+    private Double latitude;
+
+    /**
+     * 责任人联系电话
+     */
+    private String constructionUnitPersonPhone;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCertificateNumber() {
+        return certificateNumber;
+    }
+
+    public void setCertificateNumber(String certificateNumber) {
+        this.certificateNumber = certificateNumber;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getLocalArea() {
+        return localArea;
+    }
+
+    public void setLocalArea(String localArea) {
+        this.localArea = localArea;
+    }
+
+    public String getOperatingArea() {
+        return operatingArea;
+    }
+
+    public void setOperatingArea(String operatingArea) {
+        this.operatingArea = operatingArea;
+    }
+
+    public Double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(Double longitude) {
+        this.longitude = longitude;
+    }
+
+    public Double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(Double latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getConstructionUnitPersonPhone() {
+        return constructionUnitPersonPhone;
+    }
+
+    public void setConstructionUnitPersonPhone(String constructionUnitPersonPhone) {
+        this.constructionUnitPersonPhone = constructionUnitPersonPhone;
+    }
+
+    public String getAddrStr(){
+        if(Objects.isNull(this.getAddress())){
+            return null;
+        }
+
+        StringBuilder builder = new StringBuilder();
+        builder.append("湖南省-长沙市-");
+        builder.append(Objects.isNull(this.getLocalArea())?"":this.getLocalArea());
+        builder.append(this.getAddress());
+
+        return builder.toString();
+    }
+
+}
@@ -3,8 +3,6 @@ package com.trash.garbage.pojo.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.trash.garbage.global.GlobalStatus;
 import com.trash.garbage.pojo.domain.GarOrderCar;
-import com.trash.garbage.pojo.dto.OrderDto;
-import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -89,6 +87,15 @@ public class OrderDetailVo {
      * 车辆信息
      */
     private List<GarOrderCar> garCarInfoList;
+    /***
+     *
+     * 垃圾处置场信息
+     * @author liujun
+     * @date 2024/6/18 10:50
+     * @param null
+     * @return null
+     */
+    private  List<DisposalSiteVo> disposalSites;
     /**
      * 订单状态
@@ -152,6 +159,14 @@ public class OrderDetailVo {
         this.garHandlerEvaluateFlag = GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue();
     }
+    public List<DisposalSiteVo> getDisposalSites() {
+        return disposalSites;
+    }
+
+    public void setDisposalSites(List<DisposalSiteVo> disposalSites) {
+        this.disposalSites = disposalSites;
+    }
+
     public String getGarHandlerCarCode() {
         return garHandlerCarCode;
     }
+package com.trash.garbage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.trash.garbage.pojo.domain.DisposalSiteEntity;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface DisposalSiteService extends IService<DisposalSiteEntity> {
+    /***
+     *
+     * 根据电话号码查询处理场所
+     * @author liujun
+     * @date 2024/6/18 11:15
+     * @param tels
+     * @return java.util.List<com.trash.garbage.pojo.domain.DisposalSiteEntity>
+     */
+    List<DisposalSiteEntity> queryDisposalSiteByTelPhone(Collection<String> tels);
+}
@@ -14,4 +14,14 @@ import java.util.List;
 public interface GarOrderMatchDisposalService extends IService<GarOrderMatchDisposal> {
     List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId);
+
+    /**
+     *
+     * 根据订单ID 查询订单处置信息
+     * @author liujun
+     * @date 2024/6/18 10:45
+     * @param orderId
+     * @return java.util.List<com.trash.garbage.pojo.vo.DispatchDisposalVo>
+     */
+    List<GarOrderMatchDisposal>  queryDisposalListByOrderId(String orderId);
 }
+package com.trash.garbage.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trash.garbage.mapper.GarDisposalSiteMapper;
+import com.trash.garbage.pojo.domain.DisposalSiteEntity;
+import com.trash.garbage.service.DisposalSiteService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author liujun
+ * @date 2024年06月18日 11:05
+ */
+@Service
+public class GarDisposalSiteServiceImpl extends ServiceImpl<GarDisposalSiteMapper, DisposalSiteEntity> implements DisposalSiteService {
+
+    @Override
+    public List<DisposalSiteEntity> queryDisposalSiteByTelPhone(Collection<String> tels) {
+        if (CollectionUtils.isEmpty(tels)) {
+            return Collections.emptyList();
+        }
+
+        LambdaQueryWrapper<DisposalSiteEntity> wrapper = new LambdaQueryWrapper<>(DisposalSiteEntity.class);
+        wrapper.in(DisposalSiteEntity::getConstructionUnitPersonPhone, tels);
+        return list(wrapper);
+    }
+}
 package com.trash.garbage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.trash.garbage.mapper.GarOrderMatchDisposalMapper;
 import com.trash.garbage.pojo.domain.GarOrderMatchDisposal;
@@ -22,6 +23,13 @@ public class GarOrderMatchDisposalServiceImpl extends ServiceImpl&lt;GarOrderMatchD
     public List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId) {
         return baseMapper.queryDisposalListWithDispatchStatus(orderId);
     }
+
+    @Override
+    public List<GarOrderMatchDisposal> queryDisposalListByOrderId(String orderId) {
+        LambdaQueryWrapper<GarOrderMatchDisposal> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GarOrderMatchDisposal::getGarOrderId,orderId);
+       return baseMapper.selectList(wrapper);
+    }
 }
@@ -23,6 +23,7 @@ import com.trash.garbage.pojo.vo.*;
 import com.trash.garbage.service.*;
 import com.trash.garbage.utils.SMSUtils;
 import com.trash.garbage.utils.ValidateCodeUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,6 +77,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     private GarOrderCarService garOrderCarService;
     @Autowired
     private RedisCache redisCache;
+    @Autowired
+    private GarOrderMatchDisposalService garOrderMatchDisposalService;
+    @Autowired
+    private DisposalSiteService disposalSiteService;
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -169,9 +174,42 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         qwc.eq(GarOrderCar::getGarOrderId, orderVo.getGarOrderId());
         List<GarOrderCar> carList = garOrderCarService.list(qwc);
         vo.setGarCarInfoList(carList);
+
+        List<GarOrderMatchDisposal> disposals = garOrderMatchDisposalService.queryDisposalListByOrderId(orderId);
+        if (CollectionUtil.isNotEmpty(disposals)) {
+            Set<String> tels = disposals.stream().map(GarOrderMatchDisposal::getGarOrderDisposalTel).collect(Collectors.toSet());
+            vo.setDisposalSites(queryDisposalSiteVo(tels));
+        }
+
         return vo;
     }
+    /***
+     *
+     * 根据电话号码查询处置场所信息
+     * @author liujun
+     * @date 2024/6/18 11:31
+     * @param tels
+     * @return java.util.List<com.trash.garbage.pojo.vo.DisposalSiteVo>
+     */
+    private List<DisposalSiteVo> queryDisposalSiteVo(Collection<String> tels) {
+        if (CollectionUtils.isEmpty(tels)) {
+            return Collections.emptyList();
+        }
+        List<DisposalSiteEntity> entities = disposalSiteService.queryDisposalSiteByTelPhone(tels);
+        if (CollectionUtils.isEmpty(entities)) {
+            return Collections.emptyList();
+        }
+        return entities.stream().map(en -> {
+            if (Objects.isNull(en)) {
+                return null;
+            }
+            DisposalSiteVo vo = new DisposalSiteVo();
+            BeanUtils.copyProperties(en, vo);
+            return vo;
+        }).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toList());
+    }
+
     private OrderDetailVo getOrderDetailVoResponsible(String id, GarUser user) {
         GarOrder order = this.getById(id);
         LambdaQueryWrapper<GarOrderImage> qwi = new LambdaQueryWrapper<>();
@@ -199,6 +237,14 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         qwc.eq(GarOrderCar::getGarOrderId, order.getGarOrderId());
         List<GarOrderCar> carList = garOrderCarService.list(qwc);
         vo.setGarCarInfoList(carList);
+
+        List<GarOrderMatchDisposal> disposals = garOrderMatchDisposalService.queryDisposalListByOrderId(id);
+        if (CollectionUtil.isNotEmpty(disposals)) {
+            Set<String> tels = disposals.stream().map(GarOrderMatchDisposal::getGarOrderDisposalTel).collect(Collectors.toSet());
+            vo.setDisposalSites(queryDisposalSiteVo(tels));
+        }
+
+
         return vo;
     }