newversion

Reviewed-on: #1

enums/ModelTypeEnum.py

@@ -543,28 +543,20 @@ class ModelType(Enum):
     CHANNEL2_MODEL = ("24", "024", "船只综合检测模型", 'channel2', lambda device, gpuName: {
         'device': device,
         'gpu_name': gpuName,
-
-        'labelnames': ["国旗", "浮标", "船名", "船只","未挂国旗船只","未封仓船只"], # 保持原来的标签顺序不变，方便后面业务端增加
+        'labelnames': ["国旗", "浮标", "船名", "船只","未挂国旗船只"],
         'segRegionCnt': 0,
         'postProcess':{'function':channel2_post_process,'name':'channel2','pars':{
             'objs':[2],
             'wRation':1/6.0,
             'hRation':1/6.0,
-            'smallId':0, #旗帜
-            'bigId':3,  #船只
-            'newId':4,  #未挂国旗船只
-            'uncoverId':5,  #未封仓标签
-            'recScale':1.2,
-            'target_cls':3.0, #目标种类
-            'filter_cls':4.0 #被过滤的种类
-            }},       
+            'smallId':0,
+            'bigId':3,
+            'newId':4,
+            'recScale':1.2}},       
         'models':[
         {
-            'weight':'../AIlib2/weights/conf/channel2/yolov5.pt',
-            # 'weight':'../AIlib2/weights/channel2/yolov5_%s_fp16.engine'%(gpuName),
-            
-            # 'weight':'../AIlib2/weights/channel2/yolov5_%s_fp16.engine'%(gpuName),
-            
+            #'weight':'../AIlib2/weights/conf/channel2/yolov5.pt',
+            'weight':'../AIlib2/weights/channel2/yolov5_%s_fp16.engine'%(gpuName),
             'name':'yolov5',
             'model':yolov5Model,
             'par':{ 'half':True,'device':'cuda:0' ,'conf_thres':0.1,'iou_thres':0.45,'allowedList':list(range(20)),'segRegionCnt':1, 'trtFlag_det':False,'trtFlag_seg':False, "score_byClass":{"0":0.7,"1":0.7,"2":0.8,"3":0.6} }
@@ -585,27 +577,20 @@ class ModelType(Enum):
                 'std':[0.5,0.5,0.5],
                 'dynamic':False,
                 },
-        } ,
-        
-         
+        }  
         ],
-        
-        #jcq:增加显示类型
-        'detModelpara':[{"id":str(x),"config":{"k1":"v1","k2":"v2"}} for x in [0,1,2,3,4,5]],
+        'detModelpara':[{"id":str(x),"config":{"k1":"v1","k2":"v2"}} for x in [0,1,2,3]],
         'segPar': None,
         'postFile': {
             "name": "post_process",
             "conf_thres": 0.25,
             "iou_thres": 0.45,
-            "classes": 6,
+            "classes": 5,
             "rainbows": COLOR
         },
         'Segweights': None,
     })
     
-    
-    
-
     RIVERT_MODEL = ("25", "025", "河道检测模型(T)", 'riverT', lambda device, gpuName: {
         'device': device,
         'labelnames': ["漂浮物", "岸坡垃圾", "排口", "违建", "菜地", "水生植物", "河湖人员", "钓鱼人员", "船只",

readme.md

@@ -1,13 +1,12 @@
-1.2025.01.21把之前的tuoheng alg仓库代码重新开个仓库
-  (1)在config/service/dsp_test_service.yml里面添加参数，控制存储用的oss还是minio
-     storage_source: 1
-2.2025.02.06
-  (1)修改代码，把mqtt读取加入到系统中。config/service/dsp_test_service.yml，中添加mqtt_flag,决定是否启用。
-  (2)修改了minio情况下的，文件名命名方式。
-3.2025.02.12
-  (1)增加了对alg算法开发的代码。可以通过配置文件config/service/dsp_test_service.yml中algSwitch: true，决定是否启用。
-
-4.2025/04/19：024增加未封仓标签
-
-
-5.2025/0823
+1.2025.01.21把之前的tuoheng alg仓库代码重新开个仓库
+  (1)在config/service/dsp_test_service.yml里面添加参数，控制存储用的oss还是minio
+     storage_source: 1
+2.2025.02.06
+  (1)修改代码，把mqtt读取加入到系统中。config/service/dsp_test_service.yml，中添加mqtt_flag,决定是否启用。
+  (2)修改了minio情况下的，文件名命名方式。
+3.2025.02.12
+  (1)增加了对alg算法开发的代码。可以通过配置文件config/service/dsp_test_service.yml中algSwitch: true，决定是否启用。
+
+4.2025.05.26:
+(1)alg add enabledefault flag 
+(2)22 23 serverce choice