装修垃圾登录优化

2c2c2c
1 parent 82c74730
Showing 2 changed files with 7 additions and 14 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/utils/HttpUtil.java
@@ -175,9 +175,6 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         GarUserReq userReq = reqGarUser(loginDto.getTel());
-//        DriverVo driver = new DriverVo();
-//        driver.setPhoneNo(loginDto.getTel());
-//        List<DriverVo> driverList = driverService.selectDriverList(driver);
         LoginVo.RuleVo ruleVo = new LoginVo.RuleVo();
         ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
         vo.setRuleVos(new ArrayList<>(Arrays.asList(ruleVo)));
@@ -193,24 +190,15 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         }
         // 企业负责人 TODO
-//        TransportationEnterprise transportationEnterprise = new TransportationEnterprise();
-//        transportationEnterprise.setServicePhone(loginDto.getTel());
-//        List<TransportationEnterprise> enterpriseList = enterpriseService.selectTransportationEnterpriseList(transportationEnterprise);
         if (Objects.nonNull(userReq) && CollectionUtil.isNotEmpty(userReq.getCompanies())) {
             GarUserReqDetail detail = userReq.getCompanies().get(0);
             ruleVo = new LoginVo.RuleVo();
             ruleVo.setTransportCompanyName(detail.getCompanyName());
             ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription());
             vo.getRuleVos().add(ruleVo);
-
-            // vo.setName(enterprise.getName());
         }
         // 处理场所 TODO
-        // 查询条件
-//        DisposalSite site = new DisposalSite();
-//        site.setConstructionUnitPersonPhone(loginDto.getTel());
-//        List<DisposalSite> disposalSites = disposalSiteService.selectDisposalSiteList(site);
         if (Objects.nonNull(userReq) && CollectionUtil.isNotEmpty(userReq.getEarthsites())) {
             GarUserReqDetail detail = userReq.getEarthsites().get(0);
             ruleVo = new LoginVo.RuleVo();
@@ -218,7 +206,6 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription());
             vo.getRuleVos().add(ruleVo);
-            // vo.setName(disposalSite.getConstructionUnitPerson());
         }
         for (LoginVo.RuleVo r : vo.getRuleVos()){
             //排除驾驶员、企业负责人、处理场所
@@ -57,8 +57,14 @@ public class HttpUtil {
                 url = url + "?" + paramStr;
             }
         }
+        String token = trashConfig.authorization;
+        if(!token.contains("Bearer")){
+            token = "Bearer " + token;
+        }
+
+
-        HttpRequest request = HttpRequest.get(trashConfig.remotePath + url).header("Authorization", trashConfig.authorization).header("Content-Type", trashConfig.contentType)
+        HttpRequest request = HttpRequest.get(trashConfig.remotePath + url).header("Authorization", token).header("Content-Type", trashConfig.contentType)
                 .timeout(15000);
         json = request.execute().body();