修改bug

Pu Zhibing

2024-12-30 443dffce29daf6ed03b3c2137738925e315fb09f

 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;
   }