1.修改欧派数据同步

2.增加

blade-biz-common/src/main/java/org/springblade/common/utils/FileLogsUtil.java

@@ -5,10 +5,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springblade.common.constant.CommonConstant;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -65,6 +64,28 @@ public class FileLogsUtil {
 		return imgPath + fileName;
 	}
 
+
+	public static String loadFileContent(String urlString) {
+		try {
+			log.info(">>>> 开始下载 {}",urlString);
+			URL url = new URL(urlString);
+			HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+			connection.setRequestMethod("GET");
+			BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+			String inputLine;
+			StringBuilder content = new StringBuilder();
+			while ((inputLine = in.readLine()) != null) {
+				content.append(inputLine);
+			}
+			in.close();
+			log.info(">>>> 结束下载 {}",urlString);
+			return content.toString();
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
 	private static String makeDateString(Date date) {
 
 		StringBuilder stringBuffer = new StringBuilder();

blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.factory.comfac.dto.OrderStatusDTO;
+import com.logpm.factory.oupai.mapper.FactoryOrderMapper;
 import com.logpm.factory.oupai.service.IOuPaiFactoryService;
 import com.logpm.factory.snm.dto.GroupByPackagesDTO;
 import com.logpm.factory.snm.entity.OrderLogEntity;
@@ -71,6 +72,8 @@ public class FactoryXxlJob {
 
 	private final IOuPaiFactoryService ouPaiFactoryService;
 
+	private final FactoryOrderMapper factoryOrderMapper;
+
 
 	/**
 	 * snm工厂数据任务调度
@@ -498,7 +501,7 @@ public class FactoryXxlJob {
 			for (String receivCode : split) {
 
 				XxlJobLogger.log(">>>>> 收货单执行单号 开始  {}",receivCode);
-				ouPaiFactoryService.saveOuPaiFactoryOrderDTOByCarCarNumber(receivCode);
+				ouPaiFactoryService.saveOuPaiFactoryOrderDTOByCarCarNumberAgain(receivCode);
 				XxlJobLogger.log(">>>>> 收货单执行单号 结束  {}",receivCode);
 
 
@@ -513,6 +516,52 @@ public class FactoryXxlJob {
 	}
 
 
+	/**
+	 * 修复欧派工厂订单数据重复
+	 * @param param
+	 * @return
+	 * @throws Exception
+	 */
+	@XxlJob("factory2OpReplayOrderDataRepeat")
+	public ReturnT<String> factory2OpReplayOrderDataRepeat(String param) throws Exception {
+
+		// todo 需要拆分方法
+		if (StringUtils.isBlank(param)) {
+			return ReturnT.FAIL;
+		}
+		String[] split = param.split(",");
+
+
+		try {
+
+			List<Map<String, Object>> dataRepeat = factoryOrderMapper.findDataRepeat();
+
+			for (Map<String, Object> stringObjectMap : dataRepeat) {
+
+				Long receiving_id = (Long)stringObjectMap.get("receiving_id");
+				String self_code = (String)stringObjectMap.get("self_code");
+
+				/**
+				 * select id from op_factory_order where is_deleted = 0 and (self_code = 'OPLCZ绵阳市231200002CA1-1' and receiving_id = 1736591024500776962) ORDER BY create_time
+				 */
+
+				List<Long> orderInforIdBySelfCodeAndReceivingid = factoryOrderMapper.findOrderInforIdBySelfCodeAndReceivingid(self_code, receiving_id);
+
+
+
+
+
+			}
+
+
+		} catch (Exception e) {
+			XxlJobLogger.log(e);
+
+
+		}
+		return ReturnT.FAIL;
+	}
+
 
 
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.java

@@ -23,6 +23,7 @@ import com.logpm.factory.oupai.vo.FactoryOrderVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 欧派工厂订单 Mapper 接口
@@ -43,4 +44,9 @@ public interface FactoryOrderMapper extends BaseMapper<FactoryOrderEntity> {
 
 
     FactoryOrderEntity selectEntityByOrderPackageCode(@Param("unitNo") String unitNo);
+
+	List<Map<String,Object>> findDataRepeat();
+
+
+	List<Long> findOrderInforIdBySelfCodeAndReceivingid(@Param("selfCode") String selfCode,@Param("receivingId") Long receivingId);
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.xml

@@ -21,5 +21,15 @@
         ofp.CODE = #{unitNo}
     </select>
 
+    <select id="findDataRepeat" resultType="map">
+        SELECT receiving_id,self_code,COUNT(1) num from op_factory_order GROUP BY receiving_id,self_code HAVING COUNT(1)>1;
+
+    </select>
+
+    <select id="findOrderInforIdBySelfCodeAndReceivingid" resultType="long">
+
+        select id from op_factory_order where is_deleted = 0 and (self_code = #{selfCode} and receiving_id = #{receivingId}) ORDER BY create_time
+    </select>
+
 
 </mapper>

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/ReceivingOrderMapper.java

@@ -44,6 +44,9 @@ public interface ReceivingOrderMapper extends BaseMapper<ReceivingOrderEntity> {
 	List<ReceivingOrderVO> selectReceivingOrderPage(IPage page, ReceivingOrderVO receivingOrder);
 
 
+	String selectReceivingOrderByOrderId (@Param("orderId") Long orderId);
+
+
 
 
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/ReceivingOrderMapper.xml

@@ -11,7 +11,11 @@
         select * from op_receiving_order where is_deleted = 0
     </select>
 
-
+    <select id="selectReceivingOrderByOrderId" resultType="string">
+        SELECT code from op_receiving_order where id =(
+        SELECT receiving_id from op_factory_order where id=#{orderId}
+        )
+    </select>
 
 
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java

@@ -14,6 +14,8 @@ public interface IOuPaiFactoryService {
 	String saveOuPaiFactoryOrderDTOByCarCarNumber(String carNumber);
 
 
+	String saveOuPaiFactoryOrderDTOByCarCarNumberAgain(String code);
+
 	String saveOuPaiPackageStatusByCode(String orderPackageCode, Integer event);
 
 	Boolean checkReceivingOrder(String code);

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/FactoryOrderServiceImpl.java

@@ -45,6 +45,7 @@ public class FactoryOrderServiceImpl extends BaseServiceImpl<FactoryOrderMapper,
 		queryWrapper.select("self_code","id");
 		queryWrapper.eq("self_code",selfCode);
 		queryWrapper.eq("receiving_id",receivingId);
+		queryWrapper.last("limit 1");
 		return baseMapper.selectOne(queryWrapper);
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.logpm.factory.comfac.constant.FactoryConstant;
 import com.logpm.factory.comfac.dto.OrderStatusDTO;
 import com.logpm.factory.comfac.service.IAsyncDataService;
 import com.logpm.factory.oupai.entity.*;
@@ -111,6 +110,52 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 
 	}
 
+
+	@Override
+	public String saveOuPaiFactoryOrderDTOByCarCarNumberAgain(String code) {
+		log.info("数据重新获取 start {}", code);
+		OpOrderStatusLogEntity opOrderStatusLogEntity = findOurPaiDataByCarNumberByLoal(code);
+
+		// 保存需要解析的数据
+		// 获取返回内容
+		try {
+
+			// 需要下载 数据中的内容
+			String responseUrl = opOrderStatusLogEntity.getResponseUrl();
+
+			// 下载这个数据
+			opOrderStatusLogEntity.setResponseBody(FileLogsUtil.loadFileContent(responseUrl));
+
+
+			JSONObject jsonObject = JSONObject.parseObject(opOrderStatusLogEntity.getResponseBody());
+			JSONArray resultArray = jsonObject.getJSONArray("value");
+			log.info("############handleData: 数据处理开始");
+			analyzeData(resultArray);
+			opOrderStatusLogEntity.setDataStatus(1);
+		} catch (Exception e) {
+			log.error(">>>> 欧派数据解析报错", e);
+			opOrderStatusLogEntity.setDataStatus(2);
+
+		}
+		opOrderStatusLogService.saveOrUpdate(opOrderStatusLogEntity);
+		log.info("数据重新获取 end {}", code);
+		return code;
+	}
+
+	private OpOrderStatusLogEntity findOurPaiDataByCarNumberByLoal(String code) {
+
+		// 查询自己数据 判断这个收货单号是否存在
+
+		LambdaQueryWrapper<OpOrderStatusLogEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(OpOrderStatusLogEntity::getType, 3);
+		lambdaQueryWrapper.like(OpOrderStatusLogEntity::getArgs,  code);
+		lambdaQueryWrapper.orderByAsc(OpOrderStatusLogEntity::getCreateTime);
+		lambdaQueryWrapper.last("limit 1");
+		return opOrderStatusLogService.getOne(lambdaQueryWrapper);
+
+
+	}
+
 	@Override
 	public String saveOuPaiPackageStatusByCode(String orderPackageCode, Integer event) {
 		//
@@ -466,6 +511,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 
 	/**
 	 * 根据推送类型修改包件上的状态
+	 *
 	 * @param factoryPackageEntity
 	 */
 	void checkOpFactoryPackagePushStatus(FactoryPackageEntity factoryPackageEntity) {
@@ -699,7 +745,8 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 			lambdaQueryWrapper.eq(ReceivingOrderEntity::getCode, code);
 			List<ReceivingOrderEntity> receivingOrderEntities = receivingOrderMapper.selectList(lambdaQueryWrapper);
 			if (ObjectUtils.isNotNull(receivingOrderEntities)) {
-				log.info(">>>>>>>>>>>>>>>>>>>>>>> 收货单已存在 {} ", code);
+				log.info(">>>>>>>>>>>>>>>>>>>>>>> 收货单已存在 收货单下面的订单是否存在  包件是否存在{} ", code);
+				extractedOuPaiOrderPackageInfor(valueObject, receivingOrderEntities.get(0).getId(), code);
 				return;
 			}
 
@@ -759,9 +806,34 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 			if (row == 1) {
 				log.info("############handleData: 保存发货单数据  成功成功成功成功 code={}", code);
 				Long receivingId = receivingOrderEntity.getId();//发货单id
+				extractedOuPaiOrderPackageInfor(valueObject, receivingId, code);
+			} else {
+				log.error("############handleData: 保存发货单数据失败 code={}", code);
+				throw new CustomerException(403, "保存发货单数据失败");
+			}
+			Date end = new Date();
+			long startLong = start.getTime();
+			long endLong = end.getTime();
+			long l = endLong - startLong;
+			log.info("############handleData: 数据处理完成 耗时 {} 毫秒", l);
+		}
+
+	}
+
+	/**
+	 * 欧派入库方法
+	 *
+	 * @param valueObject
+	 * @param receivingId
+	 * @param code
+	 */
+	private void extractedOuPaiOrderPackageInfor(JSONObject valueObject, Long receivingId, String code) {
 		JSONArray packages = valueObject.getJSONArray("Packages");
+
+		log.info(">>> 获取的包件长度 {}", packages.size());
 		for (int j = 0; j < packages.size(); j++) {
 			JSONObject packageEntity = packages.getJSONObject(j);//包件信息
+			log.info(">>>>> 解析出欧派的包件信息 {}", packageEntity.getString("Code"));
 			JSONObject orderEntity = packageEntity.getJSONObject("Order");//订单信息
 			if (orderEntity == null) {
 				log.info("包件数据没有订单信息 packageCode {}", packageEntity.getString("Code"));
@@ -772,6 +844,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 //
 			FactoryOrderEntity factoryOrderEntity = factoryOrderService.selectEntityBySelfCode(selfCode, receivingId);
 			if (Objects.isNull(factoryOrderEntity)) {
+				log.info(" oupai 收货单ID{} 收货单下面的订单不存在 进行新增订单 {}", receivingId, selfCode);
 				factoryOrderEntity = new FactoryOrderEntity();
 				factoryOrderEntity.setCode(orderEntity.getString("Code"));
 				factoryOrderEntity.setSelfCode(selfCode);
@@ -885,6 +958,8 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 			FactoryPackageEntity factoryPackageEntity = factoryPackageService.getOne(packageEntityQueryWrapper);
 
 			if (Objects.isNull(factoryPackageEntity)) {
+				log.info(" oupai 收货单ID{} 收货单下面的包件不存在 进行新增订单 {} 关联包件 {}", receivingId, selfCode, packageCode);
+
 				factoryPackageEntity = new FactoryPackageEntity();
 				factoryPackageEntity.setOrderId(orderId);
 				factoryPackageEntity.setCode(packageCode);
@@ -983,22 +1058,18 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 				}
 			} else {
 
-						log.error("############handleData: 包件码已存在 packageCode={} 收货单号 {}", packageCode,code);
+				String receiveCode = receivingOrderMapper.selectReceivingOrderByOrderId(factoryPackageEntity.getOrderId());
+
+				if(receiveCode.equals(code)){
+					log.error("############handleData: 包件码已存在 packageCode={} ,订单 id {} 收货单号 {}", packageCode, factoryPackageEntity.getOrderId(), code);
 
-						//throw new CustomerException(403, "包件码已存在");
-					}
-				}
 				}else{
-				log.error("############handleData: 保存发货单数据失败 code={}", code);
-				throw new CustomerException(403, "保存发货单数据失败");
-			}
-			Date end = new Date();
-			long startLong = start.getTime();
-			long endLong = end.getTime();
-			long l = endLong - startLong;
-			log.info("############handleData: 数据处理完成 耗时 {} 毫秒", l);
+					log.error("############handleData: 该包件存在于其它收货单 packageCode={} 订单ID {}  收货单号 {}", packageCode,factoryPackageEntity.getOrderId(), receiveCode);
 				}
 
+				//throw new CustomerException(403, "包件码已存在");
+			}
+		}
 	}
 
 
@@ -1010,6 +1081,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 	 */
 	private OpOrderStatusLogEntity findOurPaiDataByCarNumber(String code) {
 
+
 		String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/ReceivingOrder?$filter=Code eq '" + code + "'&select=Code,Type,Status,Plate,PackagesCount,ReceivePackageCount,PlateNum,CarNumber,CarrierCode,SendTime,ArrivalTime,ReceiveTime,CreateTime,ReturnNumber\n" +
 			"&$expand=" +
 			"Packages($select=Oid,Code,PdaNumber,FirstClassCode,FirstClassName,SecondClassCode,SecondClassName,ThirdClassCode,ThirdClassName,BuyIn,CosourcingCode,CosourcingUnit,SortingCenter,DistributionCenter,Length,Width,Height,Weight,OrderDetail,Order,PathIndex,PathDetail,DeliveryOrders,ReceivingOrders,LPN,LpnSerialNum,IsEntruck,ReservationOrder,OutGoingOrderDetail,SignBill,IsInventory,Inventories,InventoryInDetails,Freeze,OutGoingOrderDetailInventoryDetail,From,Creator,CreateTime,ShipTime,CarNumber,DeliveryMethod,DeliveryReceiver,DeliveryReceiverPhone,ReturnNumber,GroupType,CarrierCode,CarrierName,PackageDetailNames,ReceivingTime,SendTime,ExceptionSignRemark,Descript,SignTime,OutOrder,IsReceiveByHand,PackageStatus,PackageDetailNames;" +