对接新版的网安接口 修改为新的对接方式

src/main/java/com/founder/interservice/controller/PushWaDataController.java

@@ -189,4 +189,83 @@ public class PushWaDataController {
         }
         return resultVO;
     }
+    /**
+     * 区域碰撞 -任务发送
+     * @param param json参数
+     * @return
+     * @throws InterServiceException
+     */
+    @RequestMapping(value = "/sendRegionalTask",method = {RequestMethod.GET,RequestMethod.POST})
+    @ResponseBody
+    public ResultVO sendRegionalTask(String param){
+        ResultVO resultVO = null;
+        try{
+            String result = pushWaDataService.sendRegionalTask(param);
+            resultVO = ResultVOUtil.success(result);
+        }catch (InterServiceException e){
+            e.printStackTrace();
+            resultVO = ResultVOUtil.error(e.getCode(),e.getMessage(),null);
+        }
+        return resultVO;
+    }
+
+    /**
+     * 区域碰撞 -结果获取
+     * @param taskId 任务编号
+     * @return
+     * @throws InterServiceException
+     */
+    @RequestMapping(value = "/getRegionalTaskInfo",method = {RequestMethod.GET,RequestMethod.POST})
+    @ResponseBody
+    public ResultVO getRegionalTaskInfo(String taskId){
+        ResultVO resultVO = null;
+        try{
+            String result = pushWaDataService.getRegionalTaskInfo(taskId);
+            resultVO = ResultVOUtil.success(result);
+        }catch (InterServiceException e){
+            e.printStackTrace();
+            resultVO = ResultVOUtil.error(e.getCode(),e.getMessage(),null);
+        }
+        return resultVO;
+    }
+
+    /**
+     * 多区域碰撞 -任务发送
+     * @param param json参数
+     * @return
+     * @throws InterServiceException
+     */
+    @RequestMapping(value = "/sendMutilRegionalTask",method = {RequestMethod.GET,RequestMethod.POST})
+    @ResponseBody
+    public ResultVO sendMutilRegionalTask(String param){
+        ResultVO resultVO = null;
+        try{
+            String result = pushWaDataService.sendMutilRegionalTask(param);
+            resultVO = ResultVOUtil.success(result);
+        }catch (InterServiceException e){
+            e.printStackTrace();
+            resultVO = ResultVOUtil.error(e.getCode(),e.getMessage(),null);
+        }
+        return resultVO;
+    }
+
+    /**
+     * 区域碰撞 -结果获取
+     * @param taskId 任务编号
+     * @return
+     * @throws InterServiceException
+     */
+    @RequestMapping(value = "/getMultiRegionalTaskInfo",method = {RequestMethod.GET,RequestMethod.POST})
+    @ResponseBody
+    public ResultVO getMultiRegionalTaskInfo(String taskId){
+        ResultVO resultVO = null;
+        try{
+            String result = pushWaDataService.getMultiRegionalTaskInfo(taskId);
+            resultVO = ResultVOUtil.success(result);
+        }catch (InterServiceException e){
+            e.printStackTrace();
+            resultVO = ResultVOUtil.error(e.getCode(),e.getMessage(),null);
+        }
+        return resultVO;
+    }
 }

src/main/java/com/founder/interservice/service/PushWaDataService.java

@@ -16,4 +16,12 @@ public interface PushWaDataService {
     public String sendDzgzTask(String param) throws InterServiceException;
     public String getDzgzTaskInfo(String taskId) throws InterServiceException;
     public String doPostWaData(String urlName,String param) throws InterServiceException;
+
+    String sendRegionalTask(String param) throws InterServiceException;
+
+    String getRegionalTaskInfo(String taskId) throws InterServiceException;
+
+    String sendMutilRegionalTask(String param) throws InterServiceException;
+
+    String getMultiRegionalTaskInfo(String taskId) throws InterServiceException;
 }

src/main/java/com/founder/interservice/service/impl/PushWaDataServiceImpl.java

@@ -181,7 +181,7 @@ public class PushWaDataServiceImpl implements PushWaDataService {
     public String sendDzgzTask(String param) throws InterServiceException{
         String result = null;
         try{
-            result = doPostWaData("fixedEvidenceByRegionalTask",param);
+            result = doPostWaData("fixedEvidenceByRegionTask",param);
         }catch (Exception e){
             throw new InterServiceException(ResultEnum.REQUEST_URL_ERROR.getCode(),ResultEnum.REQUEST_URL_ERROR.getMessage());
         }
@@ -200,13 +200,85 @@ public class PushWaDataServiceImpl implements PushWaDataService {
         try{
             JSONObject param = new JSONObject();
             param.put("taskId", taskId);
-            result = doPostWaData("fixedEvidenceByRegionalTaskFetch",param.toJSONString());
+            result = doPostWaData("fixedEvidenceByRegionTaskFetch",param.toJSONString());
         }catch (Exception e){
             throw new InterServiceException(ResultEnum.REQUEST_URL_ERROR.getCode(),ResultEnum.REQUEST_URL_ERROR.getMessage());
         }
         return result;
     }
 
+    /**
+     * 区域碰撞-任务发送
+     * @param param
+     * @return
+     * @throws InterServiceException
+     */
+    @Override
+    public String sendRegionalTask(String param) throws InterServiceException {
+        String result = null;
+        try{
+            result = doPostWaData("regionalAnalysisTask",param);
+        }catch (Exception e){
+            throw new InterServiceException(ResultEnum.REQUEST_URL_ERROR.getCode(),ResultEnum.REQUEST_URL_ERROR.getMessage());
+        }
+        return result;
+    }
+
+    /**
+     * 区域碰撞-结果获取
+     * @param taskId
+     * @return
+     * @throws InterServiceException
+     */
+    @Override
+    public String getRegionalTaskInfo(String taskId) throws InterServiceException {
+        String result = null;
+        try{
+            String url = "regionalAnalysisTaskInfo/"+taskId;
+            result = doPostWaData(url,null);
+        }catch (Exception e){
+            throw new InterServiceException(ResultEnum.REQUEST_URL_ERROR.getCode(),ResultEnum.REQUEST_URL_ERROR.getMessage());
+        }
+        return result;
+    }
+
+    /**
+     * 多区域碰撞-任务发送
+     * @param param
+     * @return
+     * @throws InterServiceException
+     */
+    @Override
+    public String sendMutilRegionalTask(String param) throws InterServiceException {
+        String result = null;
+        try{
+            result = doPostWaData("multiRegionalsAnalyseTask",param);
+        }catch (Exception e){
+            throw new InterServiceException(ResultEnum.REQUEST_URL_ERROR.getCode(),ResultEnum.REQUEST_URL_ERROR.getMessage());
+        }
+        return result;
+    }
+    /**
+     * 多区域碰撞-结果获取
+     * @param taskId
+     * @return
+     * @throws InterServiceException
+     */
+    @Override
+    public String getMultiRegionalTaskInfo(String taskId) throws InterServiceException {
+        String result = null;
+        try{
+            JSONObject param = new JSONObject();
+            param.put("taskId", taskId);
+            String url = "multiRegionalsAnalyseTaskFetch";
+            result = doPostWaData(url,param.toJSONString());
+        }catch (Exception e){
+            throw new InterServiceException(ResultEnum.REQUEST_URL_ERROR.getCode(),ResultEnum.REQUEST_URL_ERROR.getMessage());
+        }
+        return result;
+    }
+
+
     @Override
     public String doPostWaData(String urlName,String param) throws InterServiceException {
         try{
@@ -219,5 +291,4 @@ public class PushWaDataServiceImpl implements PushWaDataService {
         }
     }
 
-
 }