Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2025-03-25 427d87e5572d72d0e3aaa4364e4f53569222e321

 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java

@@ -2,6 +2,8 @@

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.util.NumUtil;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrApp.workOrder.qo.QoWorkOrder;
import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
@@ -9,6 +11,8 @@
import com.dy.pipIrrGlobal.daoOp.OpeProcessingResultMapper;
import com.dy.pipIrrGlobal.daoOp.OpeTaskTypeMapper;
import com.dy.pipIrrGlobal.daoOp.OpeWorkOrderMapper;
import com.dy.pipIrrGlobal.dyFile.FileOperate;
import com.dy.pipIrrGlobal.dyFile.FileRestVo;
import com.dy.pipIrrGlobal.pojoOp.OpeApproveResult;
import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
@@ -21,6 +25,7 @@
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import java.util.Date;
@@ -53,6 +58,33 @@
    @Autowired
    private BaUserMapper baUserMapper;

    @Value("${dy.webFile.fmUrl}")
    private String fmUrl ;

    @Autowired
    private FileOperate fileOp ;

    private void dealWebFilePath(JSONArray jsonArray, boolean hasZipFile, boolean isVideo){
        for (Object obj : jsonArray){
            if(obj instanceof JSONObject){
                JSONObject jsonObject = (JSONObject) obj;
                Object hashObj = jsonObject.get("hash") ;
                if(hashObj != null && NumUtil.isIntNumber(hashObj.toString())){
                    FileRestVo fvo = fileOp.parseHashcode(fmUrl, Integer.valueOf(hashObj.toString()));
                    if(fvo != null && fvo.fileWebUrl != null){
                        jsonObject.put("webPath", fvo.fileWebUrl + jsonObject.get("filePath"));
                        if(hasZipFile){
                            if(!isVideo){
                                jsonObject.put("webPathZip", fileOp.getFileZipPath(fvo.fileWebUrl + jsonObject.get("filePath")));
                            }else{
                                jsonObject.put("webPathZip", fileOp.getFileZipPath(fvo.fileWebUrl + jsonObject.get("filePath"), "jpg"));
                            }
                        }
                    }
                }
            }
        }
    }
    /**
     * 添加工单记录
     * @param po
@@ -194,6 +226,9 @@
        JSONArray images_array = Optional.ofNullable(JSON.parseArray(result_temp.getImages())).orElse(new JSONArray());
        JSONArray audios_array = Optional.ofNullable(JSON.parseArray(result_temp.getAudios())).orElse(new JSONArray());
        JSONArray videos_array = Optional.ofNullable(JSON.parseArray(result_temp.getVideos())).orElse(new JSONArray());
        this.dealWebFilePath(images_array, true, false) ;
        this.dealWebFilePath(audios_array, false, false) ;
        this.dealWebFilePath(videos_array, true, true) ;
        result.setImages(images_array);
        result.setAudios(audios_array);
        result.setVideos(videos_array);