修改bug

src/main/java/im/zhaojun/system/controller/TrafficStatisticsController.java

@@ -853,6 +853,30 @@ public class TrafficStatisticsController {
         return ResultBean.success();
 
     }
+    @OperationLog("查询事件详情")
+    @GetMapping("/queryTraffDetail/{id}/{recordtype}")
+    @ResponseBody
+    public ResultBean queryTraffDetail(@PathVariable("id") String id,@PathVariable("recordtype") String recordtype) {
+        if("1".equals(recordtype)){
+          List<Pedestrian>  results= trafficStatisticsService.queryTraffPedeDetail(id);
+            return ResultBean.success(results);
+        }
+       else  if("2".equals(recordtype)){//车辆
+            List<Traffic>  results= trafficStatisticsService.queryTrafficDetail(id);
+            return ResultBean.success(results);
+        }
+        else  if("3".equals(recordtype)){//人脸
+            List<Face>  results= trafficStatisticsService.queryTraffFaceDetail(id);
+            return ResultBean.success(results);
+        }
+        else  if("4".equals(recordtype)){//人骑车
+            List<PeopleRideBicyc>  results= trafficStatisticsService.queryTraffPeopleRideBicycDetail(id);
+            return ResultBean.success(results);
+        }
+        return ResultBean.success();
+
+    }
+
 
 
 

src/main/java/im/zhaojun/system/mapper/TrafficStatisticsMapper.java

@@ -76,4 +76,12 @@ public interface TrafficStatisticsMapper {
     int  deleteTraffalarmrecordById(String recordid);
 
     int  updateTraffalarmrecordPushStatusById(String recordid);
+
+    List<Pedestrian> queryTraffPedeDetail(String id);
+
+    List<Traffic> queryTrafficDetail(String id);
+
+    List<Face> queryTraffFaceDetail(String id);
+
+    List<PeopleRideBicyc> queryTraffPeopleRideBicycDetail(String id);
 }
\ No newline at end of file

src/main/java/im/zhaojun/system/model/Face.java

+package im.zhaojun.system.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class Face {
+    private Long id;
+    private String Type;
+    private FaceBoundingBox FaceBoundingBox;
+    private HeadBoundingBox HeadBoundingBox;
+    private String Gender;
+    private String Age;
+    private String HasGlasses;
+    private String HasHat;
+    private String HasMask;
+    private String HairStyle;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setType(String Type) {
+        this.Type = Type;
+    }
+
+    public String getType() {
+        return Type;
+    }
+
+    public void setFaceBoundingBox(FaceBoundingBox FaceBoundingBox) {
+        this.FaceBoundingBox = FaceBoundingBox;
+    }
+
+    public FaceBoundingBox getFaceBoundingBox() {
+        return FaceBoundingBox;
+    }
+
+    public void setHeadBoundingBox(HeadBoundingBox HeadBoundingBox) {
+        this.HeadBoundingBox = HeadBoundingBox;
+    }
+
+    public HeadBoundingBox getHeadBoundingBox() {
+        return HeadBoundingBox;
+    }
+
+    public void setGender(String Gender) {
+        this.Gender = Gender;
+    }
+
+    public String getGender() {
+        return Gender;
+    }
+
+    public void setAge(String Age) {
+        this.Age = Age;
+    }
+
+    public String getAge() {
+        return Age;
+    }
+
+    public void setHasGlasses(String HasGlasses) {
+        this.HasGlasses = HasGlasses;
+    }
+
+    public String getHasGlasses() {
+        return HasGlasses;
+    }
+
+    public void setHasHat(String HasHat) {
+        this.HasHat = HasHat;
+    }
+
+    public String getHasHat() {
+        return HasHat;
+    }
+
+    public void setHasMask(String HasMask) {
+        this.HasMask = HasMask;
+    }
+
+    public String getHasMask() {
+        return HasMask;
+    }
+
+    public void setHairStyle(String HairStyle) {
+        this.HairStyle = HairStyle;
+    }
+
+    public String getHairStyle() {
+        return HairStyle;
+    }
+}

src/main/java/im/zhaojun/system/model/FaceBoundingBox.java

+/**
+  * Copyright 2021 json.cn 
+  */
+package im.zhaojun.system.model;
+
+public class FaceBoundingBox {
+
+    private int x;
+    private int y;
+    private int w;
+    private int h;
+    public void setX(int x) {
+         this.x = x;
+     }
+     public int getX() {
+         return x;
+     }
+
+    public void setY(int y) {
+         this.y = y;
+     }
+     public int getY() {
+         return y;
+     }
+
+    public void setW(int w) {
+         this.w = w;
+     }
+     public int getW() {
+         return w;
+     }
+
+    public void setH(int h) {
+         this.h = h;
+     }
+     public int getH() {
+         return h;
+     }
+
+}
\ No newline at end of file

src/main/java/im/zhaojun/system/model/HeadBoundingBox.java

+/**
+  * Copyright 2021 json.cn 
+  */
+package im.zhaojun.system.model;
+
+public class HeadBoundingBox {
+
+    private int x;
+    private int y;
+    private int w;
+    private int h;
+    public void setX(int x) {
+         this.x = x;
+     }
+     public int getX() {
+         return x;
+     }
+
+    public void setY(int y) {
+         this.y = y;
+     }
+     public int getY() {
+         return y;
+     }
+
+    public void setW(int w) {
+         this.w = w;
+     }
+     public int getW() {
+         return w;
+     }
+
+    public void setH(int h) {
+         this.h = h;
+     }
+     public int getH() {
+         return h;
+     }
+
+}
\ No newline at end of file

src/main/java/im/zhaojun/system/model/LowerBoundingBox.java

+/**
+  * Copyright 2021 json.cn 
+  */
+package im.zhaojun.system.model;
+
+public class LowerBoundingBox {
+
+    private int x;
+    private int y;
+    private int w;
+    private int h;
+    public void setX(int x) {
+         this.x = x;
+     }
+     public int getX() {
+         return x;
+     }
+
+    public void setY(int y) {
+         this.y = y;
+     }
+     public int getY() {
+         return y;
+     }
+
+    public void setW(int w) {
+         this.w = w;
+     }
+     public int getW() {
+         return w;
+     }
+
+    public void setH(int h) {
+         this.h = h;
+     }
+     public int getH() {
+         return h;
+     }
+
+}
\ No newline at end of file

src/main/java/im/zhaojun/system/model/ObjectBoundingBox.java

+/**
+  * Copyright 2021 json.cn 
+  */
+package im.zhaojun.system.model;
+
+public class ObjectBoundingBox {
+
+    private int x;
+    private int y;
+    private int w;
+    private int h;
+    public void setX(int x) {
+         this.x = x;
+     }
+     public int getX() {
+         return x;
+     }
+
+    public void setY(int y) {
+         this.y = y;
+     }
+     public int getY() {
+         return y;
+     }
+
+    public void setW(int w) {
+         this.w = w;
+     }
+     public int getW() {
+         return w;
+     }
+
+    public void setH(int h) {
+         this.h = h;
+     }
+     public int getH() {
+         return h;
+     }
+
+}
\ No newline at end of file

src/main/java/im/zhaojun/system/model/Pedestrian.java

+package im.zhaojun.system.model;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/***
+ * 行人
+ */
+public class Pedestrian {
+    private Long id;
+    private String Type;
+    private ObjectBoundingBox ObjectBoundingBox;
+    private String Gender;
+    private String Age;
+    private String Angle;
+    private String HasBackpack;
+    private String HasGlasses;
+    private String HasCarrybag;
+    private String HasUmbrella;
+    private String CoatLength;
+    private String CoatColorNums;
+    private String CoatColor;
+    private String TrousersLength;
+    private String TrousersColorNums;
+    private String TrousersColor;
+    private HeadBoundingBox HeadBoundingBox;
+    private UpperBoundingBox UpperBoundingBox;
+    private LowerBoundingBox LowerBoundingBox;
+    private FaceBoundingBox FaceBoundingBox;
+    private String HasHat;
+    private String HasMask;
+    private String HairStyle;
+    private String CoatTexture;
+    private String TrousersTexture;
+    private String HasTrolley;
+    private String HasLuggage;
+    private String LuggageColorNums;
+    private String LuggageColor;
+    private int HasKnife;
+    public void setType(String Type) {
+        this.Type = Type;
+    }
+    @JSONField(name = "Type")
+    public String getType() {
+        return Type;
+    }
+
+
+    public void setObjectBoundingBox(ObjectBoundingBox ObjectBoundingBox) {
+        this.ObjectBoundingBox = ObjectBoundingBox;
+    }
+    @JSONField(name = "ObjectBoundingBox")
+    public ObjectBoundingBox getObjectBoundingBox() {
+        return ObjectBoundingBox;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setGender(String Gender) {
+        this.Gender = Gender;
+    }
+    @JSONField(name = "Gender")
+    public String getGender() {
+        return Gender;
+    }
+
+    public void setAge(String Age) {
+        this.Age = Age;
+    }
+    @JSONField(name = "Age")
+    public String getAge() {
+        return Age;
+    }
+
+    public void setAngle(String Angle) {
+        this.Angle = Angle;
+    }
+    @JSONField(name = "Angle")
+    public String getAngle() {
+        return Angle;
+    }
+
+    public void setHasBackpack(String HasBackpack) {
+        this.HasBackpack = HasBackpack;
+    }
+    @JSONField(name = "HasBackpack")
+    public String getHasBackpack() {
+        return HasBackpack;
+    }
+
+    public void setHasGlasses(String HasGlasses) {
+        this.HasGlasses = HasGlasses;
+    }
+    @JSONField(name = "HasGlasses")
+    public String getHasGlasses() {
+        return HasGlasses;
+    }
+
+    public void setHasCarrybag(String HasCarrybag) {
+        this.HasCarrybag = HasCarrybag;
+    }
+    @JSONField(name = "HasCarrybag")
+    public String getHasCarrybag() {
+        return HasCarrybag;
+    }
+
+    public void setHasUmbrella(String HasUmbrella) {
+        this.HasUmbrella = HasUmbrella;
+    }
+    @JSONField(name = "HasUmbrella")
+    public String getHasUmbrella() {
+        return HasUmbrella;
+    }
+
+    public void setCoatLength(String CoatLength) {
+        this.CoatLength = CoatLength;
+    }
+    @JSONField(name = "CoatLength")
+    public String getCoatLength() {
+        return CoatLength;
+    }
+
+    public void setCoatColorNums(String CoatColorNums) {
+        this.CoatColorNums = CoatColorNums;
+    }
+    @JSONField(name = "CoatColorNums")
+    public String getCoatColorNums() {
+        return CoatColorNums;
+    }
+
+
+
+    public void setTrousersLength(String TrousersLength) {
+        this.TrousersLength = TrousersLength;
+    }
+    @JSONField(name = "TrousersLength")
+    public String getTrousersLength() {
+        return TrousersLength;
+    }
+
+    public void setTrousersColorNums(String TrousersColorNums) {
+        this.TrousersColorNums = TrousersColorNums;
+    }
+    @JSONField(name = "TrousersColorNums")
+    public String getTrousersColorNums() {
+        return TrousersColorNums;
+    }
+
+
+
+    public void setHeadBoundingBox(HeadBoundingBox HeadBoundingBox) {
+        this.HeadBoundingBox = HeadBoundingBox;
+    }
+    @JSONField(name = "HeadBoundingBox")
+    public HeadBoundingBox getHeadBoundingBox() {
+        return HeadBoundingBox;
+    }
+
+    public void setUpperBoundingBox(UpperBoundingBox UpperBoundingBox) {
+        this.UpperBoundingBox = UpperBoundingBox;
+    }
+    @JSONField(name = "UpperBoundingBox")
+    public UpperBoundingBox getUpperBoundingBox() {
+        return UpperBoundingBox;
+    }
+
+    public void setLowerBoundingBox(LowerBoundingBox LowerBoundingBox) {
+        this.LowerBoundingBox = LowerBoundingBox;
+    }
+    @JSONField(name = "LowerBoundingBox")
+    public LowerBoundingBox getLowerBoundingBox() {
+        return LowerBoundingBox;
+    }
+
+    public void setFaceBoundingBox(FaceBoundingBox FaceBoundingBox) {
+        this.FaceBoundingBox = FaceBoundingBox;
+    }
+    @JSONField(name = "FaceBoundingBox")
+    public FaceBoundingBox getFaceBoundingBox() {
+        return FaceBoundingBox;
+    }
+
+    public void setHasHat(String HasHat) {
+        this.HasHat = HasHat;
+    }
+    @JSONField(name = "HasHat")
+    public String getHasHat() {
+        return HasHat;
+    }
+
+    public void setHasMask(String HasMask) {
+        this.HasMask = HasMask;
+    }
+    @JSONField(name = "HasMask")
+    public String getHasMask() {
+        return HasMask;
+    }
+
+    public void setHairStyle(String HairStyle) {
+        this.HairStyle = HairStyle;
+    }
+    @JSONField(name = "HairStyle")
+    public String getHairStyle() {
+        return HairStyle;
+    }
+
+    public void setCoatTexture(String CoatTexture) {
+        this.CoatTexture = CoatTexture;
+    }
+    @JSONField(name = "CoatTexture")
+    public String getCoatTexture() {
+        return CoatTexture;
+    }
+
+    public void setTrousersTexture(String TrousersTexture) {
+        this.TrousersTexture = TrousersTexture;
+    }
+    @JSONField(name = "TrousersTexture")
+    public String getTrousersTexture() {
+        return TrousersTexture;
+    }
+
+    public void setHasTrolley(String HasTrolley) {
+        this.HasTrolley = HasTrolley;
+    }
+    @JSONField(name = "HasTrolley")
+    public String getHasTrolley() {
+        return HasTrolley;
+    }
+
+    public void setHasLuggage(String HasLuggage) {
+        this.HasLuggage = HasLuggage;
+    }
+    @JSONField(name = "HasLuggage")
+    public String getHasLuggage() {
+        return HasLuggage;
+    }
+
+    public void setLuggageColorNums(String LuggageColorNums) {
+        this.LuggageColorNums = LuggageColorNums;
+    }
+    @JSONField(name = "LuggageColorNums")
+    public String getLuggageColorNums() {
+        return LuggageColorNums;
+    }
+
+    public void setHasKnife(int HasKnife) {
+        this.HasKnife = HasKnife;
+    }
+    @JSONField(name = "HasKnife")
+    public int getHasKnife() {
+        return HasKnife;
+    }
+
+    @JSONField(name = "CoatColor")
+    public String getCoatColor() {
+        return CoatColor;
+    }
+
+    public void setCoatColor(String coatColor) {
+        CoatColor = coatColor;
+    }
+
+    @JSONField(name = "TrousersColor")
+    public String getTrousersColor() {
+        return TrousersColor;
+    }
+
+    public void setTrousersColor(String trousersColor) {
+        TrousersColor = trousersColor;
+    }
+
+    @JSONField(name = "LuggageColor")
+    public String getLuggageColor() {
+        return LuggageColor;
+    }
+
+    public void setLuggageColor(String luggageColor) {
+        LuggageColor = luggageColor;
+    }
+}

src/main/java/im/zhaojun/system/model/PeopleRideBicyc.java

+package im.zhaojun.system.model;
+
+public class PeopleRideBicyc {
+
+    private Long id;
+    private String Type;
+    private ObjectBoundingBox ObjectBoundingBox;
+    private String BikeClass;
+    private String Gender;
+    private String Age;
+    private String Angle;
+    private String HasBackpack;
+    private String HasGlasses;
+    private String HasMask;
+    private String HasCarrybag;
+    private String HasUmbrella;
+    private String CoatLength;
+    private String HasPlate;
+    private String PlateNo;
+    private String HasHelmet;
+    private String HelmetColor;
+    private String CoatColorNums;
+    private String CoatColor;
+    private String CoatTexture;
+    private FaceBoundingBox FaceBoundingBox;
+    private String SocialAttribute;
+    private String Enterprise;
+    private String HasPassenger;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setType(String Type) {
+        this.Type = Type;
+    }
+
+    public String getType() {
+        return Type;
+    }
+
+    public void setObjectBoundingBox(ObjectBoundingBox ObjectBoundingBox) {
+        this.ObjectBoundingBox = ObjectBoundingBox;
+    }
+
+    public ObjectBoundingBox getObjectBoundingBox() {
+        return ObjectBoundingBox;
+    }
+
+    public void setBikeClass(String BikeClass) {
+        this.BikeClass = BikeClass;
+    }
+
+    public String getBikeClass() {
+        return BikeClass;
+    }
+
+    public void setGender(String Gender) {
+        this.Gender = Gender;
+    }
+
+    public String getGender() {
+        return Gender;
+    }
+
+    public void setAge(String Age) {
+        this.Age = Age;
+    }
+
+    public String getAge() {
+        return Age;
+    }
+
+    public void setAngle(String Angle) {
+        this.Angle = Angle;
+    }
+
+    public String getAngle() {
+        return Angle;
+    }
+
+    public void setHasBackpack(String HasBackpack) {
+        this.HasBackpack = HasBackpack;
+    }
+
+    public String getHasBackpack() {
+        return HasBackpack;
+    }
+
+    public void setHasGlasses(String HasGlasses) {
+        this.HasGlasses = HasGlasses;
+    }
+
+    public String getHasGlasses() {
+        return HasGlasses;
+    }
+
+    public void setHasMask(String HasMask) {
+        this.HasMask = HasMask;
+    }
+
+    public String getHasMask() {
+        return HasMask;
+    }
+
+    public void setHasCarrybag(String HasCarrybag) {
+        this.HasCarrybag = HasCarrybag;
+    }
+
+    public String getHasCarrybag() {
+        return HasCarrybag;
+    }
+
+    public void setHasUmbrella(String HasUmbrella) {
+        this.HasUmbrella = HasUmbrella;
+    }
+
+    public String getHasUmbrella() {
+        return HasUmbrella;
+    }
+
+    public void setCoatLength(String CoatLength) {
+        this.CoatLength = CoatLength;
+    }
+
+    public String getCoatLength() {
+        return CoatLength;
+    }
+
+    public void setHasPlate(String HasPlate) {
+        this.HasPlate = HasPlate;
+    }
+
+    public String getHasPlate() {
+        return HasPlate;
+    }
+
+    public void setPlateNo(String PlateNo) {
+        this.PlateNo = PlateNo;
+    }
+
+    public String getPlateNo() {
+        return PlateNo;
+    }
+
+    public void setHasHelmet(String HasHelmet) {
+        this.HasHelmet = HasHelmet;
+    }
+
+    public String getHasHelmet() {
+        return HasHelmet;
+    }
+
+    public void setHelmetColor(String HelmetColor) {
+        this.HelmetColor = HelmetColor;
+    }
+
+    public String getHelmetColor() {
+        return HelmetColor;
+    }
+
+    public void setCoatColorNums(String CoatColorNums) {
+        this.CoatColorNums = CoatColorNums;
+    }
+
+    public String getCoatColorNums() {
+        return CoatColorNums;
+    }
+
+    public String getCoatColor() {
+        return CoatColor;
+    }
+
+    public void setCoatColor(String coatColor) {
+        CoatColor = coatColor;
+    }
+
+    public void setCoatTexture(String CoatTexture) {
+        this.CoatTexture = CoatTexture;
+    }
+
+    public String getCoatTexture() {
+        return CoatTexture;
+    }
+
+    public void setFaceBoundingBox(FaceBoundingBox FaceBoundingBox) {
+        this.FaceBoundingBox = FaceBoundingBox;
+    }
+
+    public FaceBoundingBox getFaceBoundingBox() {
+        return FaceBoundingBox;
+    }
+
+    public void setSocialAttribute(String SocialAttribute) {
+        this.SocialAttribute = SocialAttribute;
+    }
+
+    public String getSocialAttribute() {
+        return SocialAttribute;
+    }
+
+    public void setEnterprise(String Enterprise) {
+        this.Enterprise = Enterprise;
+    }
+
+    public String getEnterprise() {
+        return Enterprise;
+    }
+
+    public void setHasPassenger(String HasPassenger) {
+        this.HasPassenger = HasPassenger;
+    }
+
+    public String getHasPassenger() {
+        return HasPassenger;
+    }
+}

src/main/java/im/zhaojun/system/model/SafetyBelt.java

+/**
+  * Copyright 2021 json.cn 
+  */
+package im.zhaojun.system.model;
+
+public class SafetyBelt {
+
+    private String MainDriver;
+    private String CoDriver;
+    public void setMainDriver(String MainDriver) {
+         this.MainDriver = MainDriver;
+     }
+     public String getMainDriver() {
+         return MainDriver;
+     }
+
+    public void setCoDriver(String CoDriver) {
+         this.CoDriver = CoDriver;
+     }
+     public String getCoDriver() {
+         return CoDriver;
+     }
+
+}
\ No newline at end of file

src/main/java/im/zhaojun/system/model/Traffic.java

+package im.zhaojun.system.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class Traffic {
+    private Long id;
+    private String Type;
+    private ObjectBoundingBox ObjectBoundingBox;
+    private String VehicleClass;
+    private String VehicleColorNums;
+    private String VehicleColor;
+    private String  VehicleBrand;
+    private String mainBrandName;
+    private String subBrandName;
+    private String yearName;
+    private String HasPlate;
+    private String PlateClass;
+    private String PlateColor;
+    private String PlateNo;
+    private String PlateNeatness;
+    private String Angle;
+    private String Sunvisor;
+    private String Paper;
+    private String Decoration;
+    private String Drop;
+    private String Tag;
+    private SafetyBelt SafetyBelt;
+    private String HasCall;
+    private String HasCrash;
+    private String HasDanger;
+    private String HasSkylight;
+    private String HasBaggage;
+    private String HasAerial;
+
+    public void setType(String Type) {
+        this.Type = Type;
+    }
+
+    public String getType() {
+        return Type;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setObjectBoundingBox(ObjectBoundingBox ObjectBoundingBox) {
+        this.ObjectBoundingBox = ObjectBoundingBox;
+    }
+
+    public ObjectBoundingBox getObjectBoundingBox() {
+        return ObjectBoundingBox;
+    }
+
+    public void setVehicleClass(String VehicleClass) {
+        this.VehicleClass = VehicleClass;
+    }
+
+    public String getVehicleClass() {
+        return VehicleClass;
+    }
+
+    public void setVehicleColorNums(String VehicleColorNums) {
+        this.VehicleColorNums = VehicleColorNums;
+    }
+
+    public String getVehicleColorNums() {
+        return VehicleColorNums;
+    }
+
+
+    public void setMainBrandName(String mainBrandName) {
+        this.mainBrandName = mainBrandName;
+    }
+
+    public String getMainBrandName() {
+        return mainBrandName;
+    }
+
+    public void setSubBrandName(String subBrandName) {
+        this.subBrandName = subBrandName;
+    }
+
+    public String getSubBrandName() {
+        return subBrandName;
+    }
+
+    public void setYearName(String yearName) {
+        this.yearName = yearName;
+    }
+
+    public String getYearName() {
+        return yearName;
+    }
+
+    public void setHasPlate(String HasPlate) {
+        this.HasPlate = HasPlate;
+    }
+
+    public String getHasPlate() {
+        return HasPlate;
+    }
+
+    public void setPlateClass(String PlateClass) {
+        this.PlateClass = PlateClass;
+    }
+
+    public String getPlateClass() {
+        return PlateClass;
+    }
+
+    public void setPlateColor(String PlateColor) {
+        this.PlateColor = PlateColor;
+    }
+
+    public String getPlateColor() {
+        return PlateColor;
+    }
+
+    public void setPlateNo(String PlateNo) {
+        this.PlateNo = PlateNo;
+    }
+
+    public String getPlateNo() {
+        return PlateNo;
+    }
+
+    public void setPlateNeatness(String PlateNeatness) {
+        this.PlateNeatness = PlateNeatness;
+    }
+
+    public String getPlateNeatness() {
+        return PlateNeatness;
+    }
+
+    public void setAngle(String Angle) {
+        this.Angle = Angle;
+    }
+
+    public String getAngle() {
+        return Angle;
+    }
+
+    public void setSunvisor(String Sunvisor) {
+        this.Sunvisor = Sunvisor;
+    }
+
+    public String getSunvisor() {
+        return Sunvisor;
+    }
+
+    public void setPaper(String Paper) {
+        this.Paper = Paper;
+    }
+
+    public String getPaper() {
+        return Paper;
+    }
+
+    public void setDecoration(String Decoration) {
+        this.Decoration = Decoration;
+    }
+
+    public String getDecoration() {
+        return Decoration;
+    }
+
+    public void setDrop(String Drop) {
+        this.Drop = Drop;
+    }
+
+    public String getDrop() {
+        return Drop;
+    }
+
+    public void setTag(String Tag) {
+        this.Tag = Tag;
+    }
+
+    public String getTag() {
+        return Tag;
+    }
+
+    public void setSafetyBelt(SafetyBelt SafetyBelt) {
+        this.SafetyBelt = SafetyBelt;
+    }
+
+    public SafetyBelt getSafetyBelt() {
+        return SafetyBelt;
+    }
+
+    public void setHasCall(String HasCall) {
+        this.HasCall = HasCall;
+    }
+
+    public String getHasCall() {
+        return HasCall;
+    }
+
+    public void setHasCrash(String HasCrash) {
+        this.HasCrash = HasCrash;
+    }
+
+    public String getHasCrash() {
+        return HasCrash;
+    }
+
+    public void setHasDanger(String HasDanger) {
+        this.HasDanger = HasDanger;
+    }
+
+    public String getHasDanger() {
+        return HasDanger;
+    }
+
+    public void setHasSkylight(String HasSkylight) {
+        this.HasSkylight = HasSkylight;
+    }
+
+    public String getHasSkylight() {
+        return HasSkylight;
+    }
+
+    public void setHasBaggage(String HasBaggage) {
+        this.HasBaggage = HasBaggage;
+    }
+
+    public String getHasBaggage() {
+        return HasBaggage;
+    }
+
+    public void setHasAerial(String HasAerial) {
+        this.HasAerial = HasAerial;
+    }
+
+    public String getHasAerial() {
+        return HasAerial;
+    }
+
+    public String getVehicleColor() {
+        return VehicleColor;
+    }
+
+    public void setVehicleColor(String vehicleColor) {
+        VehicleColor = vehicleColor;
+    }
+
+    public String getVehicleBrand() {
+        return VehicleBrand;
+    }
+
+    public void setVehicleBrand(String vehicleBrand) {
+        VehicleBrand = vehicleBrand;
+    }
+}

src/main/java/im/zhaojun/system/model/TraffpictureParam.java

 package im.zhaojun.system.model;
 
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.Date;
@@ -18,38 +17,60 @@ public class TraffpictureParam extends Traffpicture {
 
     private static final long serialVersionUID=1L;
 
+
     private Long recordid;
     private String fdid;
     private  Integer  channelid;
-    private  String tdmc;
-    private String xzmc;
     private Long areaid;
     private String recordtype;
+    @JsonIgnore
     private Integer retrycount;
     private Integer recordlevel;
     private Integer checkstatus;
     private String creator;
-    private Date createtime;
     private Date recordtime;
     private String updator;
     private Date updatetime;
+    @JsonIgnore
     private String remark;
+    @JsonIgnore
     private Integer pushstatus;
+    @JsonIgnore
     private String pushdesc;
+    @JsonIgnore
     private Integer pushcount;
+    @JsonIgnore
     private Date pushdate;
     private String processstatus;
+    @JsonIgnore
     private Integer manualstatus;
     private  String  imagedata;
 
-    public String getImagedata() {
-        return imagedata;
+    private Integer objx;
+    private Integer objy;
+    private Integer objw;
+    private Integer objh;
+    private String  tdmc;
+    private String  xzmc;
+
+    public String getTdmc() {
+        return tdmc;
     }
 
-    public void setImagedata(String imagedata) {
-        this.imagedata = imagedata;
+    public void setTdmc(String tdmc) {
+        this.tdmc = tdmc;
     }
 
+    public String getXzmc() {
+        return xzmc;
+    }
+
+    public void setXzmc(String xzmc) {
+        this.xzmc = xzmc;
+    }
+
+    private  String  recordname;
+
     public String getRecordname() {
         return recordname;
     }
@@ -58,30 +79,44 @@ public class TraffpictureParam extends Traffpicture {
         this.recordname = recordname;
     }
 
-    private  String  recordname;
+    public Integer getObjx() {
+        return objx;
+    }
 
-    public String getXzmc() {
-        return xzmc;
+    public void setObjx(Integer objx) {
+        this.objx = objx;
     }
 
-    public void setXzmc(String xzmc) {
-        this.xzmc = xzmc;
+    public Integer getObjy() {
+        return objy;
     }
 
-    public String getTdmc() {
-        return tdmc;
+    public void setObjy(Integer objy) {
+        this.objy = objy;
     }
 
-    public void setTdmc(String tdmc) {
-        this.tdmc = tdmc;
+    public Integer getObjw() {
+        return objw;
     }
 
-    public Date getRecordtime() {
-        return recordtime;
+    public void setObjw(Integer objw) {
+        this.objw = objw;
     }
 
-    public void setRecordtime(Date recordtime) {
-        this.recordtime = recordtime;
+    public Integer getObjh() {
+        return objh;
+    }
+
+    public void setObjh(Integer objh) {
+        this.objh = objh;
+    }
+
+    public String getImagedata() {
+        return imagedata;
+    }
+
+    public void setImagedata(String imagedata) {
+        this.imagedata = imagedata;
     }
 
     public Long getRecordid() {
@@ -132,12 +167,12 @@ public class TraffpictureParam extends Traffpicture {
         this.creator = creator;
     }
 
-    public Date getCreatetime() {
-        return createtime;
+    public Date getRecordtime() {
+        return recordtime;
     }
 
-    public void setCreatetime(Date createtime) {
-        this.createtime = createtime;
+    public void setRecordtime(Date recordtime) {
+        this.recordtime = recordtime;
     }
 
     public String getUpdator() {

src/main/java/im/zhaojun/system/model/UpperBoundingBox.java

+/**
+  * Copyright 2021 json.cn 
+  */
+package im.zhaojun.system.model;
+
+/**
+ * Auto-generated: 2021-04-28 19:16:46
+ *
+ * @author json.cn (i@json.cn)
+ * @website http://www.json.cn/java2pojo/
+ */
+public class UpperBoundingBox {
+
+    private int x;
+    private int y;
+    private int w;
+    private int h;
+    public void setX(int x) {
+         this.x = x;
+     }
+     public int getX() {
+         return x;
+     }
+
+    public void setY(int y) {
+         this.y = y;
+     }
+     public int getY() {
+         return y;
+     }
+
+    public void setW(int w) {
+         this.w = w;
+     }
+     public int getW() {
+         return w;
+     }
+
+    public void setH(int h) {
+         this.h = h;
+     }
+     public int getH() {
+         return h;
+     }
+
+}
\ No newline at end of file

src/main/java/im/zhaojun/system/service/TrafficStatisticsService.java

@@ -188,5 +188,21 @@ public class TrafficStatisticsService {
         return trafficStatisticsMapper.updateTraffalarmrecordPushStatusById(recordid);
     }
 
+    public  List<Pedestrian>  queryTraffPedeDetail(String id ){
+        return trafficStatisticsMapper.queryTraffPedeDetail(id);
+    }
+
+    public  List<Traffic>  queryTrafficDetail(String id ){
+        return trafficStatisticsMapper.queryTrafficDetail(id);
+    }
+    public  List<Face>  queryTraffFaceDetail(String id ){
+        return trafficStatisticsMapper.queryTraffFaceDetail(id);
+    }
+    public  List<PeopleRideBicyc>  queryTraffPeopleRideBicycDetail(String id ){
+        return trafficStatisticsMapper.queryTraffPeopleRideBicycDetail(id);
+    }
+
+
+
 
 }
\ No newline at end of file

src/main/resources/application.properties

 spring.profiles.active=dev
 
-server.port=8083
+server.port=8082
 
 
 spring.datasource.username=root
 spring.datasource.password=123456
-spring.datasource.url=jdbc:mysql://192.168.168.212:3306/imagepro?useUnicode=true&characterEncoding=utf-8
+spring.datasource.url=jdbc:mysql://192.168.168.212:3306/imagepro?useUnicode=true&characterEncoding=utf-8&useSSL=false
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.filters= stat

src/main/resources/mapper/DeptTreeMapper.xml

@@ -189,7 +189,7 @@
         (SELECT count(*) FROM sbtdspsr) + (@rownum := @rownum + 1) order_num
         from videoerecordtype a
         left join t_code b
-        on a.recordtype = b.key) a,(SELECT @rownum:=0) r
+        on a.recordtype = b.key and  b.type=1) a,(SELECT @rownum:=0) r
         order by order_num
 
     </select>
@@ -202,7 +202,7 @@
 
     <select id="selectVideoeRecordType" resultType="im.zhaojun.system.model.VideoeRecordType">
         select a.*,(select  tdmc   from  sbtdspsr b  where  a.videoid=concat(b.sbbh ,'_',b.tdbh) limit  1) videoName,
-        (select  name  from  t_code b   where  a.recordtype=b.key)recordtypeName
+        (select  name  from  t_code b   where  a.recordtype=b.key and  b.type=1)recordtypeName
         from videoerecordtype a
         where  a.videoid=#{videoId}
 

src/main/resources/mapper/TrafficStatisticsMapper.xml

@@ -138,7 +138,7 @@
         recordtype "type",
         name "typename"
         from traffalarmrecord a,t_code b
-        where UPPER(a.recordtype)=b.key and b.type=1 and fdid||'_'||channelid in(
+        where upper(a.recordtype)=b.key and b.type=1 and fdid||'_'||channelid in(
         select b.videoid
         from deptdefaultvideo b
         <if test="deptId != '' and deptId != null and  deptId!='-1' ">
@@ -535,7 +535,7 @@
     <select id="selectAlarmsByTime" resultMap="AlarmResultMap">
         select a.*,b.name "typename",c.tdmc videoname,c.qymc deptname
         from traffalarmrecord a,t_code b,sbtdspsr c
-        where a.recordtype=b.key and a.fdid =c.sbbh and a.channelid=c.tdbh
+        where a.recordtype=b.key and  b.type=1  and a.fdid =c.sbbh and a.channelid=c.tdbh
         <if test="starttime != null  and starttime != '' ">
             and recordtime >= STR_TO_DATE( #{starttime}, '%Y-%m-%d %H:%i:%s' )
         </if>
@@ -662,7 +662,7 @@
 
 
     <select id="queryTraffalarmrecordByPage" resultType="im.zhaojun.system.model.TraffpictureParam">
-        SELECT TA.*,TA.createtime recordtime, A.tdmc,b.name  recordname,
+        SELECT TA.*,TA.createtime recordtime, A.tdmc,
         (select dept_name from dept b where b.dept_id=TA.areaid limit 1 )xzmc,
         b.name recordname, b.alarmlevel recordlevel
         FROM traffpicture TA
@@ -674,7 +674,7 @@
         and d.user_id =#{userId} ) b
         on TA.fdid || '_' || TA.channelid = b.videoid  and  TA.recordtype=b.recordtype
         LEFT JOIN sbtdspsr A ON TA.fdid = A.sbbh AND TA.channelid = A.tdbh
-        LEFT JOIN t_code b ON TA.recordtype =LOWER(b.key)
+        LEFT JOIN t_code b ON TA.recordtype =LOWER(b.key) and b.type=1
 
         <where>
             <if test="recordtype!=null and recordtype != ''">
@@ -1343,5 +1343,138 @@
         update  traffalarmrecord set manualstatus=1 where  recordid= #{recordid,jdbcType=VARCHAR}
     </update>
 
+    <select id="queryTraffPedeDetail" resultType="im.zhaojun.system.model.Pedestrian">
+        select
+        (select  name from  t_code t where  type='GenderType' and t.key=gender ) gender,
+        (select  name from  t_code t where  type='AgeType' and t.key=age ) age,
+        (select  name from  t_code t where  type='AngleType' and t.key=angle )angle,
+        hasbackpack,
+        hasglasses,
+        hascarrybag,
+        hasumbrella,
+        (select  name  from  t_code t where t.type='CoatType' and t.key=coatlength)coatlength,
+        coatcolornums,
+        (select  group_concat(name separator ',') name from  t_code t where  type='ObjectColorType' and  instr( coatcolor,t.key)>0 ) coatcolor,
+       (select  name  from  t_code  t  where  t.type='TrousersType' and t.key=trouserslength) trouserslength,
+        trouserscolornums,
+        (select  group_concat(name separator ',') name from  t_code t where  type='ObjectColorType' and  instr( trouserscolor,t.key)>0 ) trouserscolor,
+        headx 'HeadBoundingBox.x',
+        heady 'HeadBoundingBox.y',
+        headw 'HeadBoundingBox.w',
+        headh 'HeadBoundingBox.h',
+        upperx  'UpperBoundingBox.x',
+        uppery  'UpperBoundingBox.y',
+        upperw  'UpperBoundingBox.w',
+        upperh  'UpperBoundingBox.h',
+        lowerx  'LowerBoundingBox.x',
+        lowery 'LowerBoundingBox.y',
+        lowerw 'LowerBoundingBox.w',
+        lowerh 'LowerBoundingBox.h',
+        facex   'FaceBoundingBox.x',
+        facey 'FaceBoundingBox.y',
+        facew  'FaceBoundingBox.w',
+        faceh 'FaceBoundingBox.h',
+        hashat,
+        hasmask,
+        (select  name from  t_code t where  type='HairStyle' and t.key=hairstyle )    hairstyle,
+        (select  name from  t_code  t where  type='CoatTexture' and t.key=coattexture )    coattexture    ,
+        (select  name from  t_code  t where  type='TrousersTexture' and t.key=trouserstexture )    trouserstexture    ,        hastrolley,
+        hasluggage,
+        (select  group_concat(name separator ',') name from  t_code t where  type='ObjectColorType' and  instr( luggagecolornums,t.key)>0 ) luggagecolornums,
+        (select  group_concat(name separator ',') name from  t_code t where  type='ObjectColorType' and t.key=luggagecolor )    luggagecolor  ,
+        hasknife,
+        objectx   'ObjectBoundingBox.x',
+        objecty   'ObjectBoundingBox.y',
+        objectw 'ObjectBoundingBox.w',
+        objecth 'ObjectBoundingBox.h'
+        from  pedestrian where  id=#{id}
+    </select>
+
+
+    <select id="queryTrafficDetail" resultType="im.zhaojun.system.model.Traffic">
+        select  id,type,
+        objectx 'ObjectBoundingBox.x',
+        objecty 'ObjectBoundingBox.y',
+        objectw 'ObjectBoundingBox.w',
+        objecth 'ObjectBoundingBox.h',
+       (select  name  from  t_code  t  where  t.type='VehicleClassType' and  t.key=vehicleclass) vehicleclass ,
+        vehiclecolornums,
+        (select  group_concat(name separator ',') name from  t_code t where  type='ObjectColorType' and  instr( vehiclecolor,t.key)>0 ) vehiclecolor,
+        vehiclebrand,
+        mainbrandname,
+        subbrandname,
+        yearname,
+        hasplate,
+        (select  name  from  t_code  t  where  t.type='PlateClassType' and  t.key=plateclass) plateclass ,
+        (select  name  from  t_code  t  where  t.type='ObjectColorType' and  t.key=platecolor) platecolor ,
+        plateno,
+        (select  name  from  t_code  t  where  t.type='PlateNeatnessType' and  t.key=plateneatness) plateneatness ,
+        (select  name  from  t_code  t  where  t.type='AngleType' and  t.key=angle) angle,
+        sunvisor,
+        paper,
+        decoration,
+        trafficdrop,
+        tag,
+        maindriver 'SafetyBelt.maindriver',
+        codriver 'SafetyBelt.codriver',
+        hascall,
+        hascrash,
+        hasdanger,
+        hasskylight,
+        hasbaggage,
+        hasaerial  from  traffic where  id=#{id}
+
+    </select>
+    
+    <select id="queryTraffFaceDetail" resultType="im.zhaojun.system.model.Face">
+        select  id,
+        facex 'FaceBoundingBox.x',
+        facey 'FaceBoundingBox.y',
+        facew 'FaceBoundingBox.w',
+        faceh 'FaceBoundingBox.h',
+        headx 'HeadBoundingBox.x',
+        heady 'HeadBoundingBox.y',
+        headw 'HeadBoundingBox.w',
+        headh 'HeadBoundingBox.h',
+        (select  name  from  t_code  t  where  t.type='GenderType' and  t.key=gender) gender ,
+        (select  name  from  t_code  t  where  t.type='AgeType' and  t.key=age) age,
+        hasglasses,
+        hashat,
+        hasmask,
+        (select  name  from  t_code  t  where  t.type='HairStyle' and  t.key=hairstyle) hairstyle
+        from  face
+        where id=#{id}
+    </select>
 
+    <select id="queryTraffPeopleRideBicycDetail" resultType="im.zhaojun.system.model.PeopleRideBicyc">
+       select id,
+        type,
+        objectx 'ObjectBoundingBox.x',
+        objecty 'ObjectBoundingBox.y',
+        obectw 'ObjectBoundingBox.w',
+        objecth 'ObjectBoundingBox.h',
+        (select  name  from  t_code  t  where  t.type='BikeClassType' and  t.key=bikeclass) bikeclass   ,
+        (select  name  from  t_code  t  where  t.type='GenderType' and  t.key=gender) gender,
+        age,
+        (select  name  from  t_code  t  where  t.type='AngleType' and  t.key=angle) angle   ,
+        hasbackpack,
+        hasglasses,
+        hasmask,
+        hascarrybag,
+        hasumbrella,
+        coatlength,
+        hasplate,
+        plateno,
+        hashelmet,
+        (select  name  from  t_code  t  where  t.type='ObjectColorType' and  t.key=helmetcolor) helmetcolor ,
+        coatcolornums,
+        (select  name  from  t_code  t  where  t.type='CoatTexture' and  t.key=coattexture)    coattexture,
+        facex 'FaceBoundingBox.x',
+        facey 'FaceBoundingBox.y',
+        facew 'FaceBoundingBox.w',
+        faceh 'FaceBoundingBox.h',
+        (select  name  from  t_code  t  where  t.type='SocialAttributeType' and  t.key=socialattribute)    socialattribute,
+        (select  name  from  t_code  t  where  t.type='EnterpriseType' and  t.key=enterprise)    enterprise,
+        haspassenger from  peopleridebicyc where  id=#{id}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/static/css/sjcx.css

@@ -503,3 +503,5 @@ html, body {
     text-indent: 0;
     text-align: center;
 }
+.leftspan{padding-left:150px
+}
\ No newline at end of file

src/main/resources/static/js/sjcx/sjcx.js

@@ -118,6 +118,36 @@ let vue_sjcx = new Vue({
             vue_sjsstx.show_s = false;
             vue_sjsstx.img_src_s = '';
             vue_sjsstx.data_wfsp = [];
+            //根据type 查询 详情
+
+              $.ajax({
+                url: "/TrafficStatistics/queryTraffDetail/"+item.id+"/"+item.recordtype,
+                dateType: 'json',
+                type: "GET",
+                contentType: 'application/json',
+                success: function (result) {
+                    if (result.code == 0) {
+                    //获得 json  的值，将详细信息展示在界面上
+                    if(item.recordtype=="3"){
+                        vue_sjsstx.dataface=result.data[0];
+                    }
+                    else if(item.recordtype=="1")
+                     {
+                            vue_sjsstx.datapede=result.data[0];
+                     }
+                        else if(item.recordtype=="2"){
+                            vue_sjsstx.datatraffic=result.data[0];
+                        }
+
+                        else  if(item.recordtype=="4")
+                        {
+                            vue_sjsstx.datapeople=result.data[0];
+                        }
+                     }
+
+                        $("#myModal").modal("show");
+                     }
+                     });
             if (item.img1path != null) {
                 vue_sjsstx.img_src_s = '/TrafficStatistics/fielagent?ftpPath=' + item.img1path;
                 vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img1path});
@@ -134,8 +164,9 @@ let vue_sjcx = new Vue({
             if (item.img5path != null) {
                 vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img5path});
             }
-            $("#myModal").modal("show");
-        },
+
+        }
+        ,
         query: function (pages, items) {
             let nodes = $('#tree-xzxq').treeview('getChecked').filter(n=>n.level == null).map(n=> {
                 return n.href
@@ -208,8 +239,8 @@ let vue_sjcx = new Vue({
                         vue_sjcx.count = result.count;
                         vue_sjcx.data_table_wfpz = result.data;
 
+            setTimeout(function () {
                         for(let  i=0;i<result.data.length;i++){
-
                                var canvas = document.getElementById("cvs"+result.data[i].id);
                                if(null==canvas) continue;
                                     //canvas.width=canvas.clientWidth;
@@ -225,10 +256,10 @@ let vue_sjcx = new Vue({
 //                            canvas.height = img.offsetHeight;
                             // 这一段如果不等img加载完成会无法绘制出图片
                             //ctx.drawImage(img, 0, 0, canvas.clientWidth, canvas.clientHeight);
-                            ctx.strokeRect(50, 50, 100, 100);
+                            ctx.strokeRect( parseInt(result.data[i].objx), parseInt(result.data[i].objy), 100,100);
 //                        }
                      }
-
+            }, 400);
                         if (items) {
                             $("#fy4").bootstrapPaginator({
                                 bootstrapMajorVersion: 3, //版本，这里设置为3，大于2即可
@@ -250,7 +281,10 @@ let vue_sjcx = new Vue({
                                     }
                                 }, onPageClicked: function (event, originalEvent, type, page) { //异步换页
                                     //请求加载数据
-                                    vue_sjcx.query(page, false);
+                                      setTimeout(function () {
+                                                        vue_sjcx.query(1, true);
+                                                    }, 100);
+
                                 }
                             });
                         }
@@ -335,8 +369,8 @@ let vue_sjcx = new Vue({
                                 vue_sjcx.arr_cllx.push({id: item.id, value: item.name});
                         });
                         setTimeout(function () {
-                            $("#cllxs").selectpicker('refresh');
-                            $("#cllxs").selectpicker('render');
+//                            $("#cllxs").selectpicker('refresh');
+//                            $("#cllxs").selectpicker('render');
                         }, 200);
                     }
                 }
@@ -389,7 +423,11 @@ let vue_sjsstx = new Vue({
         class_s1: 'class_2',
         show_s: false,
         img_src_s: '',
-        video_src: ''
+        video_src: '',
+        dataface:{},
+        datapede:{},
+        datatraffic:{},
+        datapeople:{}
     },
     methods: {
         sp_qh: function (e) {

src/main/resources/templates/main.html

@@ -11,7 +11,7 @@
 <body>
 <div class="container-index">
     <div class="top-nav">
-        <img src="img/index/gh.png" class="gh-img">
+        <img src="images/security.png" class="gh-img">
         <span class="title">视频分析系统</span>
         <ul class="nav navbar-nav navbar-right admin">
             <li class="dropdown">

src/main/resources/templates/page/sjcx.html

@@ -32,13 +32,13 @@
                     </div>
                     <div id="sjcx_s" class="div-right">
                         <div class="div-right-top">
-                            <span class="pub-span">告警时间：</span>
+                            <span class="pub-span">检测时间：</span>
                             <input type="text" class="form-control input-pub" id="kssj" style="width: 300px;" placeholder="请选择开始时间至结束时间">
-                            <span class="pub-span">车辆类型</span>
-                            <select class="form-control selectpicker" multiple v-model="cllx_select" id="cllxs">
-                                <option v-for="(item,index) in arr_cllx" :value="item.id"
-                                        v-text="item.value"></option>
-                            </select>
+                            <!--<span class="pub-span" style="display:none">车辆类型</span>-->
+                            <!--<select class="form-control selectpicker" style="display:none" multiple v-model="cllx_select" id="cllxs">-->
+                                <!--<option v-for="(item,index) in arr_cllx" :value="item.id"-->
+                                        <!--v-text="item.value"></option>-->
+                            <!--</select>-->
                             <span class="pub-span" style="margin-left: 10px;">处理状态</span>
                             <select class="form-control selectpicker" multiple v-model="clzt_select">
                                 <option value="0">未处理</option>
@@ -81,7 +81,7 @@
                                     </div>
                                     <div class="show-icon" :style="{'background':(item.processstatus==0||item.processstatus==null)?'#ff9c2b':(item.processstatus==2)?'#fc3939':(item.processstatus==1)?'#2fba08':'#cccccc'}" v-text="item.processstatus==0||item.processstatus==null?'未处理':item.processstatus==1?'正检':item.processstatus==2?'误检':'重复事件'"></div>
                                     <div class="li-top" style=" position: relative;">
-                                        <!--<img :src="'data:image/png;base64,'+item.imagedata" :id="'img'+item.id">-->
+                                        <img :src="'data:image/png;base64,'+item.imagedata" :id="'img'+item.id">
                                         <canvas :id="'cvs'+item.id" style="position: absolute;pointer-events: none;left:0;width:100%;height:100%"></canvas>
                                     </div>
                                     <div class="li-center">
@@ -89,7 +89,7 @@
                                             <span class="lx-span" v-text="item.recordname"></span>
                                         </div>
                                         <div>
-                                            <span>告警时间：</span>
+                                            <span>检测时间：</span>
                                             <span v-text="item.recordtime"></span>
                                         </div>
                                         <div>
@@ -100,10 +100,6 @@
                                             <span>辖区名称：</span>
                                             <span v-text="item.xzmc"></span>
                                         </div>
-                                        <div v-show="item.objlablename==''||item.objlablename==null?false:true">
-                                            <span>车辆类型：</span>
-                                            <span v-text="item.objlablename"></span>
-                                        </div>
                                     </div>
                                     <div class="li-bottom">
                                         <img src="../img/sjcx/lssp.png" v-show="item.videopath==null?false:true">
@@ -114,8 +110,8 @@
                             <table v-if="!show" class="table table-td">
                                 <thead>
                                 <tr style="background-color: rgb(228, 228, 228);">
-                                    <td>告警类型</td>
-                                    <td>告警时间</td>
+                                    <td>类型</td>
+                                    <td>时间</td>
                                     <td>通道名称</td>
                                     <td>辖区名称</td>
                                     <td>操作</td>
@@ -176,45 +172,244 @@
             <div class="modal-header" style="background-color: rgb(48, 53, 72);">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                         aria-hidden="true" style="color: white;">&times;</span></button>
-                <h6 class="modal-title">事件详细信息
+                <h6 class="modal-title">详细信息
                 </h6>
             </div>
-            <div class="modal-body">
-                <div>
-                    <div class="top-video">
-                        <video id="my_video_1" class="video-js" controls preload="auto" width="480" height="280"
-                               ref='video' v-show="show_s" style="object-fit: fill;width: 100%;height: 100%;" :src="video_src">
-                        </video >
-                        <img :src="img_src_s" v-show="!show_s" style="width: 100%;height: 100%;cursor: zoom-in;" data-gallery="manual">
+                    <!--<div class="top-video">-->
+                        <!--<video id="my_video_1" class="video-js" controls preload="auto" width="480" height="280"-->
+                               <!--ref='video' v-show="show_s" style="object-fit: fill;width: 100%;height: 100%;" :src="video_src">-->
+                        <!--</video >-->
+                        <!--<img :src="img_src_s" v-show="!show_s" style="width: 100%;height: 100%;cursor: zoom-in;" data-gallery="manual">-->
+                    <!--</div>-->
+                    <!--<div class="pub-div" v-show="!show_s">-->
+                        <!--<div class="div-img" style="width: 100%;">-->
+                            <!--<img v-for="(item,index) in data_wfsp" :src="item.src" @click="click_img_bf(item.src)">-->
+                        <!--</div>-->
+
+
+                    <!--</div>-->
+                    <!--<div class="pub-div">-->
+                        <!--<button type="button" class="btn btn-sm" v-bind:class=class_s @click="sp_qh(1)">事件图片-->
+                        <!--</button>-->
+                        <!--<button type="button" class="btn btn-sm" v-bind:class=class_s1 @click="sp_qh(2)" v-show="data_sj.videopath==null?false:true">事件视频</button>-->
+                    <!--</div>-->
+                    <div style="color: #5d5d5d;" class="pub-div">
+
+                        <div class="gjlx">
+                            <span v-text="data_sj.recordname"></span>
                         </div>
-                    <div class="pub-div" v-show="!show_s">
-                        <div class="div-img" style="width: 100%;">
-                            <img v-for="(item,index) in data_wfsp" :src="item.src" @click="click_img_bf(item.src)">
+                        <div class="pub-div-span" v-show="dataface!=null && dataface.id!=null">
+                            <span>年龄：</span>
+                            <span v-text="dataface.age"></span>
+                            <span class="leftspan">性别：</span>
+                            <span v-text="dataface.gender"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="dataface!=null && dataface.id!=null">
+                            <span>发型：</span>
+                            <span v-text="dataface.hairStyle"></span>
+                            <span class="leftspan">有无戴眼镜：</span>
+                            <span v-text="dataface.hasGlasses=='0'?'无':'有'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="dataface!=null && dataface.id!=null">
+                            <span>有无帽子：</span>
+                            <span v-text="dataface.hasHat=='1'?'有':'无'"></span>
+                            <span class="leftspan">有无戴口罩：</span>
+                            <span v-text="dataface.hasMask=='1'?'有':'无'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapede!=null && datapede.id!=null">
+                            <span>年龄：</span>
+                            <span v-text="datapede.age"></span>
+                            <span class="leftspan">性别：</span>
+                            <span v-text="datapede.gender"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapede!=null && datapede.id!=null">
+                            <span>有无帽子：</span>
+                            <span v-text="datapede.hasHat=='1'?'有':'无'"></span>
+                            <span class="leftspan">有无戴口罩：</span>
+                            <span v-text="datapede.hasMask=='1'?'有':'无'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapede!=null && datapede.id!=null">
+                            <span>角度：</span>
+                            <span v-text="datapede.angle"></span>
+                            <span class="leftspan">有无背包：</span>
+                            <span v-text="datapede.hasBackpack=='0'?'无':'有'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapede!=null && datapede.id!=null">
+                            <span>有无戴眼镜：</span>
+                            <span v-text="datapede.hasGlasses=='1'?'有':'无'"></span>
+                            <span class="leftspan">有无手提包：</span>
+                            <span v-text="datapede.hasCarrybag=='1'?'有':'无'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapede!=null && datapede.id!=null">
+                            <span>有无打伞：</span>
+                            <span v-text="datapede.hasUmbrella"></span>
+                            <span class="leftspan">有无手推车：</span>
+                            <span v-text="datapede.hasTrolley=='1'?'有':'无'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapede!=null && datapede.id!=null">
+                            <span>有无行李：</span>
+                            <span v-text="datapede.haLuggage=='1'?'有':'无'"></span>
+                            <span class="leftspan">有无刀具：</span>
+                            <span v-text="datapede.hasKnife=='1'?'有':'无'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapede!=null && datapede.id!=null">
+                            <span>上衣衣着类型：</span>
+                            <span v-text="datapede.coatLength"></span>
+                            <span>下身衣着类型：</span>
+                            <span v-text="datapede.trousersLength"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapede!=null && datapede.id!=null">
+                            <span>上衣颜色：</span>
+                            <span v-text="datapede.coatColor"></span>
+                            <span class="leftspan">上衣特征：</span>
+                            <span v-text="datapede.coatTexture"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapede!=null && datapede.id!=null">
+                            <span>下身颜色：</span>
+                            <span v-text="datapede.trousersColor"></span>
+                            <span class="leftspan">下身特征：</span>
+                            <span v-text="datapede.trousersTexture"></span>
                         </div>
+
+                        <div class="pub-div-span" v-show="datatraffic!=null && datatraffic.id!=null">
+                            <span>车辆类型：</span>
+                            <span v-text="datatraffic.vehicleClass"></span>
+                            <span class="leftspan">车辆颜色：</span>
+                            <span v-text="datatraffic.vehicleColor"></span>
                         </div>
-                    <div class="pub-div">
-                        <button type="button" class="btn btn-sm" v-bind:class=class_s @click="sp_qh(1)">事件图片
-                        </button>
-                        <button type="button" class="btn btn-sm" v-bind:class=class_s1 @click="sp_qh(2)" v-show="data_sj.videopath==null?false:true">事件视频</button>
+
+                        <div class="pub-div-span" v-show="datatraffic!=null && datatraffic.id!=null">
+                            <span>车辆品牌：</span>
+                            <span v-text="datatraffic.vehicleBrand"></span>
+                            <span class="leftspan">有无车牌：</span>
+                            <span v-text="datatraffic.hasPlate=='1'?'有':'无'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datatraffic!=null && datatraffic.id!=null">
+                            <span>车牌种类：</span>
+                            <span v-text="datatraffic.plateClass"></span>
+                            <span class="leftspan">车牌颜色：</span>
+                            <span v-text="datatraffic.plateColor"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datatraffic!=null && datatraffic.id!=null">
+                            <span>车牌号：</span>
+                            <span v-text="datatraffic.plateNo"></span>
+                            <span class="leftspan">车牌有无污浊遮挡：</span>
+                            <span v-text="datatraffic.plateNeatness=='1'?'有':'无'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datatraffic!=null && datatraffic.id!=null">
+                            <span>角度：</span>
+                            <span v-text="datatraffic.angle"></span>
+                            <span class="leftspan">遮阳板状态：</span>
+                            <span v-text="datatraffic.sunvisor=='1'?'放下':'收起'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datatraffic!=null && datatraffic.id!=null">
+                            <span>是否有纸巾：</span>
+                            <span v-text="datatraffic.paper=='1'?'有':'无'"></span>
+                            <span class="leftspan">是否有挂饰：</span>
+                            <span v-text="datatraffic.drop=='1'?'有':'无'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datatraffic!=null && datatraffic.id!=null">
+                            <span>年检个数：</span>
+                            <span v-text="datatraffic.tag"></span>
+                            <span class="leftspan">是否打电话：</span>
+                            <span v-text="datatraffic.hasCall=='1'?'有':'无'"></span>
+                        </div>
+                        <!--<div class="pub-div-span" v-show="datatraffic.id!=null">-->
+                            <!--<span>主驾驶员安全带状态：</span>-->
+                            <!--<span v-text="datatraffic.safetyBelt.mainDriver=='1'?'有系':'未系'"></span>-->
+                            <!--<span>副驾驶员安全带状态：</span>-->
+                            <!--<span v-text="datatraffic.safetyBelt.coDriver=='1'?'有系':'未系'"></span>-->
+                        <!--</div>-->
+
+                        <div class="pub-div-span" v-show="datatraffic!=null && datatraffic.id!=null">
+                            <span>是否危化车：</span>
+                            <span v-text="datatraffic.hasDanger=='1'?'是':'否'"></span>
+                            <span class="leftspan">是否有天窗：</span>
+                            <span v-text="datatraffic.hasSkylight=='1'?'有':'未'"></span>
                         </div>
-                    <div style="color: #5d5d5d;" class="pub-div">
-                        <div class="gjlx">
-                            <span v-text="data_sj.recordname"></span>
+
+
+                        <div class="pub-div-span" v-show="datapeople!=null && datapeople.id!=null">
+                            <span>年龄：</span>
+                            <span v-text="datapeople.age"></span>
+                            <span class="leftspan">性别：</span>
+                            <span v-text="datapeople.gender"></span>
                         </div>
-                        <div class="pub-div-span">
-                            <span>报警时间：</span>
-                            <span v-text="data_sj.recordtime"></span>
+
+                        <div class="pub-div-span" v-show="datapeople!=null && datapeople.id!=null">
+                            <span>有无帽子：</span>
+                            <span v-text="datapeople.hasHat=='1'?'有':'无'"></span>
+                            <span class="leftspan">有无戴口罩：</span>
+                            <span v-text="datapeople.hasMask=='1'?'有':'无'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapeople!=null && datapeople.id!=null">
+                            <span>角度：</span>
+                            <span v-text="datapeople.angle"></span>
+                            <span class="leftspan">有无背包：</span>
+                            <span v-text="datapeople.hasBackpack=='0'?'无':'有'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapeople!=null && datapeople.id!=null">
+                            <span>有无戴眼镜：</span>
+                            <span v-text="datapeople.hasGlasses=='1'?'有':'无'"></span>
+                            <span class="leftspan">有无手提包：</span>
+                            <span v-text="datapeople.hasCarrybag=='1'?'有':'无'"></span>
                         </div>
-                        <div class="pub-div-span">
-                            <span>辖区编号：</span>
-                            <span v-text="data_sj.areaid"></span>
+
+                        <div class="pub-div-span" v-show="datapeople!=null && datapeople.id!=null">
+                            <span>有无打伞：</span>
+                            <span v-text="datapeople.hasUmbrella=='1'?'有':'无'"></span>
+                            <span class="leftspan"> 有无挂牌：</span>
+                            <span v-text="datapeople.hasPlate=='1'?'有':'无'"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapeople!=null && datapeople.id!=null">
+                            <span>骑行类型：</span>
+                            <span v-text="datapeople.bikeClass"></span>
+
+                            <span class="leftspan"> 上衣衣着类型：</span>
+                            <span v-text="datapeople.coatLength"></span>
+                        </div>
+
+                        <div class="pub-div-span" v-show="datapeople!=null && datapeople.id!=null">
+                            <span>车牌号：</span>
+                            <span v-text="datapeople.plateNo"></span>
+
+                            <span class="leftspan">有无头盔：</span>
+                            <span v-text="datapeople.HasHelmet=='1'?'有':'无'"></span>
                         </div>
+
+
+                        <div class="pub-div-span" v-show="datapeople!=null && datapeople.id!=null">
+                            <span>头盔颜色：</span>
+                            <span v-text="datapeople.helmetColor"></span>
+
+                            <span class="leftspan">上衣颜色：</span>
+                            <span v-text="datapeople.coatColor"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapeople!=null && datapeople.id!=null">
+                            <span>上衣特征：</span>
+                            <span v-text="datapeople.coatTexture"></span>
+
+                            <span class="leftspan">非机动车社会属性：</span>
+                            <span v-text="datapeople.socialAttribute"></span>
+                        </div>
+                        <div class="pub-div-span" v-show="datapeople!=null && datapeople.id!=null">
+                            <span>非机动车所属企业：</span>
+                            <span v-text="datapeople.enterprise"></span>
+
+                            <span class="leftspan">是有载客：</span>
+                            <span v-text="datapeople.hasPassenger=='1'?'有':'无'"></span>
+                        </div>
+
+                        <!--<div class="pub-div-span">-->
+                            <!--<span>报警时间：</span>-->
+                            <!--<span v-text="data_sj.recordtime"></span>-->
+                            <!--<span class="leftspan">辖区编号：</span>-->
+                            <!--<span v-text="data_sj.areaid"></span>-->
+                        <!--</div>-->
                         <div class="pub-div-span">
                             <span>辖区名称：</span>
                             <span v-text="data_sj.xzmc"></span>
-                        </div>
-                        <div class="pub-div-span">
-                            <span>通道编号：</span>
+                            <span class="leftspan">通道编号：</span>
                             <span v-text="data_sj.fdid+'_'+data_sj.channelid"></span>
                         </div>
                         <div class="pub-div-span">
@@ -222,8 +417,8 @@
                             <span v-text="data_sj.tdmc"></span>
                         </div>
                     </div>
-                </div>
-            </div>
+
+
             <div class="modal-footer" style="border-top:none;">
                 <button type="button" class="btn btn-sm" data-dismiss="modal" style="color: #2f2f2f;">关闭</button>
             </div>

src/main/resources/templates/role/role-list.html

@@ -91,7 +91,7 @@
     <script th:src="@{/lib/jquery/jquery.min.js}"></script>
     <script th:src="@{/lib/layui/layui.js}"></script>
     <script th:src="@{/js/common.js}"></script>
-    <script th:src="@{/js/util/http_util.js}"></script>
+    <script th:src="@{/js/util/httputil.js}"></script>
 
     <script>
         layui.config({