优化车辆信息,将客户的数据拉入我们的库

liujun001
1 parent 14347a7c
Showing 11 changed files with 98 additions and 8 deletions
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/DispatchDriverVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/LoginVo.java
trash-garbage/src/main/java/com/trash/garbage/service/GarUserService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
trash-unit/src/main/java/com/trash/enterprise/mapper/TransportationEnterpriseMapper.java
trash-unit/src/main/java/com/trash/enterprise/service/ITransportationEnterpriseService.java
trash-unit/src/main/java/com/trash/enterprise/service/impl/TransportationEnterpriseServiceImpl.java
trash-unit/src/main/resources/mapper/unit/TransportationEnterpriseMapper.xml
@@ -41,7 +41,7 @@ public interface GarOrderMapper extends BaseMapper&lt;GarOrder&gt; {
     String queryCompanyIdByPhone(@Param("phone")String phone);
-    List<DockingQRCodeEntity> queryReportByCarCode(@Param("carCode") String carCode);
+    List<DockingQRCodeEntity> queryReportByCarCode(@Param("carCode") String carCode,@Param("dateStr") String dateStr);
 }
@@ -2,9 +2,11 @@ package com.trash.garbage.pojo.vo;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.apache.commons.lang3.StringUtils;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 /**
  * @author 20412
@@ -25,6 +27,8 @@ public class DispatchDriverVo {
     private Collection<Personnel> personnelInfo;
+    private Integer sortValue;
+
     /**
      * 人员信息
      */
@@ -105,5 +109,18 @@ public class DispatchDriverVo {
         this.licensePlateNumber = licensePlateNumber;
     }
-
+    public Integer getSortValue() {
+        if (Objects.isNull(sortValue)) {
+            if (StringUtils.equals(StringUtils.trim(containerVolume), "轻型货车") || StringUtils.equals(StringUtils.trim(containerVolume), "4方车")) {
+                sortValue = 1;
+            } else if (StringUtils.equals(StringUtils.trim(containerVolume), "中型货车") || StringUtils.equals(StringUtils.trim(containerVolume), "6方车")) {
+                sortValue = 2;
+            } else if (StringUtils.equals(StringUtils.trim(containerVolume), "中大型货车") || StringUtils.equals(StringUtils.trim(containerVolume), "8方车")) {
+                sortValue = 3;
+            } else {
+                sortValue = Integer.MAX_VALUE;
+            }
+        }
+        return sortValue;
+    }
 }
@@ -9,8 +9,17 @@ import java.util.List;
 @EqualsAndHashCode
 public class LoginVo {
     private String token;
+    private String name;
     private List<RuleVo> ruleVos;
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getToken() {
         return token;
     }
@@ -40,4 +40,5 @@ public interface GarUserService extends IService&lt;GarUser&gt; {
     List<GarUser> queryListByUser(GarUser garUser);
     LoginVo queryRole();
+    GarUser queryGarUserByTel(String tel);
 }
@@ -34,6 +34,8 @@ 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.apache.commons.lang3.time.DateUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
 import org.apache.http.client.utils.HttpClientUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,6 +100,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     private String authorization;
     @Value("${trash.remotePath}")
     private String remotePath;
+    private FastDateFormat fastDateFormat = FastDateFormat.getInstance("yyyy-MM-dd");
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -661,6 +664,12 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 vo.setGarOrderHandleName(driverVos.get(0).getName());
                 vo.setGarOrderHandleTel(driverVos.get(0).getPhoneNo());
             }
+        } else if (StringUtils.isNotEmpty(vo.getGarOrderCompanyTel())) {
+            TransportationEnterprise enterprise = transportationEnterpriseService.queryByServerPhone(vo.getGarOrderCompanyTel());
+            if(Objects.nonNull(enterprise)){
+                vo.setGarOrderHandleName(enterprise.getLegalRepresentative());
+                vo.setGarOrderHandleTel(enterprise.getLegalRepresentativePhone());
+            }
         }
         // 获取车辆信息
         LambdaQueryWrapper<GarOrderCar> qwc = new LambdaQueryWrapper<>();
@@ -768,6 +777,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                             if (opt.isPresent()) {
                                 JSONObject jsonObject = (JSONObject) opt.get();
                                 params.put("adCodes", jsonObject.getString("code"));
+                            } else {
+                                params.put("adCodes", "no found");
                             }
                         }
                     }
@@ -880,17 +891,21 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                             if (Objects.isNull(source)) {
                                 transportationEnterpriseService.save(transportationEnterprise);
                             } else {
+                                TransportationEnterprise target = new TransportationEnterprise();
+                                BeanUtils.copyProperties(transportationEnterprise, target);
                                 TransportationEnterprise source1 = new TransportationEnterprise();
                                 source1.setId(source.getId());
                                 //transportationEnterprise.setId(jsonObject.get("id").toString());
                                 source1.setName(source.getName());
                                 source1.setAbbreviation(source.getAbbreviation());
                                 source1.setOfficeAddress(source.getOfficeAddress());
-                                source1.setServicePhone(source.getServicePhone());
+                                //  source1.setServicePhone(source.getServicePhone());
                                 source1.setLegalRepresentative(source.getLegalRepresentative());
                                 source1.setLegalRepresentativePhone(source.getLegalRepresentativePhone());
                                 source1.setCarNumber(0);
-                                if (Objects.equals(JSON.toJSONString(source1), JSON.toJSONString(transportationEnterprise))) {
+                                target.setServicePhone(null);
+
+                                if (Objects.equals(JSON.toJSONString(source1), JSON.toJSONString(target))) {
                                     continue;
                                 } else {
                                     transportationEnterpriseService.updateById(transportationEnterprise);
@@ -1078,7 +1093,17 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         List<GarOrderCar> carList = garOrderCarService.list(qwc);
         if (CollectionUtils.isNotEmpty(carList)) {
             Set<String> carTypes = carList.stream().map(GarOrderCar::getGarOrderCarType).collect(Collectors.toSet());
-            voList = voList.stream().filter(v -> carTypes.contains(v.getContainerVolume())).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(carTypes)) {
+                String[] carTypeStrs = {"4方车", "6方车", "8方车"};
+                String[] carTypeStrs1 = {"轻型货车", "中型货车", "中大型货车"};
+                int size = carTypeStrs.length;
+                for (int i = 0; i < size; i++) {
+                    if (carTypes.contains(carTypeStrs[i])) {
+                        carTypes.add(carTypeStrs1[i]);
+                    }
+                }
+            }
+            voList = voList.stream().filter(v -> carTypes.contains(v.getContainerVolume())).sorted(Comparator.comparing(DispatchDriverVo::getLicensePlateNumber)).sorted(Comparator.comparing(DispatchDriverVo::getSortValue)).collect(Collectors.toList());
         }
         return voList;
@@ -1269,6 +1294,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         // String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
         // 选中的司机处理场所
         List<DispatchDisposalVo> voList = disposalService.queryDisposalListWithDispatchStatus(orderId);
+        if (CollectionUtils.isNotEmpty(voList)) {
+            voList = voList.stream().sorted(Comparator.comparing(DispatchDisposalVo::getGarOrderDisposalCompanyName)).collect(Collectors.toList());
+        }
         return voList;
     }
@@ -1516,7 +1544,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @Override
     public List<DockingQRCodeEntity> queryReportByCarCode(String carCode) {
-        return baseMapper.queryReportByCarCode(carCode);
+        String dateStr = fastDateFormat.format(DateUtils.addDays(new Date(), -1));
+        return baseMapper.queryReportByCarCode(carCode, dateStr);
     }
@@ -19,6 +19,7 @@ import com.trash.disposalSite.domain.DisposalSite;
 import com.trash.disposalSite.service.IDisposalSiteService;
 import com.trash.garbage.utils.SMSUtils;
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -167,6 +168,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             ruleVo.setTransportCompanyName(enterprise.getName());
             ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription());
             vo.getRuleVos().add(ruleVo);
+            vo.setName(driverVo.getName());
         }
         // 企业负责人 TODO
@@ -179,6 +181,8 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             ruleVo.setTransportCompanyName(enterprise.getName());
             ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription());
             vo.getRuleVos().add(ruleVo);
+
+            // vo.setName(enterprise.getName());
         }
         // 处理场所 TODO
@@ -192,6 +196,8 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             ruleVo.setTransportCompanyName(disposalSite.getName());
             ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription());
             vo.getRuleVos().add(ruleVo);
+
+            // vo.setName(disposalSite.getConstructionUnitPerson());
         }
         return vo;
     }
@@ -364,6 +370,14 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         return vo;
     }
+    @Override
+    public GarUser queryGarUserByTel(String tel) {
+        LambdaQueryWrapper<GarUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GarUser::getGarUserTel, tel);
+        List<GarUser> garUsers = list(wrapper);
+        return CollectionUtils.isEmpty(garUsers) ? null : garUsers.get(0);
+    }
+
     private LambdaQueryWrapper<GarUser> createQueryWrapperByUser(GarUser garUser) {
         return new LambdaQueryWrapper<GarUser>()
                 .eq(StringUtils.isNotEmpty(garUser.getGarUserId()), GarUser::getGarUserId, garUser.getGarUserId())
@@ -268,6 +268,7 @@
         left join disposal_site ds on ds.id = gomd.gar_order_disposal_company_id
         left join gar_order_match_handler gomh on gomh.gar_order_id =go2.gar_order_id
         where gomh.gar_handler_car_code=#{carCode}
-        and gomh.gar_order_handler_status = 1 AND gomh.gar_cancel_flag = 0
+         AND gomh.gar_cancel_flag = 0
+        and (go2.gar_create_time <![CDATA[ >= ]]>#{dateStr}  or go2.gar_order_handler_status in(0,1))
     </select>
 </mapper>
 package com.trash.enterprise.mapper;
 import com.trash.enterprise.domain.TransportationEnterprise;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -22,6 +23,8 @@ public interface TransportationEnterpriseMapper
         TransportationEnterprise selectTransportationEnterpriseByIdStr(String id);
+        List<TransportationEnterprise> queryByServerPhone(@Param("serverPhone") String serverPhone);
+
     /**
      * 查询运输企业管理列表
      * 
@@ -22,6 +22,7 @@ public interface ITransportationEnterpriseService
         TransportationEnterprise selectTransportationEnterpriseById(String id);
         TransportationEnterprise selectTransportationEnterpriseByIdStr(String id);
+        TransportationEnterprise queryByServerPhone(String phone);
     /**
      * 查询运输企业管理列表
@@ -6,6 +6,7 @@ import java.util.List;
 import com.trash.common.config.trashConfig;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.SecurityUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.trash.enterprise.mapper.TransportationEnterpriseMapper;
@@ -42,6 +43,12 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
         return transportationEnterpriseMapper.selectTransportationEnterpriseByIdStr(id);
     }
+    @Override
+    public TransportationEnterprise queryByServerPhone(String phone) {
+        List<TransportationEnterprise> enterprises = transportationEnterpriseMapper.queryByServerPhone(phone);
+        return CollectionUtils.isEmpty(enterprises) ? null : enterprises.get(0);
+    }
+
     /**
      * 查询运输企业管理列表
      *
@@ -47,6 +47,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <sql id="selectTransportationEnterpriseVo">
         select id, name, abbreviation, registration_area, transport_permission_date, enter_date, business_license_date, office_address, parking_lot_location, parking_area, (select count(id) from car_info where company_id = te.id) car_number, safety_manager_name, safety_manager_phone, social_uniform_credit_code_number, legal_representative, legal_representative_phone, safety_people_name, remark, transport_permission, enterprise_business_license, safety_officer_qualification_certificate, safety_certificate, car_park_panorama, business_unit, status, create_time, create_by, update_time, update_by, parent_id, company_type, credit_status, qr_code,service_phone,office_address_gps,offer,company_logo from transportation_enterprise te
     </sql>
+    <sql id="selectTransportationEnterpriseVo1">
+        select id, name, abbreviation, registration_area, transport_permission_date, enter_date, business_license_date, office_address, parking_lot_location, parking_area, safety_manager_name, safety_manager_phone, social_uniform_credit_code_number, legal_representative, legal_representative_phone, safety_people_name, remark, transport_permission, enterprise_business_license, safety_officer_qualification_certificate, safety_certificate, car_park_panorama, business_unit, status, create_time, create_by, update_time, update_by, parent_id, company_type, credit_status, qr_code,service_phone,office_address_gps,offer,company_logo from transportation_enterprise te
+    </sql>
+
     <select id="selectTransportationEnterpriseList" parameterType="TransportationEnterprise" resultMap="TransportationEnterpriseResult">
         <include refid="selectTransportationEnterpriseVo"/>
@@ -92,7 +96,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <include refid="selectTransportationEnterpriseVo"/>
         where id = #{id}
     </select>
-        
+    <select id="queryByServerPhone" resultType="com.trash.enterprise.domain.TransportationEnterprise">
+        <include refid="selectTransportationEnterpriseVo1"/>
+        where service_phone = #{serverPhone}
+    </select>
+
     <insert id="insertTransportationEnterprise" parameterType="TransportationEnterprise" useGeneratedKeys="true" keyProperty="id">
         insert into transportation_enterprise
         <trim prefix="(" suffix=")" suffixOverrides=",">