fix:1.取消签收推送老系统推送日志

2.增加司机角色的配置项 存在多个司机不同的功能权限的场景

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java

@@ -239,6 +239,7 @@ public class DistributionSignforClient implements IDistributionSignforClient {
 			}
 
 
+			log.info(">>>> clerkCheckPushData SignPushDataDTO :{}",delivery);
 			Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
 			return b;
 		} catch (Exception e) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -2313,9 +2313,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			//判断当前登录人是否为司机
 			boolean delivery = false;
 			String value1 = DictBizCache.getValue("role_class", "delivery_driver_new");
-			if (roleId.contains(value1)) {
+
-                delivery = true;
+			String[] roleIds = value1.split(",");
-            }
+			String[] roleIdsT = roleId.split(",");
+			for (String id : roleIds) {
+				for (String s : roleIdsT) {
+					if (s.equals(id)) {
+						delivery = true;
+						break;
+					}
+				}
+			}
+
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 //		R<String> value = dictBizClient.getValue("role_class", roleId);
 			if (delivery) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -93,6 +93,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.User;
 import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.feign.IUserClient;
@@ -3988,12 +3989,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		String roleId = user.getRoleId();
 		//判断当前登录人是否为司机
 		List<DistributionAppDeliveryListVO> distributionAppDeliveryListVOS = new ArrayList<>();
-		R<String> value = dictBizClient.getValue("role_class", "delivery_driver_new");
+//		R<String> value = dictBizClient.getValue("role_class", "delivery_driver_new");
 
-		log.info(">>>>>> 获取配置的司机角色 {}", value.getData());
+		String value1 = DictBizCache.getValue("role_class", "delivery_driver_new");
+
+
+		log.info(">>>>>> 获取配置的司机角色 {}", value1);
 
 		// 得到配置的多个配送角色
-		String[] split = value.getData().split(",");
+		String[] split = value1.split(",");
 
 		boolean isDriver = false;
 		for (String s : split) {

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java

@@ -30,26 +30,23 @@ public class SignPushClient implements IOldSignPushClient {
 
 		//todo  这里存在调用老系统的接口 将数据会写给老系统
 
+		Boolean result =false;
+		log.info(">>>> pushOldSystemSignInfo 程序执行 start time: {}",System.currentTimeMillis());
 		String authCode = oldLogin(signPushDataDTO.getWarehouseId()+"");
 
-		log.info("##################pushOldSystemSignInfo: 请求老系统接口 start  map {}", signPushDataDTO);
-
 		String url = oldSystemProperties.getUrl() + "openApi/newSystem.OptimsSign/index";
 
 		String data = JSON.toJSONString(signPushDataDTO);
 		String body = HttpRequest.post(url).body(data).header("token", authCode).execute().body();
-		log.info("##################pushOldSystemSignInfo: 请求老系统接口,url:{},body:{}", url, body);
 		if (StringUtil.isNotBlank(body)) {
-
 			JSONObject res = JSON.parseObject(body);
 			if ("200".equals(res.getString("code"))) {
-				return true;
+				result= true;
 			}
-
 		}
+		log.info(">>>> pushOldSystemSignInfo 程序执行 end  time : {} >>  return result :{} ",System.currentTimeMillis(),result);
 
-
+		return result;
-		return false;
 	}
 
 	@Override

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java

@@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -183,21 +184,25 @@ public class DistributionDatarepair {
 	public ReturnT<String> pushNotification(String params) {
 		// 得到当前仓库所有的签收任务
 
-		List<JSONObject> allSignfor = warehouseMappingDataMapper.findAllSignfor();
 
+		Integer parmeId = null;
+		if(StringUtil.isNotBlank(params)){
+			parmeId = Integer.parseInt(params);
+		}
+		List<JSONObject> allSignfor = warehouseMappingDataMapper.findAllSignfor(parmeId);
 		for (JSONObject entries : allSignfor) {
 			Long id = entries.getLong("singnforId");
 
 			Boolean b = distributionSignforClient.clerkCheckPushData(id);
-			if(b){
+			if(b!=null&&b){
 				warehouseMappingDataMapper.updateClearSignforStatus(id, entries.getLong("warehouseId"), 1);
 				log.info(">>> 推送成功 {}",id);
 			}else{
 				log.error(">>> 推送失败 id="+id);
 			}
+		}
 
 
-		}
 
 
 		return ReturnT.SUCCESS;
@@ -210,7 +215,7 @@ public class DistributionDatarepair {
 		// 得到当前仓库所有的签收任务
 
 
-		List<JSONObject> allSignfor = warehouseMappingDataMapper.findAllSignfor();
+		List<JSONObject> allSignfor = warehouseMappingDataMapper.findAllSignfor(null);
 
 		for (JSONObject entries : allSignfor) {
 			Long id = entries.getLong("singnforId");

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java

@@ -91,7 +91,7 @@ public interface WarehouseMappingDataMapper {
 	void updatePackageUpdownStatus(@Param("id") Integer id, @Param("syncStatus") Integer syncStatus);
 
 
-	List<JSONObject> findAllSignfor();
+	List<JSONObject> findAllSignfor(@Param("id") Integer id);
 
 	void updateClearSignforStatus(@Param("singnforId") Long singnforId, @Param("warehouseId") Long warehouseId, @Param("dealStatus") Integer dealStatus);
 

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml

@@ -276,6 +276,10 @@
         warehouse_id warehouseId
         from clear_singnfor_status_record
         where deal_status = 0
+        <if test="id != null">
+            and id > #{id}
+        </if>
+
     </select>