Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java

Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
lichao
2 parents 5be5ab69 07cf9847
Showing 4 changed files with 75 additions and 40 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarTransportationEnterpriseServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
@@ -101,7 +101,7 @@ public class GarbageOrderController {
     @RequestMapping("/upload")
     public Result<?> uploadFile(@RequestParam("file") MultipartFile file) {
-        log.info("上传文件");
+//        log.info("上传文件");
         String fileName = null;
         try { // 上传文件路径
             String filePath = trashConfig.getUploadPath();
@@ -110,14 +110,14 @@ public class GarbageOrderController {
         } catch (IOException e) {
             e.printStackTrace();
             System.out.println("上传文件失败");
-            log.error("上传文件失败，请稍后再试",e);
+//            log.error("上传文件失败，请稍后再试",e);
             throw new BizException(ResultCode.CODE_400, ResultCode.CODE_400.getMsg());
         }
         String url = serverConfig.getUrl() + fileName;
         Map<String, String> urlMap = new HashMap<>();
         urlMap.put("url", url);
         urlMap.put("fileName", fileName);
-        log.info("上传文件完成");
+//        log.info("上传文件完成");
         return Result.OK(urlMap, "图片上传成功");
     }
@@ -13,10 +13,13 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.trash.carInfo.domain.CarInfo;
 import com.trash.carInfo.domain.vo.CarInfoVo;
 import com.trash.carInfo.mapper.CarInfoMapper;
 import com.trash.carInfo.service.impl.CarInfoServiceImpl;
+import com.trash.common.config.trashConfig;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
@@ -1000,7 +1003,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         return pageInfo;
     }
-
     @Override
     public PageInfo dockingUpEnterpriseList(TransportationEnterprise dto) {
         // 1）支持选择企业"所属区域"（长沙市内的）展示区域内所有企业
@@ -1050,15 +1052,39 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 log.error("请求的确信息异常", e);
             }
         }
+        
+        Map<String, Object> params = new HashMap<>();
+        if (StringUtils.isNotEmpty(tel)) {
+            params.put("phoneNo", tel);
+        }
-        // 修改这里，将name参数传递给request方法
-        List<TransportationEnterprise> list = garTransportationEnterpriseService.request(tel, areaCode, officeAddress, name);
+        if (StringUtils.isNotEmpty(areaCode)) {
+            params.put("adCodes", areaCode);
+        }
-        // 后续代码保持不变...
-        if (CollectionUtils.isNotEmpty(list) && StringUtils.isNotEmpty(tel)) {
-            String telStr = tel;
-            list = list.stream().filter(t -> StringUtils.equals(telStr, t.getServicePhone())).collect(Collectors.toList());
+        if (StringUtils.isNotEmpty(officeAddress)) {
+            params.put("officeAddress", officeAddress);
         }
+        if (StringUtils.isNotEmpty(name)) {
+            params.put("name", name);
+        }
+        
+        params.put("tag", "1");
+        
+        JSONArray array = RemoteServerUtils.getCompanyList(params,trashConfig.getToken());
+        
+        Gson g = new Gson();
+        
+        List<TransportationEnterprise> list = g.fromJson(array.toJSONString(), new TypeToken<List<TransportationEnterprise>>(){}.getType());
+        
+//        // 修改这里，将name参数传递给request方法
+//        List<TransportationEnterprise> list = garTransportationEnterpriseService.request(tel, areaCode, officeAddress, name);
+
+        // 后续代码保持不变...
+//        if (CollectionUtils.isNotEmpty(array) && StringUtils.isNotEmpty(tel)) {
+//            String telStr = tel;
+//            array = array.stream().filter(t -> StringUtils.equals(telStr, t.getServicePhone())).collect(Collectors.toList());
+//        }
 //        saveOrUpdate(list);
         Integer pageNum = ServletUtils.getParameterToInt("pageNum");
@@ -3,10 +3,14 @@ package com.trash.garbage.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.trash.common.utils.RemoteServerUtils;
 import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.garbage.service.GarTransportationEnterpriseService;
 import com.trash.garbage.utils.HttpUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.*;
@@ -40,11 +44,16 @@ public class GarTransportationEnterpriseServiceImpl implements GarTransportation
         if (StringUtils.isNotEmpty(name)) {
             params.put("name", name);
         }
+        
+        
         System.out.println(HttpUtil.doGet("/api/gpsservice/cs/companies/simple/list?tag=1", params));
         return HttpUtil.doGet("/api/gpsservice/cs/companies/simple/list?tag=1", params);
     }
+
+    @Autowired
+    private com.trash.common.config.trashConfig trashConfig;
     // 实现接口中定义的三个参数的request方法
     @Override
     public List<TransportationEnterprise> request(String tel, String adCodes, String officeAddress) {
@@ -53,31 +62,31 @@ public class GarTransportationEnterpriseServiceImpl implements GarTransportation
     // 新增的四个参数的request方法
     public List<TransportationEnterprise> request(String tel, String adCodes, String officeAddress, String name) {
-        String json = requestStr(tel, adCodes, officeAddress, name); // 传递name参数
-        if (StringUtils.isEmpty(json)) {
-            return Collections.emptyList();
+    	
+        Map<String, Object> params = new HashMap<>();
+        if (StringUtils.isNotEmpty(tel)) {
+            params.put("phoneNo", tel);
         }
-        List<TransportationEnterprise> list = new ArrayList<>();
-        Map<String, Object> hash = JSON.parseObject(json, HashMap.class);
-        if (Objects.nonNull(hash)) {
-            if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {
-                if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONArray) {
-                    JSONArray jsonArray = (JSONArray) hash.get("result");
-                    for (Object object : jsonArray) {
-                        JSONObject jsonObject = (JSONObject) object;
-                        TransportationEnterprise transportationEnterprise = new TransportationEnterprise();
-                        transportationEnterprise.setId(StringUtils.replace(jsonObject.get("id").toString(), "zxljqy", ""));
-                        transportationEnterprise.setName(jsonObject.getString("name"));
-                        transportationEnterprise.setAbbreviation(jsonObject.getString("abbreviation"));
-                        transportationEnterprise.setOfficeAddress(jsonObject.getString("officeAddress"));
-                        transportationEnterprise.setServicePhone(jsonObject.getString("servicePhone"));
-                        transportationEnterprise.setLegalRepresentative(jsonObject.getString("principal"));
-                        transportationEnterprise.setLegalRepresentativePhone(jsonObject.getString("principalPhoneNo"));
-                        list.add(transportationEnterprise);
-                    }
-                }
-            }
+
+        if (StringUtils.isNotEmpty(adCodes)) {
+            params.put("adCodes", adCodes);
         }
+
+        if (StringUtils.isNotEmpty(officeAddress)) {
+            params.put("officeAddress", officeAddress);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            params.put("name", name);
+        }
+        
+        params.put("tag", "1");
+        
+        JSONArray array = RemoteServerUtils.getCompanyList(params,trashConfig.getToken());
+        
+        Gson g = new Gson();
+        
+        List<TransportationEnterprise> list = g.fromJson(array.toJSONString(), new TypeToken<List<TransportationEnterprise>>(){}.getType());
+
         return list;
     }
 }
@@ -262,14 +262,14 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             vo.getRuleVos().add(ruleVo);
         }
-//        for (LoginVo.RuleVo r : vo.getRuleVos()){
-//            //排除驾驶员、企业负责人、处理场所
-//            if(r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())){
-//                vo.setTestUser(true);
-//            }
-//        }
-        
+        for (LoginVo.RuleVo r : vo.getRuleVos()){
+            //排除驾驶员、企业负责人、处理场所
+            if(r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())){
+                vo.setTestUser(true);
+            }
+        }
+
         this.saveOrUpdate(nUser);
         return vo;
     }