dengyj há 3 anos atrás
pai
commit
83e2abdefc

+ 1 - 0
src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/mapper/MeterWorkCarMeterTimeMapper.xml

@@ -476,5 +476,6 @@
         and t1.BASE_SPOT_NO = #{baseSpotNo}
       </if>
     </where>
+    order by t.CREATE_TIME desc
   </select>
 </mapper>

+ 1 - 0
src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/mapper/MeterWorkCarnoIdentifyMapper.xml

@@ -469,6 +469,7 @@
     <if test="baseSpotName != null and baseSpotName != ''">
       and B.BASE_SPOT_NAME like '%${baseSpotName}%'
     </if>
+    order by B.create_time desc
   </select>
 
 </mapper>

+ 21 - 0
src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/service/impl/MeterWorkCarnoIdentifyServiceImpl.java

@@ -75,6 +75,10 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                 long countBallIdentify = 0L;
                 //枪机车号识别数
                 long countGunIdentify = 0L;
+                //视觉识别数
+                long countVisualIdentify = 0L;
+                //视觉识别率
+                double countVisualIdentifyRate = 0;
                 //枪机球机识别差异数
                 long countBallDifferGun = 0L;
                 //Rfid车号识别数
@@ -107,6 +111,21 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
                             && model.getCarNoType().equals("1")
                             && StringUtils.isNotEmpty(model.getVideoCarNo2())).count();
+                    //视觉识别数
+                    countVisualIdentify = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                            && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                            && model.getCarNoType().equals("1")
+                            && (    (
+                                        StringUtils.isNotEmpty(model.getVideoCarNo1())
+                                        && StringUtils.isNotEmpty(model.getVideoCarNo2())
+                                        && model.getVideoCarNo1().equals(model.getVideoCarNo2()
+                                    ) ||
+                                    (StringUtils.isNotEmpty(model.getVideoCarNo1()) || StringUtils.isNotEmpty(model.getVideoCarNo2())
+                                    )))).count();
+                    //视觉识别率
+                    if(countVisualIdentify != 0) {
+                        countVisualIdentifyRate = Math.round((countVisualIdentify)/(countCarFirst*1.0)*100*100)/100.0; //(Math.round((*100))/100.0;
+                    }
                     //枪机球机识别差异数
                     countBallDifferGun = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
@@ -160,6 +179,8 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                     obj.put("countCarFirst", countCarFirst);
                     obj.put("countBallIdentify", countBallIdentify);
                     obj.put("countGunIdentify", countGunIdentify);
+                    obj.put("countVisualIdentify", countVisualIdentify);
+                    obj.put("countVisualIdentifyRate", countVisualIdentifyRate);
                     obj.put("countBallDifferGun", countBallDifferGun);
                     obj.put("countRfidIdentify", countRfidIdentify);
                     obj.put("countResetCar", countResetCar);