Merge branch 'onemap' of http://114.244.114.158:8802/siwei/onemap-implementationSupervision-system-back into onemap

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/ChscServiceImpl.java

@@ -273,7 +273,7 @@ public class ChscServiceImpl implements IChscService {
         String shpFolder = rootPath + "shp\\";
         checkAndMakeFolder(shpFolder);
         String shpPath = shpFolder + "Full_DK.shp";
-        String geojsonPath = rootPath + "Full_DK.geojson";
+        String geojsonPath = rootPath + "Full_DK.json";
         String zipPath = rootPath + "Full_DK.zip";
         //定义导出条件
         String gisWhere = String.format("%s = '%s'", "rwbsm", bsm);

onemap-modules/onemap-api/src/main/java/com/onemap/api/service/impl/ResultsServiceImpl.java

@@ -27,6 +27,7 @@ import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Array;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -165,9 +166,18 @@ public class ResultsServiceImpl implements ResultsService {
             makedir(folder);
             loginfo(folder);
             String filename = file.getOriginalFilename();
+            if ("150624".equals(user.getXzqdm())) {
+                filename = "_" + chunk;
+            }
+            System.out.println("------filename-----" + filename);
             try {
-                file.transferTo(Paths.get(folder + "\\" + filename));
+                System.out.println("-----get filePath-----");
+                Path filepath = Paths.get(folder + "" + filename);
+                System.out.println("-----get filePath End-----");
+                file.transferTo(filepath);
+                System.out.println("-----file transferTo End-----");
             } catch (IOException e) {
+                System.out.println("-----get filePath Errr-----");
                 e.printStackTrace();
             }
             //TODO wanger 删除成果包分片表

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/cggl/CgglServiceImpl.java

@@ -489,7 +489,7 @@ public class CgglServiceImpl implements CgglService {
                                 }
                                 jsonObjectMd5.put("totalSliceNum", totalSliceNum);
                                 jsonObjectMd5.put("curSliceOrder", 0);
-                                jsonObjectMd5.put("resetSliceOrder2Zero", false);
+                                jsonObjectMd5.put("resetSliceOrder2Zero", true);
                                 JSONObject reStrMd5 = postRemote(token, findByMd5Url, jsonObjectMd5, null);
                                 if (reStrMd5 != null && reStrMd5.containsKey("success") && reStrMd5.getBoolean("success")) {
                                     System.out.println(reStrMd5);
@@ -541,7 +541,7 @@ public class CgglServiceImpl implements CgglService {
                                             if (reStrFileUpload.containsKey("code") && !"200".equals(reStrFileUpload.getString("code"))) {
                                                 System.out.println("上传规划成果数据分片失败，分片数： " + i + "  ！");
                                                 EscalationDTO dto = new EscalationDTO();
-                                                dto.setUploadstatus("999");
+//                                                dto.setUploadstatus("999");
                                                 dto.setId(escalationDTO.getId());
                                                 dto.setRemark(reStrFileUpload.toJSONString());
                                                 addCgglRz(dto);

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/sbjk/XzczghcgsbServiceImpl.java

@@ -454,12 +454,12 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
     public int insert(XzczghcgsbDTO xzczghcgsbDTO) {
         xzczghcgsbDTO.setUuid(IdUtils.simpleUUID());
         xzczghcgsbDTO.setUploadTime(new Date());
-        //如果是补正数据 直接上报到市级
-        if (StringUtils.isNotEmpty(xzczghcgsbDTO.getInstid())) {
-            xzczghcgsbDTO.setStatus("11");
-            xzczghcgsbDTO.setCglevel("1");
-            xzczghcgsbDTO.setUploadStatus(2);
-        }
+        //TODO wanger 如果是补正数据 直接上报到市级
+//        if (StringUtils.isNotEmpty(xzczghcgsbDTO.getInstid())) {
+//            xzczghcgsbDTO.setStatus("11");
+//            xzczghcgsbDTO.setCglevel("1");
+//            xzczghcgsbDTO.setUploadStatus(2);
+//        }
         //TODO wanger 提取基本信息中的行政区信息
         String txtStr = xmDetailMap.get(xzczghcgsbDTO.getFilePath());
         if (StringUtils.isNotEmpty(txtStr)) {
@@ -835,7 +835,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                         }
                         jsonObjectMd5.put("totalSliceNum", totalSliceNum);
                         jsonObjectMd5.put("curSliceOrder", 0);
-                        jsonObjectMd5.put("resetSliceOrder2Zero", false);
+                        jsonObjectMd5.put("resetSliceOrder2Zero", true);
                         JSONObject reStrMd5 = RInterfaceUtil.postRemote(token, findByMd5Url, jsonObjectMd5, null);
                         System.out.println("findByMd5Url : " + findByMd5Url);
                         if (reStrMd5 != null && reStrMd5.containsKey("success") && reStrMd5.getBoolean("success")) {
@@ -887,7 +887,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                                     System.out.println("reStrFileUpload :" + reStrFileUpload);
                                     if (reStrFileUpload.containsKey("code") && !"200".equals(reStrFileUpload.getString("code"))) {
                                         System.out.println("上传规划成果数据分片失败，分片数： " + i + "  ！");
-                                        xzczghcgsbDTO.setUploadStatus(-1);
+//                                        xzczghcgsbDTO.setUploadStatus(-1);
                                         xzczghcgsbDTO.setMsg(reStrFileUpload.toString());
                                         update(xzczghcgsbDTO);
                                         return AjaxResult.error("上传分片数据" + i + "失败：" + reStrFileUpload.toString() + "！");
@@ -912,7 +912,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                                 }
                             }
                         } else {
-                            xzczghcgsbDTO.setUploadStatus(-1);
+//                            xzczghcgsbDTO.setUploadStatus(-1);
                             xzczghcgsbDTO.setMsg(reStrMd5.toString());
                             xzczghcgsbDTO.setUploadTime(new Date());
                             update(xzczghcgsbDTO);