增加欧派数据重推 走数据库

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

@@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory;
 import org.springblade.common.constant.LogpmDataStatusEnum;
 import org.springblade.common.constant.PackagesTypeEnum;
 import org.springblade.common.utils.CommonUtil;
+import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -428,24 +429,41 @@ public class FactoryXxlJob {
 	@XxlJob("factoryByOpOrderPackageCodeJobHandlerIn")
 	public ReturnT<String> factoryByOpOrderPackageCodeJobHandlerIn(String param) throws Exception {
 
+
+		List<String> split = new ArrayList<>();
+		List<String> codes = new ArrayList<>();
+
 		if (StringUtils.isBlank(param)) {
-			return ReturnT.FAIL;
+//			return ReturnT.FAIL;
+			// 查询数据库
+			List<JSONObject> packagePushAgain = factoryOrderMapper.findPackagePushAgain(1);
+
+			for (JSONObject jsonObject : packagePushAgain) {
+				split.add(jsonObject.getString("code"));
+			}
+		}else{
+
+			String[] splits = param.split(",");
+			split.addAll(Arrays.asList(splits));
 		}
-		String[] split = param.split(",");
 
 
 		try {
 			for (String orderPackageCode : split) {
 
 				OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
-				orderStatusDTO.setUnitNo(orderPackageCode);
+				orderStatusDTO.setUnitNo(orderPackageCode.trim());
 				orderStatusDTO.setStatus("1");
-
 				// 查询老系统的操作人
 				orderStatusDTO.setUsername("admin");// 操作人
-				ouPaiFactoryService.handleStatusData(orderStatusDTO);
+				R r =ouPaiFactoryService.handleStatusData(orderStatusDTO);
+				if(r.isSuccess()){
+					factoryOrderMapper.updatePackagePushAgain(orderPackageCode.trim(),1);
+				}
 
 			}
+
+
 			return ReturnT.SUCCESS;
 		} catch (Exception e) {
 			XxlJobLogger.log(e);

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.factory.oupai.mapper;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.factory.oupai.entity.FactoryOrderEntity;
@@ -49,4 +50,8 @@ public interface FactoryOrderMapper extends BaseMapper<FactoryOrderEntity> {
 
 
 	List<Long> findOrderInforIdBySelfCodeAndReceivingid(@Param("selfCode") String selfCode,@Param("receivingId") Long receivingId);
+
+
+	List<JSONObject> findPackagePushAgain(@Param("type") Integer type);
+	void updatePackagePushAgain(@Param("code") String code,@Param("type") Integer type);
 }

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

@@ -7,6 +7,7 @@
     </resultMap>
 
 
+
     <select id="selectFactoryOrderPage" resultMap="factoryOrderResultMap">
         select * from op_factory_order where is_deleted = 0
     </select>
@@ -32,4 +33,16 @@
     </select>
 
 
+    <select id="findPackagePushAgain" resultType="com.alibaba.fastjson.JSONObject">
+
+        select * from op_package_pushagain where type =#{type} and status=1
+
+    </select>
+
+    <update id="updatePackagePushAgain">
+
+        update op_package_pushagain set status=2 where code=#{code} and type=#{type}
+    </update>
+
+
 </mapper>