删除演示代码和新增加1模型结果

Pu Zhibing

2024-12-27 b5ad78ef20d012da5efe3a087646dc65217547c7

删除演示代码和新增加1模型结果

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TaskDetailMapper.xml

@@ -29,19 +29,19 @@
            b.`name`,
            a.`status`,
            a.execution_time as executionTime,
            c.num as vehicleNum,
            d.num as unexecutedQuantity,
            e.num as offlineNum,
            f.num as normalNum,
            g.num as abnormalNum,
            ifnull(c.num, 0) as vehicleNum,
            ifnull(d.num, 0) as unexecutedQuantity,
            ifnull(e.num, 0) as offlineNum,
            ifnull(f.num, 0) as normalNum,
            ifnull(g.num, 0) as abnormalNum,
            if(h.num > 0, 0, 1) as authStatus
        from t_task_detail a
         left join t_patrol_task b on (a.patrol_task_id = b.id)
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles group by task_detail_id) c on (a.id = c.task_detail_id)
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles where `status` = 1 group by task_detail_id) d on (a.id = d.task_detail_id)
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles where `status` = 3 group by task_detail_id) e on (a.id = e.task_detail_id)
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles where `status` = 2 group by task_detail_id) f on (a.id = f.task_detail_id)
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles where `status` = 4 group by task_detail_id) g on (a.id = g.task_detail_id)
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles where `status` = 4 group by task_detail_id) e on (a.id = e.task_detail_id)
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles where `status` = 3 group by task_detail_id) f on (a.id = f.task_detail_id)
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles where `status` = 5 group by task_detail_id) g on (a.id = g.task_detail_id)
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles_channel where artificial_status = 1 group by task_detail_id) h on (a.id = h.task_detail_id)
        where a.del_flag = 0
        <if test="null != item.code and '' != item.code">

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

@@ -35,6 +35,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
@@ -224,6 +225,7 @@
                String terminalId = vehicleOnline1.getTerminalId();
                for (TaskDetailVehiclesChannel taskDetailVehiclesChannel : taskDetailVehiclesChannels) {
                    Integer videoChannel = taskDetailVehiclesChannel.getVideoChannel();
					
                    if("1".equals(vehicleGpsProtocol)){
                        //2018 协议
                        String fileId = VideoGateway.cameraShot2018(terminalId, videoChannel, 0);

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

@@ -179,7 +179,8 @@
     * Loaded Cargo - Unsealed装载-未关闭
     * Empty Container - Sealed 空载-关闭
     * Empty Container - Unsealed空载-未关闭
     * Loaded Cargo - Sealed-装载-关闭
     * Loaded Cargo - Sealed  装载-关闭
     * ttt 未识别到货箱
     * 2号模型四类分别是：'blurred'（模糊）, 'no_video'（无视频）,'normalcy'（正常）, 'splash_screen（花屏）'
     * @param url
     * @param modelEnum
@@ -190,7 +191,7 @@
            case TOP_SEAL:
                List<String> list1 = closedTopModel(url);
                //其中包含装载未关闭，视为异常
                return !list1.contains("Loaded Cargo - Unsealed");
                return !(list1.contains("Loaded Cargo - Unsealed") || list1.contains("ttt"));
            case CAMERA_FAULT:
                List<String> list2 = cameraFaultModel(url);
                //其中包含正常，视为正常

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/videoGateway/VideoGateway.java

@@ -491,12 +491,16 @@
//        String decryptStr = sm4.decryptStr("357b94ca60ce8140f3d22eceaaa5d71b0d25d6cd20c8218d9a3ddcd30881126d", CharsetUtil.CHARSET_UTF_8);
//        System.err.println(decryptStr);

        accountLogin();
        System.err.println(accountLogin);
//        accountLogin();
//        System.err.println(accountLogin);
//        getVehicleList(null, null, null);
//        getShipList(null, null, null);
//        queryRuntimeInfoByCache();
        locationRealTimeInfoCache(0);
//        locationRealTimeInfoCache(0);
		
		
        List<Vehicle> 粤AFX998 = VideoGateway.getVehicleList("粤AFX998", null, null, 0);
        System.err.println(粤AFX998);
    }
    
//    public static void main(String[] args) {