完成成果数据入库(DB)方式，修改DB文件上传接口。

rain

2024-05-09 74d0031c16c468fa82208dbcdde4fa3766a58eeb

 src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java

@@ -8,8 +8,10 @@
import com.dji.sample.territory.dao.ITbFjMapper;
import com.dji.sample.territory.model.entity.TbFjEntity;
import com.dji.sample.territory.service.ITbFJService;
import com.dji.sample.territory.utils.Sm3Util;
import com.dji.sample.territory.utils.VideoZipUtil;
import com.dji.sample.territory.utils.WaterMarkUtil;
import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -22,6 +24,8 @@
import java.util.UUID;

import static com.dji.sample.territory.utils.CoordinateSystemUtil.*;
import static com.dji.sample.territory.utils.SM2SignUtil.getSM2PrivateKey;
import static com.dji.sample.territory.utils.SM2SignUtil.signWithSM2;

@Service
@DS("sqlite-ret")
@@ -40,7 +44,7 @@
     * @throws IOException
     */
    @Transactional
    public int insertData(List<MediaFileEntity> mediaFile, LotInfo lotInfo) throws IOException {
    public int insertData(List<MediaFileEntity> mediaFile, LotInfo lotInfo) throws Exception {
        int count = 0;
        List<TbFjEntity> list = new ArrayList<>();
        TbFjEntity tbFj;
@@ -54,6 +58,11 @@
        return count;
    }

    @Override
    public void deleteData() {
        tbFjMapper.delete(null);
    }

    /**
     * 将Media和Lotinfo实体类转化为TbFjEntity实体类
     *
@@ -62,7 +71,7 @@
     * @return
     * @throws IOException
     */
    private TbFjEntity dbConvertToEntity(MediaFileEntity mediaFile, LotInfo lotInfo) throws IOException {
    private TbFjEntity dbConvertToEntity(MediaFileEntity mediaFile, LotInfo lotInfo) throws Exception {
        File file1 = null;
        byte[] FJ = null;
        String jsonString = JSONObject.toJSONString(mediaFile.getMetadata());
@@ -80,9 +89,8 @@
        int psjd = 0;
        String fjhxz = "0";
        int pshgj = 0;
        String jym = "0";
        String psry = "0";
        String zsdm = "0";
        String zsdm = "23C8CCC61E3042FBA6A658F319337B1A";
        String dklx = "0";
        String xzqdm = "0";
        int fjlx = 1;
@@ -102,6 +110,13 @@
            file1 = VideoZipUtil.compressVideo(file, 800000, 128000, 1280, 720);
            FJ = fileToByteArray(file1);
        }
        String sm3 = Sm3Util.calculateSM3Hash(fjhxz+","+pssj+","+lng+","+lat+","+gimbalYawDegree+","+psjd+","+pshgj+","+psry+","+zsdm);

        byte[] hash = sm3.getBytes(); // 注意：使用SM3或其他哈希算法来计算数据的哈希值
        // 加载私钥
        ECPrivateKeyParameters sm2PrivateKey = getSM2PrivateKey();
        // 使用SM2私钥对哈希值进行签名
        String signatureHex = signWithSM2(hash, sm2PrivateKey);
        TbFjEntity.TbFjEntityBuilder builder = TbFjEntity.builder();
        if (lotInfo != null) {
            builder.bsm(bsm)
@@ -122,12 +137,13 @@
                    .pshgj(pshgj)
                    .zsdm(zsdm)
                    .psry(psry)
                    .jym(jym)
                    .jym(signatureHex)
                    .url(url)
                    .build();
        } else {
            throw new IllegalArgumentException("未匹配到相关地块");
        }
//        else {
////            throw new IllegalArgumentException("未匹配到相关地块");
//        }
        return builder.build();
    }