1.完成欧派工厂签收图片数据的保存

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpSignPictureEntity.java

@@ -0,0 +1,38 @@
+package com.logpm.factory.oupai.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("op_sign_picture")
+@ApiModel(value = "OpSignPicture对象", description = "欧派工厂签收图片")
+@EqualsAndHashCode(callSuper = true)
+public class OpSignPictureEntity extends BaseEntity {
+
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+
+	private Long signBillId;//签收单id
+	private String signBillCode;//签收单号
+	private String oid;
+	private String fileUrl;//图片地址
+
+
+}

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

@@ -0,0 +1,9 @@
+package com.logpm.factory.oupai.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.factory.oupai.entity.OpSignPictureEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface OpSignPictureMapper extends BaseMapper<OpSignPictureEntity> {
+}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.factory.oupai.mapper.OpSignPictureMapper">
+
+</mapper>

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

@@ -2,13 +2,11 @@ package com.logpm.factory.oupai.receiver;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.logpm.factory.oupai.entity.OpOrderStatusLogEntity;
+import com.logpm.factory.oupai.entity.*;
-import com.logpm.factory.oupai.entity.OpOutGoingOrderEntity;
-import com.logpm.factory.oupai.entity.OpSignBillEntity;
-import com.logpm.factory.oupai.entity.OpSignPackageEntity;
 import com.logpm.factory.oupai.service.IOpOutGoingOrderService;
 import com.logpm.factory.oupai.service.IOpSignBillService;
 import com.logpm.factory.oupai.service.IOpSignPackageService;
+import com.logpm.factory.oupai.service.IOpSignPictureService;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
@@ -41,6 +39,8 @@ public class OpSignDataHandler {
 	private IOpSignBillService opSignBillService;
 	@Autowired
 	private IOpSignPackageService opSignPackageService;
+	@Autowired
+	private IOpSignPictureService opSignPictureService;
 
 
 	@RabbitHandler
@@ -66,6 +66,7 @@ public class OpSignDataHandler {
 				String outGoingOrderCode = outGoingOrder.getString("Code");
 				JSONObject store = valueObject.getJSONObject("Store");
 				JSONArray packages = valueObject.getJSONArray("Packages");
+				JSONArray signPictures = valueObject.getJSONArray("SignPictures");
 				String status = outGoingOrder.getString("Status");
 				//先查询是否已经有数据存在系统中
 				OpOutGoingOrderEntity opOutGoingOrderEntity = opOutGoingOrderService.getEntityByCode(outGoingOrderCode);
@@ -195,9 +196,24 @@ public class OpSignDataHandler {
 
 
 				// 保存签收图片
+				for (int t = 0; t < signPictures.size(); t++) {
+					JSONObject signPicturesJSONObject = signPictures.getJSONObject(t);
+					String oid = signPicturesJSONObject.getString("Oid");
+					//先判断库中是否已经存在
+					OpSignPictureEntity signPictureEntity = opSignPictureService.findEntityByOid(oid);
+					if(Objects.isNull(signPictureEntity)){
+						JSONObject data = signPicturesJSONObject.getJSONObject("Data");
+						signPictureEntity = new OpSignPictureEntity();
+						signPictureEntity.setSignBillId(signBillId);
+						signPictureEntity.setSignBillCode(signBillEntity.getCode());
+						signPictureEntity.setOid(oid);
+						if(!Objects.isNull(data)){
+							signPictureEntity.setFileUrl(data.getString("FileUrl"));
+						}
+						opSignPictureService.save(signPictureEntity);
+					}
 
-
+				}
-
 
 				//存入包件数据
 				for (int j = 0; j < packages.size(); j++) {

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

@@ -0,0 +1,8 @@
+package com.logpm.factory.oupai.service;
+
+import com.logpm.factory.oupai.entity.OpSignPictureEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IOpSignPictureService extends BaseService<OpSignPictureEntity> {
+	OpSignPictureEntity findEntityByOid(String oid);
+}

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

@@ -0,0 +1,20 @@
+package com.logpm.factory.oupai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.logpm.factory.oupai.entity.OpSignPictureEntity;
+import com.logpm.factory.oupai.mapper.OpSignPictureMapper;
+import com.logpm.factory.oupai.service.IOpSignPictureService;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class OpSignPictureServiceImpl extends BaseServiceImpl<OpSignPictureMapper, OpSignPictureEntity> implements IOpSignPictureService {
+	@Override
+	public OpSignPictureEntity findEntityByOid(String oid) {
+		QueryWrapper<OpSignPictureEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("oid",oid);
+		return baseMapper.selectOne(queryWrapper);
+	}
+}