Merge branch 'dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/controller/OrderController.java

@@ -15,13 +15,13 @@ import org.springblade.core.tool.api.R;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -59,19 +59,19 @@ public class OrderController {
 		return R.data(pages);
 
 	}
-	@PostMapping("rePush/{id}")
+	@PostMapping("rePush")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "重新推送", notes = "重新推送")
-	public R<Boolean> rePush(@PathVariable("id") String id) {
-		Boolean flag = nodePushService.rePush(id);
+	public R<Boolean> rePush(@RequestBody List<String>  ids) {
+		Boolean flag = nodePushService.rePush(ids);
 		return R.data(flag);
 
 	}
-	@PatchMapping("cancel/{id}")
+	@PatchMapping("cancel")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "取消", notes = "取消")
-	public R<Boolean> cancel(@PathVariable("id") String id) {
-		Boolean flag = nodePushService.cancel(id);
+	public R<Boolean> cancel(@RequestBody List<String> ids) {
+		Boolean flag = nodePushService.cancel(ids);
 		return R.data(flag);
 
 	}

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/entity/FactoryNodePushEntity.java

@@ -28,77 +28,77 @@ public class FactoryNodePushEntity extends BaseEntity {
 	/**
 	 * 预留1
 	 */
-	@ApiModelProperty(name = "预留1", notes = "")
+	@ApiModelProperty(value = "预留1")
 	private String reserve1;
 	/**
 	 * 预留2
 	 */
-	@ApiModelProperty(name = "预留2", notes = "")
+	@ApiModelProperty(value = "预留2")
 	private String reserve2;
 	/**
 	 * 预留3
 	 */
-	@ApiModelProperty(name = "预留3", notes = "")
+	@ApiModelProperty(value = "预留3")
 	private String reserve3;
 	/**
 	 * 预留4
 	 */
-	@ApiModelProperty(name = "预留4", notes = "")
+	@ApiModelProperty(value = "预留4")
 	private String reserve4;
 	/**
 	 * 预留5
 	 */
-	@ApiModelProperty(name = "预留5", notes = "")
+	@ApiModelProperty(value = "预留5")
 	private String reserve5;
 	/**
 	 * 发货单编号
 	 */
-	@ApiModelProperty(name = "发货单编号", notes = "")
+	@ApiModelProperty(value = "发货单编号")
 	private String senderCode;
 	/**
 	 * 订单号
 	 */
-	@ApiModelProperty(name = "订单号", notes = "")
+	@ApiModelProperty(value = "订单号")
 	private String orderCode;
 	/**
 	 * 包条码
 	 */
-	@ApiModelProperty(name = "包条码", notes = "")
+	@ApiModelProperty(value = "包条码")
 	private String packageCode;
 	/**
 	 * 类型
 	 */
-	@ApiModelProperty(name = "类型（收货，确认收货，签收，确认签收）", notes = "")
+	@ApiModelProperty(value = "类型（收货，确认收货，签收，确认签收）")
 	private String type;
 	/**
 	 * 送货任务ID
 	 */
-	@ApiModelProperty(name = "送货任务ID", notes = "")
+	@ApiModelProperty(value = "送货任务ID")
 	private String sendTaskId;
 	/**
 	 * 发送状态
 	 */
-	@ApiModelProperty(name = "发送状态(0:成功，-1：失败，1：取消)", notes = "")
+	@ApiModelProperty(value = "发送状态(0:成功，-1：失败，1：取消)")
 	private String sendStatus;
 	/**
 	 * 操作码
 	 */
-	@ApiModelProperty(name = "操作码", notes = "")
+	@ApiModelProperty(value = "操作码")
 	private String operationCode;
 	/**
 	 * url
 	 */
-	@ApiModelProperty(name = "url", notes = "")
+	@ApiModelProperty(value = "url")
 	private String sendUrl;
 	/**
 	 * 内容
 	 */
-	@ApiModelProperty(name = "内容", notes = "")
+	@ApiModelProperty(value = "内容")
 	private String content;
 	/**
 	 * 返回值
 	 */
-	@ApiModelProperty(name = "返回值", notes = "")
+	@ApiModelProperty(value = "返回值")
 	private String resultContent;
 
 }

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.java

@@ -20,5 +20,5 @@ public interface FactoryNodePushMapper extends BaseMapper<FactoryNodePushEntity>
 
     List<FactoryNodePushEntity> pageNodePush(IPage<FactoryNodePushEntity> page, @Param("ew") Wrapper queryWrapper);
 
-	Boolean cancel(@Param("id") String id);
+	Boolean cancel(@Param("ids") List<String> ids);
 }

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml

@@ -3,10 +3,16 @@
 <mapper namespace="com.logpm.factorydata.mengtian.mapper.FactoryNodePushMapper">
 
     <select id="pageNodePush" resultType="com.logpm.factorydata.mengtian.entity.FactoryNodePushEntity">
-        select * from mt_factory_node_push #{ew.customSqlSegment}
+        select * from mt_factory_node_push
+        <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
+            ${ew.sqlSegment}
+        </if>
     </select>
 
     <update id="cancel">
-        update mt_factory_node_push set send_status = 1 where id = #{id}
+        update mt_factory_node_push set send_status = 1 where id in
+        <foreach collection="ids" item="id" separator="," open="(" close=")">
+            #{id}
+        </foreach>
     </update>
 </mapper>

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/FactoryNodePushService.java

@@ -5,6 +5,8 @@ import com.logpm.factorydata.mengtian.entity.FactoryNodePushEntity;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 
+import java.util.List;
+
 /**
  * 推送工厂节点数据 服务类
  *
@@ -15,7 +17,7 @@ public interface FactoryNodePushService extends BaseService<FactoryNodePushEntit
 
 	IPage<FactoryNodePushEntity> pageNodePush(FactoryNodePushEntity vo, Query query);
 
-	Boolean cancel(String id);
+	Boolean cancel(List<String> id);
 
-	Boolean rePush(String id);
+	Boolean rePush(List<String> id);
 }

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java

@@ -1,5 +1,6 @@
 package com.logpm.factorydata.mengtian.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpRequest;
@@ -15,6 +16,7 @@ import com.logpm.factorydata.mengtian.service.FactoryNodePushService;
 import com.logpm.factorydata.mengtian.util.QueryUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -38,17 +40,25 @@ public class FactoryNodePushServiceImpl extends BaseServiceImpl<FactoryNodePushM
 		IPage<FactoryNodePushEntity> page = Condition.getPage(query);
 		QueryWrapper<FactoryNodePushEntity> queryWrapper = QueryUtil.buildQueryWrapper(vo, FactoryNodePushEntity.class);
 		List<FactoryNodePushEntity> deliveryTrainPage = baseMapper.pageNodePush(page, queryWrapper);
-		return null;
+		return page.setRecords(deliveryTrainPage);
     }
 
 	@Override
-	public Boolean cancel(String id) {
-		return baseMapper.cancel(id);
+	public Boolean cancel(List<String> ids) {
+		if(CollUtil.isEmpty(ids)){
+			throw new ServiceException("参数为空");
+		}
+		return baseMapper.cancel(ids);
 	}
 
 	@Override
-	public Boolean rePush(String id) {
-		FactoryNodePushEntity factoryNodePushEntity = baseMapper.selectById(id);
+	public Boolean rePush(List<String> ids) {
+		if(CollUtil.isEmpty(ids)){
+			throw new ServiceException("参数为空");
+		}
+		List<FactoryNodePushEntity> factoryNodePushEntities = baseMapper.selectBatchIds(ids);
+		if(CollUtil.isNotEmpty(factoryNodePushEntities)){
+			for (FactoryNodePushEntity factoryNodePushEntity : factoryNodePushEntities) {
 				if(ObjectUtil.isNotEmpty(factoryNodePushEntity)){
 					log.info("重新推送工厂：{}", JSONUtil.toJsonStr(factoryNodePushEntity));
 					HttpRequest post = HttpUtil.createPost(factoryNodePushEntity.getSendUrl());
@@ -65,6 +75,9 @@ public class FactoryNodePushServiceImpl extends BaseServiceImpl<FactoryNodePushM
 					baseMapper.updateById(factoryNodePushEntity);
 					return Boolean.TRUE;
 				}
+			}
+		}
+
 		return Boolean.FALSE;
 	}
 }