youxiw2000 / trash · Commits

Commit b87ba607db09593e3ab3e1665b97669abdabea49

Authored by liujun001
1 parent cf5c28af
build: skipped

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

Inline Side-by-side
Showing 22 changed files with 855 additions and 314 deletions
trash-admin/src/main/resources/application-local.yml
  View file @b87ba60
@@ -20,8 +20,8 @@ trash: @@ -20,8 +20,8 @@ trash:
20 #remotePath: http://175.6.47.84:8008 20 #remotePath: http://175.6.47.84:8008
21 #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ 21 #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
22 #remotePath: http://cszhatu.natapp1.cc 22 #remotePath: http://cszhatu.natapp1.cc
23 - remotePath: http://183.66.242.6:14601  
24 - token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w 23 + remotePath: http://175.178.228.30:8008
  24 + token: Bearer durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
25 25
26 26
27 # 数据源配置 27 # 数据源配置
@@ -33,9 +33,9 @@ spring: @@ -33,9 +33,9 @@ spring:
33 # 主库数据源 33 # 主库数据源
34 master: 34 master:
35 # url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true 35 # url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
36 - url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true 36 + url: jdbc:mysql://127.0.0.1:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
37 username: root 37 username: root
38 - password: root 38 + password: 1
39 # 从库数据源 39 # 从库数据源
40 slave: 40 slave:
41 # 从数据源开关/默认关闭 41 # 从数据源开关/默认关闭
trash-garbage/src/main/java/com/trash/garbage/config/GarTrashConfig.java 0 → 100644
  View file @b87ba60
  1 +package com.trash.garbage.config;
  2 +
  3 +import org.springframework.beans.factory.annotation.Value;
  4 +import org.springframework.stereotype.Component;
  5 +
  6 +@Component
  7 +public class GarTrashConfig {
  8 + public String contentType = "application/json";
  9 + @Value("${trash.token}")
  10 + public String authorization;
  11 + @Value("${trash.remotePath}")
  12 + public String remotePath;
  13 +
  14 +}
trash-garbage/src/main/java/com/trash/garbage/controller/GarCarController.java
  View file @b87ba60
@@ -17,6 +17,7 @@ import com.trash.driver.domain.vo.DriverVo; @@ -17,6 +17,7 @@ import com.trash.driver.domain.vo.DriverVo;
17 import com.trash.driver.service.IDriverService; 17 import com.trash.driver.service.IDriverService;
18 import com.trash.enterprise.domain.TransportationEnterprise; 18 import com.trash.enterprise.domain.TransportationEnterprise;
19 import com.trash.garbage.pojo.dto.GarCarInfoVo; 19 import com.trash.garbage.pojo.dto.GarCarInfoVo;
  20 +import com.trash.garbage.service.GarCarServer;
20 import javafx.scene.control.SplitPane; 21 import javafx.scene.control.SplitPane;
21 import lombok.extern.slf4j.Slf4j; 22 import lombok.extern.slf4j.Slf4j;
22 import org.apache.commons.collections4.CollectionUtils; 23 import org.apache.commons.collections4.CollectionUtils;
@@ -47,8 +48,9 @@ public class GarCarController { @@ -47,8 +48,9 @@ public class GarCarController {
47 48
48 @Autowired 49 @Autowired
49 private IDriverService driverService; 50 private IDriverService driverService;
  51 + @Autowired
  52 + private GarCarServer garCarServer;
50 53
51 - private final static FastDateFormat FAST_DATE_FORMAT = FastDateFormat.getInstance("yyyy-MM-dd");  
52 54
53 public GarCarController(CarInfoServiceImpl carInfoServiceImpl) { 55 public GarCarController(CarInfoServiceImpl carInfoServiceImpl) {
54 this.carInfoServiceImpl = carInfoServiceImpl; 56 this.carInfoServiceImpl = carInfoServiceImpl;
@@ -60,103 +62,12 @@ public class GarCarController { @@ -60,103 +62,12 @@ public class GarCarController {
60 } 62 }
61 @GetMapping("/list/group/by/carType") 63 @GetMapping("/list/group/by/carType")
62 public TableDataInfo listGroupByCarType(GarCarInfoVo carInfo) throws ParseException { 64 public TableDataInfo listGroupByCarType(GarCarInfoVo carInfo) throws ParseException {
63 - Map<String, String> headers = new HashMap<>();  
64 - headers.put("Authorization", authorization);  
65 - headers.put("Content-Type", contentType);  
66 -  
67 - Map<String, Object> params = new HashMap<>();  
68 - if (Objects.nonNull(carInfo.getCompanyId())) {  
69 - if (StringUtils.length(carInfo.getCompanyId()) < 5) {  
70 - params.put("companyID", "zxljqy" + carInfo.getCompanyId());  
71 - } else {  
72 - params.put("companyID", carInfo.getCompanyId());  
73 - }  
74 - }  
75 -  
76 - params.put("valid", 0);  
77 - params.put("tag", 1);  
78 - params.put("page", 1);  
79 - params.put("size", 100);  
80 -  
81 - String json = null;  
82 - List<GarCarInfoVo> list = new ArrayList<>();  
83 - try {  
84 - String paramStr = JSON.toJSONString(params);  
85 - json = HttpRequest.get(remotePath + "/api/gpsservice/cs/basevehicle/ledger/list").header("Authorization", authorization).header("Content-Type", contentType)  
86 - .timeout(15000).body(paramStr).execute().body();  
87 - log.info("/api/gpsservice/cs/basevehicle/ledger/list;params:[{}],returnJson:[{}]", paramStr, json);  
88 - } catch (Exception e) {  
89 - log.error("请求公司车辆信息异常", e);  
90 - }  
91 -  
92 - if (StringUtils.isNotEmpty(json)) {  
93 - Map<String, Object> hash = JSON.parseObject(json, HashMap.class);  
94 - if (Objects.nonNull(hash)) {  
95 - if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {  
96 - if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONObject) {  
97 - JSONObject resultObj = (JSONObject) hash.get("result");  
98 - if (Objects.nonNull(resultObj) && Objects.nonNull(resultObj.get("list")) && resultObj.get("list") instanceof JSONArray) {  
99 - JSONArray jsonArray = (JSONArray) resultObj.get("list");  
100 - for (Object object : jsonArray) {  
101 - JSONObject jsonObject = (JSONObject) object;  
102 -  
103 - GarCarInfoVo vo = new GarCarInfoVo();  
104 - vo.setCarBrank(jsonObject.getString("brandName"));  
105 - vo.setCarCode(jsonObject.getString("licenseplateNo"));  
106 - vo.setCarColor(jsonObject.getString(""));  
107 - vo.setCarIdentification(jsonObject.getString("licenseplateNo"));  
108 - vo.setCarType(jsonObject.getString("energyTypeName"));  
109 - if (Objects.nonNull(jsonObject.getString("companyID"))) {  
110 - vo.setCompanyId(StringUtils.replace(jsonObject.getString("companyID").toString(), "zxljqy", ""));  
111 - }  
112 - vo.setCompanyName(jsonObject.getString("companyName"));  
113 - vo.setContainerVolume(jsonObject.getString("containerVolume"));  
114 - vo.setEmissionStandard(jsonObject.getString("emissionStanName"));  
115 - vo.setFarmeNumber(jsonObject.getString("frmaeNo"));  
116 - vo.setId(StringUtils.replace(jsonObject.getString("id"), "zxljcl", ""));  
117 - vo.setStatus(jsonObject.getInteger("auditStatus"));  
118 - if (StringUtils.isNotEmpty(jsonObject.getString("transportCertValid"))) {  
119 - vo.setRoadTransportDate(FAST_DATE_FORMAT.parse(jsonObject.getString("transportCertValid")));  
120 - }  
121 - if (StringUtils.isNotEmpty(jsonObject.getString("registerAt"))) {  
122 - vo.setEnterDate(FAST_DATE_FORMAT.parse(jsonObject.getString("registerAt")));  
123 - }  
124 65
125 - if (Objects.nonNull(jsonObject.get("drivers")) && jsonObject.get("drivers") instanceof JSONArray) {  
126 - JSONArray das = (JSONArray) jsonObject.get("drivers");  
127 - int length = CollectionUtils.size(das);  
128 - if (length > 0) {  
129 - if (Objects.nonNull(das.get(0)) && das.get(0) instanceof JSONObject) {  
130 - JSONObject dro = (JSONObject) das.get(0);  
131 - vo.setDrivers(StringUtils.replace(dro.getString("driverId").toString(), "zxljjsy", ""));  
132 - vo.setDriversName(dro.getString("driverName"));  
133 - }  
134 -  
135 - Set<DriverVo> driverVoList = new HashSet<>();  
136 - for (Object da : das) {  
137 - JSONObject dro = (JSONObject) da;  
138 - DriverVo driverVo = new DriverVo();  
139 - driverVo.setName(dro.getString("driverName"));  
140 - driverVo.setPhoneNo(dro.getString("driverPhone"));  
141 - driverVo.setId(StringUtils.replace(dro.getString("driverId"), "zxljjsy", ""));  
142 - driverVoList.add(driverVo);  
143 - }  
144 - vo.setDriverVoList(driverVoList);  
145 - }  
146 - } 66 + List<GarCarInfoVo> list = garCarServer.requestGarCarInfoVo(carInfo.getCompanyId());
147 67
148 68
149 - if (StringUtils.isNotEmpty(vo.getCarType())) {  
150 - list.add(vo);  
151 - }  
152 - }  
153 - }  
154 - }  
155 - }  
156 - }  
157 - }  
158 69
159 - saveOrUpdateCarInfoAndDriver(list); 70 +// saveOrUpdateCarInfoAndDriver(list);
160 71
161 TableDataInfo data = getDataTable(list); 72 TableDataInfo data = getDataTable(list);
162 if (CollectionUtils.isNotEmpty(list)) { 73 if (CollectionUtils.isNotEmpty(list)) {
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
  View file @b87ba60
@@ -177,6 +177,7 @@ public class GarbageOrderController { @@ -177,6 +177,7 @@ public class GarbageOrderController {
177 177
178 @GetMapping("/queryDispatch/{orderId}") 178 @GetMapping("/queryDispatch/{orderId}")
179 public Result<?> queryDispatch(@PathVariable("orderId") String orderId) { 179 public Result<?> queryDispatch(@PathVariable("orderId") String orderId) {
  180 +
180 return Result.OK(garOrderService.queryDispatch(orderId)); 181 return Result.OK(garOrderService.queryDispatch(orderId));
181 } 182 }
182 183
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchDisposalMapper.java
  View file @b87ba60
@@ -18,6 +18,7 @@ public interface GarOrderMatchDisposalMapper extends BaseMapper&lt;GarOrderMatchDis @@ -18,6 +18,7 @@ public interface GarOrderMatchDisposalMapper extends BaseMapper&lt;GarOrderMatchDis
18 List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(@Param("orderId") String orderId); 18 List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(@Param("orderId") String orderId);
19 19
20 List<DispatchDisposalVo> queryDisposalListWithDispatchByOrderId(@Param("orderId") String orderId); 20 List<DispatchDisposalVo> queryDisposalListWithDispatchByOrderId(@Param("orderId") String orderId);
  21 + List<GarOrderMatchDisposal> queryObjByOrderId(@Param("orderId") String orderId);
21 } 22 }
22 23
23 24
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarUserReq.java 0 → 100644
  View file @b87ba60
  1 +package com.trash.garbage.pojo.domain;
  2 +
  3 +import java.util.List;
  4 +
  5 +public class GarUserReq {
  6 + //公司
  7 + private List<GarUserReqDetail> companies;
  8 + //司机
  9 + private List<GarUserReqDetail> drivers;
  10 + //消纳场
  11 + private List<GarUserReqDetail> earthsites;
  12 +
  13 + public List<GarUserReqDetail> getCompanies() {
  14 + return companies;
  15 + }
  16 +
  17 + public void setCompanies(List<GarUserReqDetail> companies) {
  18 + this.companies = companies;
  19 + }
  20 +
  21 + public List<GarUserReqDetail> getDrivers() {
  22 + return drivers;
  23 + }
  24 +
  25 + public void setDrivers(List<GarUserReqDetail> drivers) {
  26 + this.drivers = drivers;
  27 + }
  28 +
  29 + public List<GarUserReqDetail> getEarthsites() {
  30 + return earthsites;
  31 + }
  32 +
  33 + public void setEarthsites(List<GarUserReqDetail> earthsites) {
  34 + this.earthsites = earthsites;
  35 + }
  36 +}
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarUserReqDetail.java 0 → 100644
  View file @b87ba60
  1 +package com.trash.garbage.pojo.domain;
  2 +
  3 +public class GarUserReqDetail {
  4 + private String id;
  5 + private String name;
  6 + private String companyId;
  7 + private String phoneNo;
  8 + private String companyName;
  9 + private String abbreviation;
  10 + private String legalRepresentative;
  11 + private String legalRepresentativePhone;
  12 + private String safetyPeopleName;
  13 + private String safetyManagerName;
  14 + private String safetyManagerPhone;
  15 + private String servicePhone;
  16 +
  17 +
  18 + public String getId() {
  19 + return id;
  20 + }
  21 +
  22 + public void setId(String id) {
  23 + this.id = id;
  24 + }
  25 +
  26 + public String getName() {
  27 + return name;
  28 + }
  29 +
  30 + public void setName(String name) {
  31 + this.name = name;
  32 + }
  33 +
  34 + public String getCompanyId() {
  35 +// return companyId;
  36 + return id;
  37 + }
  38 +
  39 +// public void setCompanyId(String companyId) {
  40 +// this.companyId = companyId;
  41 +// }
  42 +
  43 + public String getPhoneNo() {
  44 + return phoneNo;
  45 + }
  46 +
  47 + public void setPhoneNo(String phoneNo) {
  48 + this.phoneNo = phoneNo;
  49 + }
  50 +
  51 + public String getCompanyName() {
  52 + return companyName;
  53 + }
  54 +
  55 + public void setCompanyName(String companyName) {
  56 + this.companyName = companyName;
  57 + }
  58 +
  59 + public String getAbbreviation() {
  60 + return abbreviation;
  61 + }
  62 +
  63 + public void setAbbreviation(String abbreviation) {
  64 + this.abbreviation = abbreviation;
  65 + }
  66 +
  67 + public String getLegalRepresentative() {
  68 + return legalRepresentative;
  69 + }
  70 +
  71 + public void setLegalRepresentative(String legalRepresentative) {
  72 + this.legalRepresentative = legalRepresentative;
  73 + }
  74 +
  75 + public String getLegalRepresentativePhone() {
  76 + return legalRepresentativePhone;
  77 + }
  78 +
  79 + public void setLegalRepresentativePhone(String legalRepresentativePhone) {
  80 + this.legalRepresentativePhone = legalRepresentativePhone;
  81 + }
  82 +
  83 + public String getSafetyPeopleName() {
  84 + return safetyPeopleName;
  85 + }
  86 +
  87 + public void setSafetyPeopleName(String safetyPeopleName) {
  88 + this.safetyPeopleName = safetyPeopleName;
  89 + }
  90 +
  91 + public String getSafetyManagerName() {
  92 + return safetyManagerName;
  93 + }
  94 +
  95 + public void setSafetyManagerName(String safetyManagerName) {
  96 + this.safetyManagerName = safetyManagerName;
  97 + }
  98 +
  99 + public String getSafetyManagerPhone() {
  100 + return safetyManagerPhone;
  101 + }
  102 +
  103 + public void setSafetyManagerPhone(String safetyManagerPhone) {
  104 + this.safetyManagerPhone = safetyManagerPhone;
  105 + }
  106 +
  107 + public String getServicePhone() {
  108 + return servicePhone;
  109 + }
  110 +
  111 + public void setServicePhone(String servicePhone) {
  112 + this.servicePhone = servicePhone;
  113 + }
  114 +}
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/DispatchDisposalVo.java
  View file @b87ba60
@@ -23,6 +23,16 @@ public class DispatchDisposalVo { @@ -23,6 +23,16 @@ public class DispatchDisposalVo {
23 23
24 private String garOrderDisposalCompanyName; 24 private String garOrderDisposalCompanyName;
25 private String garOrderDisposalCompanyId; 25 private String garOrderDisposalCompanyId;
  26 + private boolean check=false;
  27 +
  28 + public boolean isCheck() {
  29 + return check;
  30 + }
  31 +
  32 + public void setCheck(boolean check) {
  33 + this.check = check;
  34 + }
  35 +
26 public String getGarOrderDisposalCompanyName() { 36 public String getGarOrderDisposalCompanyName() {
27 return garOrderDisposalCompanyName; 37 return garOrderDisposalCompanyName;
28 } 38 }
trash-garbage/src/main/java/com/trash/garbage/service/GarAreaServer.java 0 → 100644
  View file @b87ba60
  1 +package com.trash.garbage.service;
  2 +
  3 +import com.alibaba.fastjson.JSONArray;
  4 +
  5 +public interface GarAreaServer {
  6 + String requestStr();
  7 + JSONArray request();
  8 +}
trash-garbage/src/main/java/com/trash/garbage/service/GarCarServer.java 0 → 100644
  View file @b87ba60
  1 +package com.trash.garbage.service;
  2 +
  3 +import com.trash.garbage.pojo.dto.GarCarInfoVo;
  4 +import com.trash.garbage.pojo.vo.DispatchDriverVo;
  5 +
  6 +import java.util.List;
  7 +
  8 +public interface GarCarServer {
  9 + String requestStr(String companId);
  10 +
  11 + List<GarCarInfoVo> requestGarCarInfoVo(String companId);
  12 +
  13 + List<DispatchDriverVo> requestDispatchDriverVo(String companId);
  14 +
  15 +}
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchDisposalService.java
  View file @b87ba60
@@ -3,6 +3,7 @@ package com.trash.garbage.service; @@ -3,6 +3,7 @@ package com.trash.garbage.service;
3 import com.baomidou.mybatisplus.extension.service.IService; 3 import com.baomidou.mybatisplus.extension.service.IService;
4 import com.trash.garbage.pojo.domain.GarOrderMatchDisposal; 4 import com.trash.garbage.pojo.domain.GarOrderMatchDisposal;
5 import com.trash.garbage.pojo.vo.DispatchDisposalVo; 5 import com.trash.garbage.pojo.vo.DispatchDisposalVo;
  6 +import org.apache.ibatis.annotations.Param;
6 7
7 import java.util.List; 8 import java.util.List;
8 9
@@ -13,6 +14,7 @@ import java.util.List; @@ -13,6 +14,7 @@ import java.util.List;
13 */ 14 */
14 public interface GarOrderMatchDisposalService extends IService<GarOrderMatchDisposal> { 15 public interface GarOrderMatchDisposalService extends IService<GarOrderMatchDisposal> {
15 16
  17 + @Deprecated
16 List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId); 18 List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId);
17 19
18 /** 20 /**
@@ -23,7 +25,13 @@ public interface GarOrderMatchDisposalService extends IService&lt;GarOrderMatchDisp @@ -23,7 +25,13 @@ public interface GarOrderMatchDisposalService extends IService&lt;GarOrderMatchDisp
23 * @param orderId 25 * @param orderId
24 * @return java.util.List<com.trash.garbage.pojo.vo.DispatchDisposalVo> 26 * @return java.util.List<com.trash.garbage.pojo.vo.DispatchDisposalVo>
25 */ 27 */
  28 + @Deprecated
26 List<GarOrderMatchDisposal> queryDisposalListByOrderId(String orderId); 29 List<GarOrderMatchDisposal> queryDisposalListByOrderId(String orderId);
27 - 30 + @Deprecated
28 List<DispatchDisposalVo> queryDisposalListWithDispatchByOrderId(String orderId); 31 List<DispatchDisposalVo> queryDisposalListWithDispatchByOrderId(String orderId);
  32 +
  33 + List<DispatchDisposalVo> requestDisposalListWithDispatch();
  34 + List<DispatchDisposalVo> requestDisposalListWithDispatchStatus(String orderId);
  35 +
  36 + List<GarOrderMatchDisposal> queryObjByOrderId( String orderId);
29 } 37 }
trash-garbage/src/main/java/com/trash/garbage/service/GarUserService.java
  View file @b87ba60
@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
5 import com.trash.garbage.pojo.domain.GarAddress; 5 import com.trash.garbage.pojo.domain.GarAddress;
6 import com.trash.garbage.pojo.domain.GarUser; 6 import com.trash.garbage.pojo.domain.GarUser;
7 import com.baomidou.mybatisplus.extension.service.IService; 7 import com.baomidou.mybatisplus.extension.service.IService;
  8 +import com.trash.garbage.pojo.domain.GarUserReq;
8 import com.trash.garbage.pojo.dto.AddressDto; 9 import com.trash.garbage.pojo.dto.AddressDto;
9 import com.trash.garbage.pojo.dto.LoginDto; 10 import com.trash.garbage.pojo.dto.LoginDto;
10 import com.trash.garbage.pojo.vo.LoginVo; 11 import com.trash.garbage.pojo.vo.LoginVo;
@@ -13,10 +14,10 @@ import javax.servlet.http.HttpServletRequest; @@ -13,10 +14,10 @@ import javax.servlet.http.HttpServletRequest;
13 import java.util.List; 14 import java.util.List;
14 15
15 /** 16 /**
16 -* @author 20412  
17 -* @description 针对表【gar_user(建筑垃圾-用户表)】的数据库操作Service  
18 -* @createDate 2023-11-20 16:03:15  
19 -*/ 17 + * @author 20412
  18 + * @description 针对表【gar_user(建筑垃圾-用户表)】的数据库操作Service
  19 + * @createDate 2023-11-20 16:03:15
  20 + */
20 public interface GarUserService extends IService<GarUser> { 21 public interface GarUserService extends IService<GarUser> {
21 22
22 LoginVo login(LoginDto user); 23 LoginVo login(LoginDto user);
@@ -40,5 +41,12 @@ public interface GarUserService extends IService&lt;GarUser&gt; { @@ -40,5 +41,12 @@ public interface GarUserService extends IService&lt;GarUser&gt; {
40 List<GarUser> queryListByUser(GarUser garUser); 41 List<GarUser> queryListByUser(GarUser garUser);
41 42
42 LoginVo queryRole(); 43 LoginVo queryRole();
  44 +
43 GarUser queryGarUserByTel(String tel); 45 GarUser queryGarUserByTel(String tel);
  46 +
  47 + String reqGarUserOfStr(String phone);
  48 +
  49 + GarUserReq reqGarUser(String phone);
  50 +
  51 +
44 } 52 }
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarAreaServerImpl.java 0 → 100644
  View file @b87ba60
  1 +package com.trash.garbage.service.impl;
  2 +
  3 +import com.alibaba.fastjson.JSON;
  4 +import com.alibaba.fastjson.JSONArray;
  5 +import com.trash.garbage.service.GarAreaServer;
  6 +import com.trash.garbage.utils.HttpUtil;
  7 +import org.apache.commons.lang3.StringUtils;
  8 +import org.springframework.stereotype.Service;
  9 +
  10 +import java.util.HashMap;
  11 +import java.util.Map;
  12 +import java.util.Objects;
  13 +
  14 +@Service
  15 +public class GarAreaServerImpl implements GarAreaServer {
  16 + @Override
  17 + public String requestStr() {
  18 + return HttpUtil.doGet("/api/gpsservice/cs/area", null);
  19 + }
  20 +
  21 + @Override
  22 + public JSONArray request() {
  23 + String json = requestStr();
  24 + if (StringUtils.isNotEmpty(json)) {
  25 + Map<String, Object> hash = JSON.parseObject(json, HashMap.class);
  26 + if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {
  27 + if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONArray) {
  28 + return (JSONArray) hash.get("result");
  29 + }
  30 + }
  31 +
  32 + }
  33 + return null;
  34 + }
  35 +}
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarCarServerImpl.java 0 → 100644
  View file @b87ba60
  1 +package com.trash.garbage.service.impl;
  2 +
  3 +import cn.hutool.http.HttpRequest;
  4 +import com.alibaba.fastjson.JSON;
  5 +import com.alibaba.fastjson.JSONArray;
  6 +import com.alibaba.fastjson.JSONObject;
  7 +import com.trash.driver.domain.vo.DriverVo;
  8 +import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
  9 +import com.trash.garbage.pojo.dto.GarCarInfoVo;
  10 +import com.trash.garbage.pojo.vo.DispatchDriverVo;
  11 +import com.trash.garbage.service.GarCarServer;
  12 +import com.trash.garbage.utils.HttpUtil;
  13 +import org.apache.commons.collections4.CollectionUtils;
  14 +import org.apache.commons.lang3.StringUtils;
  15 +import org.apache.commons.lang3.time.FastDateFormat;
  16 +import org.slf4j.Logger;
  17 +import org.slf4j.LoggerFactory;
  18 +import org.springframework.stereotype.Service;
  19 +
  20 +import java.util.*;
  21 +
  22 +@Service
  23 +public class GarCarServerImpl implements GarCarServer {
  24 + private final Logger logger = LoggerFactory.getLogger(GarCarServerImpl.class);
  25 +
  26 + private final static FastDateFormat FAST_DATE_FORMAT = FastDateFormat.getInstance("yyyy-MM-dd");
  27 +
  28 + @Override
  29 + public String requestStr(String companId) {
  30 + Map<String, Object> params = new HashMap<>();
  31 + if (Objects.nonNull(companId)) {
  32 + if (StringUtils.length(companId) < 5) {
  33 + params.put("companyID", "zxljqy" + companId);
  34 + } else {
  35 + params.put("companyID", companId);
  36 + }
  37 + }
  38 +
  39 + params.put("valid", 0);
  40 + params.put("tag", 1);
  41 + params.put("page", 1);
  42 + params.put("size", 100);
  43 + return HttpUtil.doPost("/api/gpsservice/cs/basevehicle/ledger/list", JSON.toJSONString(params));
  44 +
  45 + }
  46 +
  47 + @Override
  48 + public List<GarCarInfoVo> requestGarCarInfoVo(String companId) {
  49 + String json = requestStr(companId);
  50 + if (StringUtils.isEmpty(json)) {
  51 + return Collections.emptyList();
  52 + }
  53 + Map<String, Object> hash = JSON.parseObject(json, HashMap.class);
  54 + if (Objects.nonNull(hash)) {
  55 + if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {
  56 + if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONObject) {
  57 + JSONObject resultObj = (JSONObject) hash.get("result");
  58 + List<GarCarInfoVo> list = new ArrayList<>();
  59 + if (Objects.nonNull(resultObj) && Objects.nonNull(resultObj.get("list")) && resultObj.get("list") instanceof JSONArray) {
  60 + JSONArray jsonArray = (JSONArray) resultObj.get("list");
  61 + for (Object object : jsonArray) {
  62 + try {
  63 + JSONObject jsonObject = (JSONObject) object;
  64 +
  65 + GarCarInfoVo vo = new GarCarInfoVo();
  66 + vo.setCarBrank(jsonObject.getString("brandName"));
  67 + vo.setCarCode(jsonObject.getString("licenseplateNo"));
  68 + vo.setCarColor(jsonObject.getString(""));
  69 + vo.setCarIdentification(jsonObject.getString("licenseplateNo"));
  70 + vo.setCarType(jsonObject.getString("energyTypeName"));
  71 + if (Objects.nonNull(jsonObject.getString("companyID"))) {
  72 + vo.setCompanyId(StringUtils.replace(jsonObject.getString("companyID").toString(), "zxljqy", ""));
  73 + }
  74 + vo.setCompanyName(jsonObject.getString("companyName"));
  75 + vo.setContainerVolume(jsonObject.getString("containerVolume"));
  76 + vo.setEmissionStandard(jsonObject.getString("emissionStanName"));
  77 + vo.setFarmeNumber(jsonObject.getString("frmaeNo"));
  78 + vo.setId(StringUtils.replace(jsonObject.getString("id"), "zxljcl", ""));
  79 + vo.setStatus(jsonObject.getInteger("auditStatus"));
  80 + if (StringUtils.isNotEmpty(jsonObject.getString("transportCertValid"))) {
  81 + vo.setRoadTransportDate(FAST_DATE_FORMAT.parse(jsonObject.getString("transportCertValid")));
  82 + }
  83 + if (StringUtils.isNotEmpty(jsonObject.getString("registerAt"))) {
  84 + vo.setEnterDate(FAST_DATE_FORMAT.parse(jsonObject.getString("registerAt")));
  85 + }
  86 +
  87 + if (Objects.nonNull(jsonObject.get("drivers")) && jsonObject.get("drivers") instanceof JSONArray) {
  88 + JSONArray das = (JSONArray) jsonObject.get("drivers");
  89 + int length = CollectionUtils.size(das);
  90 + if (length > 0) {
  91 + if (Objects.nonNull(das.get(0)) && das.get(0) instanceof JSONObject) {
  92 + JSONObject dro = (JSONObject) das.get(0);
  93 + vo.setDrivers(StringUtils.replace(dro.getString("driverId").toString(), "zxljjsy", ""));
  94 + vo.setDriversName(dro.getString("driverName"));
  95 + }
  96 +
  97 + Set<DriverVo> driverVoList = new HashSet<>();
  98 + for (Object da : das) {
  99 + JSONObject dro = (JSONObject) da;
  100 + DriverVo driverVo = new DriverVo();
  101 + driverVo.setName(dro.getString("driverName"));
  102 + driverVo.setPhoneNo(dro.getString("driverPhone"));
  103 + driverVo.setId(StringUtils.replace(dro.getString("driverId"), "zxljjsy", ""));
  104 + driverVoList.add(driverVo);
  105 + }
  106 + vo.setDriverVoList(driverVoList);
  107 + }
  108 + }
  109 +
  110 +
  111 + if (StringUtils.isNotEmpty(vo.getCarType())) {
  112 + list.add(vo);
  113 + }
  114 + } catch (Exception e) {
  115 + logger.error("车辆信息转换异常", e);
  116 + }
  117 + }
  118 + }
  119 + return list;
  120 + }
  121 + }
  122 + }
  123 + return Collections.emptyList();
  124 + }
  125 +
  126 + @Override
  127 + public List<DispatchDriverVo> requestDispatchDriverVo(String companId) {
  128 + String json = requestStr(companId);
  129 + if (StringUtils.isEmpty(json)) {
  130 + return Collections.emptyList();
  131 + }
  132 + Map<String, Object> hash = JSON.parseObject(json, HashMap.class);
  133 + if (Objects.nonNull(hash)) {
  134 + if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {
  135 + if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONObject) {
  136 + JSONObject resultObj = (JSONObject) hash.get("result");
  137 + if (Objects.nonNull(resultObj) && Objects.nonNull(resultObj.get("list")) && resultObj.get("list") instanceof JSONArray) {
  138 + JSONArray jsonArray = (JSONArray) resultObj.get("list");
  139 + List<DispatchDriverVo> voList = new ArrayList<>();
  140 + for (Object object : jsonArray) {
  141 + JSONObject jsonObject = (JSONObject) object;
  142 +
  143 + DispatchDriverVo vo = new DispatchDriverVo();
  144 + vo.setContainerVolume(jsonObject.getString("energyTypeName"));
  145 + vo.setLicensePlateNumber(jsonObject.getString("licenseplateNo"));
  146 +
  147 + if (Objects.nonNull(jsonObject.get("drivers")) && jsonObject.get("drivers") instanceof JSONArray) {
  148 + JSONArray das = (JSONArray) jsonObject.get("drivers");
  149 + int length = CollectionUtils.size(das);
  150 + if (length > 0) {
  151 + Set<DispatchDriverVo.Personnel> personnelInfos = new LinkedHashSet<>();
  152 +
  153 + for (Object da : das) {
  154 + JSONObject dro = (JSONObject) da;
  155 + DispatchDriverVo.Personnel personnel = new DispatchDriverVo.Personnel();
  156 + personnel.setName(dro.getString("driverName"));
  157 + personnel.setTel(dro.getString("driverPhone"));
  158 +
  159 + personnel.setChecked(false);
  160 + personnelInfos.add(personnel);
  161 + }
  162 + vo.setPersonnelInfo(personnelInfos);
  163 + }
  164 + }
  165 + voList.add(vo);
  166 + }
  167 + return voList;
  168 + }
  169 + }
  170 + }
  171 + }
  172 + return Collections.emptyList();
  173 + }
  174 +}
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchDisposalServiceImpl.java
  View file @b87ba60
1 package com.trash.garbage.service.impl; 1 package com.trash.garbage.service.impl;
2 2
  3 +import cn.hutool.http.HttpRequest;
  4 +import cn.hutool.http.HttpUtil;
  5 +import com.alibaba.fastjson.JSON;
  6 +import com.alibaba.fastjson.JSONArray;
  7 +import com.alibaba.fastjson.JSONObject;
3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 8 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 9 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  10 +import com.trash.carInfo.domain.vo.CarInfoVo;
5 import com.trash.garbage.mapper.GarOrderMatchDisposalMapper; 11 import com.trash.garbage.mapper.GarOrderMatchDisposalMapper;
6 import com.trash.garbage.pojo.domain.GarOrderMatchDisposal; 12 import com.trash.garbage.pojo.domain.GarOrderMatchDisposal;
7 import com.trash.garbage.pojo.vo.DispatchDisposalVo; 13 import com.trash.garbage.pojo.vo.DispatchDisposalVo;
8 import com.trash.garbage.service.GarOrderMatchDisposalService; 14 import com.trash.garbage.service.GarOrderMatchDisposalService;
  15 +import org.apache.commons.collections4.CollectionUtils;
  16 +import org.apache.commons.lang3.StringUtils;
  17 +import org.apache.http.client.HttpClient;
  18 +import org.jetbrains.annotations.NotNull;
  19 +import org.springframework.beans.factory.annotation.Autowired;
9 import org.springframework.stereotype.Service; 20 import org.springframework.stereotype.Service;
10 21
11 -import java.util.Collections;  
12 -import java.util.List; 22 +import java.util.*;
  23 +import java.util.stream.Collectors;
13 24
14 /** 25 /**
15 * @author 20412 26 * @author 20412
@@ -19,6 +30,8 @@ import java.util.List; @@ -19,6 +30,8 @@ import java.util.List;
19 @Service 30 @Service
20 public class GarOrderMatchDisposalServiceImpl extends ServiceImpl<GarOrderMatchDisposalMapper, GarOrderMatchDisposal> 31 public class GarOrderMatchDisposalServiceImpl extends ServiceImpl<GarOrderMatchDisposalMapper, GarOrderMatchDisposal>
21 implements GarOrderMatchDisposalService { 32 implements GarOrderMatchDisposalService {
  33 + @Autowired
  34 + private GarOrderMatchDisposalMapper garOrderMatchDisposalMapper;
22 35
23 @Override 36 @Override
24 public List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId) { 37 public List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId) {
@@ -36,6 +49,100 @@ public class GarOrderMatchDisposalServiceImpl extends ServiceImpl&lt;GarOrderMatchD @@ -36,6 +49,100 @@ public class GarOrderMatchDisposalServiceImpl extends ServiceImpl&lt;GarOrderMatchD
36 public List<DispatchDisposalVo> queryDisposalListWithDispatchByOrderId(String orderId) { 49 public List<DispatchDisposalVo> queryDisposalListWithDispatchByOrderId(String orderId) {
37 return baseMapper.queryDisposalListWithDispatchByOrderId(orderId); 50 return baseMapper.queryDisposalListWithDispatchByOrderId(orderId);
38 } 51 }
  52 +
  53 + @Override
  54 + public List<DispatchDisposalVo> requestDisposalListWithDispatch() {
  55 + String json = requestDisposal(null);
  56 + if (StringUtils.isEmpty(json)) {
  57 + return Collections.emptyList();
  58 + }
  59 +
  60 + HashMap hash = JSON.parseObject(json, HashMap.class);
  61 + if (!StringUtils.equals(String.valueOf(hash.get("code")), "200")) {
  62 + log.warn("json code no equals 200");
  63 + return Collections.emptyList();
  64 + }
  65 + if (!(Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONObject)) {
  66 + log.warn("result not JSONArray ");
  67 + return Collections.emptyList();
  68 + }
  69 + JSONObject resultObj = (JSONObject) hash.get("result");
  70 + if (Objects.isNull(resultObj.get("list")) || !(resultObj.get("list") instanceof JSONArray)) {
  71 + log.warn("result list not JSONArray ");
  72 + return Collections.emptyList();
  73 + }
  74 + JSONArray list = (JSONArray) resultObj.get("list");
  75 + return getDispatchDisposalVos(list);
  76 + }
  77 +
  78 +
  79 + @Override
  80 + public List<DispatchDisposalVo> requestDisposalListWithDispatchStatus(String orderId) {
  81 + List<DispatchDisposalVo> vos = requestDisposalListWithDispatch();
  82 + if (CollectionUtils.isEmpty(vos)) {
  83 + return Collections.emptyList();
  84 + }
  85 + List<GarOrderMatchDisposal> disposals = garOrderMatchDisposalMapper.queryObjByOrderId(orderId);
  86 + if (CollectionUtils.isEmpty(disposals)) {
  87 + return vos;
  88 + }
  89 +
  90 + return vos.stream().filter(vo -> Objects.nonNull(vo.getPersonnelInfo())).map(vo -> {
  91 + List<DispatchDisposalVo.Personnel> personnels = vo.getPersonnelInfo().stream().map(personnel -> {
  92 + Optional<GarOrderMatchDisposal> optional = disposals.stream().filter(d -> StringUtils.equals(personnel.getTel(), d.getGarOrderDisposalTel())).findFirst();
  93 + if (optional.isPresent()) {
  94 + personnel.setChecked(Boolean.TRUE);
  95 + }
  96 + return personnel;
  97 + }).collect(Collectors.toList());
  98 + vo.setPersonnelInfo(personnels);
  99 + return vo;
  100 + }).collect(Collectors.toList());
  101 + }
  102 +
  103 + @Override
  104 + public List<GarOrderMatchDisposal> queryObjByOrderId(String orderId) {
  105 + return garOrderMatchDisposalMapper.queryObjByOrderId(orderId);
  106 + }
  107 +
  108 + @NotNull
  109 + private static List<DispatchDisposalVo> getDispatchDisposalVos(JSONArray list) {
  110 + List<DispatchDisposalVo> vos = new ArrayList<>();
  111 + for (Object listObj : list) {
  112 + if (Objects.nonNull(listObj) && listObj instanceof JSONObject) {
  113 + JSONObject obj = (JSONObject) listObj;
  114 +
  115 + DispatchDisposalVo vo = new DispatchDisposalVo();
  116 + vo.setGarOrderDisposalCompanyId(obj.getString("id"));
  117 + vo.setGarOrderDisposalCompanyName(obj.getString("name"));
  118 +
  119 + List<DispatchDisposalVo.Personnel> personnelInfos = new ArrayList<>();
  120 + DispatchDisposalVo.Personnel personnel = new DispatchDisposalVo.Personnel();
  121 + personnel.setPersonName(obj.getString("principal"));
  122 + personnel.setTel(obj.getString("principalPhoneNo"));
  123 + personnelInfos.add(personnel);
  124 +
  125 + vo.setPersonnelInfo(personnelInfos);
  126 + vos.add(vo);
  127 + }
  128 + }
  129 + return vos;
  130 + }
  131 +
  132 + private String requestDisposal(String phone) {
  133 +
  134 + Map<String, Object> params = new HashMap<>();
  135 + if (StringUtils.isNotEmpty(phone)) {
  136 + params.put("principalPhoneNo", phone);
  137 + }
  138 +
  139 + params.put("auditStatus", 1);
  140 + params.put("tag", 1);
  141 + params.put("page", 1);
  142 + params.put("size", 1000);
  143 +
  144 + return com.trash.garbage.utils.HttpUtil.doPost("/api/siteservice/cs/earthsites/ledger/list", JSON.toJSONString(params));
  145 + }
39 } 146 }
40 147
41 148
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @b87ba60
@@ -95,12 +95,22 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -95,12 +95,22 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
95 private GarOrderMatchDisposalService garOrderMatchDisposalService; 95 private GarOrderMatchDisposalService garOrderMatchDisposalService;
96 @Autowired 96 @Autowired
97 private DisposalSiteService disposalSiteService; 97 private DisposalSiteService disposalSiteService;
98 - private String contentType = "application/json"; 98 + @Autowired
  99 + private GarTransportationEnterpriseService garTransportationEnterpriseService;
  100 + @Autowired
  101 + private GarAreaServer garAreaServer;
  102 +
  103 + private FastDateFormat fastDateFormat = FastDateFormat.getInstance("yyyy-MM-dd");
  104 +
  105 + public String contentType = "application/json";
99 @Value("${trash.token}") 106 @Value("${trash.token}")
100 - private String authorization; 107 + public String authorization;
101 @Value("${trash.remotePath}") 108 @Value("${trash.remotePath}")
102 - private String remotePath;  
103 - private FastDateFormat fastDateFormat = FastDateFormat.getInstance("yyyy-MM-dd"); 109 + public String remotePath;
  110 + @Autowired
  111 + private GarCarServer garCarServer;
  112 + @Autowired
  113 + private GarOrderMatchHandlerService garOrderMatchHandlerService;
104 114
105 @Override 115 @Override
106 @Transactional(rollbackFor = Exception.class) 116 @Transactional(rollbackFor = Exception.class)
@@ -718,13 +728,36 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -718,13 +728,36 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
718 } 728 }
719 vo.setCarReports(orderCarReports); 729 vo.setCarReports(orderCarReports);
720 } 730 }
721 - List<DispatchDisposalVo> dispatchDisposalVos = garOrderMatchDisposalService.queryDisposalListWithDispatchByOrderId(id);  
722 - if(CollectionUtils.isNotEmpty(dispatchDisposalVos)){ 731 +
  732 + List<GarOrderMatchDisposal> garOrderMatchDisposals = garOrderMatchDisposalService.queryObjByOrderId(id);
  733 + List<DispatchDisposalVo> dispatchDisposalVos = garOrderMatchDisposalService.requestDisposalListWithDispatch();
  734 + if (CollectionUtils.isNotEmpty(garOrderMatchDisposals) && CollectionUtils.isNotEmpty(garOrderMatchDisposals)) {
  735 +
  736 + dispatchDisposalVos = dispatchDisposalVos.stream().map(d -> {
  737 + if (CollectionUtils.isNotEmpty(d.getPersonnelInfo())) {
  738 + boolean flag = false;
  739 + for (DispatchDisposalVo.Personnel personnel : d.getPersonnelInfo()) {
  740 + if (Objects.nonNull(personnel)) {
  741 + for (GarOrderMatchDisposal disposal : garOrderMatchDisposals) {
  742 + if (StringUtils.equals(disposal.getGarOrderDisposalTel(), personnel.getTel())) {
  743 + d.setCheck(true);
  744 + flag = true;
  745 + break;
  746 + }
  747 + }
  748 + if (flag) {
  749 + break;
  750 + }
  751 + }
  752 + }
  753 + }
  754 + return d;
  755 + }).filter(d -> d.isCheck()).collect(Collectors.toList());
723 List<OrderDisposalCompanyReport> disposalCompanyReports = new ArrayList<>(); 756 List<OrderDisposalCompanyReport> disposalCompanyReports = new ArrayList<>();
724 for (DispatchDisposalVo disposalVo : dispatchDisposalVos) { 757 for (DispatchDisposalVo disposalVo : dispatchDisposalVos) {
725 OrderDisposalCompanyReport report = new OrderDisposalCompanyReport(); 758 OrderDisposalCompanyReport report = new OrderDisposalCompanyReport();
726 report.setDisposalCompanyName(disposalVo.getGarOrderDisposalCompanyName()); 759 report.setDisposalCompanyName(disposalVo.getGarOrderDisposalCompanyName());
727 - if(CollectionUtils.isNotEmpty(disposalVo.getPersonnelInfo())){ 760 + if (CollectionUtils.isNotEmpty(disposalVo.getPersonnelInfo())) {
728 report.setTelphone(disposalVo.getPersonnelInfo().get(0).getTel()); 761 report.setTelphone(disposalVo.getPersonnelInfo().get(0).getTel());
729 } 762 }
730 disposalCompanyReports.add(report); 763 disposalCompanyReports.add(report);
@@ -811,74 +844,47 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -811,74 +844,47 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
811 headers.put("Authorization", authorization); 844 headers.put("Authorization", authorization);
812 headers.put("Content-Type", contentType); 845 headers.put("Content-Type", contentType);
813 846
814 - Map<String, Object> params = new HashMap<>(); 847 + String tel = null;
  848 + String areaCode = null;
  849 + String officeAddress = null;
  850 +
815 if (StringUtils.isNotEmpty(dto.getServicePhone())) { 851 if (StringUtils.isNotEmpty(dto.getServicePhone())) {
816 - params.put("principalPhoneNo", dto.getServicePhone()); 852 + tel = dto.getServicePhone();
817 } 853 }
818 854
819 -// if (StringUtils.isNotEmpty(dto.getRegistrationArea())) {  
820 -// params.put("officeAddress", dto.getRegistrationArea());  
821 -// } 855 + if (StringUtils.isNotEmpty(dto.getRegistrationArea())) {
  856 + officeAddress = dto.getRegistrationArea();
  857 + }
822 858
823 if (StringUtils.isNotEmpty(dto.getRegistrationArea())) { 859 if (StringUtils.isNotEmpty(dto.getRegistrationArea())) {
824 try { 860 try {
825 - String json = HttpUtil.doGet(remotePath + "/api/gpsservice/cs/area", headers, null);  
826 - if (StringUtils.isNotEmpty(json)) {  
827 - Map<String, Object> hash = JSON.parseObject(json, HashMap.class);  
828 - if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {  
829 - if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONArray) {  
830 - JSONArray jsonArray = (JSONArray) hash.get("result");  
831 - Optional<Object> opt = jsonArray.stream().filter(jo -> {  
832 - JSONObject jsonObject = (JSONObject) jo;  
833 - return StringUtils.equals(jsonObject.getString("name"), dto.getRegistrationArea());  
834 - }).findFirst();  
835 - if (opt.isPresent()) {  
836 - JSONObject jsonObject = (JSONObject) opt.get();  
837 - params.put("adCodes", jsonObject.getString("code"));  
838 - } else {  
839 - params.put("adCodes", "no found");  
840 - }  
841 - } 861 + JSONArray jsonArray = garAreaServer.request();
  862 + if (Objects.isNull(jsonArray)) {
  863 + areaCode = "no found";
  864 + } else {
  865 + Optional<Object> opt = jsonArray.stream().filter(jo -> {
  866 + JSONObject jsonObject = (JSONObject) jo;
  867 + return StringUtils.equals(jsonObject.getString("name"), dto.getRegistrationArea());
  868 + }).findFirst();
  869 + if (opt.isPresent()) {
  870 + areaCode = ((JSONObject) opt.get()).getString("code");
  871 + } else {
  872 + areaCode = "no found";
842 } 873 }
843 } 874 }
  875 +
844 } catch (Exception e) { 876 } catch (Exception e) {
845 log.error("请求的确信息异常", e); 877 log.error("请求的确信息异常", e);
846 } 878 }
847 } 879 }
848 - String json = null;  
849 - List<TransportationEnterprise> list = new ArrayList<>();  
850 - try {  
851 - json = com.trash.garbage.utils.HttpUtil.doGet(remotePath + "/api/gpsservice/cs/companies/simple/list?tag=1&valid=0", headers, params);  
852 - log.debug("/api/gpsservice/cs/companies/simple/list?tag=1&valid=0;params:" + JSON.toJSONString(params) + ";json:" + json);  
853 - } catch (Exception e) {  
854 - log.error("请求公司信息异常[{}]", e);  
855 - }  
856 -  
857 - if (StringUtils.isNotEmpty(json)) {  
858 - Map<String, Object> hash = JSON.parseObject(json, HashMap.class);  
859 - if (Objects.nonNull(hash)) {  
860 - if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {  
861 - if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONArray) {  
862 - JSONArray jsonArray = (JSONArray) hash.get("result");  
863 - for (Object object : jsonArray) {  
864 - JSONObject jsonObject = (JSONObject) object;  
865 - TransportationEnterprise transportationEnterprise = new TransportationEnterprise();  
866 - transportationEnterprise.setId(StringUtils.replace(jsonObject.get("id").toString(), "zxljqy", ""));  
867 - //transportationEnterprise.setId(jsonObject.get("id").toString());  
868 - transportationEnterprise.setName(jsonObject.getString("name"));  
869 - transportationEnterprise.setAbbreviation(jsonObject.getString("abbreviation"));  
870 - transportationEnterprise.setOfficeAddress(jsonObject.getString("officeAddress"));  
871 - transportationEnterprise.setServicePhone(jsonObject.getString("principalPhoneNo"));  
872 - transportationEnterprise.setLegalRepresentative(jsonObject.getString("principal"));  
873 - transportationEnterprise.setLegalRepresentativePhone(jsonObject.getString("principalPhoneNo"));  
874 - list.add(transportationEnterprise);  
875 - }  
876 - }  
877 - }  
878 - } 880 +
  881 + List<TransportationEnterprise> list = garTransportationEnterpriseService.request(tel, areaCode, officeAddress);
  882 + if (CollectionUtils.isNotEmpty(list) && StringUtils.isNotEmpty(tel)) {
  883 + String telStr = tel;
  884 + list = list.stream().filter(t -> StringUtils.equals(telStr, t.getServicePhone())).collect(Collectors.toList());
879 } 885 }
880 886
881 - saveOrUpdate(list); 887 +// saveOrUpdate(list);
882 Integer pageNum = ServletUtils.getParameterToInt("pageNum"); 888 Integer pageNum = ServletUtils.getParameterToInt("pageNum");
883 Integer pageSize = ServletUtils.getParameterToInt("pageSize"); 889 Integer pageSize = ServletUtils.getParameterToInt("pageSize");
884 Integer orderByColumn = ServletUtils.getParameterToInt("orderByColumn"); 890 Integer orderByColumn = ServletUtils.getParameterToInt("orderByColumn");
@@ -1080,71 +1086,40 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -1080,71 +1086,40 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1080 // GarOrder order = getById(orderId); 1086 // GarOrder order = getById(orderId);
1081 // order.setGarOrderMatchFlag(GlobalStatus.GarOrderStatus.MATCH_YES.getValue()); 1087 // order.setGarOrderMatchFlag(GlobalStatus.GarOrderStatus.MATCH_YES.getValue());
1082 // updateById(order); 1088 // updateById(order);
  1089 +
1083 String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber(); 1090 String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
1084 - TransportationEnterprise enterprise = new TransportationEnterprise();  
1085 - enterprise.setServicePhone(tel);  
1086 - List<TransportationEnterprise> enterprises = transportationEnterpriseService.selectTransportationEnterpriseList(enterprise); 1091 +
  1092 + List<TransportationEnterprise> enterprises = garTransportationEnterpriseService.request(tel, null, null);
  1093 + if (CollectionUtils.isEmpty(enterprises)) {
  1094 + return Collections.emptyList();
  1095 + }
  1096 + enterprises = enterprises.stream().filter(e -> Objects.equals(e.getServicePhone(), tel)).collect(Collectors.toList());
1087 if (CollectionUtils.isEmpty(enterprises)) { 1097 if (CollectionUtils.isEmpty(enterprises)) {
1088 return Collections.emptyList(); 1098 return Collections.emptyList();
1089 } 1099 }
1090 -  
1091 List<GarOrderMatchHandler> garOrderCars = garOrderCarService.queryGarOrderMatchHandler(orderId); 1100 List<GarOrderMatchHandler> garOrderCars = garOrderCarService.queryGarOrderMatchHandler(orderId);
1092 int garOrderCarsLength = CollectionUtils.size(garOrderCars); 1101 int garOrderCarsLength = CollectionUtils.size(garOrderCars);
1093 1102
1094 - String json = requestCarAndDriver(enterprises.get(0).getId());  
1095 - List<DispatchDriverVo> voList = new ArrayList<>();  
1096 - if (StringUtils.isNotEmpty(json)) {  
1097 - if (StringUtils.isNotEmpty(json)) {  
1098 - Map<String, Object> hash = JSON.parseObject(json, HashMap.class);  
1099 - if (Objects.nonNull(hash)) {  
1100 - if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {  
1101 - if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONObject) {  
1102 - JSONObject resultObj = (JSONObject) hash.get("result");  
1103 - if (Objects.nonNull(resultObj) && Objects.nonNull(resultObj.get("list")) && resultObj.get("list") instanceof JSONArray) {  
1104 - JSONArray jsonArray = (JSONArray) resultObj.get("list");  
1105 - for (Object object : jsonArray) {  
1106 - JSONObject jsonObject = (JSONObject) object;  
1107 -  
1108 - DispatchDriverVo vo = new DispatchDriverVo();  
1109 - vo.setContainerVolume(jsonObject.getString("energyTypeName"));  
1110 - vo.setLicensePlateNumber(jsonObject.getString("licenseplateNo"));  
1111 -  
1112 - if (Objects.nonNull(jsonObject.get("drivers")) && jsonObject.get("drivers") instanceof JSONArray) {  
1113 - JSONArray das = (JSONArray) jsonObject.get("drivers");  
1114 - int length = CollectionUtils.size(das);  
1115 - if (length > 0) {  
1116 - Set<DispatchDriverVo.Personnel> personnelInfos = new LinkedHashSet<>();  
1117 -  
1118 - for (Object da : das) {  
1119 - JSONObject dro = (JSONObject) da;  
1120 - DispatchDriverVo.Personnel personnel = new DispatchDriverVo.Personnel();  
1121 - personnel.setName(dro.getString("driverName"));  
1122 - personnel.setTel(dro.getString("driverPhone"));  
1123 -  
1124 - personnel.setChecked(false);  
1125 - if (garOrderCarsLength > 0) {  
1126 - Optional<GarOrderMatchHandler> optional = garOrderCars.stream().filter(ga -> Objects.equals(ga.getGarOrderHandlerTel(), personnel.getTel()) && Objects.equals(ga.getGarHandlerCarCode(), vo.getLicensePlateNumber())).findFirst();  
1127 - personnel.setChecked(optional.isPresent());  
1128 -  
1129 - }  
1130 -  
1131 - personnelInfos.add(personnel);  
1132 - }  
1133 - vo.setPersonnelInfo(personnelInfos);  
1134 - }  
1135 - }  
1136 - voList.add(vo);  
1137 - }  
1138 - }  
1139 - }  
1140 - }  
1141 - }  
1142 - }  
1143 - } 1103 + List<DispatchDriverVo> voList = garCarServer.requestDispatchDriverVo(enterprises.get(0).getId());
  1104 +
1144 1105
1145 if (CollectionUtils.isEmpty(voList)) { 1106 if (CollectionUtils.isEmpty(voList)) {
1146 return Collections.emptyList(); 1107 return Collections.emptyList();
1147 } 1108 }
  1109 + voList = voList.stream().map(vo -> {
  1110 + Collection<DispatchDriverVo.Personnel> ps = vo.getPersonnelInfo();
  1111 + if (CollectionUtils.isNotEmpty(ps)) {
  1112 + ps = ps.stream().map(p -> {
  1113 + if (garOrderCarsLength > 0) {
  1114 + Optional<GarOrderMatchHandler> optional = garOrderCars.stream().filter(ga -> Objects.equals(ga.getGarOrderHandlerTel(), p.getTel()) && Objects.equals(ga.getGarHandlerCarCode(), vo.getLicensePlateNumber())).findFirst();
  1115 + p.setChecked(optional.isPresent());
  1116 + }
  1117 + return p;
  1118 + }).collect(Collectors.toList());
  1119 + vo.setPersonnelInfo(ps);
  1120 + }
  1121 + return vo;
  1122 + }).collect(Collectors.toList());
1148 LambdaQueryWrapper<GarOrderCar> qwc = new LambdaQueryWrapper<>(); 1123 LambdaQueryWrapper<GarOrderCar> qwc = new LambdaQueryWrapper<>();
1149 qwc.eq(GarOrderCar::getGarOrderId, orderId); 1124 qwc.eq(GarOrderCar::getGarOrderId, orderId);
1150 1125
@@ -1167,38 +1142,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -1167,38 +1142,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1167 return voList; 1142 return voList;
1168 } 1143 }
1169 1144
1170 - private String requestCarAndDriver(String companyID) {  
1171 - Map<String, String> headers = new HashMap<>();  
1172 - headers.put("Authorization", authorization);  
1173 - headers.put("Content-Type", contentType);  
1174 -  
1175 - Map<String, Object> params = new HashMap<>();  
1176 - if (Objects.nonNull(companyID)) {  
1177 - if (StringUtils.length(companyID) < 5) {  
1178 - params.put("companyID", "zxljqy" + companyID);  
1179 - } else {  
1180 - params.put("companyID", companyID);  
1181 - }  
1182 - }  
1183 -  
1184 - params.put("valid", 0);  
1185 - params.put("tag", 1);  
1186 - params.put("page", 1);  
1187 - params.put("size", 100);  
1188 -  
1189 - String json = null;  
1190 - List<CarInfoVo> list = new ArrayList<>();  
1191 - try {  
1192 - String paramStr = JSON.toJSONString(params);  
1193 - json = HttpRequest.get(remotePath + "/api/gpsservice/cs/basevehicle/ledger/list").header("Authorization", authorization).header("Content-Type", contentType)  
1194 - .timeout(15000).body(paramStr).execute().body();  
1195 - log.debug("/api/gpsservice/cs/basevehicle/ledger/list;params:[" + paramStr + "],returnJson:[" + json + "]");  
1196 - } catch (Exception e) {  
1197 - log.error("请求公司车辆信息异常", e);  
1198 - }  
1199 -  
1200 - return json;  
1201 - }  
1202 1145
1203 // private List<DispatchDisposalVo> comDis(){ 1146 // private List<DispatchDisposalVo> comDis(){
1204 // Map<String, String> headers = new HashMap<>(); 1147 // Map<String, String> headers = new HashMap<>();
@@ -1351,7 +1294,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -1351,7 +1294,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1351 // TODO 1294 // TODO
1352 // String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber(); 1295 // String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
1353 // 选中的司机处理场所 1296 // 选中的司机处理场所
1354 - List<DispatchDisposalVo> voList = disposalService.queryDisposalListWithDispatchStatus(orderId); 1297 + List<DispatchDisposalVo> voList = disposalService.requestDisposalListWithDispatchStatus(orderId);
  1298 +
1355 if (CollectionUtils.isNotEmpty(voList)) { 1299 if (CollectionUtils.isNotEmpty(voList)) {
1356 voList = voList.stream().sorted(Comparator.comparing(DispatchDisposalVo::getGarOrderDisposalCompanyName)).collect(Collectors.toList()); 1300 voList = voList.stream().sorted(Comparator.comparing(DispatchDisposalVo::getGarOrderDisposalCompanyName)).collect(Collectors.toList());
1357 } 1301 }
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarTransportationEnterpriseServiceImpl.java 0 → 100644
  View file @b87ba60
  1 +package com.trash.garbage.service.impl;
  2 +
  3 +import com.alibaba.fastjson.JSON;
  4 +import com.alibaba.fastjson.JSONArray;
  5 +import com.alibaba.fastjson.JSONObject;
  6 +import com.trash.enterprise.domain.TransportationEnterprise;
  7 +import com.trash.garbage.service.GarTransportationEnterpriseService;
  8 +import com.trash.garbage.utils.HttpUtil;
  9 +import org.apache.commons.lang3.StringUtils;
  10 +import org.springframework.stereotype.Service;
  11 +
  12 +import java.util.*;
  13 +
  14 +@Service
  15 +public class GarTransportationEnterpriseServiceImpl implements GarTransportationEnterpriseService {
  16 + @Override
  17 + public String requestStr(String tel, String adCodes,String officeAddress) {
  18 + Map<String, Object> params = new HashMap<>();
  19 + if (StringUtils.isNotEmpty(tel)) {
  20 + params.put("phoneNo", tel);
  21 + }
  22 +
  23 + if (StringUtils.isNotEmpty(adCodes)) {
  24 + params.put("adCodes", adCodes);
  25 + }
  26 +
  27 + if (StringUtils.isNotEmpty(adCodes)) {
  28 + params.put("officeAddress", officeAddress);
  29 + }
  30 +
  31 + return HttpUtil.doGet("/api/gpsservice/cs/companies/simple/list?tag=1", params);
  32 + }
  33 +
  34 + @Override
  35 + public List<TransportationEnterprise> request(String tel, String adCodes,String officeAddress) {
  36 + String json = requestStr(tel, adCodes,officeAddress);
  37 + if (StringUtils.isEmpty(json)) {
  38 + return Collections.emptyList();
  39 + }
  40 + List<TransportationEnterprise> list = new ArrayList<>();
  41 + Map<String, Object> hash = JSON.parseObject(json, HashMap.class);
  42 + if (Objects.nonNull(hash)) {
  43 + if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {
  44 + if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONArray) {
  45 + JSONArray jsonArray = (JSONArray) hash.get("result");
  46 + for (Object object : jsonArray) {
  47 + JSONObject jsonObject = (JSONObject) object;
  48 + TransportationEnterprise transportationEnterprise = new TransportationEnterprise();
  49 + transportationEnterprise.setId(StringUtils.replace(jsonObject.get("id").toString(), "zxljqy", ""));
  50 + //transportationEnterprise.setId(jsonObject.get("id").toString());
  51 + transportationEnterprise.setName(jsonObject.getString("name"));
  52 + transportationEnterprise.setAbbreviation(jsonObject.getString("abbreviation"));
  53 + transportationEnterprise.setOfficeAddress(jsonObject.getString("officeAddress"));
  54 + transportationEnterprise.setServicePhone(jsonObject.getString("principalPhoneNo"));
  55 + transportationEnterprise.setLegalRepresentative(jsonObject.getString("principal"));
  56 + transportationEnterprise.setLegalRepresentativePhone(jsonObject.getString("principalPhoneNo"));
  57 + list.add(transportationEnterprise);
  58 + }
  59 + }
  60 + }
  61 + }
  62 + return list;
  63 + }
  64 +}
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
  View file @b87ba60
1 package com.trash.garbage.service.impl; 1 package com.trash.garbage.service.impl;
2 2
3 import java.security.spec.AlgorithmParameterSpec; 3 import java.security.spec.AlgorithmParameterSpec;
4 -import java.util.ArrayList;  
5 -import java.util.Arrays;  
6 -import java.util.HashSet;  
7 -import java.util.List;  
8 -import java.util.Objects;  
9 -import java.util.Set; 4 +import java.util.*;
10 import java.util.concurrent.TimeUnit; 5 import java.util.concurrent.TimeUnit;
11 6
12 import javax.annotation.Resource; 7 import javax.annotation.Resource;
@@ -15,8 +10,12 @@ import javax.crypto.spec.IvParameterSpec; @@ -15,8 +10,12 @@ import javax.crypto.spec.IvParameterSpec;
15 import javax.crypto.spec.SecretKeySpec; 10 import javax.crypto.spec.SecretKeySpec;
16 import javax.servlet.http.HttpServletRequest; 11 import javax.servlet.http.HttpServletRequest;
17 12
  13 +import com.alibaba.fastjson.JSON;
  14 +import com.alibaba.fastjson.JSONArray;
18 import com.trash.disposalSite.domain.DisposalSite; 15 import com.trash.disposalSite.domain.DisposalSite;
19 import com.trash.disposalSite.service.IDisposalSiteService; 16 import com.trash.disposalSite.service.IDisposalSiteService;
  17 +import com.trash.garbage.pojo.domain.GarUserReq;
  18 +import com.trash.garbage.pojo.domain.GarUserReqDetail;
20 import com.trash.garbage.utils.SMSUtils; 19 import com.trash.garbage.utils.SMSUtils;
21 import org.apache.commons.codec.binary.Base64; 20 import org.apache.commons.codec.binary.Base64;
22 import org.apache.commons.collections4.CollectionUtils; 21 import org.apache.commons.collections4.CollectionUtils;
@@ -154,31 +153,35 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt; @@ -154,31 +153,35 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
154 loginUser.setToken(token); 153 loginUser.setToken(token);
155 tokenService.refreshToken(loginUser); 154 tokenService.refreshToken(loginUser);
156 vo.setToken(token); 155 vo.setToken(token);
157 - DriverVo driver = new DriverVo();  
158 - driver.setPhoneNo(loginDto.getTel());  
159 - List<DriverVo> driverList = driverService.selectDriverList(driver); 156 +
  157 +
  158 + GarUserReq userReq = reqGarUser(loginDto.getTel());
  159 +
  160 +// DriverVo driver = new DriverVo();
  161 +// driver.setPhoneNo(loginDto.getTel());
  162 +// List<DriverVo> driverList = driverService.selectDriverList(driver);
160 LoginVo.RuleVo ruleVo = new LoginVo.RuleVo(); 163 LoginVo.RuleVo ruleVo = new LoginVo.RuleVo();
161 ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription()); 164 ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
162 vo.setRuleVos(new ArrayList<>(Arrays.asList(ruleVo))); 165 vo.setRuleVos(new ArrayList<>(Arrays.asList(ruleVo)));
163 // 运输驾驶员 166 // 运输驾驶员
164 - if (CollectionUtil.isNotEmpty(driverList)) {  
165 - DriverVo driverVo = driverList.get(0);  
166 - TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId()); 167 + if (Objects.nonNull(userReq) && CollectionUtil.isNotEmpty(userReq.getDrivers())) {
  168 + GarUserReqDetail detail = userReq.getDrivers().get(0);
  169 +// TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId());
167 ruleVo = new LoginVo.RuleVo(); 170 ruleVo = new LoginVo.RuleVo();
168 - ruleVo.setTransportCompanyName(enterprise.getName()); 171 + ruleVo.setTransportCompanyName(detail.getCompanyName());
169 ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()); 172 ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription());
170 vo.getRuleVos().add(ruleVo); 173 vo.getRuleVos().add(ruleVo);
171 - vo.setName(driverVo.getName()); 174 + vo.setName(detail.getName());
172 } 175 }
173 176
174 // 企业负责人 TODO 177 // 企业负责人 TODO
175 - TransportationEnterprise transportationEnterprise = new TransportationEnterprise();  
176 - transportationEnterprise.setServicePhone(loginDto.getTel());  
177 - List<TransportationEnterprise> enterpriseList = enterpriseService.selectTransportationEnterpriseList(transportationEnterprise);  
178 - if (CollectionUtil.isNotEmpty(enterpriseList)) {  
179 - TransportationEnterprise enterprise = enterpriseList.get(0); 178 +// TransportationEnterprise transportationEnterprise = new TransportationEnterprise();
  179 +// transportationEnterprise.setServicePhone(loginDto.getTel());
  180 +// List<TransportationEnterprise> enterpriseList = enterpriseService.selectTransportationEnterpriseList(transportationEnterprise);
  181 + if (Objects.nonNull(userReq) && CollectionUtil.isNotEmpty(userReq.getCompanies())) {
  182 + GarUserReqDetail detail = userReq.getCompanies().get(0);
180 ruleVo = new LoginVo.RuleVo(); 183 ruleVo = new LoginVo.RuleVo();
181 - ruleVo.setTransportCompanyName(enterprise.getName()); 184 + ruleVo.setTransportCompanyName(detail.getCompanyName());
182 ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription()); 185 ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription());
183 vo.getRuleVos().add(ruleVo); 186 vo.getRuleVos().add(ruleVo);
184 187
@@ -187,13 +190,13 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt; @@ -187,13 +190,13 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
187 190
188 // 处理场所 TODO 191 // 处理场所 TODO
189 // 查询条件 192 // 查询条件
190 - DisposalSite site = new DisposalSite();  
191 - site.setConstructionUnitPersonPhone(loginDto.getTel());  
192 - List<DisposalSite> disposalSites = disposalSiteService.selectDisposalSiteList(site);  
193 - if (CollectionUtil.isNotEmpty(disposalSites)) {  
194 - DisposalSite disposalSite = disposalSites.get(0); 193 +// DisposalSite site = new DisposalSite();
  194 +// site.setConstructionUnitPersonPhone(loginDto.getTel());
  195 +// List<DisposalSite> disposalSites = disposalSiteService.selectDisposalSiteList(site);
  196 + if (Objects.nonNull(userReq) && CollectionUtil.isNotEmpty(userReq.getEarthsites())) {
  197 + GarUserReqDetail detail = userReq.getEarthsites().get(0);
195 ruleVo = new LoginVo.RuleVo(); 198 ruleVo = new LoginVo.RuleVo();
196 - ruleVo.setTransportCompanyName(disposalSite.getName()); 199 + ruleVo.setTransportCompanyName(detail.getName());
197 ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()); 200 ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription());
198 vo.getRuleVos().add(ruleVo); 201 vo.getRuleVos().add(ruleVo);
199 202
@@ -378,6 +381,38 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt; @@ -378,6 +381,38 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
378 return CollectionUtils.isEmpty(garUsers) ? null : garUsers.get(0); 381 return CollectionUtils.isEmpty(garUsers) ? null : garUsers.get(0);
379 } 382 }
380 383
  384 + @Override
  385 + public String reqGarUserOfStr(String phone) {
  386 + Map<String, Object> paramMap = new HashMap<>();
  387 + paramMap.put("phoneNo", phone);
  388 + return com.trash.garbage.utils.HttpUtil.doGet("/api/gpsservice/cs/authority/getInfoByPhoneNo", paramMap);
  389 + }
  390 +
  391 + @Override
  392 + public GarUserReq reqGarUser(String phone) {
  393 + String json = reqGarUserOfStr(phone);
  394 + if (org.apache.commons.lang3.StringUtils.isEmpty(json)) {
  395 + return null;
  396 + }
  397 +
  398 + JSONObject jo = JSON.parseObject(json);
  399 + if (!org.apache.commons.lang3.StringUtils.equals(jo.getString("code"), "200")) {
  400 + return null;
  401 + }
  402 +
  403 + if (Objects.nonNull(jo.get("result")) && jo.get("result") instanceof JSONObject) {
  404 + JSONObject result = (JSONObject) jo.get("result");
  405 + GarUserReq userReq = new GarUserReq();
  406 + userReq.setCompanies(combationGarUserReqDetail(result, "companies"));
  407 + userReq.setDrivers(combationGarUserReqDetail(result, "drivers"));
  408 + userReq.setEarthsites(combationGarUserReqDetail(result, "earthSites"));
  409 +
  410 + return userReq;
  411 + }
  412 +
  413 + return null;
  414 + }
  415 +
381 private LambdaQueryWrapper<GarUser> createQueryWrapperByUser(GarUser garUser) { 416 private LambdaQueryWrapper<GarUser> createQueryWrapperByUser(GarUser garUser) {
382 return new LambdaQueryWrapper<GarUser>() 417 return new LambdaQueryWrapper<GarUser>()
383 .eq(StringUtils.isNotEmpty(garUser.getGarUserId()), GarUser::getGarUserId, garUser.getGarUserId()) 418 .eq(StringUtils.isNotEmpty(garUser.getGarUserId()), GarUser::getGarUserId, garUser.getGarUserId())
@@ -442,6 +477,38 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt; @@ -442,6 +477,38 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
442 this.tokenService = tokenService; 477 this.tokenService = tokenService;
443 } 478 }
444 479
  480 + private List<GarUserReqDetail> combationGarUserReqDetail(JSONObject result, String key) {
  481 + if (Objects.isNull(result)) {
  482 + return Collections.emptyList();
  483 + }
  484 + if (Objects.nonNull(result.get(key)) && result.get(key) instanceof JSONArray) {
  485 + JSONArray array = (JSONArray) result.get(key);
  486 + List<GarUserReqDetail> details = new ArrayList<>();
  487 + for (Object object : array) {
  488 + if (Objects.nonNull(object)) {
  489 + JSONObject jo = (JSONObject) object;
  490 +
  491 + GarUserReqDetail detail = new GarUserReqDetail();
  492 + detail.setId(jo.getString("id"));
  493 + detail.setName(jo.getString("name"));
  494 + detail.setPhoneNo(jo.getString("phoneNo"));
  495 + detail.setCompanyName(jo.getString("companyName"));
  496 + detail.setAbbreviation(jo.getString("abbreviation"));
  497 + detail.setLegalRepresentative(jo.getString("legalRepresentative"));
  498 + detail.setLegalRepresentativePhone(jo.getString("legalRepresentativePhone"));
  499 + detail.setSafetyPeopleName(jo.getString("safetyPeopleName"));
  500 + detail.setSafetyManagerName(jo.getString("safetyManagerName"));
  501 + detail.setSafetyManagerPhone(jo.getString("safetyManagerPhone"));
  502 + detail.setServicePhone(jo.getString("servicePhone"));
  503 +
  504 + details.add(detail);
  505 + }
  506 + }
  507 + return details;
  508 + }
  509 + return Collections.emptyList();
  510 + }
  511 +
445 512
446 } 513 }
447 514
trash-garbage/src/main/java/com/trash/garbage/utils/HttpUtil.java
  View file @b87ba60
1 package com.trash.garbage.utils; 1 package com.trash.garbage.utils;
2 2
  3 +import cn.hutool.http.HttpRequest;
  4 +import com.trash.common.utils.spring.SpringUtils;
  5 +import com.trash.garbage.config.GarTrashConfig;
3 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
4 import org.apache.commons.collections4.MapUtils; 7 import org.apache.commons.collections4.MapUtils;
5 import org.apache.commons.lang3.StringUtils; 8 import org.apache.commons.lang3.StringUtils;
6 import org.apache.http.client.methods.CloseableHttpResponse; 9 import org.apache.http.client.methods.CloseableHttpResponse;
7 import org.apache.http.client.methods.HttpGet; 10 import org.apache.http.client.methods.HttpGet;
8 -import org.apache.http.client.methods.HttpPost;  
9 -import org.apache.http.entity.StringEntity;  
10 import org.apache.http.impl.client.CloseableHttpClient; 11 import org.apache.http.impl.client.CloseableHttpClient;
11 import org.apache.http.impl.client.HttpClients; 12 import org.apache.http.impl.client.HttpClients;
12 import org.apache.http.util.EntityUtils; 13 import org.apache.http.util.EntityUtils;
  14 +import org.slf4j.Logger;
  15 +import org.slf4j.LoggerFactory;
13 16
14 import java.io.IOException; 17 import java.io.IOException;
  18 +import java.util.HashMap;
15 import java.util.Map; 19 import java.util.Map;
16 import java.util.Objects; 20 import java.util.Objects;
17 21
18 @Slf4j 22 @Slf4j
19 public class HttpUtil { 23 public class HttpUtil {
20 - public static String doPost(String url, Map<String, String> headers, String body) throws IOException {  
21 - HttpPost post = new HttpPost(url);  
22 - CloseableHttpClient client = HttpClients.createDefault();  
23 - if (MapUtils.isNotEmpty(headers)) {  
24 - for (Map.Entry<String, String> entry : headers.entrySet()) {  
25 - post.addHeader(entry.getKey(), entry.getValue());  
26 - }  
27 - } 24 + private final static Logger LOGGER = LoggerFactory.getLogger(HttpUtil.class);
  25 + public static String doPost(String url, String body) {
  26 + GarTrashConfig trashConfig = SpringUtils.getBean(GarTrashConfig.class);
  27 +
  28 + String json = null;
28 29
  30 + HttpRequest request = HttpRequest.post(trashConfig.remotePath + url).header("Authorization", trashConfig.authorization).header("Content-Type", trashConfig.contentType)
  31 + .timeout(15000);
29 if (StringUtils.isNotEmpty(body)) { 32 if (StringUtils.isNotEmpty(body)) {
30 - post.setEntity(new StringEntity(body)); 33 + request.body(body);
31 } 34 }
32 - CloseableHttpResponse response = client.execute(post);  
33 - if (response.getStatusLine().getStatusCode() == 200) {  
34 - String content = EntityUtils.toString(response.getEntity()); 35 + json = request.execute().body();
  36 + LOGGER.info(url + ";params:[" + body + "],returnJson:[" + json + "]");
  37 + return json;
  38 + }
35 39
36 - System.out.println(content);  
37 - return content; 40 + public static String doGet(String url, Map<String, Object> params) {
  41 + GarTrashConfig trashConfig = SpringUtils.getBean(GarTrashConfig.class);
  42 + String json = null;
  43 +
  44 + if (MapUtils.isNotEmpty(params)) {
  45 + StringBuilder builder = new StringBuilder();
  46 + for (Map.Entry<String, Object> entry : params.entrySet()) {
  47 + builder.append(entry.getKey());
  48 + builder.append("=");
  49 + builder.append(entry.getValue());
  50 + builder.append("&");
  51 + }
  52 +
  53 + String paramStr = StringUtils.substringBeforeLast(builder.toString(), "&");
  54 + if (StringUtils.indexOf(url, "?") > 0) {
  55 + url = url + "&" + paramStr;
  56 + } else {
  57 + url = url + "?" + paramStr;
  58 + }
38 } 59 }
39 - return null; 60 +
  61 + HttpRequest request = HttpRequest.get(trashConfig.remotePath + url).header("Authorization", trashConfig.authorization).header("Content-Type", trashConfig.contentType)
  62 + .timeout(15000);
  63 +
  64 + json = request.execute().body();
  65 + LOGGER.info(url + ";,returnJson:[" + json + "]");
  66 + return json;
40 } 67 }
41 68
42 - public static String doGet(String url, Map<String, String> headers, Map<String,Object> paramMap) throws IOException {  
43 - if(MapUtils.isNotEmpty(paramMap)){ 69 + public static String doGet(String url, Map<String, String> headers, Map<String, Object> paramMap) throws IOException {
  70 + if (MapUtils.isNotEmpty(paramMap)) {
44 StringBuilder builder = new StringBuilder(); 71 StringBuilder builder = new StringBuilder();
45 builder.append(url); 72 builder.append(url);
46 for (Map.Entry<String, Object> entry : paramMap.entrySet()) { 73 for (Map.Entry<String, Object> entry : paramMap.entrySet()) {
47 - if(StringUtils.indexOf(url,"?") == -1){ 74 + if (StringUtils.indexOf(url, "?") == -1) {
48 builder.append("?"); 75 builder.append("?");
49 - }else{ 76 + } else {
50 builder.append("&"); 77 builder.append("&");
51 } 78 }
52 builder.append(entry.getKey()); 79 builder.append(entry.getKey());
@@ -67,10 +94,10 @@ public class HttpUtil { @@ -67,10 +94,10 @@ public class HttpUtil {
67 CloseableHttpResponse response = client.execute(httpGet); 94 CloseableHttpResponse response = client.execute(httpGet);
68 if (response.getStatusLine().getStatusCode() == 200) { 95 if (response.getStatusLine().getStatusCode() == 200) {
69 String content = EntityUtils.toString(response.getEntity()); 96 String content = EntityUtils.toString(response.getEntity());
70 - log.info("[{}],[{}]",url,content); 97 + log.info("[{}],[{}]", url, content);
71 return content; 98 return content;
72 } else if (Objects.nonNull(response) && Objects.nonNull(response.getStatusLine())) { 99 } else if (Objects.nonNull(response) && Objects.nonNull(response.getStatusLine())) {
73 - log.info("[{}],[{}]",url,response.getStatusLine().getStatusCode()); 100 + log.info("[{}],[{}]", url, response.getStatusLine().getStatusCode());
74 } 101 }
75 102
76 return null; 103 return null;
trash-garbage/src/main/resources/mapper/GarOrderMatchDisposalMapper.xml
  View file @b87ba60
@@ -65,4 +65,7 @@ @@ -65,4 +65,7 @@
65 inner JOIN gar_order_match_disposal gomd on gomd.gar_order_disposal_tel= disposal.construction_unit_person_phone 65 inner JOIN gar_order_match_disposal gomd on gomd.gar_order_disposal_tel= disposal.construction_unit_person_phone
66 where gomd. gar_order_id=#{orderId} 66 where gomd. gar_order_id=#{orderId}
67 </select> 67 </select>
  68 + <select id="queryObjByOrderId" resultType="com.trash.garbage.pojo.domain.GarOrderMatchDisposal">
  69 + select * from gar_order_match_disposal where gar_order_id=#{orderId}
  70 + </select>
68 </mapper> 71 </mapper>
trash-ui/src/views/gar/order/index.vue
  View file @b87ba60
@@ -265,7 +265,7 @@ export default { @@ -265,7 +265,7 @@ export default {
265 return "" 265 return ""
266 }, 266 },
267 computedHandleStatusString(val) { 267 computedHandleStatusString(val) {
268 - console.log(val); 268 +
269 if (val === 0) { 269 if (val === 0) {
270 return '未处理' 270 return '未处理'
271 } 271 }
@@ -355,7 +355,6 @@ export default { @@ -355,7 +355,6 @@ export default {
355 this.combnationImagePath(this.form.putDownImages); 355 this.combnationImagePath(this.form.putDownImages);
356 this.combnationImagePath(this.form.putOnImages); 356 this.combnationImagePath(this.form.putOnImages);
357 this.combnationImagePath(this.form.panoramas); 357 this.combnationImagePath(this.form.panoramas);
358 - console.log(this.form);  
359 358
360 this.open = true; 359 this.open = true;
361 this.title = "清运派单详情"; 360 this.title = "清运派单详情";
@@ -410,16 +409,7 @@ export default { @@ -410,16 +409,7 @@ export default {
410 if(nodes){ 409 if(nodes){
411 let length = nodes.length; 410 let length = nodes.length;
412 for (let index = 0; index < length; index++) { 411 for (let index = 0; index < length; index++) {
413 - const element = nodes[index];  
414 - console.log("==========================>");  
415 -  
416 - console.log(element);  
417 -  
418 - nodes[index]= this.displayImage(element);  
419 -  
420 - console.log("==========================>nodes");  
421 -  
422 - console.log(nodes[index]); 412 + nodes[index]= this.displayImage(nodes[index]);
423 } 413 }
424 } 414 }
425 } 415 }
trash-unit/src/main/java/com/trash/enterprise/service/impl/TransportationEnterpriseServiceImpl.java
  View file @b87ba60
1 package com.trash.enterprise.service.impl; 1 package com.trash.enterprise.service.impl;
2 2
3 import java.io.IOException; 3 import java.io.IOException;
  4 +import java.util.Collections;
4 import java.util.List; 5 import java.util.List;
5 6
  7 +import com.aliyuncs.http.HttpUtil;
6 import com.trash.common.config.trashConfig; 8 import com.trash.common.config.trashConfig;
7 import com.trash.common.utils.DateUtils; 9 import com.trash.common.utils.DateUtils;
8 import com.trash.common.utils.SecurityUtils; 10 import com.trash.common.utils.SecurityUtils;
  11 +import com.trash.common.utils.http.HttpUtils;
9 import org.apache.commons.collections4.CollectionUtils; 12 import org.apache.commons.collections4.CollectionUtils;
10 import org.springframework.beans.factory.annotation.Autowired; 13 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Service; 14 import org.springframework.stereotype.Service;
@@ -60,6 +63,7 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter @@ -60,6 +63,7 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
60 return transportationEnterpriseMapper.selectTransportationEnterpriseList(transportationEnterprise); 63 return transportationEnterpriseMapper.selectTransportationEnterpriseList(transportationEnterprise);
61 } 64 }
62 65
  66 +
63 /** 67 /**
64 * 新增运输企业管理 68 * 新增运输企业管理
65 * 69 *