From 235032f6f941ea94595014570925196e7357b7cf Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 12 九月 2023 17:49:48 +0800
Subject: [PATCH] 修改栅格发布的文件组成形式

---
 src/main/java/com/moon/server/service/data/ShuJianService.java |   44 +++++++++++++++++++++++++++++---------------
 1 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/moon/server/service/data/ShuJianService.java b/src/main/java/com/moon/server/service/data/ShuJianService.java
index 81ab86c..ad0de07 100644
--- a/src/main/java/com/moon/server/service/data/ShuJianService.java
+++ b/src/main/java/com/moon/server/service/data/ShuJianService.java
@@ -78,9 +78,9 @@
     /**
      * 鍒嗛〉鏌ヨ鏁扮畝鐨勯鑹茶〃
      */
-    public void selectSjColorTables(Integer port, Integer pageSize, Integer pageIndex, HttpServletRequest req, HttpServletResponse res) {
+    public void selectSjColorTables(Integer pageSize, Integer pageIndex, HttpServletRequest req, HttpServletResponse res) {
         try {
-            String url = String.format(COLOR_TABLE, null == port || 50001 == port ? sjUrl1 : sjUrl5, ak, pageSize, pageIndex);
+            String url = String.format(COLOR_TABLE, sjUrl5, ak, pageSize, pageIndex);
 
             HttpHelper httpHelper = new HttpHelper();
             httpHelper.service(req, res, null, url);
@@ -108,18 +108,18 @@
      */
     public Integer insertSjService(PubEntity pub) {
         CreateLayerEntity layerEntity = createLayerEntity(pub);
-        Integer layerId = postLayerEntity(layerEntity);
-        if (null == layerId) {
+        LayerResultEntity.Result layerResult = postLayerEntity(layerEntity);
+        if (null == layerResult) {
             return 0;
         }
 
-        CreateServiceEntity serviceEntity = createServiceEntity(pub, layerId);
+        CreateServiceEntity serviceEntity = createServiceEntity(pub, layerResult.getLayer_id());
         Integer serviceId = postServiceEntity(serviceEntity);
         if (null == serviceId) {
             return 0;
         }
 
-        PublishEntity publishEntity = createPublishEntity(pub, layerId, serviceId);
+        PublishEntity publishEntity = createPublishEntity(pub, layerResult.getLayer_id(), serviceId);
         int rows = publishService.insert(publishEntity);
         if (0 == rows) {
             return 0;
@@ -131,7 +131,7 @@
         insertMetaPub(pub, publishEntity.getId());
         // layerService.insert(createLayerEntity(resEntity, StaticData.I3))
 
-        return rows;
+        return layerResult.getMission_id();
     }
 
     /**
@@ -221,14 +221,14 @@
     /**
      * 鍙戦�佸浘灞傚疄浣撶被
      */
-    public Integer postLayerEntity(CreateLayerEntity layerEntity) {
+    public LayerResultEntity.Result postLayerEntity(CreateLayerEntity layerEntity) {
         Map<String, Object> map = getMapData(layerEntity);
         String url = String.format("%s/sj_raster/v6/api/layer?op=create_ex&%s", sjUrl5, ak);
 
         LayerResultEntity rs = postForRest(url, map, LayerResultEntity.class);
-        boolean flag = null == rs || !StaticData.SUCCESS.equals(rs.getStatus()) || null == rs.getResult().getLayer_id();
+        boolean flag = null == rs || !StaticData.SUCCESS.equals(rs.getStatus());
 
-        return flag ? null : rs.getResult().getLayer_id();
+        return flag ? null : rs.getResult();
     }
 
     /**
@@ -418,18 +418,18 @@
         setPubEntity(pub, entity);
 
         CreateLayerEntity layerEntity = createLayerEntity(pub);
-        Integer layerId = postLayerEntity(layerEntity);
-        if (null == layerId) {
+        LayerResultEntity.Result layerResult = postLayerEntity(layerEntity);
+        if (null == layerResult) {
             return 0;
         }
 
-        CreateServiceEntity serviceEntity = createServiceEntity(pub, layerId);
+        CreateServiceEntity serviceEntity = createServiceEntity(pub, layerResult.getLayer_id());
         Integer serviceId = postServiceEntity(serviceEntity);
         if (null == serviceId) {
             return 0;
         }
 
-        entity.setLayerid(layerId);
+        entity.setLayerid(layerResult.getLayer_id());
         entity.setServiceid(serviceId);
         entity.setEventid(pub.getUuid());
         entity.setUpdateUser(pub.getUserId());
@@ -461,7 +461,7 @@
             layerService.update(lyrEntity);
         }
 
-        return entity.getId();
+        return layerResult.getMission_id();
     }
 
     /**
@@ -595,4 +595,18 @@
 
         return map;
     }
+
+    /**
+     * 鑾峰彇浠诲姟鐘舵��
+     */
+    public List<TaskResultEntity.Result> getTaskStatus(List<Integer> list) {
+        String url = String.format("%s/sj_raster/v6/api/mission?op=bulk_get_mission_status&%s", sjUrl5, ak);
+        Map<String, Object> map = new HashMap<>();
+        map.put("cmd_list", list);
+
+        TaskResultEntity rs = postForRest(url, map, TaskResultEntity.class);
+        boolean flag = null == rs || !StaticData.SUCCESS.equals(rs.getStatus());
+
+        return flag ? null : rs.getResult();
+    }
 }

--
Gitblit v1.9.3