youxiw2000 / trash · Commits

Commit 02856d4010b2f01c40c6eaa46939f7120985fb35

Authored by 2c2c2c
1 parent 4a78f2a8
build: skipped

垃圾装修趟次逻辑优化

Inline Side-by-side
Showing 2 changed files with 12 additions and 1 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderAssociationServiceAsync.java
  View file @02856d4
@@ -92,6 +92,9 @@ public class GarOrderAssociationServiceAsync { @@ -92,6 +92,9 @@ public class GarOrderAssociationServiceAsync {
92 log.info("开始判断车辆是否在处置场所内"); 92 log.info("开始判断车辆是否在处置场所内");
93 // 假设 garOrderMatchAsk.getDisposalId() 返回处置场所的 ID 93 // 假设 garOrderMatchAsk.getDisposalId() 返回处置场所的 ID
94 String token = trashConfig.getToken(); 94 String token = trashConfig.getToken();
  95 + if (!token.contains("Bearer")){
  96 + token = "Bearer " + token;
  97 + }
95 String data = RemoteServerUtils.getEarthSitesDetails(token,garOrderMatchAsk.getDisposalId()); 98 String data = RemoteServerUtils.getEarthSitesDetails(token,garOrderMatchAsk.getDisposalId());
96 JSONObject disposalJson = JSON.parseObject(data); 99 JSONObject disposalJson = JSON.parseObject(data);
97 JSONObject result = disposalJson.getJSONObject("result"); 100 JSONObject result = disposalJson.getJSONObject("result");
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @02856d4
@@ -692,6 +692,9 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder> @@ -692,6 +692,9 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
692 692
693 public String generateAssociationNumber(String garOrderAddress) { 693 public String generateAssociationNumber(String garOrderAddress) {
694 String token = trashConfig.getToken(); 694 String token = trashConfig.getToken();
  695 + if (!token.contains("Bearer")){
  696 + token = "Bearer " + token;
  697 + }
695 String data = RemoteServerUtils.getAreasList(token); 698 String data = RemoteServerUtils.getAreasList(token);
696 JSONArray jsonArray = JSON.parseArray(data); 699 JSONArray jsonArray = JSON.parseArray(data);
697 String[] address = garOrderAddress.split("-"); 700 String[] address = garOrderAddress.split("-");
@@ -1456,7 +1459,12 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder> @@ -1456,7 +1459,12 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
1456 garOrderMatchAsk.setGarUpdateBy(dto.getGarOrderHandlerName()); 1459 garOrderMatchAsk.setGarUpdateBy(dto.getGarOrderHandlerName());
1457 garOrderMatchAsk.setGarUpdateTime(new Date()); 1460 garOrderMatchAsk.setGarUpdateTime(new Date());
1458 1461
1459 - if(!garOrderMatchAsk.getGarCarCode().equals(dto.getGarHandlerCarCode())){ 1462 + // 判断本趟次是否上传了图片
  1463 + if(garOrderMatchAsk.getGarCarCode()==null){
  1464 + garOrderMatchAsk.setGarOrderType("1");
  1465 + garOrderMatchAsk.setGarRemark(garOrderMatchAsk.getGarRemark()!=null?garOrderMatchAsk.getGarRemark()+";未上传装车图片":"未上传装车图片");
  1466 + }else if(!dto.getGarHandlerCarCode().equals(garOrderMatchAsk.getGarCarCode())){
  1467 + //判断本趟次运输车辆是否相同
1460 garOrderMatchAsk.setGarOrderType("1"); 1468 garOrderMatchAsk.setGarOrderType("1");
1461 garOrderMatchAsk.setGarRemark(garOrderMatchAsk.getGarRemark()!=null?garOrderMatchAsk.getGarRemark()+";装车和卸车的车辆号牌不一致":"装车和卸车的车辆号牌不一致"); 1469 garOrderMatchAsk.setGarRemark(garOrderMatchAsk.getGarRemark()!=null?garOrderMatchAsk.getGarRemark()+";装车和卸车的车辆号牌不一致":"装车和卸车的车辆号牌不一致");
1462 } 1470 }