youxiw2000 / trash · Commits

Commit 5c8738133a90c015eb4a04b09751ef8b6dbaa4eb

Authored by liujun001
1 parent c0bed285
build: skipped

添加处理场所地址

Inline Side-by-side
Showing 9 changed files with 567 additions and 2 deletions
trash-garbage/src/main/java/com/trash/garbage/mapper/GarDisposalSiteMapper.java 0 → 100644
  View file @5c87381
  1 +package com.trash.garbage.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.trash.garbage.pojo.domain.DisposalSiteEntity;
  5 +
  6 +public interface GarDisposalSiteMapper extends BaseMapper<DisposalSiteEntity> {
  7 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/DisposalSiteEntity.java 0 → 100644
  View file @5c87381
  1 +package com.trash.garbage.pojo.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.TableName;
  4 +
  5 +/**
  6 + * @author liujun
  7 + * @date 2024年06月18日 10:53
  8 + */
  9 +@TableName(value = "disposal_site")
  10 +public class DisposalSiteEntity implements java.io.Serializable {
  11 +
  12 +
  13 + private static final long serialVersionUID = 5844957797707384456L;
  14 + /**
  15 + * $column.columnComment
  16 + */
  17 + private Long id;
  18 +
  19 + /**
  20 + * 建筑垃圾处理场所名称
  21 + */
  22 + private String name;
  23 +
  24 + /**
  25 + * 证书编号
  26 + */
  27 + private String certificateNumber;
  28 +
  29 + /**
  30 + * 所在地址
  31 + */
  32 + private String address;
  33 +
  34 +// /**
  35 +// * 消纳（回填）场所工程性质
  36 +// */
  37 +// private String engineeringProperty;
  38 +//
  39 +// /**
  40 +// * 建筑垃圾处理场所类型
  41 +// */
  42 +// private String siteType;
  43 +//
  44 + /**
  45 + * 所在区域
  46 + */
  47 + private String localArea;
  48 +
  49 + /**
  50 + * 作业区域
  51 + */
  52 + private String operatingArea;
  53 +//
  54 +// /**
  55 +// * 可受纳建筑垃圾类型
  56 +// */
  57 +// private String trashType;
  58 +//
  59 +// /**
  60 +// * 建设（施工）单位名称
  61 +// */
  62 +// private String constructionUnit;
  63 +//
  64 +// /**
  65 +// * 建设（施工）单位责任人
  66 +// */
  67 +// private String constructionUnitPerson;
  68 +//
  69 + /**
  70 + * 责任人联系电话
  71 + */
  72 + private String constructionUnitPersonPhone;
  73 +//
  74 +// /**
  75 +// * 有限期开始时间
  76 +// */
  77 +// private Date validityBeginDate;
  78 +//
  79 +// /**
  80 +// * 有限期结束时间
  81 +// */
  82 +// private Date validityEndDate;
  83 +//
  84 +// /**
  85 +// * 审批方量(m³)
  86 +// */
  87 +// private String squareMeasure;
  88 +//
  89 +// /**
  90 +// * 剩余方量
  91 +// */
  92 +// private String surplusSquareMeasure;
  93 +//
  94 +// /**
  95 +// * 洗车作业设施
  96 +// */
  97 +// private String carWashingFacilities;
  98 +//
  99 +// /**
  100 +// * 出口道路状况
  101 +// */
  102 +// private String exitRoadCondition;
  103 +//
  104 +// /**
  105 +// * 照明设施
  106 +// */
  107 +// private String lightingFacility;
  108 +//
  109 +// /**
  110 +// * 视频监控设施
  111 +// */
  112 +// private String videoSurveillanceFacility;
  113 +//
  114 +// /**
  115 +// * 填表人
  116 +// */
  117 +// private String preparer;
  118 +//
  119 +// /**
  120 +// * 办理意见
  121 +// */
  122 +// private String handlingAdvice;
  123 +//
  124 +// /**
  125 +// * 消纳来源
  126 +// */
  127 +// private String absorbSource;
  128 +//
  129 +// /**
  130 +// * 电子围栏
  131 +// */
  132 +// private String electronicFence;
  133 +//
  134 +// /**
  135 +// * 信用状态
  136 +// */
  137 +// private String creditStatus;
  138 +//
  139 +// /**
  140 +// * 批准文件
  141 +// */
  142 +// private String approvalDocument;
  143 +//
  144 +// /**
  145 +// * 审批资料
  146 +// */
  147 +// private String approvalData;
  148 +//
  149 +// /**
  150 +// * 现场照片
  151 +// */
  152 +// private String scenePhoto;
  153 +//
  154 +// /**
  155 +// * 洗车设施照片
  156 +// */
  157 +// private String carWashingFacilitiesImage;
  158 +//
  159 +// /**
  160 +// * 期限范围
  161 +// */
  162 +// private String termRange;
  163 +//
  164 +// /**
  165 +// * 安全评估报告
  166 +// */
  167 +// private String safetyAssessmentReport;
  168 +//
  169 +// /**
  170 +// * 环评报告及环保部门批复
  171 +// */
  172 +// private String environmentalApproval;
  173 +//
  174 +// /**
  175 +// * 签署消纳合同授权委托书
  176 +// */
  177 +// private String authorization;
  178 +//
  179 +// /**
  180 +// * 其他资料
  181 +// */
  182 +// private String otherInformation;
  183 +//
  184 +// /**
  185 +// * 运输企业
  186 +// */
  187 +// private String companyIds;
  188 +//
  189 +// /**
  190 +// * 审批状态,0=审批中,1=审批通过,2=被驳回
  191 +// */
  192 +// private Integer status;
  193 +//
  194 +// /**
  195 +// * 二维码
  196 +// */
  197 +// private String qrCode;
  198 +//
  199 +// /**
  200 +// * 审核情况
  201 +// */
  202 +// private String auditStatus;
  203 +
  204 + /**
  205 + * 经度
  206 + */
  207 + private Double longitude;
  208 + /**
  209 + * 纬度
  210 + */
  211 + private Double latitude;
  212 +
  213 +
  214 + public Long getId() {
  215 + return id;
  216 + }
  217 +
  218 + public void setId(Long id) {
  219 + this.id = id;
  220 + }
  221 +
  222 + public String getName() {
  223 + return name;
  224 + }
  225 +
  226 + public void setName(String name) {
  227 + this.name = name;
  228 + }
  229 +
  230 + public String getCertificateNumber() {
  231 + return certificateNumber;
  232 + }
  233 +
  234 + public void setCertificateNumber(String certificateNumber) {
  235 + this.certificateNumber = certificateNumber;
  236 + }
  237 +
  238 + public String getAddress() {
  239 + return address;
  240 + }
  241 +
  242 + public void setAddress(String address) {
  243 + this.address = address;
  244 + }
  245 +
  246 +
  247 + public Double getLongitude() {
  248 + return longitude;
  249 + }
  250 +
  251 + public void setLongitude(Double longitude) {
  252 + this.longitude = longitude;
  253 + }
  254 +
  255 + public Double getLatitude() {
  256 + return latitude;
  257 + }
  258 +
  259 + public void setLatitude(Double latitude) {
  260 + this.latitude = latitude;
  261 + }
  262 +
  263 + public String getLocalArea() {
  264 + return localArea;
  265 + }
  266 +
  267 + public void setLocalArea(String localArea) {
  268 + this.localArea = localArea;
  269 + }
  270 +
  271 + public String getOperatingArea() {
  272 + return operatingArea;
  273 + }
  274 +
  275 + public void setOperatingArea(String operatingArea) {
  276 + this.operatingArea = operatingArea;
  277 + }
  278 +
  279 + public String getConstructionUnitPersonPhone() {
  280 + return constructionUnitPersonPhone;
  281 + }
  282 +
  283 + public void setConstructionUnitPersonPhone(String constructionUnitPersonPhone) {
  284 + this.constructionUnitPersonPhone = constructionUnitPersonPhone;
  285 + }
  286 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/DisposalSiteVo.java 0 → 100644
  View file @5c87381
  1 +package com.trash.garbage.pojo.vo;
  2 +
  3 +import java.util.Objects;
  4 +
  5 +/**
  6 + * @author liujun
  7 + * @date 2024年06月18日 11:02
  8 + */
  9 +public class DisposalSiteVo implements java.io.Serializable {
  10 +
  11 + private static final long serialVersionUID = 3485370958002241712L;
  12 +
  13 + /**
  14 + * $column.columnComment
  15 + */
  16 + private Long id;
  17 +
  18 + /**
  19 + * 建筑垃圾处理场所名称
  20 + */
  21 + private String name;
  22 +
  23 + /**
  24 + * 证书编号
  25 + */
  26 + private String certificateNumber;
  27 +
  28 + /**
  29 + * 所在地址
  30 + */
  31 + private String address;
  32 +
  33 + /**
  34 + * 所在区域
  35 + */
  36 + private String localArea;
  37 +
  38 + /**
  39 + * 作业区域
  40 + */
  41 + private String operatingArea;
  42 +
  43 + /**
  44 + * 经度
  45 + */
  46 + private Double longitude;
  47 + /**
  48 + * 纬度
  49 + */
  50 + private Double latitude;
  51 +
  52 + /**
  53 + * 责任人联系电话
  54 + */
  55 + private String constructionUnitPersonPhone;
  56 +
  57 + public Long getId() {
  58 + return id;
  59 + }
  60 +
  61 + public void setId(Long id) {
  62 + this.id = id;
  63 + }
  64 +
  65 + public String getName() {
  66 + return name;
  67 + }
  68 +
  69 + public void setName(String name) {
  70 + this.name = name;
  71 + }
  72 +
  73 + public String getCertificateNumber() {
  74 + return certificateNumber;
  75 + }
  76 +
  77 + public void setCertificateNumber(String certificateNumber) {
  78 + this.certificateNumber = certificateNumber;
  79 + }
  80 +
  81 + public String getAddress() {
  82 + return address;
  83 + }
  84 +
  85 + public void setAddress(String address) {
  86 + this.address = address;
  87 + }
  88 +
  89 + public String getLocalArea() {
  90 + return localArea;
  91 + }
  92 +
  93 + public void setLocalArea(String localArea) {
  94 + this.localArea = localArea;
  95 + }
  96 +
  97 + public String getOperatingArea() {
  98 + return operatingArea;
  99 + }
  100 +
  101 + public void setOperatingArea(String operatingArea) {
  102 + this.operatingArea = operatingArea;
  103 + }
  104 +
  105 + public Double getLongitude() {
  106 + return longitude;
  107 + }
  108 +
  109 + public void setLongitude(Double longitude) {
  110 + this.longitude = longitude;
  111 + }
  112 +
  113 + public Double getLatitude() {
  114 + return latitude;
  115 + }
  116 +
  117 + public void setLatitude(Double latitude) {
  118 + this.latitude = latitude;
  119 + }
  120 +
  121 + public String getConstructionUnitPersonPhone() {
  122 + return constructionUnitPersonPhone;
  123 + }
  124 +
  125 + public void setConstructionUnitPersonPhone(String constructionUnitPersonPhone) {
  126 + this.constructionUnitPersonPhone = constructionUnitPersonPhone;
  127 + }
  128 +
  129 + public String getAddrStr(){
  130 + if(Objects.isNull(this.getAddress())){
  131 + return null;
  132 + }
  133 +
  134 + StringBuilder builder = new StringBuilder();
  135 + builder.append("湖南省-长沙市-");
  136 + builder.append(Objects.isNull(this.getLocalArea())?"":this.getLocalArea());
  137 + builder.append(this.getAddress());
  138 +
  139 + return builder.toString();
  140 + }
  141 +
  142 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
  View file @5c87381
... ... @@ -3,8 +3,6 @@ package com.trash.garbage.pojo.vo;
3 3 import com.fasterxml.jackson.annotation.JsonFormat;
4 4 import com.trash.garbage.global.GlobalStatus;
5 5 import com.trash.garbage.pojo.domain.GarOrderCar;
6   -import com.trash.garbage.pojo.dto.OrderDto;
7   -import lombok.Data;
8 6 import lombok.EqualsAndHashCode;
9 7 import lombok.ToString;
10 8  
... ... @@ -89,6 +87,15 @@ public class OrderDetailVo {
89 87 * 车辆信息
90 88 */
91 89 private List<GarOrderCar> garCarInfoList;
  90 + /***
  91 + *
  92 + * 垃圾处置场信息
  93 + * @author liujun
  94 + * @date 2024/6/18 10:50
  95 + * @param null
  96 + * @return null
  97 + */
  98 + private List<DisposalSiteVo> disposalSites;
92 99  
93 100 /**
94 101 * 订单状态
... ... @@ -152,6 +159,14 @@ public class OrderDetailVo {
152 159 this.garHandlerEvaluateFlag = GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue();
153 160 }
154 161  
  162 + public List<DisposalSiteVo> getDisposalSites() {
  163 + return disposalSites;
  164 + }
  165 +
  166 + public void setDisposalSites(List<DisposalSiteVo> disposalSites) {
  167 + this.disposalSites = disposalSites;
  168 + }
  169 +
155 170 public String getGarHandlerCarCode() {
156 171 return garHandlerCarCode;
157 172 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/DisposalSiteService.java 0 → 100644
  View file @5c87381
  1 +package com.trash.garbage.service;
  2 +
  3 +import com.baomidou.mybatisplus.extension.service.IService;
  4 +import com.trash.garbage.pojo.domain.DisposalSiteEntity;
  5 +
  6 +import java.util.Collection;
  7 +import java.util.List;
  8 +
  9 +public interface DisposalSiteService extends IService<DisposalSiteEntity> {
  10 + /***
  11 + *
  12 + * 根据电话号码查询处理场所
  13 + * @author liujun
  14 + * @date 2024/6/18 11:15
  15 + * @param tels
  16 + * @return java.util.List<com.trash.garbage.pojo.domain.DisposalSiteEntity>
  17 + */
  18 + List<DisposalSiteEntity> queryDisposalSiteByTelPhone(Collection<String> tels);
  19 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchDisposalService.java
  View file @5c87381
... ... @@ -14,4 +14,14 @@ import java.util.List;
14 14 public interface GarOrderMatchDisposalService extends IService<GarOrderMatchDisposal> {
15 15  
16 16 List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId);
  17 +
  18 + /**
  19 + *
  20 + * 根据订单ID 查询订单处置信息
  21 + * @author liujun
  22 + * @date 2024/6/18 10:45
  23 + * @param orderId
  24 + * @return java.util.List<com.trash.garbage.pojo.vo.DispatchDisposalVo>
  25 + */
  26 + List<GarOrderMatchDisposal> queryDisposalListByOrderId(String orderId);
17 27 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarDisposalSiteServiceImpl.java 0 → 100644
  View file @5c87381
  1 +package com.trash.garbage.service.impl;
  2 +
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  5 +import com.trash.garbage.mapper.GarDisposalSiteMapper;
  6 +import com.trash.garbage.pojo.domain.DisposalSiteEntity;
  7 +import com.trash.garbage.service.DisposalSiteService;
  8 +import org.apache.commons.collections4.CollectionUtils;
  9 +import org.springframework.stereotype.Service;
  10 +
  11 +import java.util.Collection;
  12 +import java.util.Collections;
  13 +import java.util.List;
  14 +
  15 +/**
  16 + * @author liujun
  17 + * @date 2024年06月18日 11:05
  18 + */
  19 +@Service
  20 +public class GarDisposalSiteServiceImpl extends ServiceImpl<GarDisposalSiteMapper, DisposalSiteEntity> implements DisposalSiteService {
  21 +
  22 + @Override
  23 + public List<DisposalSiteEntity> queryDisposalSiteByTelPhone(Collection<String> tels) {
  24 + if (CollectionUtils.isEmpty(tels)) {
  25 + return Collections.emptyList();
  26 + }
  27 +
  28 + LambdaQueryWrapper<DisposalSiteEntity> wrapper = new LambdaQueryWrapper<>(DisposalSiteEntity.class);
  29 + wrapper.in(DisposalSiteEntity::getConstructionUnitPersonPhone, tels);
  30 + return list(wrapper);
  31 + }
  32 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchDisposalServiceImpl.java
  View file @5c87381
1 1 package com.trash.garbage.service.impl;
2 2  
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
3 4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4 5 import com.trash.garbage.mapper.GarOrderMatchDisposalMapper;
5 6 import com.trash.garbage.pojo.domain.GarOrderMatchDisposal;
... ... @@ -22,6 +23,13 @@ public class GarOrderMatchDisposalServiceImpl extends ServiceImpl&lt;GarOrderMatchD
22 23 public List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId) {
23 24 return baseMapper.queryDisposalListWithDispatchStatus(orderId);
24 25 }
  26 +
  27 + @Override
  28 + public List<GarOrderMatchDisposal> queryDisposalListByOrderId(String orderId) {
  29 + LambdaQueryWrapper<GarOrderMatchDisposal> wrapper = new LambdaQueryWrapper<>();
  30 + wrapper.eq(GarOrderMatchDisposal::getGarOrderId,orderId);
  31 + return baseMapper.selectList(wrapper);
  32 + }
25 33 }
26 34  
27 35  
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @5c87381
... ... @@ -23,6 +23,7 @@ import com.trash.garbage.pojo.vo.*;
23 23 import com.trash.garbage.service.*;
24 24 import com.trash.garbage.utils.SMSUtils;
25 25 import com.trash.garbage.utils.ValidateCodeUtil;
  26 +import org.apache.commons.collections4.CollectionUtils;
26 27 import org.apache.commons.lang3.StringUtils;
27 28 import org.springframework.beans.BeanUtils;
28 29 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -76,6 +77,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
76 77 private GarOrderCarService garOrderCarService;
77 78 @Autowired
78 79 private RedisCache redisCache;
  80 + @Autowired
  81 + private GarOrderMatchDisposalService garOrderMatchDisposalService;
  82 + @Autowired
  83 + private DisposalSiteService disposalSiteService;
79 84  
80 85 @Override
81 86 @Transactional(rollbackFor = Exception.class)
... ... @@ -169,9 +174,42 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
169 174 qwc.eq(GarOrderCar::getGarOrderId, orderVo.getGarOrderId());
170 175 List<GarOrderCar> carList = garOrderCarService.list(qwc);
171 176 vo.setGarCarInfoList(carList);
  177 +
  178 + List<GarOrderMatchDisposal> disposals = garOrderMatchDisposalService.queryDisposalListByOrderId(orderId);
  179 + if (CollectionUtil.isNotEmpty(disposals)) {
  180 + Set<String> tels = disposals.stream().map(GarOrderMatchDisposal::getGarOrderDisposalTel).collect(Collectors.toSet());
  181 + vo.setDisposalSites(queryDisposalSiteVo(tels));
  182 + }
  183 +
172 184 return vo;
173 185 }
174 186  
  187 + /***
  188 + *
  189 + * 根据电话号码查询处置场所信息
  190 + * @author liujun
  191 + * @date 2024/6/18 11:31
  192 + * @param tels
  193 + * @return java.util.List<com.trash.garbage.pojo.vo.DisposalSiteVo>
  194 + */
  195 + private List<DisposalSiteVo> queryDisposalSiteVo(Collection<String> tels) {
  196 + if (CollectionUtils.isEmpty(tels)) {
  197 + return Collections.emptyList();
  198 + }
  199 + List<DisposalSiteEntity> entities = disposalSiteService.queryDisposalSiteByTelPhone(tels);
  200 + if (CollectionUtils.isEmpty(entities)) {
  201 + return Collections.emptyList();
  202 + }
  203 + return entities.stream().map(en -> {
  204 + if (Objects.isNull(en)) {
  205 + return null;
  206 + }
  207 + DisposalSiteVo vo = new DisposalSiteVo();
  208 + BeanUtils.copyProperties(en, vo);
  209 + return vo;
  210 + }).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toList());
  211 + }
  212 +
175 213 private OrderDetailVo getOrderDetailVoResponsible(String id, GarUser user) {
176 214 GarOrder order = this.getById(id);
177 215 LambdaQueryWrapper<GarOrderImage> qwi = new LambdaQueryWrapper<>();
... ... @@ -199,6 +237,14 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
199 237 qwc.eq(GarOrderCar::getGarOrderId, order.getGarOrderId());
200 238 List<GarOrderCar> carList = garOrderCarService.list(qwc);
201 239 vo.setGarCarInfoList(carList);
  240 +
  241 + List<GarOrderMatchDisposal> disposals = garOrderMatchDisposalService.queryDisposalListByOrderId(id);
  242 + if (CollectionUtil.isNotEmpty(disposals)) {
  243 + Set<String> tels = disposals.stream().map(GarOrderMatchDisposal::getGarOrderDisposalTel).collect(Collectors.toSet());
  244 + vo.setDisposalSites(queryDisposalSiteVo(tels));
  245 + }
  246 +
  247 +
202 248 return vo;
203 249 }
204 250  
... ...