zhubaomin
2024-12-02 a6874344d96b58312337225cb62b2927162bb626
重构添加巡检轨迹接口,如果巡检已存在,返回巡检员ID对应的巡检ID
1个文件已修改
13 ■■■■■ 已修改文件
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java
@@ -1,5 +1,7 @@
package com.dy.pipIrrApp.inspect;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
import com.dy.common.util.IDLongGenerator;
import com.dy.common.webUtil.BaseResponse;
@@ -10,7 +12,6 @@
import com.dy.pipIrrGlobal.pojoOp.OpeInspect;
import com.dy.pipIrrGlobal.pojoOp.OpeTrack;
import com.dy.pipIrrGlobal.voOp.VoInspect;
import com.dy.pipIrrGlobal.voOp.VoIssueReport;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +58,7 @@
            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        JSONArray result_array = new JSONArray();
        if(list_Inspects != null && list_Inspects.size() > 0) {
            for (int i = 0; i < list_Inspects.size(); i++) {
                Inspects inspects = list_Inspects.get(i);
@@ -88,6 +90,12 @@
                        return BaseResponseUtils.buildErrorMsg("巡检记录添加失败");
                    }
                    // 构造返回值
                    JSONObject inspect_job = new JSONObject();
                    inspect_job.put("inspectorId", inspectorId);
                    inspect_job.put("inspectId", inspectId);
                    result_array.add(inspect_job);
                    for (int j = 0; j < tracks.size(); j++) {
                        tracks.get(j).setId(idLongGenerator.generate());
                        tracks.get(j).setInspectId(inspectId);
@@ -117,6 +125,9 @@
                    }
                }
            }
            if(result_array != null && result_array.size() > 0) {
                return BaseResponseUtils.buildSuccess(result_array) ;
            }
            return BaseResponseUtils.buildSuccess() ;
        }
        return BaseResponseUtils.buildErrorMsg("您提交的巡检轨迹为空");