修改bug

Pu Zhibing

2024-12-30 443dffce29daf6ed03b3c2137738925e315fb09f

修改bug

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TaskDetailVehiclesChannel.java

@@ -75,4 +75,9 @@
     */
    @TableField("remark")
    private String remark;
    /**
     * 模型审核结果
     */
    @TableField("result")
    private String result;
}

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PatrolTaskServiceImpl.java

@@ -37,6 +37,7 @@
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
@@ -259,8 +260,11 @@
                                        taskDetailVehiclesChannel.setSysCreateTime(LocalDateTime.now());
                                        taskDetailVehiclesChannel.setArtificialStatus(1);
                                        //开始调模型接口得出结果
                                        boolean b = ImageModelUtil.modelCheck(fileUrl, ImageModelEnum.getImageModelEnum(patrolTask.getImageModel()));
                                        Map<String, Object> map = ImageModelUtil.modelCheck(fileUrl, ImageModelEnum.getImageModelEnum(patrolTask.getImageModel()));
                                        Boolean b = (Boolean) map.get("b");
                                        String r = map.get("r").toString();
                                        taskDetailVehiclesChannel.setSysStatus(b ? 2 : 3);
                                        taskDetailVehiclesChannel.setResult(r);
                                        taskDetailVehiclesChannelService.updateById(taskDetailVehiclesChannel);
                                    }
                                }
@@ -269,8 +273,11 @@
                                taskDetailVehiclesChannel.setSysCreateTime(LocalDateTime.now());
                                taskDetailVehiclesChannel.setArtificialStatus(1);
                                //开始调模型接口得出结果
                                boolean b = ImageModelUtil.modelCheck(fileUrl, ImageModelEnum.getImageModelEnum(patrolTask.getImageModel()));
                                Map<String, Object> map = ImageModelUtil.modelCheck(fileUrl, ImageModelEnum.getImageModelEnum(patrolTask.getImageModel()));
                                Boolean b = (Boolean) map.get("b");
                                String r = map.get("r").toString();
                                taskDetailVehiclesChannel.setSysStatus(b ? 2 : 3);
                                taskDetailVehiclesChannel.setResult(r);
                                taskDetailVehiclesChannelService.updateById(taskDetailVehiclesChannel);
                            }
                        }
@@ -305,8 +312,11 @@
                                        taskDetailVehiclesChannel.setSysCreateTime(LocalDateTime.now());
                                        taskDetailVehiclesChannel.setArtificialStatus(1);
                                        //开始调模型接口得出结果
                                        boolean b = ImageModelUtil.modelCheck(fileUrl, ImageModelEnum.getImageModelEnum(patrolTask.getImageModel()));
                                        Map<String, Object> map = ImageModelUtil.modelCheck(fileUrl, ImageModelEnum.getImageModelEnum(patrolTask.getImageModel()));
                                        Boolean b = (Boolean) map.get("b");
                                        String r = map.get("r").toString();
                                        taskDetailVehiclesChannel.setSysStatus(b ? 2 : 3);
                                        taskDetailVehiclesChannel.setResult(r);
                                        taskDetailVehiclesChannelService.updateById(taskDetailVehiclesChannel);
                                    }
                                }
@@ -315,8 +325,11 @@
                                taskDetailVehiclesChannel.setSysCreateTime(LocalDateTime.now());
                                taskDetailVehiclesChannel.setArtificialStatus(1);
                                //开始调模型接口得出结果
                                boolean b = ImageModelUtil.modelCheck(fileUrl, ImageModelEnum.getImageModelEnum(patrolTask.getImageModel()));
                                Map<String, Object> map = ImageModelUtil.modelCheck(fileUrl, ImageModelEnum.getImageModelEnum(patrolTask.getImageModel()));
                                Boolean b = (Boolean) map.get("b");
                                String r = map.get("r").toString();
                                taskDetailVehiclesChannel.setSysStatus(b ? 2 : 3);
                                taskDetailVehiclesChannel.setResult(r);
                                taskDetailVehiclesChannelService.updateById(taskDetailVehiclesChannel);
                            }
                        }

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java

@@ -240,7 +240,7 @@
    public ResultUtil manualAudit(ManualAuditVo vo) {
        List<TaskDetailVehiclesChannel> taskDetailVehiclesChannels = taskDetailVehiclesChannelService.selectBatchIds(vo.getId());
        for (TaskDetailVehiclesChannel taskDetailVehiclesChannel : taskDetailVehiclesChannels) {
            if(null != taskDetailVehiclesChannel.getArtificialStatus() && 1 == taskDetailVehiclesChannel.getArtificialStatus()){
            if(null != taskDetailVehiclesChannel.getArtificialStatus() && 1 != taskDetailVehiclesChannel.getArtificialStatus()){
                return ResultUtil.error("不能重复审核");
            }
            taskDetailVehiclesChannel.setArtificialStatus(vo.getStatus());

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java

@@ -21,7 +21,9 @@
import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @author zhibing.pu
@@ -187,22 +189,29 @@
     * @param modelEnum
     * @return
     */
    public static boolean modelCheck(String url, ImageModelEnum modelEnum){
    public static Map<String, Object> modelCheck(String url, ImageModelEnum modelEnum){
        Map<String, Object> map = new HashMap<>();
        switch (modelEnum){
            case TOP_SEAL:
                List<String> list1 = closedTopModel(url);
                map.put("r", JSON.toJSONString(list1));
                map.put("b", !(list1.contains("Loaded Cargo - Unsealed") || list1.contains("ttt")));
                //其中包含装载未关闭，视为异常
                return !(list1.contains("Loaded Cargo - Unsealed") || list1.contains("ttt"));
                return map;
            case CAMERA_FAULT:
                List<String> list2 = cameraFaultModel(url);
                map.put("r", JSON.toJSONString(list2));
                map.put("b", list2.contains("normalcy"));
                //其中包含正常，视为正常
                return list2.contains("normalcy");
                return map;
            case CONSTRUCTION_WASTE_LOAD: // TODO 待完善
                List<String> list3 = constructionWasteLoadModel(url);
                map.put("r", JSON.toJSONString(list3));
                map.put("b", list3.contains("normalcy"));
                //其中包含正常，视为正常
                return list3.contains("normalcy");
                return map;
        }
        return false;
        return null;
    }