改为单独调用抽帧和分析的服务

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>VideoofCultural</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
-    <description>文物局视频截图推送</description>
+    <description></description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -175,11 +175,7 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.46</version>
-        </dependency>
+
 
     </dependencies>
 

src/main/java/com/cx/cn/cxquartz/config/ScheduleTaskConfig.java

@@ -22,19 +22,19 @@ public class ScheduleTaskConfig {
     @Value("${file.getrtspbyurl}")
     private String getrtspbyurl;
     RestUtil restUtil=new RestUtil();
-    /***
-     * 每隔20分钟执行一遍判断rtsp 是否变换
-     */
-//    @Scheduled(cron = "0 0 2 * * ? ")
-    private void statis() {
-        //查询所有监控设备，更新rtsp 地址
-        List<Sbtdspsr> sbtdpsrList= sbtdspsrService.list();
-        //调用decice 端口获得新的rtsp 地址，如果与表里的一样无需更新，不一样则立即更新
-        for(Sbtdspsr  sbtd:sbtdpsrList)
-        {
-            restUtil.rtspChangeVlue(sbtd.getSbbh(),sbtd.getSqurllj(),getrtspbyurl);
-        }
-    }
+//    /***
+//     * 每隔20分钟执行一遍判断rtsp 是否变换
+//     */
+////    @Scheduled(cron = "0 0 2 * * ? ")
+//    private void statis() {
+//        //查询所有监控设备，更新rtsp 地址
+//        List<Sbtdspsr> sbtdpsrList= sbtdspsrService.list();
+//        //调用decice 端口获得新的rtsp 地址，如果与表里的一样无需更新，不一样则立即更新
+//        for(Sbtdspsr  sbtd:sbtdpsrList)
+//        {
+//            restUtil.rtspChangeVlue(sbtd.getSbbh(),sbtd.getSqurllj(),getrtspbyurl);
+//        }
+//    }
 
 
 //    @Scheduled(cron = "0 30/5 6-19 * * ?")//每隔5分钟统计当天目前为止的数据

src/main/java/com/cx/cn/cxquartz/controller/QuartzController.java

 package com.cx.cn.cxquartz.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.cx.cn.cxquartz.bean.QuartzTaskErrors;
 import com.cx.cn.cxquartz.bean.QuartzTaskInformations;
 import com.cx.cn.cxquartz.service.quartz.FtpService;
@@ -77,14 +76,15 @@ public class QuartzController {
     public TaskResultObj scheduleJob(@RequestBody JobParam jobParam) {
 
         String  taskno="fx_" + jobParam.getDeviceId() + "_" + jobParam.getDetectType();
+        String cztaskno="cz_" + jobParam.getDeviceId() + "_" + jobParam.getDetectType();
         QuartzTaskInformations taskInformations = new QuartzTaskInformations();
         taskInformations.setExecuteparamter(jobParam.getDeviceId());
         taskInformations.setMetatype(jobParam.getDetectType());
         //查询是否有抽帧服务
-       // List<QuartzTaskInformations> tasks = quartzService.getTaskSByDeviceCode(jobParam.getDeviceId());
-       // Map<String, Integer> map = getTaskCzAndFxNumer(tasks);
-        //Integer cznum = map.get("cznum");
-        //Integer fxnum = map.get("fxnum");
+        List<QuartzTaskInformations> tasks = quartzService.getTaskSByDeviceCode(jobParam.getDeviceId());
+        Map<String, Integer> map = getTaskCzAndFxNumer(tasks);
+        Integer cznum = map.get("cznum");
+        Integer fxnum = map.get("fxnum");
         Long[] roiarray=new  Long[4];
         if ("0".equals(jobParam.getType())) {//0新增 1开启 2停止 3删除
             //判断是否存在抽帧任务，存在则直接新增分析任务，不存在则新增
@@ -104,15 +104,28 @@ public class QuartzController {
             taskInformations.setVideoid(jobParam.getDeviceId() );
             taskInformations.setRecordtype(jobParam.getDetectType());
             String result = quartzService.addTask(taskInformations);
+            try {
+                quartzService.startJob(taskno, "UNFROZEN");
+            }catch (Exception ex){
+                logger.error(taskno+"   fx startJob error:"+ex.toString());
+            }
             //查询是否有抽帧服务
-            //if (cznum == 0) {
-              //  taskInformations.setExecutorno("cz_" + jobParam.getDeviceId() + "_" + jobParam.getDetectType());
-              //  taskInformations.setTaskno(taskInformations.getExecutorno());
-             //   quartzService.addTask(taskInformations);
-           // }
+            if (cznum == 0) {
+                taskInformations.setExecutorno(cztaskno);
+                taskInformations.setTaskno(cztaskno);
+                quartzService.addTask(taskInformations);
+                try {
+                    quartzService.startJob(cztaskno, "UNFROZEN");
+                }catch (Exception ex){
+                    logger.error(cztaskno+"cz startJob error:"+ex.toString());
+                }
+            }
         } else if ("1".equals(jobParam.getType()))//开启
         {
             try {
+                if (fxnum == 1) {
+                    quartzService.startOrStopJob(cztaskno,"UNFROZEN");
+                 }//开启分析服务,开启抽帧
                 quartzService.startOrStopJob(taskno,"UNFROZEN");
             } catch (Exception ex) {
                 logger.error(ex.toString());
@@ -120,15 +133,22 @@ public class QuartzController {
         } else if ("2".equals(jobParam.getType()) ) {//停止
             //一抽帧多分析,停止不停抽帧服务
             try {
+                if (fxnum == 1) {
+                    quartzService.startOrStopJob(cztaskno,"FROZEN");
+                }
                 quartzService.startOrStopJob(taskno, "FROZEN");
             } catch (Exception ex) {
                 logger.error(ex.toString());
             }
             } else if ("3".equals(jobParam.getType())) {//删除
-            //一抽帧多分析,停止不停抽帧服务
-            try {
+               try {
                 quartzService.startOrStopJob(taskno, "FROZEN");
                 quartzService.deletetask(taskno);
+                if(fxnum==1){
+                    quartzService.startOrStopJob(cztaskno, "FROZEN");
+                    quartzService.deletetask(cztaskno);
+                }
+
             } catch (Exception ex) {
                 logger.error(ex.toString());
             }

src/main/java/com/cx/cn/cxquartz/job/QuartzMainJobFactory.java

@@ -50,7 +50,7 @@ public class QuartzMainJobFactory implements Job {
 
             //if (ResultEnum.HTTP.getMessage().equals(sendType)) {
                 try {
-                    String result = HttpClientUtil.doPost(taskNo.contains("cz_") ? czurl : fxurl, "text/json", taskNo);
+                    String result = HttpClientUtil.doPost(taskNo.contains("cz_") ? czurl : fxurl, "text/json", executeParameter);
                     logger.info("taskNo={},执行结果result{}", taskNo, result);
                     if (StringUtils.isEmpty(result)) {
                         throw new RuntimeException("taskNo=" + taskNo + "http方式返回null");

src/main/java/com/cx/cn/cxquartz/job/WebSocket.java

 package com.cx.cn.cxquartz.job;
 
-import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.stereotype.Component;
 
 import javax.websocket.*;
@@ -60,7 +60,12 @@ public class WebSocket {
             Map map=new HashMap();
             map.put("type","HEARTBEAT");
             map.put("ts",new Date().getTime());
-            AppointSending(name, JSONObject.toJSONString(map));
+            try {
+                AppointSending(name, new ObjectMapper().writeValueAsString(map));
+            }catch (Exception ex)
+            {
+                ex.printStackTrace();
+            }
         }
     }
 

src/main/java/com/cx/cn/cxquartz/service/quartz/impl/QuartzServiceImpl.java

@@ -340,9 +340,7 @@ public class QuartzServiceImpl implements QuartzService, InitializingBean {
            // if (ResultEnum.HTTP.getMessage().equals(sendType)) {
 
                 try {
-                    //将抽取的时间段获得，如果是没有规则，全抽所有。、
-                    //如果是当天上午八点，就抽当天8点之前喝前一天的3点之后0 30 8 ? * *
-                    HttpClientUtil.doPost(taskNo.contains("cz_") ? czurl : fxurl, "text/json", taskNo);
+                    HttpClientUtil.doPost(taskNo.contains("cz_") ? czurl : fxurl, "text/json", executeParameter);
                     logger.info("");
                 } catch (Exception ex) {
                     logger.error("");

src/main/java/com/cx/cn/cxquartz/util/FileTransferManager.java

@@ -11,6 +11,7 @@ import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletionService;
@@ -89,32 +90,57 @@ public class FileTransferManager {
         return record;
     }
 
-    public static GoalStructureParam getGoalStructureParam(Long[] roiarray, int model, BASE64Encoder base64Encoder, TraffAlarmRecord transferRecord) {
+//    public static GoalStructureParam getGoalStructureParam(Long[] roiarray, int model, BASE64Encoder base64Encoder, TraffAlarmRecord transferRecord) {
+//        //获得图片进行分析
+//        GoalStructureParam param = new GoalStructureParam();
+//        param.setOutput(new Output(1));
+//        param.setModel(model);
+//        param.setApiout("1");////打开1400标准输出，默认可以不填
+//        List<ImageList> list = new ArrayList<>();
+//        getImageList("1", roiarray, base64Encoder, list, transferRecord.getImg1path());
+//        param.setImageList(list);
+//        return param;
+//
+//    }
+    public static GoalStructureParam getGoalStructureParam(Long[] roiarray, int model,int format, TraffAlarmRecord transferRecord) {
         //获得图片进行分析
         GoalStructureParam param = new GoalStructureParam();
-        param.setOutput(new Output(1));
+
+        Map outmap=new HashMap();
+        outmap.put("SubClass",1);
+        param.setOutput(outmap);
         param.setModel(model);
         param.setApiout("1");////打开1400标准输出，默认可以不填
-        List<ImageList> list = new ArrayList<>();
-        getImageList("1", roiarray, base64Encoder, list, transferRecord.getImg1path());
+        List<Map> list = new ArrayList<>();
+        Map imgmap=new HashMap();
+        imgmap.put("ImageID","1");
+        imgmap.put("Roi",roiarray);
+        imgmap.put("apiout","1");
+        imgmap.put("Format",format);
+        imgmap.put("Data",transferRecord.getImg1path());
+        imgmap.put("RoiPadding",0);
+        imgmap.put("CropObjectImage",1);
+        imgmap.put("CropObjectImagePadding",20);
+        imgmap.put("CropObjectImageQuality",100);
+        list.add(imgmap);
+//        new ImageList("1", roiarray, format,10, 1, 20, 100, transferRecord.getImg1urlfrom())
+//        getImageList("1", roiarray,format, list, transferRecord.getImg1urlfrom());
         param.setImageList(list);
         return param;
 
     }
 
 
-    private static void getImageList(String id, Long[] roiarray, BASE64Encoder base64Encoder, List<ImageList> list, String img1path) {
-        if (null != img1path && !"".equals(img1path)) {
-
-            byte[] Img = FTPUtil.getFtpPicBytes(img1path);
-            if (Img != null) {
-                list.add(new ImageList(id, roiarray, 10, 1, 20, 100, base64Encoder.encode(Img).replaceAll("\r|\n", "")));
-
-            }
-        }
-    }
-
-
+//    private static void getImageList(String id, Long[] roiarray, BASE64Encoder base64Encoder, List<ImageList> list, String img1path) {
+//        if (null != img1path && !"".equals(img1path)) {
+//
+//            byte[] Img = FTPUtil.getFtpPicBytes(img1path);
+//            if (Img != null) {
+//                list.add(new ImageList(id, roiarray, 10, 1, 20, 100, base64Encoder.encode(Img).replaceAll("\r|\n", "")));
+//
+//            }
+//        }
+//    }
     public static String urlTransToFtp(String url, final Ftp ftp, final String basePath) {
 
         threadService.submit(() -> {

src/main/java/com/cx/cn/cxquartz/util/PointUtil.java

@@ -59,7 +59,8 @@ public static  ByteArrayOutputStream drawByPoints(InputStream bais,List<Map> det
                         try {
                             Location lo =(Location) box.get("location");
                             logger.info("detectObjects x1,x2,y1,y2==="+lo.toString());
-                            g.drawRect(lo.getX1(),lo.getY1(),lo.getX2()-lo.getX1(),lo.getY2()-lo.getY1());
+                            g.drawRect(lo.getX1(),
+                                    lo.getY1(),lo.getX2()-lo.getX1(),lo.getY2()-lo.getY1());
                         }catch (Exception ex){
                             logger.error("Location Map error:{}", ex.toString());
                         }

src/main/java/com/cx/cn/cxquartz/vo/GoalStructureParam.java

 package com.cx.cn.cxquartz.vo;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.List;
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
-
+@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY, getterVisibility=JsonAutoDetect.Visibility.NONE)
 public class GoalStructureParam {
     @JsonProperty("Output")
-    private Output  Output;
+    private Map  Output;
 
     @JsonProperty("Model")
     private int Model;
@@ -19,16 +21,9 @@ public class GoalStructureParam {
     private String apiout;
 
     @JsonProperty("ImageList")
-    private List<ImageList> ImageList;
-
-    public void setOutput(Output Output) {
-        this.Output = Output;
-    }
+    private List<Map> ImageList;
 
 
-    public Output getOutput() {
-        return this.Output;
-    }
 
     public void setModel(int Model) {
         this.Model = Model;
@@ -47,12 +42,19 @@ public class GoalStructureParam {
         return this.apiout;
     }
 
-    public void setImageList(List<ImageList> ImageList) {
-        this.ImageList = ImageList;
+    public Map getOutput() {
+        return Output;
     }
 
+    public void setOutput(Map output) {
+        Output = output;
+    }
+
+    public List<Map> getImageList() {
+        return ImageList;
+    }
 
-    public List<ImageList> getImageList() {
-        return this.ImageList;
+    public void setImageList(List<Map> imageList) {
+        ImageList = imageList;
     }
 }
\ No newline at end of file

src/main/java/com/cx/cn/cxquartz/vo/ImageList.java

 package com.cx.cn.cxquartz.vo;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class ImageList {
@@ -10,12 +9,12 @@ public class ImageList {
     @JsonProperty("Roi")
     private Long[] Roi;
 
-    @JsonIgnore
+    @JsonProperty("Format")
     private int Format;
     @JsonProperty("Data")
     private String Data;
 
-    //    private Integer RoiPadding;
+        private Integer RoiPadding;
     private Integer CropObjectImage;
     private Integer CropObjectImagePadding;
     private Integer CropObjectImageQuality;
@@ -29,13 +28,13 @@ public class ImageList {
         Roi = roi;
     }
 
-//    public Integer getRoiPadding() {
-//        return RoiPadding;
-//    }
-//
-//    public void setRoiPadding(Integer roiPadding) {
-//        RoiPadding = roiPadding;
-//    }
+    public Integer getRoiPadding() {
+        return RoiPadding;
+    }
+
+    public void setRoiPadding(Integer roiPadding) {
+        RoiPadding = roiPadding;
+    }
 
     public Integer getCropObjectImage() {
         return CropObjectImage;
@@ -70,13 +69,24 @@ public class ImageList {
     public ImageList(String imageID, Long[] roi, Integer roiPadding, Integer cropObjectImage, Integer cropObjectImagePadding, Integer cropObjectImageQuality, String data) {
         ImageID = imageID;
         Roi = roi;
-//        RoiPadding = roiPadding;
+        RoiPadding = roiPadding;
         CropObjectImage = cropObjectImage;
         CropObjectImagePadding = cropObjectImagePadding;
         CropObjectImageQuality = cropObjectImageQuality;
         Data = data;
     }
 
+    public ImageList(String imageID, Long[] roi, int format,  Integer roiPadding, Integer cropObjectImage, Integer cropObjectImagePadding, Integer cropObjectImageQuality,String data) {
+        ImageID = imageID;
+        Roi = roi;
+        Format = format;
+         Data = data;
+        RoiPadding = roiPadding;
+        CropObjectImage = cropObjectImage;
+        CropObjectImagePadding = cropObjectImagePadding;
+        CropObjectImageQuality = cropObjectImageQuality;
+    }
+
     public ImageList() {
     }
 

src/main/java/com/cx/cn/cxquartz/vo/Pedestrian.java

 package com.cx.cn.cxquartz.vo;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /***
  * 行人
  */
 public class Pedestrian {
-    @JsonIgnore
     private Long id;
     private String Type;
     private ObjectBoundingBox ObjectBoundingBox;
@@ -43,7 +39,7 @@ public class Pedestrian {
     public void setType(String Type) {
         this.Type = Type;
     }
-    @JSONField(name = "Type")
+    @JsonProperty("Type")
     public String getType() {
         return Type;
     }
@@ -52,7 +48,7 @@ public class Pedestrian {
     public void setObjectBoundingBox(ObjectBoundingBox ObjectBoundingBox) {
         this.ObjectBoundingBox = ObjectBoundingBox;
     }
-    @JSONField(name = "ObjectBoundingBox")
+    @JsonProperty("ObjectBoundingBox")
     public ObjectBoundingBox getObjectBoundingBox() {
         return ObjectBoundingBox;
     }
@@ -68,7 +64,7 @@ public class Pedestrian {
     public void setGender(String Gender) {
         this.Gender = Gender;
     }
-    @JSONField(name = "Gender")
+    @JsonProperty("Gender")
     public String getGender() {
         return Gender;
     }
@@ -76,7 +72,7 @@ public class Pedestrian {
     public void setAge(String Age) {
         this.Age = Age;
     }
-    @JSONField(name = "Age")
+    @JsonProperty("Age")
     public String getAge() {
         return Age;
     }
@@ -84,7 +80,7 @@ public class Pedestrian {
     public void setAngle(String Angle) {
         this.Angle = Angle;
     }
-    @JSONField(name = "Angle")
+    @JsonProperty("Angle")
     public String getAngle() {
         return Angle;
     }
@@ -92,7 +88,7 @@ public class Pedestrian {
     public void setHasBackpack(String HasBackpack) {
         this.HasBackpack = HasBackpack;
     }
-    @JSONField(name = "HasBackpack")
+    @JsonProperty("HasBackpack")
     public String getHasBackpack() {
         return HasBackpack;
     }
@@ -100,7 +96,7 @@ public class Pedestrian {
     public void setHasGlasses(String HasGlasses) {
         this.HasGlasses = HasGlasses;
     }
-    @JSONField(name = "HasGlasses")
+    @JsonProperty("HasGlasses")
     public String getHasGlasses() {
         return HasGlasses;
     }
@@ -108,7 +104,7 @@ public class Pedestrian {
     public void setHasCarrybag(String HasCarrybag) {
         this.HasCarrybag = HasCarrybag;
     }
-    @JSONField(name = "HasCarrybag")
+    @JsonProperty("HasCarrybag")
     public String getHasCarrybag() {
         return HasCarrybag;
     }
@@ -116,7 +112,7 @@ public class Pedestrian {
     public void setHasUmbrella(String HasUmbrella) {
         this.HasUmbrella = HasUmbrella;
     }
-    @JSONField(name = "HasUmbrella")
+    @JsonProperty("HasUmbrella")
     public String getHasUmbrella() {
         return HasUmbrella;
     }
@@ -124,7 +120,7 @@ public class Pedestrian {
     public void setCoatLength(String CoatLength) {
         this.CoatLength = CoatLength;
     }
-    @JSONField(name = "CoatLength")
+    @JsonProperty("CoatLength")
     public String getCoatLength() {
         return CoatLength;
     }
@@ -132,7 +128,7 @@ public class Pedestrian {
     public void setCoatColorNums(String CoatColorNums) {
         this.CoatColorNums = CoatColorNums;
     }
-    @JSONField(name = "CoatColorNums")
+    @JsonProperty("CoatColorNums")
     public String getCoatColorNums() {
         return CoatColorNums;
     }
@@ -142,7 +138,7 @@ public class Pedestrian {
     public void setTrousersLength(String TrousersLength) {
         this.TrousersLength = TrousersLength;
     }
-    @JSONField(name = "TrousersLength")
+    @JsonProperty( "TrousersLength")
     public String getTrousersLength() {
         return TrousersLength;
     }
@@ -150,7 +146,7 @@ public class Pedestrian {
     public void setTrousersColorNums(String TrousersColorNums) {
         this.TrousersColorNums = TrousersColorNums;
     }
-    @JSONField(name = "TrousersColorNums")
+    @JsonProperty( "TrousersColorNums")
     public String getTrousersColorNums() {
         return TrousersColorNums;
     }
@@ -160,7 +156,7 @@ public class Pedestrian {
     public void setHeadBoundingBox(HeadBoundingBox HeadBoundingBox) {
         this.HeadBoundingBox = HeadBoundingBox;
     }
-    @JSONField(name = "HeadBoundingBox")
+    @JsonProperty("HeadBoundingBox")
     public HeadBoundingBox getHeadBoundingBox() {
         return HeadBoundingBox;
     }
@@ -168,7 +164,7 @@ public class Pedestrian {
     public void setUpperBoundingBox(UpperBoundingBox UpperBoundingBox) {
         this.UpperBoundingBox = UpperBoundingBox;
     }
-    @JSONField(name = "UpperBoundingBox")
+    @JsonProperty("UpperBoundingBox")
     public UpperBoundingBox getUpperBoundingBox() {
         return UpperBoundingBox;
     }
@@ -176,7 +172,7 @@ public class Pedestrian {
     public void setLowerBoundingBox(LowerBoundingBox LowerBoundingBox) {
         this.LowerBoundingBox = LowerBoundingBox;
     }
-    @JSONField(name = "LowerBoundingBox")
+    @JsonProperty("LowerBoundingBox")
     public LowerBoundingBox getLowerBoundingBox() {
         return LowerBoundingBox;
     }
@@ -184,7 +180,7 @@ public class Pedestrian {
     public void setFaceBoundingBox(FaceBoundingBox FaceBoundingBox) {
         this.FaceBoundingBox = FaceBoundingBox;
     }
-    @JSONField(name = "FaceBoundingBox")
+    @JsonProperty("FaceBoundingBox")
     public FaceBoundingBox getFaceBoundingBox() {
         return FaceBoundingBox;
     }
@@ -192,7 +188,7 @@ public class Pedestrian {
     public void setHasHat(String HasHat) {
         this.HasHat = HasHat;
     }
-    @JSONField(name = "HasHat")
+    @JsonProperty("HasHat")
     public String getHasHat() {
         return HasHat;
     }
@@ -200,7 +196,7 @@ public class Pedestrian {
     public void setHasMask(String HasMask) {
         this.HasMask = HasMask;
     }
-    @JSONField(name = "HasMask")
+    @JsonProperty("HasMask")
     public String getHasMask() {
         return HasMask;
     }
@@ -208,7 +204,7 @@ public class Pedestrian {
     public void setHairStyle(String HairStyle) {
         this.HairStyle = HairStyle;
     }
-    @JSONField(name = "HairStyle")
+    @JsonProperty( "HairStyle")
     public String getHairStyle() {
         return HairStyle;
     }
@@ -216,7 +212,7 @@ public class Pedestrian {
     public void setCoatTexture(String CoatTexture) {
         this.CoatTexture = CoatTexture;
     }
-    @JSONField(name = "CoatTexture")
+    @JsonProperty("CoatTexture")
     public String getCoatTexture() {
         return CoatTexture;
     }
@@ -224,7 +220,7 @@ public class Pedestrian {
     public void setTrousersTexture(String TrousersTexture) {
         this.TrousersTexture = TrousersTexture;
     }
-    @JSONField(name = "TrousersTexture")
+    @JsonProperty("TrousersTexture")
     public String getTrousersTexture() {
         return TrousersTexture;
     }
@@ -232,7 +228,7 @@ public class Pedestrian {
     public void setHasTrolley(String HasTrolley) {
         this.HasTrolley = HasTrolley;
     }
-    @JSONField(name = "HasTrolley")
+    @JsonProperty("HasTrolley")
     public String getHasTrolley() {
         return HasTrolley;
     }
@@ -240,7 +236,7 @@ public class Pedestrian {
     public void setHasLuggage(String HasLuggage) {
         this.HasLuggage = HasLuggage;
     }
-    @JSONField(name = "HasLuggage")
+    @JsonProperty("HasLuggage")
     public String getHasLuggage() {
         return HasLuggage;
     }
@@ -248,7 +244,7 @@ public class Pedestrian {
     public void setLuggageColorNums(String LuggageColorNums) {
         this.LuggageColorNums = LuggageColorNums;
     }
-    @JSONField(name = "LuggageColorNums")
+    @JsonProperty("LuggageColorNums")
     public String getLuggageColorNums() {
         return LuggageColorNums;
     }
@@ -256,12 +252,12 @@ public class Pedestrian {
     public void setHasKnife(int HasKnife) {
         this.HasKnife = HasKnife;
     }
-    @JSONField(name = "HasKnife")
+    @JsonProperty("HasKnife")
     public int getHasKnife() {
         return HasKnife;
     }
 
-    @JSONField(name = "CoatColor")
+    @JsonProperty("CoatColor")
     public String getCoatColor() {
         return CoatColor;
     }
@@ -270,7 +266,7 @@ public class Pedestrian {
         CoatColor = coatColor;
     }
 
-    @JSONField(name = "TrousersColor")
+    @JsonProperty("TrousersColor")
     public String getTrousersColor() {
         return TrousersColor;
     }
@@ -279,7 +275,7 @@ public class Pedestrian {
         TrousersColor = trousersColor;
     }
 
-    @JSONField(name = "LuggageColor")
+    @JsonProperty("LuggageColor")
     public String getLuggageColor() {
         return LuggageColor;
     }

src/main/resources/application-local.yml

@@ -35,11 +35,11 @@ local:
 
 file:
   rtspurl: http://zjh189.ncpoi.cc:7080/getDeviceSnapshot
-  recogurl: http://zjh189.ncpoi.cc:7080/getDeviceSnapshotAndRecognize
+  recogurl: http://zjh189.ncpoi.cc:9098/images/recog
   uploadurl: http://home2.ncpoi.cc:7080/uploadResultFile
 
 countryside:
-  callbackurl: http://kvideo.51iwifi.com/hesc-mq/hesc/mq/receive
+  callbackurl: http://kvideo.51iwifi.com/hesc-mq/hesc
 
 logging:
   level:

src/main/resources/application-test.yml

@@ -27,7 +27,9 @@ local:
 countryside:
   callbackurl: http://kvideo.51iwifi.com
 file:
-  rootpath: /home/ubuntu/pictures
+#  rootpath: /home/ubuntu/pictures
+  recogurl: http://172.16.24.29:9098/images/recog
+  rtspurl: http://172.16.24.29:7180/getDeviceSnapshot
 logging:
   level:
     com.cx.cn.cxquartz.dao:

src/main/resources/application.yml

 spring:
   profiles:
-    active: local
+    active: dev85
 
 mybatis:
   type-aliases-package: com.cx.cn.cxquartz.bean

src/main/resources/logback-spring.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
     <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
-    <property name="log.path" value="/home/ubuntu/tar/zjdxtest/logs/${spring.application.name}"/>
-    <!--<property name="log.path" value="/home/prod/deploy/HZDXService/logs/${spring.application.name}"/>-->
+    <!--<property name="log.path" value="/home/ubuntu/tar/zjdxtest/logs/${spring.application.name}"/>-->
+    <property name="log.path" value="/home/prod/deploy/HZDXService/logs/${spring.application.name}"/>
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>

src/main/resources/mapper/SbtdspsrMapper.xml

@@ -20,7 +20,7 @@
       select * from
 			quartz_task_informations b
 		WHERE
-		(taskNo = #{rtsp})
+		(taskNo =#{rtsp})
 		and frozenstatus='UNFROZEN'
     </select>
 

src/main/resources/mapper/TraffAlarmRecordMapper.xml

@@ -13,86 +13,10 @@
 
     <insert id="inserTraffAlarmRecord" parameterType="com.cx.cn.cxquartz.vo.TraffAlarmRecord" useGeneratedKeys="true" keyProperty="recordid" keyColumn="recordid">
 
-        insert into traffalarmrecord
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="algotype != null">algotype,</if>
-            <if test="areaid != null">areaid,</if>
-            <if test="fdid != null">fdid,</if>
-            <if test="channelid != null">channelid,</if>
-            <if test="channeletype != null">channeletype,</if>
-            <if test="channelname != null">channelname ,</if>
-            <if test="recordtime != null">recordtime,</if>
-            <if test="recordtype != null">recordtype,</if>
-            <if test="location != null">location,</if>
-            <if test="img1urlfrom != null">img1urlfrom,</if>
-            <if test="img1path != null">img1path,</if>
-            <if test="img2urlfrom != null">img2urlfrom,</if>
-            <if test="img2path != null">img2path,</if>
-            <if test="img3urlfrom != null">img3urlfrom,</if>
-            <if test="img3path != null">img3path,</if>
-            <if test="img4urlfrom != null">img4urlfrom,</if>
-            <if test="img4path != null">img4path,</if>
-            <if test="img5urlfrom != null">img5urlfrom,</if>
-            <if test="img5path != null">img5path,</if>
-            <if test="videourlfrom != null">videourlfrom,</if>
-            <if test="videopath != null">videopath,</if>
-            <if test="retrytime != null">retrytime,</if>
-            <if test="retrycount != null">retrycount,</if>
-            <if test="recordlevel != null">recordlevel,</if>
-            <if test="checkstatus != null">checkstatus,</if>
-            <if test="creator != null">creator,</if>
-            <if test="createtime != null">createtime,</if>
-            <if test="updator != null">updator,</if>
-            <if test="updatetime != null">updatetime,</if>
-            <if test="remark != null">remark,</if>
-            <if test="pushstatus != null">pushstatus,</if>
-            <if test="pushdesc != null">pushdesc,</if>
-            <if test="processstatus != null">processstatus,</if>
-            <if test="objlable != null">objlable,</if>
-            <if test="rectificationtype  != null">rectificationtype ,</if>
-            <if test="manualstatus  != null">manualstatus ,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="algotype != null">#{algotype},</if>
-            <if test="areaid != null">#{areaid},</if>
-            <if test="fdid != null">#{fdid},</if>
-            <if test="channelid != null">#{ channelid},</if>
-            <if test="channeletype != null">#{channeletype},</if>
-            <if test="channelname != null">#{ channelname },</if>
-            <if test="recordtime != null">#{ recordtime},</if>
-            <if test="recordtype != null">#{ recordtype},</if>
-            <if test="location != null">#{ location},</if>
-            <if test="img1urlfrom != null">#{img1urlfrom},</if>
-            <if test="img1path != null">#{ img1path},</if>
-            <if test="img2urlfrom != null">#{img2urlfrom},</if>
-            <if test="img2path != null">#{ img2path},</if>
-            <if test="img3urlfrom != null">#{img3urlfrom},</if>
-            <if test="img3path != null">#{ img3path},</if>
-            <if test="img4urlfrom != null">#{img4urlfrom},</if>
-            <if test="img4path != null">#{ img4path},</if>
-            <if test="img5urlfrom != null">#{img5urlfrom},</if>
-            <if test="img5path != null">#{img5path},</if>
-            <if test="videourlfrom != null">#{videourlfrom},</if>
-            <if test="videopath != null">#{videopath},</if>
-            <if test="retrytime != null">#{retrytime},</if>
-            <if test="retrycount != null">#{retrycount},</if>
-            <if test="recordlevel != null">#{recordlevel,jdbcType=INTEGER},</if>
-            <if test="checkstatus != null">#{checkstatus,jdbcType=INTEGER},</if>
-            <if test="creator != null">#{creator},</if>
-            <if test="createtime != null">str_to_date(#{createtime},'%Y-%m-%d %H:%i:%s'),</if>
-            <if test="updator != null">#{updator},</if>
-            <if test="updatetime != null">#{updatetime},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="pushstatus != null">#{pushstatus},</if>
-            <if test="pushdesc != null">#{pushdesc},</if>
-            <if test="processstatus != null">#{processstatus},</if>
-            <if test="objlable != null">#{objlable},</if>
-            <if test="rectificationtype != null">#{rectificationtype},</if>
-            <if test="manualstatus  != null">#{manualstatus,jdbcType=INTEGER},</if>
-
-        </trim>
-
-    </insert>
+        insert into traffalarmrecord(areaid,fdid,recordtype,channelid,recordtime,img1urlfrom,img1path,processstatus)
+        select #{areaid}, #{fdid},recordtype,#{ channelid},#{ recordtime},#{img1urlfrom},#{img1path},#{processstatus} from  quartz_task_informations
+        where  executeparamter=#{fdid} and  frozenStatus='UNFROZEN' and  taskno like 'fx_%'
+        </insert>
     <update id="updateTraffAlarmRecordUrl" parameterType="com.cx.cn.cxquartz.vo.TraffAlarmRecord">
         UPDATE traffalarmrecord
         set updatetime= now()
@@ -150,7 +74,7 @@
     </update>
 
 <select id="getTraffAlarmRecordByProgress" parameterType="java.util.HashMap" resultType="com.cx.cn.cxquartz.vo.TraffAlarmRecord">
-    select * from traffalarmrecord where fdid=#{sbbh}  and  processstatus='-2'
+    select * from traffalarmrecord where fdid=#{sbbh} and recordtype=#{recordtype}  and  processstatus='-2'
 </select>
 
     <update id="updateTraffAlarmRecordProcess" parameterType="com.cx.cn.cxquartz.vo.TraffAlarmRecord">

src/test/java/com/quartz/cn/com/cx/cn/cxquartz/CXQuartzApplicationTests.java

 package com.quartz.cn.com.cx.cn.cxquartz;
 
-import com.alibaba.fastjson.JSONObject;
 import com.cx.cn.cxquartz.service.quartz.impl.SbtdspsrImpl;
 import com.cx.cn.cxquartz.vo.Sbtdspsr;
 import org.junit.Test;
@@ -11,27 +10,27 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @SpringBootTest
   public class CXQuartzApplicationTests {
-
-	@Test
-	public void contextLoads() {
-        String body = "{\"errorCode\":\"0\",\"errorMsg\":\"success\",\"data\":{\"rtspUri\":\"rtsp://60.188.134.18:30030/streamDelivery_JX04_136/1_0_52268/3d10d70b9e7012bd2f85f35fa3d5f8d3\",\"rtpUri\":\"rtp://60.188.134.18:11348/304\",\"rtmpUri\":\"rtmp://60.188.134.18:30031/streamDelivery_JX04_136/1_0_52268/3d10d70b9e7012bd2f85f35fa3d5f8d3\",\"hlsUri\":\"http://60.188.134.18:30120/streamDelivery_JX04_136/1_0_52268/3d10d70b9e7012bd2f85f35fa3d5f8d3.m3u8\",\"received\":true}}";
-        JSONObject json = JSONObject.parseObject(body);
-        if (null != json.getString("errorCode") && json.getString("errorCode").equals("0")) {
-             json = JSONObject.parseObject(json.getString("data"));
-            //返回rtsp  地址
-            if (null != json.get("rtspUri") && !"".equals(json.get("rtspUri"))) {
-                String rtspnewvalue = String.valueOf(json.get("rtspUri"));
-                if (rtspnewvalue.contains("rtsp")) {
-                    //更新sbtdspsr  地址
-                    //int result = sbtdspsrService.updateRecogByRtsp(rtspnewvalue, devicecode);
-
-                }
-
-            }
-        }
-
-
-    }
+//
+//	@Test
+//	public void contextLoads() {
+//        String body = "{\"errorCode\":\"0\",\"errorMsg\":\"success\",\"data\":{\"rtspUri\":\"rtsp://60.188.134.18:30030/streamDelivery_JX04_136/1_0_52268/3d10d70b9e7012bd2f85f35fa3d5f8d3\",\"rtpUri\":\"rtp://60.188.134.18:11348/304\",\"rtmpUri\":\"rtmp://60.188.134.18:30031/streamDelivery_JX04_136/1_0_52268/3d10d70b9e7012bd2f85f35fa3d5f8d3\",\"hlsUri\":\"http://60.188.134.18:30120/streamDelivery_JX04_136/1_0_52268/3d10d70b9e7012bd2f85f35fa3d5f8d3.m3u8\",\"received\":true}}";
+//        JSONObject json = JSONObject.parseObject(body);
+//        if (null != json.getString("errorCode") && json.getString("errorCode").equals("0")) {
+//             json = JSONObject.parseObject(json.getString("data"));
+//            //返回rtsp  地址
+//            if (null != json.get("rtspUri") && !"".equals(json.get("rtspUri"))) {
+//                String rtspnewvalue = String.valueOf(json.get("rtspUri"));
+//                if (rtspnewvalue.contains("rtsp")) {
+//                    //更新sbtdspsr  地址
+//                    //int result = sbtdspsrService.updateRecogByRtsp(rtspnewvalue, devicecode);
+//
+//                }
+//
+//            }
+//        }
+
+
+//    }
 @Test
     public  void  testfilepath(){
         String ftpfilepath="ftp://jiuling:9ling.cn@172.16.24.29:21/gstraff/picturedemo/20210625.jpg";