适配

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

@@ -449,12 +449,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)) {
@@ -830,7 +830,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")) {
@@ -882,7 +882,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() + "！");
@@ -907,7 +907,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                                 }
                             }
                         } else {
-                            xzczghcgsbDTO.setUploadStatus(-1);
+//                            xzczghcgsbDTO.setUploadStatus(-1);
                             xzczghcgsbDTO.setMsg(reStrMd5.toString());
                             xzczghcgsbDTO.setUploadTime(new Date());
                             update(xzczghcgsbDTO);