适配乌拉特前旗一张图系统

onemap-common/onemap-common-core/src/main/java/com/onemap/common/core/utils/StringUtils.java

@@ -705,6 +705,37 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         }
     }
 
+    /**
+     * 通过规划类型标识   获取规划类型中文名  巴彦淖尔
+     *
+     * @param ghlx
+     * @return
+     */
+    public static Integer getGhlxByne(String ghlx) {
+        switch (ghlx) {
+            case "1":
+                return 9;
+            case "2":
+                return 9;
+            case "3":
+                return 0;
+            case "4":
+                return 1;
+            case "5":
+                return 2;
+            case "6":
+                return 4;
+            case "7":
+                return 5;
+            case "8":
+                return 9;
+            case "9":
+                return 3;
+            default:
+                return 0;
+        }
+    }
+
     /**
      * 搜索文件夹下指定文件名结尾的文件  默认返回第一个
      *
@@ -894,4 +925,32 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         }
     }
 
+    /**
+     * 获取当前年份
+     *
+     * @return
+     */
+    public static String getCurrentYear() {
+        Calendar calendar = Calendar.getInstance();
+        int year = calendar.get(Calendar.YEAR);
+        System.out.println(year);
+        return String.valueOf(year);
+    }
+
+    public static void byteArrayToFile(byte[] bytes, String filePath) {
+        File file = new File(filePath);
+        if(file.exists()){
+            try {
+                FileUtils.delete(file);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        try (FileOutputStream fos = new FileOutputStream(filePath)) {
+            fos.write(bytes);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/sbjk/XzczghcgsbController.java

@@ -27,6 +27,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
+import static com.onemap.common.core.utils.StringUtils.byteArrayToFile;
+
 /**
  * 厅里-乡镇村庄评估结果上报
  */
@@ -107,7 +109,7 @@ public class XzczghcgsbController extends BaseController {
         String cglevel = xzczghcgsbDTO.getCglevel();
         String error = "";
         for (int i = 0; i < uuids.length; i++) {
-            AjaxResult ajaxResult = xzczghcgsbService.reportSubmit(uuids[i], cglevel);
+            AjaxResult ajaxResult = xzczghcgsbService.reportSubmit(uuids[i], cglevel, xzczghcgsbDTO);
             if (!"200".equals(ajaxResult.get("code") + "")) {
                 error = error + ajaxResult.get("msg");
             }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/cggl/EscalationDTO.java

@@ -1,10 +1,12 @@
 package com.onemap.apply.domain.cggl;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import oracle.sql.DATE;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.File;
 import java.util.Date;
 
 @TableName("t_cggl_escalation")
@@ -30,6 +32,48 @@ public class EscalationDTO {
     private String scmodel;
     private String loginfo;//上报日志
 
+    //TODO 巴彦淖尔新增前端请求参数
+    @TableField(exist = false)
+    private String phone;
+    @TableField(exist = false)
+    private String wdbh;
+    @TableField(exist = false)
+    private String uploadremark;
+    @TableField(exist = false)
+    private byte[] file;
+
+    public byte[] getFile() {
+        return file;
+    }
+
+    public void setFile(byte[] file) {
+        this.file = file;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getWdbh() {
+        return wdbh;
+    }
+
+    public void setWdbh(String wdbh) {
+        this.wdbh = wdbh;
+    }
+
+    public String getUploadremark() {
+        return uploadremark;
+    }
+
+    public void setUploadremark(String uploadremark) {
+        this.uploadremark = uploadremark;
+    }
+
     public String getLoginfo() {
         return loginfo;
     }
@@ -57,7 +101,7 @@ public class EscalationDTO {
     /**
      * 审查状态（审查状态  默认0待审（旗县）、1审查中（旗县）、2完结（旗县）、3退回（旗县）、4待审（市级）、5审查中（市级）、6完结（市级）、7退回（市级） ）
      */
-    private String sczt="0";
+    private String sczt = "0";
     private String scresult;
     private String scr;
 
@@ -144,8 +188,6 @@ public class EscalationDTO {
     }
 
 
-
-
     public String getUsername() {
         return username;
     }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/cggl/EscalationInfoDTO.java

@@ -25,6 +25,15 @@ public class EscalationInfoDTO {
     private String lxdh;
     private String username;
     private String loginfo;
+    private String instid;
+
+    public String getInstid() {
+        return instid;
+    }
+
+    public void setInstid(String instid) {
+        this.instid = instid;
+    }
 
     /**
      * 市级审查状态（审查状态  默认0待审（旗县）、1审查中（旗县）、2完结（旗县）、3退回（旗县）、4待审（市级）、5审查中（市级）、6完结（市级）、7退回（市级）

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/sbjk/XzczghcgsbDTO.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.util.Date;
 
 @TableName("t_xzczghcgsb")
@@ -55,6 +57,48 @@ public class XzczghcgsbDTO {
     private String instid;
     private String bz;
 
+    //TODO 巴彦淖尔新增前端请求参数
+    @TableField(exist = false)
+    private String phone;
+    @TableField(exist = false)
+    private String wdbh;
+    @TableField(exist = false)
+    private String uploadremark;
+    @TableField(exist = false)
+    private byte[] file;
+
+    public byte[] getFile() {
+        return file;
+    }
+
+    public void setFile(byte[] file) {
+        this.file = file;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getWdbh() {
+        return wdbh;
+    }
+
+    public void setWdbh(String wdbh) {
+        this.wdbh = wdbh;
+    }
+
+    public String getUploadremark() {
+        return uploadremark;
+    }
+
+    public void setUploadremark(String uploadremark) {
+        this.uploadremark = uploadremark;
+    }
+
     public String getBz() {
         return bz;
     }

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

@@ -112,15 +112,31 @@ public class CgglServiceImpl implements CgglService {
     SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
     private long sliceSize = 10 * 1024 * 1024;
 
+    //TODO wanger  巴彦淖尔
+    @Value("${Byne.isUse}")
+    private Boolean isByne;
+    @Value("${Byne.username}")
+    private String byneusername;
+    @Value("${Byne.password}")
+    private String bynepassword;
+    @Value("${Byne.scope}")
+    private String bynescope;
+    @Value("${Byne.oauthUrl}")
+    private String byneOauthUrl;
+    @Value("${Byne.findByMd5Url}")
+    private String byneFindByMd5Url;
+    @Value("${Byne.uploadCompleteFileUrl}")
+    private String byneUploadCompleteFileUrl;
+    @Value("${Byne.uploadFileUrl}")
+    private String byneUploadFileUrl;
+
+
     //规划成果上传
     @Override
     public RequestResult uploadCgFile(MultipartFile file) {
         if (file == null) {
             return RequestResult.error("上传失败！", false);
         }
-//        if (file.getOriginalFilename().getBytes().length > 100) {
-//            return RequestResult.error("上传文件名不能大于100个字节！", false);
-//        }
         String uuid = StringUtils.getUUID();
         EscalationFileDTO dto = new EscalationFileDTO();
         dto.setId(uuid);
@@ -135,7 +151,6 @@ public class CgglServiceImpl implements CgglService {
         File copyFile = new File(temppath);
         System.out.println(temppath);
         try {
-            //file.transferTo(copyFile);
             // 复制文件流
             FileUtils.copyInputStreamToFile(file.getInputStream(), copyFile);
         } catch (Exception e) {
@@ -164,44 +179,11 @@ public class CgglServiceImpl implements CgglService {
             escalationFileMapper.update(curdto, wrapper);
             return RequestResult.error("上传失败！");
         }
-//        FixedThreadUtil.FIXED_THREAD_POOL.execute(() -> {
-//            QueryWrapper<EscalationFileDTO> wrapper = new QueryWrapper<>();
-//            wrapper.eq("id", uuid);
-//            EscalationFileDTO curdto = escalationFileMapper.selectOne(wrapper);
-//            try {
-//                String filetype = StringUtils.getFileKzmx(filename);
-//                if (".zip".equals(filetype)) {
-//                    new UnPackageUtils().unPackZip(copyFile, unzippath);
-//                } else if (".rar".equals(filetype)) {
-//                    //解压rar格式
-//                    new UnPackageUtils().unPackRar(copyFile, unzippath);
-//                }
-//                curdto.setStatus("9");
-//                curdto.setPath(temppath);
-//                curdto.setUnzippath(unzippath);
-//                escalationFileMapper.update(curdto, wrapper);
-//            } catch (Exception r) {
-//                r.printStackTrace();
-//                curdto.setStatus("2");
-//                curdto.setRemark("上传压缩包或者解压失败");
-//                escalationFileMapper.update(curdto, wrapper);
-//            }
-////            copyFile.delete();
-//        });
         return RequestResult.success("上传成功！", dto.getId());
     }
 
     @Override
     public RequestResult uploadCgInfo(EscalationDTO escalationDTO) {
-//        QueryWrapper<EscalationDTO> wrapper = new QueryWrapper<EscalationDTO>();
-//        wrapper.eq("name", escalationDTO.getName());
-//        EscalationDTO res = escalationMapper.selectOne(wrapper);
-//        if (res != null) {
-//            return RequestResult.error("该名称已存在！", false);
-//        }
-//        if (escalationDTO.getName().getBytes().length > 100) {
-//            return RequestResult.error("成果名称不能大于100个字节！", false);
-//        }
         try {
             String id = StringUtils.getUUID();
             escalationDTO.setUploadstatus("0");
@@ -467,160 +449,453 @@ public class CgglServiceImpl implements CgglService {
         EscalationDTO validateEscalationDTO = escalationMapper.selectOne(wrapper);
         setSbjd(escalationDTO.getId(), "0/0");
         if ("1".equals(validateEscalationDTO.getCglevel()) && "1".equals(escalationDTO.getUploadstatus())) {
-            //获取token授权
-            JSONObject jsonObject = new JSONObject();
-            //组装请求参数
-            jsonObject.put("appid", appid);
-            //调用post请求方法
-            JSONObject tokenJson = RInterfaceUtil.postRemote(null, oauthUrl, jsonObject, null);
-            String token = "";
-            String fileMd5 = "";
-            try {
-                if (tokenJson.containsKey("success") && tokenJson.getBoolean("success")) {
-                    //获取token
-                    if (tokenJson.containsKey("data") && tokenJson.getJSONObject("data").containsKey("token")) {
-                        token = tokenJson.getJSONObject("data").getString("token");
-                        System.out.println(token);
-                        //查询数据库文件路径
-                        QueryWrapper<EscalationFileDTO> wrapperFile = new QueryWrapper<EscalationFileDTO>();
-                        wrapperFile.eq("id", validateEscalationDTO.getFileid());
-                        EscalationFileDTO fileDTO = escalationFileMapper.selectOne(wrapperFile);
-                        //获取文件md5
-                        if (fileDTO != null) {
-                            File file = new File(fileDTO.getPath());
-                            if (file.exists()) {
-                                fileMd5 = Md5Utils.getMD5(file);
-                                JSONObject jsonObjectMd5 = new JSONObject();
-//                                jsonObjectMd5.put("fileName", file.getName());
-//                                jsonObjectMd5.put("fileSize", file.length());
-//                                jsonObjectMd5.put("fileMd5", fileMd5);
-                                //每个切片文件大小
-                                long mod = file.length() % sliceSize;
-                                long totalSliceNum = file.length() / sliceSize;
-                                if (mod > 0) {
-                                    totalSliceNum = totalSliceNum + 1;
+            //TODO wanger 判断乌拉特前旗
+            if (isByne) {
+                String instid = validateEscalationDTO.getInstid();
+                //TODO wanger 是否为补正上传
+                if (StringUtils.isNotEmpty(instid)) {//TODO wanger 补正的直接上传到自治区
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("grant_type", "password");
+                    jsonObject.put("username", username);
+                    jsonObject.put("password", Md5Utils.hash(password));
+                    JSONObject tokenJson = RInterfaceUtilFromSheng.postRemote(null, oauthUrl, jsonObject, null);
+                    String token = "";
+                    String fileMd5 = "";
+                    try {
+                        if (tokenJson.containsKey("success") && tokenJson.getBoolean("success")) {
+                            //获取token
+                            if (tokenJson.containsKey("data") && tokenJson.getJSONObject("data").containsKey("access_token")) {
+                                token = tokenJson.getJSONObject("data").getString("access_token");
+                                System.out.println(token);
+                                //查询数据库文件路径
+                                QueryWrapper<EscalationFileDTO> wrapperFile = new QueryWrapper<EscalationFileDTO>();
+                                wrapperFile.eq("id", validateEscalationDTO.getFileid());
+                                EscalationFileDTO fileDTO = escalationFileMapper.selectOne(wrapperFile);
+                                //获取文件md5
+                                if (fileDTO != null) {
+                                    File file = new File(fileDTO.getPath());
+                                    if (file.exists()) {
+                                        fileMd5 = Md5Utils.getMD5(file);
+                                        JSONObject jsonObjectMd5 = new JSONObject();
+                                        jsonObjectMd5.put("fileName", file.getName());
+                                        jsonObjectMd5.put("fileSize", file.length());
+                                        jsonObjectMd5.put("fileMd5", fileMd5);
+                                        //每个切片文件大小
+                                        long mod = file.length() % sliceSize;
+                                        long totalSliceNum = file.length() / sliceSize;
+                                        if (mod > 0) {
+                                            totalSliceNum = totalSliceNum + 1;
+                                        }
+                                        if (!StringUtils.isEmpty(validateEscalationDTO.getInstid())) {
+                                            jsonObjectMd5.put("instId", validateEscalationDTO.getInstid());
+                                        }
+                                        jsonObjectMd5.put("totalSliceNum", totalSliceNum);
+                                        jsonObjectMd5.put("curSliceOrder", 0);
+                                        jsonObjectMd5.put("resetSliceOrder2Zero", true);
+                                        JSONObject reStrMd5 = RInterfaceUtilFromSheng.postRemote(token, findByMd5Url, jsonObjectMd5, null);
+                                        if (reStrMd5 != null && reStrMd5.containsKey("success") && reStrMd5.getBoolean("success")) {
+                                            System.out.println(reStrMd5);
+                                            File toDir = new File(temp + File.separator + fileMd5);
+                                            String toFileName = toDir.getAbsolutePath() + File.separator + fileMd5;
+                                            if (toDir.exists()) {
+                                                FileUtils.deleteDirectory(toDir);
+                                            }
+                                            toDir.mkdirs();
+                                            //切割文件，是否成功
+                                            long curSliceSize = RInterfaceUtil.spilt(file.getAbsolutePath(), toFileName, fileSplitCode);
+                                            if (curSliceSize > 0) {
+                                                JSONObject reStrFileUpload = null;
+                                                //上传zip文件分片
+                                                int startIndex = 0;
+                                                try {
+                                                    if (reStrMd5 != null && reStrMd5.containsKey("data") && reStrMd5.getJSONObject("data") != null) {
+                                                        startIndex = reStrMd5.getJSONObject("data").getInteger("curSliceOrder");
+                                                    }
+                                                } catch (Exception r) {
+
+                                                }
+                                                setSbjd(escalationDTO.getId(), (startIndex + 1) + "/" + totalSliceNum);
+                                                //上传zip文件分片
+                                                for (int i = startIndex; i < totalSliceNum; i++) {
+                                                    // 生成文件的路径
+                                                    String t = toFileName + fileSplitCode + i;
+                                                    Map<String, Object> paramFile = new HashMap<>();
+                                                    File f = new File(t);
+                                                    paramFile.put("name", file.getName());
+                                                    if (StringUtils.isEmpty(validateEscalationDTO.getYear())) {
+                                                        paramFile.put("year", StringUtils.getCurrentYear());
+                                                    } else {
+                                                        paramFile.put("year", validateEscalationDTO.getYear().substring(0, 4));
+                                                    }
+                                                    paramFile.put("zipFileSlice", f);
+                                                    paramFile.put("zipMd5", fileMd5);
+                                                    paramFile.put("totalSliceNum", totalSliceNum);
+                                                    paramFile.put("curSliceOrder", i);
+                                                    if (StringUtils.isNotEmpty(instid)) {
+                                                        paramFile.put("instId", instid);
+                                                    }
+                                                    paramFile.put("curSliceSize", 10240 * 1024);
+                                                    reStrFileUpload = RInterfaceUtilFromSheng.postRemote(token, uploadSplitFileUrl, null, paramFile);
+                                                    System.out.println("reStrFileUpload :" + reStrFileUpload);
+                                                    if (reStrFileUpload.containsKey("code") && !"200".equals(reStrFileUpload.getString("code"))) {
+                                                        System.out.println("上传规划成果数据分片失败，分片数： " + i + "  ！");
+                                                        EscalationDTO dto = new EscalationDTO();
+                                                        dto.setId(escalationDTO.getId());
+                                                        dto.setRemark(reStrFileUpload.toJSONString());
+                                                        addCgglRz(dto);
+                                                        updateLogInfo(validateEscalationDTO, reStrFileUpload.toJSONString());
+                                                        return RequestResult.error("上传规划成果数据分片失败：" + reStrFileUpload.getString("msg") + "，分片数： " + i + "  ！", false);
+                                                    } else {//记录分片个数及上传状态
+                                                        setSbjd(escalationDTO.getId(), (i + 1) + "/" + totalSliceNum);
+                                                    }
+                                                }
+                                                if (reStrFileUpload != null && reStrFileUpload.containsKey("success") && reStrFileUpload.getBoolean("success")) {
+                                                    if (toDir.exists()) {
+                                                        //删除临时文件
+                                                        FileUtils.deleteDirectory(toDir);
+                                                    }
+                                                    //TODO wanger 补正状态更正
+                                                    if (StringUtils.isNotEmpty(instid)) {
+                                                        validateEscalationDTO.setInstid(instid + "#");
+                                                    }
+                                                }
+                                            }
+                                        } else {
+                                            updateLogInfo(validateEscalationDTO, reStrMd5.toJSONString());
+                                            System.out.println("上传规划成果数据接口-查询MD5值接口失败！");
+                                            return RequestResult.error("上传规划成果数据接口-查询MD5值接口失败！", false);
+                                        }
+                                    } else {
+                                        System.out.println("成果文件不存在！");
+                                        return RequestResult.error("成果文件不存在！", false);
+                                    }
                                 }
-//                                if (!StringUtils.isEmpty(validateEscalationDTO.getInstid())) {
-//                                    jsonObjectMd5.put("instId", validateEscalationDTO.getInstid());
-//                                }
-//                                jsonObjectMd5.put("totalSliceNum", totalSliceNum);
-//                                jsonObjectMd5.put("curSliceOrder", 0);
-//                                jsonObjectMd5.put("resetSliceOrder2Zero", false);
-                                //TODO wanger 根据鄂尔多斯市级接口文档对接
-                                jsonObjectMd5.put("md5", fileMd5);
-                                jsonObjectMd5.put("size", totalSliceNum);
-                                jsonObjectMd5.put("new", false);
-                                jsonObjectMd5.put("ghlx", StringUtils.getGhlx(validateEscalationDTO.getPlantype()));
-                                JSONObject reStrMd5 = RInterfaceUtil.getRemote(token, findByMd5Url, jsonObjectMd5, null);
-                                if (reStrMd5 != null && reStrMd5.containsKey("success") && reStrMd5.getBoolean("success")) {
-                                    System.out.println(reStrMd5);
-                                    File toDir = new File(temp + File.separator + fileMd5);
-                                    String toFileName = toDir.getAbsolutePath() + File.separator + fileMd5;
-                                    if (toDir.exists()) {
-                                        FileUtils.deleteDirectory(toDir);
+                            } else {
+                                updateLogInfo(validateEscalationDTO, tokenJson.toJSONString());
+                                System.out.println(tokenJson);
+                                return RequestResult.error("市级系统token信息获取失败，请检查token获取地址、用户名、密码！", false);
+                            }
+                        } else {
+                            updateLogInfo(validateEscalationDTO, tokenJson.toJSONString());
+                            System.out.println(tokenJson);
+                            return RequestResult.error("市级系统token信息获取失败，请检查token获取地址、用户名、密码！", false);
+                        }
+                    } catch (Exception e) {
+                        System.out.println(e.toString());
+                    }
+                } else {//TODO wanger 非补正成果上报到巴彦淖尔盟
+                    //TODO wanger 巴彦淖尔上传数据第一步：request token
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("grant_type", "password");
+                    jsonObject.put("username", byneusername);
+                    jsonObject.put("password", bynepassword);
+                    jsonObject.put("scope", bynescope);
+                    Map<String, Object> body = new HashMap<>();
+                    body.put("grant_type", "password");
+                    body.put("username", byneusername);
+                    body.put("password", bynepassword);
+                    body.put("scope", bynescope);
+                    JSONObject tokenJson = RInterfaceUtil.postRemote(null, byneOauthUrl, jsonObject, body);
+                    System.out.println("tokenJson == " + tokenJson);
+                    String token = "";
+                    String fileMd5 = "";
+                    try {
+                        if (tokenJson.containsKey("access_token")) {
+                            token = tokenJson.getString("token_type") + " " + tokenJson.getString("access_token");
+                            System.out.println(token);
+                            //查询数据库文件路径
+                            QueryWrapper<EscalationFileDTO> wrapperFile = new QueryWrapper<EscalationFileDTO>();
+                            wrapperFile.eq("id", validateEscalationDTO.getFileid());
+                            EscalationFileDTO fileDTO = escalationFileMapper.selectOne(wrapperFile);
+                            //获取文件md5
+                            if (fileDTO != null) {
+                                File file = new File(fileDTO.getPath());
+                                if (file.exists()) {
+                                    fileMd5 = Md5Utils.getMD5(file);
+                                    JSONObject jsonObjectMd5 = new JSONObject();
+                                    String filename = file.getName();
+                                    String relFileName = StringUtils.getFileRelName(filename);
+                                    jsonObjectMd5.put("fileName", filename);
+                                    jsonObjectMd5.put("fileMd5", fileMd5);
+                                    //每个切片文件大小
+                                    long mod = file.length() % sliceSize;
+                                    long totalSliceNum = file.length() / sliceSize;
+                                    if (mod > 0) {
+                                        totalSliceNum = totalSliceNum + 1;
                                     }
-                                    toDir.mkdirs();
-                                    //切割文件，是否成功
-                                    long curSliceSize = RInterfaceUtil.spilt(file.getAbsolutePath(), toFileName, fileSplitCode);
-                                    if (curSliceSize > 0) {
-                                        JSONObject reStrFileUpload = null;
-                                        //上传zip文件分片
-                                        int startIndex = 0;
-                                        try {
-                                            if (reStrMd5 != null && reStrMd5.containsKey("data") && reStrMd5.getJSONObject("data") != null) {
-                                                JSONArray chunks = reStrMd5.getJSONObject("data").getJSONArray("chunks");
-                                                if (chunks != null) {
-                                                    startIndex = chunks.size();
+//                                    jsonObjectMd5.put("totalSliceNum", totalSliceNum);
+//                                    jsonObjectMd5.put("curSliceOrder", 0);
+//                                    jsonObjectMd5.put("resetSliceOrder2Zero", true);
+                                    //TODO wanger 巴彦淖尔上传数据第二步：FindByMd5
+                                    JSONObject reStrMd5 = RInterfaceUtil.getRemote(token, byneFindByMd5Url, jsonObjectMd5, null);
+                                    System.out.println("reStrMd5 == " + reStrMd5);
+                                    if (reStrMd5 != null && "200".equals(reStrMd5.getString("code"))) {
+                                        System.out.println(reStrMd5);
+                                        String fileUploadPath = "";//TODO wanger 记录最后上传的文件位置
+                                        File toDir = new File(temp + File.separator + fileMd5);
+                                        String toFileName = toDir.getAbsolutePath() + File.separator + relFileName;
+                                        if (toDir.exists()) {
+                                            FileUtils.deleteDirectory(toDir);
+                                        }
+                                        toDir.mkdirs();
+                                        long curSliceSize = RInterfaceUtil.spiltByne(file.getAbsolutePath(), toFileName, fileSplitCode);
+                                        if (curSliceSize > 0) {
+                                            JSONObject reStrFileUpload = null;
+                                            int startIndex = 0;
+                                            try {
+                                                if (reStrMd5 != null && reStrMd5.containsKey("data") && reStrMd5.getJSONObject("data") != null) {
+                                                    startIndex = reStrMd5.getJSONObject("data").getJSONArray("uploadedChunks").size();
                                                 }
+                                            } catch (Exception r) {
+
                                             }
-                                        } catch (Exception r) {
-                                        }
-                                        setSbjd(escalationDTO.getId(), (startIndex + 1) + "/" + totalSliceNum);
-                                        //上传zip文件分片
-                                        for (int i = startIndex; i < totalSliceNum; i++) {
-                                            // 生成文件的路径
-                                            String t = toFileName + fileSplitCode + i;
+                                            setSbjd(escalationDTO.getId(), (startIndex + 1) + "/" + totalSliceNum);
+                                            for (int i = startIndex; i < totalSliceNum; i++) {
+                                                // 生成文件的路径
+                                                String t = toFileName + fileSplitCode + "zip-" + (i + 1);
+                                                Map<String, Object> paramFile = new HashMap<>();
+                                                File f = new File(t);
+                                                String curMd5 = Md5Utils.getMD5(f);
+                                                paramFile.put("fileMd5", fileMd5);
+                                                paramFile.put("chunkFileMd5", curMd5);
+                                                paramFile.put("fileName", filename);
+                                                paramFile.put("currentChunk", (i + 1));
+                                                paramFile.put("upfile", f);
+                                                paramFile.put("totalSize", file.length());
+                                                paramFile.put("totalChunk", totalSliceNum);
+                                                paramFile.put("chunkSize", sliceSize);
+//                                                paramFile.put("currentChunkSize", 10240 * 1024);
+                                                paramFile.put("currentChunkSize", f.length());
+                                                //TODO wanger 巴彦淖尔上传数据第三步：UploadSplitFile
+                                                reStrFileUpload = RInterfaceUtil.postRemote(token, byneFindByMd5Url, null, paramFile);
+                                                System.out.println("reStrFileUpload == " + reStrFileUpload);
+                                                System.out.println("reStrFileUpload :" + reStrFileUpload);
+                                                if (reStrFileUpload.containsKey("code") && !"200".equals(reStrFileUpload.getString("code"))) {
+                                                    System.out.println("上传规划成果数据分片失败，分片数： " + i + "  ！");
+                                                    EscalationDTO dto = new EscalationDTO();
+                                                    dto.setId(escalationDTO.getId());
+                                                    dto.setRemark(reStrFileUpload.toJSONString());
+                                                    addCgglRz(dto);
+                                                    updateLogInfo(validateEscalationDTO, reStrFileUpload.toJSONString());
+                                                    return RequestResult.error("上传规划成果数据分片失败：" + reStrFileUpload.getString("msg") + "，分片数： " + i + "  ！", false);
+                                                } else {//记录分片个数及上传状态
+                                                    fileUploadPath = reStrFileUpload.getString("data");
+                                                    setSbjd(escalationDTO.getId(), (i + 1) + "/" + totalSliceNum);
+                                                }
+                                            }
+                                            //TODO wanger 巴彦淖尔上传数据第四步：Complete
                                             Map<String, Object> paramFile = new HashMap<>();
-                                            File f = new File(t);
-                                            paramFile.put("file", f);
-                                            paramFile.put("md5", fileMd5);
-                                            paramFile.put("chunk", i);
-//                                            paramFile.put("name", file.getName());
-//                                            paramFile.put("year", validateEscalationDTO.getYear().substring(0, 4));
-//                                            paramFile.put("zipFileSlice", f);
-//                                            paramFile.put("zipMd5", fileMd5);
-//                                            paramFile.put("totalSliceNum", totalSliceNum);
-//                                            paramFile.put("curSliceOrder", i);
-//                                            if (!StringUtils.isEmpty(validateEscalationDTO.getInstid())) {
-//                                                paramFile.put("instId", validateEscalationDTO.getInstid());
-//                                            }
-//                                            //上传文件总大小
-//                                            paramFile.put("curSliceSize", 10240 * 1024);
-                                            //当前分片文件大小
-//                                            paramFile.put("curSliceSize", f.length());
-                                            reStrFileUpload = RInterfaceUtil.postRemote(token, uploadSplitFileUrl, null, paramFile);
-                                            System.out.println("reStrFileUpload :" + reStrFileUpload);
-                                            if (reStrFileUpload.containsKey("statuscode") && !"200".equals(reStrFileUpload.getString("statuscode"))) {
-                                                System.out.println("上传规划成果数据分片失败，分片数： " + i + "  ！");
+//                                            paramFile.put("fileMd5", fileMd5);
+//                                            paramFile.put("fileName", filename);
+//                                            paramFile.put("filePath", fileUploadPath);
+//                                            paramFile.put("fileSize", file.length());
+                                            JSONObject mergeJSONObject = new JSONObject();
+                                            mergeJSONObject.put("fileMd5", fileMd5);
+                                            mergeJSONObject.put("fileName", filename);
+                                            mergeJSONObject.put("filePath", fileUploadPath);
+                                            mergeJSONObject.put("fileSize", file.length());
+                                            reStrFileUpload = RInterfaceUtil.postRemote(token, byneUploadCompleteFileUrl, mergeJSONObject, null);
+                                            System.out.println("reStrFileUpload == " + reStrFileUpload);
+                                            if (reStrFileUpload != null && "200".equals(reStrFileUpload.getString("code"))) {
+                                                if (toDir.exists()) {
+                                                    FileUtils.deleteDirectory(toDir);
+                                                }
+                                                String fileUploadId = reStrFileUpload.getString("data");
+                                                //TODO wanger 巴彦淖尔上传数据第五步：Complete
+                                                paramFile = new HashMap<>();
+                                                paramFile.put("fileInfoId", fileUploadId);
+                                                paramFile.put("name", filename);
+                                                if (StringUtils.isEmpty(validateEscalationDTO.getYear())) {
+                                                    paramFile.put("year", StringUtils.getCurrentYear());
+                                                } else {
+                                                    paramFile.put("year", validateEscalationDTO.getYear().substring(0, 4));
+                                                }
+                                                paramFile.put("xzqmc", validateEscalationDTO.getXzqmc());
+                                                paramFile.put("xzqdm", validateEscalationDTO.getXzqdm());
+                                                paramFile.put("type", StringUtils.getGhlxByne(validateEscalationDTO.getPlantype()));
+                                                File zjfile = null;
+                                                if (escalationDTO.getFile() != null) {
+                                                    String filepath = temp + "check.pdf";
+                                                    byteArrayToFile(escalationDTO.getFile(), filepath);
+                                                    zjfile = new File(filepath);
+                                                }
+                                                paramFile.put("zjbgFile", zjfile);
+                                                paramFile.put("phone", escalationDTO.getPhone());
+                                                paramFile.put("remark", escalationDTO.getUploadremark());
+                                                paramFile.put("wdbh", escalationDTO.getWdbh());
+                                                reStrFileUpload = RInterfaceUtil.postRemote(token, byneUploadFileUrl, null, paramFile);
+                                                System.out.println("reStrFileUpload == " + reStrFileUpload);
+                                                if (reStrFileUpload.containsKey("code") && !"200".equals(reStrFileUpload.getString("code"))) {
+                                                    System.out.println("成果上报接口失败： ！==" + reStrFileUpload.toJSONString());
+                                                    EscalationDTO dto = new EscalationDTO();
+                                                    dto.setId(escalationDTO.getId());
+                                                    dto.setRemark(reStrFileUpload.toJSONString());
+                                                    addCgglRz(dto);
+                                                    updateLogInfo(validateEscalationDTO, reStrFileUpload.toJSONString());
+                                                    return RequestResult.error("成果上报接口失败：" + reStrFileUpload.toJSONString() + "！", false);
+                                                }
+                                            } else {
+                                                System.out.println("Complete Error！" + reStrFileUpload.toJSONString());
                                                 EscalationDTO dto = new EscalationDTO();
-                                                dto.setUploadstatus("999");
                                                 dto.setId(escalationDTO.getId());
                                                 dto.setRemark(reStrFileUpload.toJSONString());
                                                 addCgglRz(dto);
                                                 updateLogInfo(validateEscalationDTO, reStrFileUpload.toJSONString());
-                                                return RequestResult.error("上传规划成果数据分片失败：" + reStrFileUpload.getString("msg") + "，分片数： " + i + "  ！", false);
-                                            } else {//记录分片个数及上传状态
-                                                setSbjd(escalationDTO.getId(), (i + 1) + "/" + totalSliceNum);
+                                                return RequestResult.error("Complete Error！：" + reStrFileUpload.getString("msg") + "！", false);
                                             }
                                         }
-                                        if ((startIndex == totalSliceNum) || (reStrFileUpload != null && reStrFileUpload.containsKey("success") && reStrFileUpload.getBoolean("success"))) {
-                                            if (toDir.exists()) {
-                                                //删除临时文件
-//                                                FileUtils.deleteDirectory(toDir);
+                                    } else {
+                                        updateLogInfo(validateEscalationDTO, reStrMd5.toJSONString());
+                                        System.out.println("上传规划成果数据接口-查询MD5值接口失败！");
+                                        return RequestResult.error("上传规划成果数据接口-查询MD5值接口失败！", false);
+                                    }
+                                } else {
+                                    System.out.println("成果文件不存在！");
+                                    return RequestResult.error("成果文件不存在！", false);
+                                }
+                            }
+                        } else {
+                            updateLogInfo(validateEscalationDTO, tokenJson.toJSONString());
+                            System.out.println(tokenJson);
+                            return RequestResult.error("市级系统token信息获取失败，请检查token获取地址、用户名、密码！", false);
+                        }
+                    } catch (Exception e) {
+                        System.out.println(e.toString());
+                    }
+                }
+
+            } else {
+                //TODO wanger 普通旗县调用市级接口（乌兰察布、鄂尔多斯）
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("appid", appid);
+                JSONObject tokenJson = RInterfaceUtil.postRemote(null, oauthUrl, jsonObject, null);
+                String token = "";
+                String fileMd5 = "";
+                try {
+                    if (tokenJson.containsKey("success") && tokenJson.getBoolean("success")) {
+                        //获取token
+                        if (tokenJson.containsKey("data") && tokenJson.getJSONObject("data").containsKey("token")) {
+                            token = tokenJson.getJSONObject("data").getString("token");
+                            System.out.println(token);
+                            //查询数据库文件路径
+                            QueryWrapper<EscalationFileDTO> wrapperFile = new QueryWrapper<EscalationFileDTO>();
+                            wrapperFile.eq("id", validateEscalationDTO.getFileid());
+                            EscalationFileDTO fileDTO = escalationFileMapper.selectOne(wrapperFile);
+                            //获取文件md5
+                            if (fileDTO != null) {
+                                File file = new File(fileDTO.getPath());
+                                if (file.exists()) {
+                                    fileMd5 = Md5Utils.getMD5(file);
+                                    JSONObject jsonObjectMd5 = new JSONObject();
+                                    //每个切片文件大小
+                                    long mod = file.length() % sliceSize;
+                                    long totalSliceNum = file.length() / sliceSize;
+                                    if (mod > 0) {
+                                        totalSliceNum = totalSliceNum + 1;
+                                    }
+                                    //TODO wanger 根据鄂尔多斯市级接口文档对接
+                                    jsonObjectMd5.put("md5", fileMd5);
+                                    jsonObjectMd5.put("size", totalSliceNum);
+                                    jsonObjectMd5.put("new", false);
+                                    jsonObjectMd5.put("ghlx", StringUtils.getGhlx(validateEscalationDTO.getPlantype()));
+                                    JSONObject reStrMd5 = RInterfaceUtil.getRemote(token, findByMd5Url, jsonObjectMd5, null);
+                                    if (reStrMd5 != null && reStrMd5.containsKey("success") && reStrMd5.getBoolean("success")) {
+                                        System.out.println(reStrMd5);
+                                        File toDir = new File(temp + File.separator + fileMd5);
+                                        String toFileName = toDir.getAbsolutePath() + File.separator + fileMd5;
+                                        if (toDir.exists()) {
+                                            FileUtils.deleteDirectory(toDir);
+                                        }
+                                        toDir.mkdirs();
+                                        //切割文件，是否成功
+                                        long curSliceSize = RInterfaceUtil.spilt(file.getAbsolutePath(), toFileName, fileSplitCode);
+                                        if (curSliceSize > 0) {
+                                            JSONObject reStrFileUpload = null;
+                                            //上传zip文件分片
+                                            int startIndex = 0;
+                                            try {
+                                                if (reStrMd5 != null && reStrMd5.containsKey("data") && reStrMd5.getJSONObject("data") != null) {
+                                                    JSONArray chunks = reStrMd5.getJSONObject("data").getJSONArray("chunks");
+                                                    if (chunks != null) {
+                                                        startIndex = chunks.size();
+                                                    }
+                                                }
+                                            } catch (Exception r) {
                                             }
-                                            //分片上传完成后发起合包请求
-                                            JSONObject jsonObjectMerge = new JSONObject();
-                                            jsonObjectMerge.put("md5", fileMd5);
-                                            jsonObjectMerge.put("filename", file.getName());
-                                            jsonObjectMerge.put("type", "0");//成果类型默认为0
-                                            if (!StringUtils.isEmpty(validateEscalationDTO.getInstid())) {
-                                                jsonObjectMerge.put("instid", validateEscalationDTO.getInstid());
+                                            setSbjd(escalationDTO.getId(), (startIndex + 1) + "/" + totalSliceNum);
+                                            //上传zip文件分片
+                                            for (int i = startIndex; i < totalSliceNum; i++) {
+                                                // 生成文件的路径
+                                                String t = toFileName + fileSplitCode + i;
+                                                Map<String, Object> paramFile = new HashMap<>();
+                                                File f = new File(t);
+                                                paramFile.put("file", f);
+                                                paramFile.put("md5", fileMd5);
+                                                paramFile.put("chunk", i);
+                                                reStrFileUpload = RInterfaceUtil.postRemote(token, uploadSplitFileUrl, null, paramFile);
+                                                System.out.println("reStrFileUpload :" + reStrFileUpload);
+                                                if (reStrFileUpload.containsKey("statuscode") && !"200".equals(reStrFileUpload.getString("statuscode"))) {
+                                                    System.out.println("上传规划成果数据分片失败，分片数： " + i + "  ！");
+                                                    EscalationDTO dto = new EscalationDTO();
+                                                    dto.setUploadstatus("999");
+                                                    dto.setId(escalationDTO.getId());
+                                                    dto.setRemark(reStrFileUpload.toJSONString());
+                                                    addCgglRz(dto);
+                                                    updateLogInfo(validateEscalationDTO, reStrFileUpload.toJSONString());
+                                                    return RequestResult.error("上传规划成果数据分片失败：" + reStrFileUpload.getString("msg") + "，分片数： " + i + "  ！", false);
+                                                } else {//记录分片个数及上传状态
+                                                    setSbjd(escalationDTO.getId(), (i + 1) + "/" + totalSliceNum);
+                                                }
                                             }
-                                            JSONObject mergeResult = RInterfaceUtil.postRemote(token, uploadCompleteUrl, jsonObjectMerge, null);
-                                            System.out.println("合包请求结果：" + mergeResult);
-                                            if (mergeResult != null && mergeResult.containsKey("success") && mergeResult.getBoolean("success")) {
-                                                //TODO wanger 补正状态更正
+                                            if ((startIndex == totalSliceNum) || (reStrFileUpload != null && reStrFileUpload.containsKey("success") && reStrFileUpload.getBoolean("success"))) {
+                                                if (toDir.exists()) {
+                                                    //删除临时文件
+//                                                FileUtils.deleteDirectory(toDir);
+                                                }
+                                                //分片上传完成后发起合包请求
+                                                JSONObject jsonObjectMerge = new JSONObject();
+                                                jsonObjectMerge.put("md5", fileMd5);
+                                                jsonObjectMerge.put("filename", file.getName());
+                                                jsonObjectMerge.put("type", "0");//成果类型默认为0
                                                 if (!StringUtils.isEmpty(validateEscalationDTO.getInstid())) {
-                                                    validateEscalationDTO.setInstid(validateEscalationDTO.getInstid() + "#");
+                                                    jsonObjectMerge.put("instid", validateEscalationDTO.getInstid());
+                                                }
+                                                JSONObject mergeResult = RInterfaceUtil.postRemote(token, uploadCompleteUrl, jsonObjectMerge, null);
+                                                System.out.println("合包请求结果：" + mergeResult);
+                                                if (mergeResult != null && mergeResult.containsKey("success") && mergeResult.getBoolean("success")) {
+                                                    //TODO wanger 补正状态更正
+                                                    if (!StringUtils.isEmpty(validateEscalationDTO.getInstid())) {
+                                                        validateEscalationDTO.setInstid(validateEscalationDTO.getInstid() + "#");
+                                                    }
+                                                } else {
+                                                    updateLogInfo(validateEscalationDTO, mergeResult.toJSONString());
+                                                    return RequestResult.error("上传规划成果数据接口-合包失败！" + (mergeResult == null ? "" : mergeResult.getString("message")), false);
                                                 }
-                                            } else {
-                                                updateLogInfo(validateEscalationDTO, mergeResult.toJSONString());
-                                                return RequestResult.error("上传规划成果数据接口-合包失败！" + (mergeResult == null ? "" : mergeResult.getString("message")), false);
                                             }
                                         }
+                                    } else {
+                                        updateLogInfo(validateEscalationDTO, reStrMd5.toJSONString());
+                                        System.out.println("上传规划成果数据接口-查询MD5值接口失败！");
+                                        return RequestResult.error("上传规划成果数据接口-查询MD5值接口失败！", false);
                                     }
                                 } else {
-                                    updateLogInfo(validateEscalationDTO, reStrMd5.toJSONString());
-                                    System.out.println("上传规划成果数据接口-查询MD5值接口失败！");
-                                    return RequestResult.error("上传规划成果数据接口-查询MD5值接口失败！", false);
+                                    System.out.println("成果文件不存在！");
+                                    return RequestResult.error("成果文件不存在！", false);
                                 }
-                            } else {
-                                System.out.println("成果文件不存在！");
-                                return RequestResult.error("成果文件不存在！", false);
                             }
+                        } else {
+                            updateLogInfo(validateEscalationDTO, tokenJson.toJSONString());
+                            System.out.println(tokenJson);
+                            return RequestResult.error("市级系统token信息获取失败，请检查token获取地址、appid！", false);
                         }
                     } else {
                         updateLogInfo(validateEscalationDTO, tokenJson.toJSONString());
                         System.out.println(tokenJson);
                         return RequestResult.error("市级系统token信息获取失败，请检查token获取地址、appid！", false);
                     }
-                } else {
-                    updateLogInfo(validateEscalationDTO, tokenJson.toJSONString());
-                    System.out.println(tokenJson);
-                    return RequestResult.error("市级系统token信息获取失败，请检查token获取地址、appid！", false);
+                } catch (Exception e) {
+                    System.out.println(e.toString());
                 }
-            } catch (Exception e) {
-                System.out.println(e.toString());
             }
         }
         //更新数据库上报状态
@@ -633,12 +908,6 @@ public class CgglServiceImpl implements CgglService {
         }
         escalationMapper.update(escalationDTO, wrapper);
         addCgglRz(escalationDTO);
-        //更改 审查状态 上报到市 同步更新到 市级(待审)
-        escalationDTO = escalationMapper.selectOne(wrapper);
-//        if (("2").equals(validateEscalationDTO.getSczt()) && ("1").equals(escalationDTO.getUploadstatus())) {
-//            escalationDTO.setSczt("4");
-//            escalationMapper.update(escalationDTO, wrapper);
-//        }
         return RequestResult.success("修改成功！", true);
     }
 

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

@@ -58,14 +58,23 @@ public class SbSearchServiceImpl implements SbSearchService {
     @Value("${Cggl.appid}")
     private String appid;
 
+    @Value("${Byne.isUse}")
+    private Boolean isByne;
+
     @Override
     public JSONObject reuploadThirdpartyReviseData(MultipartFile file, String instid, String id, String title) {
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("instid", instid);
-        jsonObject.put("id", id);
-        jsonObject.put("title", title);
-        jsonObject.put("file", file);
-        return getRequestFileData(reuploadThirdpartyReviseURI, jsonObject);
+        if (isByne) {
+            jsonObject.put("instId", instid);
+            jsonObject.put("file", file);
+            return getRequestDataFromSheng(reuploadThirdpartyReviseURI, jsonObject);
+        } else {
+            jsonObject.put("instid", instid);
+            jsonObject.put("id", id);
+            jsonObject.put("title", title);
+            jsonObject.put("file", file);
+            return getRequestFileData(reuploadThirdpartyReviseURI, jsonObject);
+        }
     }
 
     @Override
@@ -74,27 +83,35 @@ public class SbSearchServiceImpl implements SbSearchService {
         jsonObject.put("current", current);
         jsonObject.put("size", size);
         if (StringUtils.isNotEmpty(subject)) {
+            jsonObject.put("title", subject);
             jsonObject.put("subject", subject);
         }
         if (StringUtils.isNotEmpty(divisionCode)) {
             jsonObject.put("divisionCode", divisionCode);
         }
+        if (isByne) {
+            return getRequestDataFromSheng(landGetRevisePageURI, jsonObject);
+        }
         return getRequestData(landGetRevisePageURI, jsonObject);
     }
 
     @Override
     public JSONObject getLandMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode, String subject) {
         JSONObject jsonObject = new JSONObject();
+        jsonObject.put("planType", planType);
         jsonObject.put("ghlx", getPlanType(planType));
-//        jsonObject.put("planType", planType);
         jsonObject.put("current", current);
         jsonObject.put("size", size);
         if (StringUtils.isNotEmpty(subject)) {
             jsonObject.put("subject", subject);
+            jsonObject.put("title", subject);
         }
         if (StringUtils.isNotEmpty(divisionCode)) {
             jsonObject.put("divisionCode", divisionCode);
         }
+        if (isByne) {
+            return getRequestDataFromSheng(landMyAttendsDataURI, jsonObject);
+        }
         return getRequestData(landMyAttendsDataURI, jsonObject);
     }
 
@@ -102,15 +119,19 @@ public class SbSearchServiceImpl implements SbSearchService {
     public JSONObject getLandGetAllTasks(Integer planType, Integer current, Integer size, String divisionCode, String subject) {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("ghlx", getPlanType(planType));
-//        jsonObject.put("planType", planType);
+        jsonObject.put("planType", planType);
         jsonObject.put("current", current);
         jsonObject.put("size", size);
         if (StringUtils.isNotEmpty(subject)) {
             jsonObject.put("subject", subject);
+            jsonObject.put("title", subject);
         }
         if (StringUtils.isNotEmpty(divisionCode)) {
             jsonObject.put("divisionCode", divisionCode);
         }
+        if (isByne) {
+            return getRequestDataFromSheng(landGetAllTasksURI, jsonObject);
+        }
         return getRequestData(landGetAllTasksURI, jsonObject);
     }
 
@@ -119,6 +140,10 @@ public class SbSearchServiceImpl implements SbSearchService {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("id", id);
         jsonObject.put("instid", instId);
+        jsonObject.put("instId", instId);
+        if (isByne) {
+            return getRequestDataFromSheng(landTaskStatusURI, jsonObject);
+        }
         return getRequestData(landTaskStatusURI, jsonObject);
     }
 
@@ -127,6 +152,11 @@ public class SbSearchServiceImpl implements SbSearchService {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("id", id);
         jsonObject.put("solid", solId);
+        jsonObject.put("solId", solId);
+        if (isByne) {
+            JSONObject data = getRequestFileDataFromSheng(reportDownloadURI, jsonObject, response);
+            return data;
+        }
         String url = reportDownloadURI + "?id=" + id + "&solid=" + solId;
         JSONObject data = getRequestFileData(url, jsonObject, response);
         if (data == null) {
@@ -259,6 +289,24 @@ public class SbSearchServiceImpl implements SbSearchService {
         return reStrMd5;
     }
 
+    /**
+     * 请求数据
+     *
+     * @param requestURI 请求地址
+     * @param params     请求参数
+     * @return
+     */
+    public JSONObject getRequestFileDataFromSheng(String requestURI, JSONObject params, HttpServletResponse response) {
+        String token = getAccessTokenFromSheng();
+        if (StringUtils.isEmpty(token)) {
+            return null;
+        }
+        JSONObject reStrMd5 = RInterfaceUtil.postRemoteFile(token, requestURI, params, null, response);
+        System.out.println("请求地址：" + requestURI);
+        System.out.println("请求参数：" + params.toJSONString());
+        return reStrMd5;
+    }
+
     /**
      * 请求数据
      *
@@ -292,7 +340,7 @@ public class SbSearchServiceImpl implements SbSearchService {
         }
         JSONObject reStrMd5 = RInterfaceUtilFromSheng.postRemote(token, requestURI, params, null);
         System.out.println("请求地址：" + requestURI);
-        System.out.println("请求参数：" + params.toJSONString());
+//        System.out.println("请求参数：" + params.toJSONString());
         System.out.println("请求结果：" + reStrMd5.toJSONString());
         return reStrMd5;
     }

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

@@ -5,9 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.onemap.apply.domain.cggl.ScmxDTO;
-import com.onemap.apply.domain.cggl.ScmxRecordDTO;
-import com.onemap.apply.domain.cggl.TCgglSjbzmlwjDto;
+import com.onemap.apply.domain.cggl.*;
 import com.onemap.apply.domain.sbjk.XzczghcgsbDTO;
 import com.onemap.apply.mapper.cggl.EscalationMapper;
 import com.onemap.apply.mapper.cggl.ScmxMapper;
@@ -17,6 +15,7 @@ import com.onemap.apply.mapper.sbjk.XzczghcgsbMapper;
 import com.onemap.apply.service.sbjk.XzczghcgsbService;
 import com.onemap.apply.utils.Md5Utils;
 import com.onemap.apply.utils.RInterfaceUtil;
+import com.onemap.apply.utils.RInterfaceUtilFromSheng;
 import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.utils.UnPackageUtils;
 import com.onemap.common.core.utils.uuid.IdUtils;
@@ -36,6 +35,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.onemap.apply.utils.RInterfaceUtil.postRemote;
 import static com.onemap.common.core.utils.StringUtils.*;
 
 
@@ -80,6 +80,26 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
     //规划成果包基本信息存储
     private Map<String, String> xmDetailMap = new HashMap<>();
 
+    @Value("${Cggl.fileSplitCode}")
+    private String fileSplitCode;
+    //TODO wanger  巴彦淖尔
+    @Value("${Byne.isUse}")
+    private Boolean isByne;
+    @Value("${Byne.username}")
+    private String byneusername;
+    @Value("${Byne.password}")
+    private String bynepassword;
+    @Value("${Byne.scope}")
+    private String bynescope;
+    @Value("${Byne.oauthUrl}")
+    private String byneOauthUrl;
+    @Value("${Byne.findByMd5Url}")
+    private String byneFindByMd5Url;
+    @Value("${Byne.uploadCompleteFileUrl}")
+    private String byneUploadCompleteFileUrl;
+    @Value("${Byne.uploadFileUrl}")
+    private String byneUploadFileUrl;
+
     @Override
     public RequestResult startcgsc(String scmodel, String jqscmodel, String cgid) {
         try {
@@ -411,36 +431,340 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
     /**
      * 上报提交
      */
-
     @Override
-    public AjaxResult reportSubmit(String uuid, String cglevel) {
+    public AjaxResult reportSubmit(String uuid, String cglevel, XzczghcgsbDTO xzczghcgsbDto) {
         XzczghcgsbDTO xzczghcgsbDTO = selectByUuid(uuid);
         if (xzczghcgsbDTO == null) {
-            return AjaxResult.error("没有找到改数据！");
+            return AjaxResult.error("没有找到该数据！");
         }
         try {
             if ("1".equals(cglevel)) {
+                //TODO wanger 判断乌拉特前旗
+                if (isByne) {
+                    String instid = xzczghcgsbDTO.getInstid();
+                    //TODO wanger 是否为补正上传
+                    if (StringUtils.isNotEmpty(instid)) {//TODO wanger 补正的直接上传到自治区
+                        try {
+                            setSbjd(uuid, "0/0");
+                            JSONObject jsonObject = new JSONObject();
+                            jsonObject.put("grant_type", "password");
+                            jsonObject.put("username", username);
+                            jsonObject.put("password", Md5Utils.hash(password));
+                            JSONObject tokenJson = RInterfaceUtilFromSheng.postRemote(null, oauthUrl, jsonObject, null);
+                            System.out.println(tokenJson);
+                            String token = "";
+                            String error = "";
+                            String fileMd5 = "";
+                            if (tokenJson.containsKey("success") && tokenJson.getBoolean("success") && tokenJson.containsKey("data") && tokenJson.getJSONObject("data").containsKey("access_token")) {
+                                token = tokenJson.getJSONObject("data").getString("access_token");
+                                System.out.println(token);
+                                if (xzczghcgsbDTO != null) {
+                                    File file = new File(xzczghcgsbDTO.getFilePath());
+                                    if (file.exists()) {
+                                        fileMd5 = Md5Utils.getMD5(file);
+                                        JSONObject jsonObjectMd5 = new JSONObject();
+                                        jsonObjectMd5.put("fileName", file.getName());
+                                        jsonObjectMd5.put("fileSize", file.length());
+                                        jsonObjectMd5.put("fileMd5", fileMd5);
+                                        long mod = file.length() % RInterfaceUtil.sliceSize;
+                                        long totalSliceNum = file.length() / RInterfaceUtil.sliceSize;
+                                        if (mod > 0) {
+                                            totalSliceNum = totalSliceNum + 1;
+                                        }
+                                        if (!StringUtils.isEmpty(xzczghcgsbDTO.getInstid())) {
+                                            jsonObjectMd5.put("instId", xzczghcgsbDTO.getInstid());
+                                        }
+                                        jsonObjectMd5.put("totalSliceNum", totalSliceNum);
+                                        jsonObjectMd5.put("curSliceOrder", 0);
+                                        jsonObjectMd5.put("resetSliceOrder2Zero", true);
+                                        JSONObject reStrMd5 = RInterfaceUtilFromSheng.postRemote(token, findByMd5Url, jsonObjectMd5, null);
+                                        System.out.println("findByMd5Url : " + findByMd5Url);
+                                        if (reStrMd5 != null && reStrMd5.containsKey("success") && reStrMd5.getBoolean("success")) {
+                                            System.out.println(reStrMd5);
+                                            File toDir = new File(temp + File.separator + fileMd5);
+                                            String toFileName = toDir.getAbsolutePath() + File.separator + fileMd5;
+                                            if (toDir.exists()) {
+                                                FileUtils.deleteDirectory(toDir);
+                                            }
+                                            toDir.mkdirs();
+                                            long curSliceSize = RInterfaceUtil.spilt(file.getAbsolutePath(), toFileName, ".");
+                                            if (curSliceSize > 0) {
+                                                JSONObject reStrFileUpload = null;
+                                                int startIndex = 0;
+                                                try {
+                                                    if (reStrMd5 != null && reStrMd5.containsKey("data") && reStrMd5.getJSONObject("data") != null) {
+                                                        startIndex = reStrMd5.getJSONObject("data").getInteger("curSliceOrder");
+                                                    }
+                                                } catch (Exception r) {
+
+                                                }
+                                                setSbjd(uuid, (startIndex + 1) + "/" + totalSliceNum);
+                                                for (int i = startIndex; i < totalSliceNum; i++) {
+                                                    String t = toFileName + "." + i;
+                                                    Map<String, Object> paramFile = new HashMap<>();
+                                                    File f = new File(t);
+                                                    paramFile.put("name", file.getName());
+                                                    if (StringUtils.isEmpty(xzczghcgsbDTO.getYear())) {
+                                                        paramFile.put("year", StringUtils.getCurrentYear());
+                                                    } else {
+                                                        paramFile.put("year", xzczghcgsbDTO.getYear().substring(0, 4));
+                                                    }
+                                                    paramFile.put("zipFileSlice", f);
+                                                    paramFile.put("zipMd5", fileMd5);
+                                                    paramFile.put("totalSliceNum", totalSliceNum);
+                                                    paramFile.put("curSliceOrder", i);
+                                                    paramFile.put("curSliceSize", 10240 * 1024);
+                                                    if (!StringUtils.isEmpty(xzczghcgsbDTO.getInstid())) {
+                                                        paramFile.put("instId", xzczghcgsbDTO.getInstid());
+                                                    }
+                                                    reStrFileUpload = RInterfaceUtilFromSheng.postRemote(token, xzczghcgsbUplaodUrl, null, paramFile);
+                                                    System.out.println("reStrFileUpload :" + reStrFileUpload);
+                                                    if (reStrFileUpload.containsKey("code") && !"200".equals(reStrFileUpload.getString("code"))) {
+                                                        System.out.println("上传规划成果数据分片失败，分片数： " + i + "  ！");
+                                                        xzczghcgsbDTO.setMsg(reStrFileUpload.toString());
+                                                        update(xzczghcgsbDTO);
+                                                        return AjaxResult.error("上传分片数据" + i + "失败：" + reStrFileUpload.toString() + "！");
+                                                    } else {
+                                                        setSbjd(uuid, (i + 1) + "/" + totalSliceNum);
+                                                    }
+                                                }
+                                                if (reStrFileUpload != null && reStrFileUpload.containsKey("success") && reStrFileUpload.getBoolean("success")) {
+                                                    if (toDir.exists()) {
+                                                        FileUtils.deleteDirectory(toDir);
+                                                    }
+                                                    xzczghcgsbDTO.setMsg(reStrFileUpload.toString());
+                                                    xzczghcgsbDTO.setStatus(cglevel + "2");
+                                                    xzczghcgsbDTO.setUploadTime(new Date());
+                                                    //补正的村庄规划成果上传完成后，将instid后面追加#标识为历史，当自治区再次推送到待办任务不再限制上传按钮
+                                                    if (!StringUtils.isEmpty(xzczghcgsbDTO.getInstid())) {
+                                                        xzczghcgsbDTO.setInstid(xzczghcgsbDTO.getInstid() + "#");
+                                                    }
+                                                    update(xzczghcgsbDTO);
+                                                    return AjaxResult.success("上报成功");
+                                                }
+                                            }
+                                        } else {
+                                            xzczghcgsbDTO.setMsg(reStrMd5.toString());
+                                            xzczghcgsbDTO.setUploadTime(new Date());
+                                            update(xzczghcgsbDTO);
+                                            return AjaxResult.error("上传规划成果数据接口-查询MD5值接口失败！", false);
+                                        }
+                                    } else {
+                                        System.out.println("成果文件不存在！");
+                                        return AjaxResult.error("成果文件不存在！", false);
+                                    }
+                                }
+                                return AjaxResult.success("上报成功");
+                            } else {
+                                return AjaxResult.error(tokenJson.toJSONString());
+                            }
+                        } catch (Exception e) {
+//                            xzczghcgsbDTO.setUploadStatus(-1);
+                            xzczghcgsbDTO.setMsg(e.toString());
+                            update(xzczghcgsbDTO);
+                            return AjaxResult.error(e.toString());
+                        }
+                    } else {//TODO wanger 非补正成果上报到巴彦淖尔盟
+                        setSbjd(uuid, "0/0");
+                        //TODO wanger 巴彦淖尔上传数据第一步：request token
+                        JSONObject jsonObject = new JSONObject();
+                        jsonObject.put("grant_type", "password");
+                        jsonObject.put("username", byneusername);
+                        jsonObject.put("password", bynepassword);
+                        jsonObject.put("scope", bynescope);
+                        Map<String, Object> body = new HashMap<>();
+                        body.put("grant_type", "password");
+                        body.put("username", byneusername);
+                        body.put("password", bynepassword);
+                        body.put("scope", bynescope);
+                        JSONObject tokenJson = RInterfaceUtil.postRemote(null, byneOauthUrl, jsonObject, body);
+                        String token = "";
+                        String fileMd5 = "";
+                        try {
+                            if (tokenJson.containsKey("access_token")) {
+                                token = tokenJson.getString("token_type") + " " + tokenJson.getString("access_token");
+                                System.out.println(token);
+                                File file = new File(xzczghcgsbDTO.getFilePath());
+                                if (file.exists()) {
+                                    fileMd5 = Md5Utils.getMD5(file);
+                                    JSONObject jsonObjectMd5 = new JSONObject();
+                                    String filename = file.getName();
+                                    String relFileName = StringUtils.getFileRelName(filename);
+                                    jsonObjectMd5.put("fileName", filename);
+                                    jsonObjectMd5.put("fileMd5", fileMd5);
+                                    long mod = file.length() % RInterfaceUtil.sliceSize;
+                                    long totalSliceNum = file.length() / RInterfaceUtil.sliceSize;
+                                    if (mod > 0) {
+                                        totalSliceNum = totalSliceNum + 1;
+                                    }
+//                                    jsonObjectMd5.put("totalSliceNum", totalSliceNum);
+//                                    jsonObjectMd5.put("curSliceOrder", 0);
+//                                    jsonObjectMd5.put("resetSliceOrder2Zero", true);
+                                    //TODO wanger 巴彦淖尔上传数据第二步：FindByMd5
+                                    JSONObject reStrMd5 = RInterfaceUtil.getRemote(token, byneFindByMd5Url, jsonObjectMd5, null);
+                                    if (reStrMd5 != null && "200".equals(reStrMd5.getString("code"))) {
+                                        System.out.println(reStrMd5);
+                                        String fileUploadPath = "";//TODO wanger 记录最后上传的文件位置
+                                        File toDir = new File(temp + File.separator + fileMd5);
+                                        String toFileName = toDir.getAbsolutePath() + File.separator + relFileName;
+                                        if (toDir.exists()) {
+                                            try {
+                                                FileUtils.deleteDirectory(toDir);
+                                            } catch (Exception e) {
+                                                e.printStackTrace();
+                                            }
+                                        }
+                                        toDir.mkdirs();
+                                        long curSliceSize = 0;
+                                        try {
+                                            curSliceSize = RInterfaceUtil.spiltByne(file.getAbsolutePath(), toFileName, fileSplitCode);
+                                        } catch (IOException ioException) {
+                                            ioException.printStackTrace();
+                                        }
+                                        if (curSliceSize > 0) {
+                                            JSONObject reStrFileUpload = null;
+                                            int startIndex = 0;
+                                            try {
+                                                if (reStrMd5 != null && reStrMd5.containsKey("data") && reStrMd5.getJSONObject("data") != null) {
+                                                    startIndex = reStrMd5.getJSONObject("data").getJSONArray("uploadedChunks").size();
+                                                }
+                                            } catch (Exception r) {
+
+                                            }
+                                            setSbjd(uuid, (startIndex + 1) + "/" + totalSliceNum);
+                                            for (int i = startIndex; i < totalSliceNum; i++) {
+                                                // 生成文件的路径
+                                                String t = toFileName + fileSplitCode + "zip-" + (i + 1);
+                                                Map<String, Object> paramFile = new HashMap<>();
+                                                File f = new File(t);
+                                                String curMd5 = Md5Utils.getMD5(f);
+                                                paramFile.put("fileMd5", fileMd5);
+                                                paramFile.put("chunkFileMd5", curMd5);
+                                                paramFile.put("fileName", filename);
+                                                paramFile.put("currentChunk", (i + 1));
+                                                paramFile.put("upfile", f);
+                                                paramFile.put("totalSize", file.length());
+                                                paramFile.put("totalChunk", totalSliceNum);
+                                                paramFile.put("chunkSize", RInterfaceUtil.sliceSize);
+//                                                paramFile.put("currentChunkSize", 10240 * 1024);
+                                                paramFile.put("currentChunkSize", f.length());
+                                                //TODO wanger 巴彦淖尔上传数据第三步：UploadSplitFile
+                                                reStrFileUpload = RInterfaceUtil.postRemote(token, byneFindByMd5Url, null, paramFile);
+                                                System.out.println("reStrFileUpload :" + reStrFileUpload);
+                                                if (reStrFileUpload.containsKey("code") && !"200".equals(reStrFileUpload.getString("code"))) {
+                                                    System.out.println("上传规划成果数据分片失败，分片数： " + i + "  ！");
+                                                    xzczghcgsbDTO.setMsg(reStrFileUpload.toString());
+                                                    update(xzczghcgsbDTO);
+                                                    return AjaxResult.error("上传分片数据" + i + "失败：" + reStrFileUpload.toString() + "！");
+                                                } else {
+                                                    fileUploadPath = reStrFileUpload.getString("data");
+                                                    setSbjd(uuid, (i + 1) + "/" + totalSliceNum);
+                                                }
+                                            }
+                                            //TODO wanger 巴彦淖尔上传数据第四步：Complete
+                                            Map<String, Object> paramFile = new HashMap<>();
+//                                            paramFile.put("fileMd5", fileMd5);
+//                                            paramFile.put("fileName", filename);
+//                                            paramFile.put("filePath", fileUploadPath);
+//                                            paramFile.put("fileSize", file.length());
+                                            JSONObject mergeJSONObject = new JSONObject();
+                                            mergeJSONObject.put("fileMd5", fileMd5);
+                                            mergeJSONObject.put("fileName", filename);
+                                            mergeJSONObject.put("filePath", fileUploadPath);
+                                            mergeJSONObject.put("fileSize", file.length());
+                                            reStrFileUpload = RInterfaceUtil.postRemote(token, byneUploadCompleteFileUrl, mergeJSONObject, null);
+                                            if (reStrFileUpload != null && "200".equals(reStrFileUpload.getString("code"))) {
+                                                if (toDir.exists()) {
+                                                    try {
+                                                        FileUtils.deleteDirectory(toDir);
+                                                    } catch (Exception ioException) {
+                                                        ioException.printStackTrace();
+                                                    }
+                                                }
+                                                String fileUploadId = reStrFileUpload.getString("data");
+                                                //TODO wanger 巴彦淖尔上传数据第五步：Complete
+                                                paramFile = new HashMap<>();
+                                                paramFile.put("fileInfoId", fileUploadId);
+                                                paramFile.put("name", filename);
+                                                if (StringUtils.isEmpty(xzczghcgsbDTO.getYear())) {
+                                                    paramFile.put("year", StringUtils.getCurrentYear());
+                                                } else {
+                                                    paramFile.put("year", xzczghcgsbDTO.getYear().substring(0, 4));
+                                                }
+                                                paramFile.put("xzqmc", xzczghcgsbDTO.getXzqName());
+                                                paramFile.put("xzqdm", xzczghcgsbDTO.getXzqCode());
+                                                paramFile.put("type", 3);//TODO wanger 村庄规划直接赋值3
+                                                File zjfile = null;
+                                                if (xzczghcgsbDTO.getFile() != null) {
+                                                    String filepath = temp + "check.pdf";
+                                                    byteArrayToFile(xzczghcgsbDTO.getFile(), filepath);
+                                                    zjfile = new File(filepath);
+                                                }
+                                                paramFile.put("zjbgFile", zjfile);
+                                                paramFile.put("phone", xzczghcgsbDto.getPhone());
+                                                paramFile.put("remark", xzczghcgsbDto.getUploadremark());
+                                                paramFile.put("wdbh", xzczghcgsbDto.getWdbh());
+                                                reStrFileUpload = RInterfaceUtil.postRemote(token, byneUploadFileUrl, null, paramFile);
+                                                if (reStrFileUpload.containsKey("code") && !"200".equals(reStrFileUpload.getString("code"))) {
+                                                    System.out.println("成果上报接口失败： ！==" + reStrFileUpload.toJSONString());
+                                                    xzczghcgsbDTO.setMsg(reStrFileUpload.toString());
+                                                    update(xzczghcgsbDTO);
+                                                    return AjaxResult.error("成果上报接口失败：" + reStrFileUpload.toJSONString() + "！", false);
+                                                } else {
+                                                    xzczghcgsbDTO.setMsg(reStrFileUpload.toString());
+                                                    xzczghcgsbDTO.setStatus(cglevel + "2");
+                                                    xzczghcgsbDTO.setUploadTime(new Date());
+                                                    if (!StringUtils.isEmpty(xzczghcgsbDTO.getInstid())) {
+                                                        xzczghcgsbDTO.setInstid(xzczghcgsbDTO.getInstid() + "#");
+                                                    }
+                                                    update(xzczghcgsbDTO);
+                                                    return AjaxResult.success("上报成功");
+                                                }
+                                            } else {
+                                                System.out.println("Complete Error！" + reStrFileUpload.toJSONString());
+                                                xzczghcgsbDTO.setMsg(reStrFileUpload.toString());
+                                                update(xzczghcgsbDTO);
+                                                return AjaxResult.error("Complete Error！：" + reStrFileUpload.getString("msg") + "！", false);
+                                            }
+                                        }
+                                    } else {
+                                        xzczghcgsbDTO.setMsg(reStrMd5.toString());
+                                        update(xzczghcgsbDTO);
+                                        System.out.println("上传规划成果数据接口-查询MD5值接口失败！");
+                                        return AjaxResult.error("上传规划成果数据接口-查询MD5值接口失败！", false);
+                                    }
+                                }
+                            } else {
+                                xzczghcgsbDTO.setMsg(tokenJson.toString());
+                                update(xzczghcgsbDTO);
+                                System.out.println(tokenJson);
+                                return AjaxResult.error("市级系统token信息获取失败，请检查token获取地址、用户名、密码！", false);
+                            }
+                        } catch (Exception e) {
+                            xzczghcgsbDTO.setMsg(e.toString());
+                            update(xzczghcgsbDTO);
+                            System.out.println(tokenJson);
+                            return AjaxResult.error("市级系统token信息获取失败，请检查token获取地址、用户名、密码！", false);
+                        }
+                    }
+                }
+            } else {
+                //TODO wanger 普通旗县调用市级接口（乌兰察布、鄂尔多斯）
                 setSbjd(uuid, "0/0");
-                //调用鄂尔多斯市级接口
-                //获取token授权
                 JSONObject jsonObject = new JSONObject();
-                //组装请求参数
                 jsonObject.put("appid", appid);
-                //调用post请求方法
-                JSONObject tokenJson = RInterfaceUtil.postRemote(null, oauthUrl, jsonObject, null);
+                JSONObject tokenJson = postRemote(null, oauthUrl, jsonObject, null);
                 System.out.println(tokenJson);
                 String token = "";
                 String error = "";
                 String fileMd5 = "";
                 String fileName = "";
-
                 if (tokenJson.containsKey("success") && tokenJson.getBoolean("success")
                         && tokenJson.containsKey("data") && tokenJson.getJSONObject("data").containsKey("token")) {
                     token = tokenJson.getJSONObject("data").getString("token");
                     System.out.println(token);
-
-                    //获取文件md5
                     if (xzczghcgsbDTO != null) {
+
                         File file = new File(xzczghcgsbDTO.getFilePath());
                         if (file.exists()) {
                             fileMd5 = Md5Utils.getMD5(file);
@@ -466,11 +790,9 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                                     FileUtils.deleteDirectory(toDir);
                                 }
                                 toDir.mkdirs();
-                                //切割文件，是否成功
                                 long curSliceSize = RInterfaceUtil.spilt(file.getAbsolutePath(), toFileName, ".");
                                 if (curSliceSize > 0) {
                                     JSONObject reStrFileUpload = null;
-                                    //上传zip文件分片
                                     int startIndex = 0;
                                     try {
                                         if (reStrMd5 != null && reStrMd5.containsKey("data") && reStrMd5.getJSONObject("data") != null) {
@@ -483,16 +805,14 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
 
                                     }
                                     setSbjd(uuid, (startIndex + 1) + "/" + totalSliceNum);
-                                    //上传zip文件分片
                                     for (int i = startIndex; i < totalSliceNum; i++) {
-                                        // 生成文件的路径
-                                        String t = toFileName + "." + i;
+                                        String t = toFileName + fileSplitCode + i;
                                         Map<String, Object> paramFile = new HashMap<>();
                                         File f = new File(t);
                                         paramFile.put("file", f);
                                         paramFile.put("md5", fileMd5);
                                         paramFile.put("chunk", i);
-                                        reStrFileUpload = RInterfaceUtil.postRemote(token, xzczghcgsbUplaodUrl, null, paramFile);
+                                        reStrFileUpload = postRemote(token, xzczghcgsbUplaodUrl, null, paramFile);
                                         System.out.println("reStrFileUpload :" + reStrFileUpload);
                                         if (reStrFileUpload.containsKey("code") && !"200".equals(reStrFileUpload.getString("code"))) {
                                             System.out.println("上传规划成果数据分片失败，分片数： " + i + "  ！");
@@ -514,13 +834,12 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                                         if (!StringUtils.isEmpty(xzczghcgsbDTO.getInstid())) {
                                             jsonObjectMerge.put("instid", xzczghcgsbDTO.getInstid());
                                         }
-                                        JSONObject mergeResult = RInterfaceUtil.postRemote(token, xzczghcgsbCompleteUrl, jsonObjectMerge, null);
+                                        JSONObject mergeResult = postRemote(token, xzczghcgsbCompleteUrl, jsonObjectMerge, null);
                                         System.out.println("合包请求结果：" + mergeResult);
                                         if (mergeResult != null && mergeResult.containsKey("success") && mergeResult.getBoolean("success")) {
                                             xzczghcgsbDTO.setMsg(reStrFileUpload.toString());
                                             xzczghcgsbDTO.setStatus(cglevel + "2");
                                             xzczghcgsbDTO.setUploadTime(new Date());
-                                            //补正的村庄规划成果上传完成后，将instid后面追加#标识为历史，当自治区再次推送到待办任务不再限制上传按钮
                                             if (!StringUtils.isEmpty(xzczghcgsbDTO.getInstid())) {
                                                 xzczghcgsbDTO.setInstid(xzczghcgsbDTO.getInstid() + "#");
                                             }
@@ -557,18 +876,14 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                 } else {
                     return AjaxResult.error(tokenJson.toJSONString());
                 }
-            } else {
-                xzczghcgsbDTO.setStatus(cglevel + "2");
-                xzczghcgsbDTO.setCglevel("2");
-                update(xzczghcgsbDTO);
-                return AjaxResult.success("上报成功");
             }
-        } catch (Exception e) {
-            xzczghcgsbDTO.setUploadStatus(-1);
-            xzczghcgsbDTO.setMsg(e.toString());
+        } catch (Exception r) {
+            xzczghcgsbDTO.setStatus(cglevel + "2");
+            xzczghcgsbDTO.setCglevel("2");
             update(xzczghcgsbDTO);
-            return AjaxResult.error(e.toString());
+            return AjaxResult.success("上报成功");
         }
+        return AjaxResult.error("成果文件不存在！", false);
     }
 
     @Override

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

@@ -6,6 +6,7 @@ import com.onemap.common.core.web.domain.AjaxResult;
 import com.onemap.common.core.web.domain.RequestResult;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.util.List;
 
 public interface XzczghcgsbService {
@@ -56,7 +57,7 @@ public interface XzczghcgsbService {
     /**
      * 上报提交
      */
-    AjaxResult reportSubmit(String uuid,String cglevel);
+    AjaxResult reportSubmit(String uuid,String cglevel, XzczghcgsbDTO xzczghcgsbDTO);
 
     List<String> getInstIds(String param);
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/utils/RInterfaceUtil.java

@@ -53,6 +53,10 @@ public class RInterfaceUtil {
      */
     public static JSONObject postRemote(String access_token, String url, JSONObject jsonParam, Map<String, Object> param) {
         //CloseableHttpClient closeableHttpClient = HttpClients.createDefault();
+        System.out.println("postRemote Start");
+        System.out.println("postRemote access_token === " + access_token);
+        System.out.println("postRemote url === " + url);
+        System.out.println("postRemote jsonParam === " + (jsonParam != null ? jsonParam.toJSONString() : ""));
         RequestConfig config = RequestConfig.custom()
                 .setConnectTimeout(0)
                 .setSocketTimeout(0)
@@ -85,7 +89,11 @@ public class RInterfaceUtil {
                 HttpEntity entity = mentity.build();
                 HttpUriRequest post = RequestBuilder.post().setUri(url).setEntity(entity).build();
                 //设置HTTP访问header
-                post.setHeader("Authorization", access_token);
+                if (StringUtils.isNotEmpty(access_token)) {
+                    post.setHeader("Authorization", access_token);
+                } else {
+                    post.setHeader("Authorization", "Basic Z21jbG91ZDpnbWNsb3Vk");
+                }
 //                post.addHeader("Tenant-Id", TenantId);
 //                if (StringUtils.isNotEmpty(access_token)) {
 //                    post.setHeader("Token-Auth", access_token);
@@ -95,7 +103,11 @@ public class RInterfaceUtil {
                 //普通请求
                 HttpPost httpPost = new HttpPost(url);
                 //设置HTTP访问header
-                httpPost.setHeader("Authorization", access_token);
+                if (StringUtils.isNotEmpty(access_token)) {
+                    httpPost.setHeader("Authorization", access_token);
+                } else {
+                    httpPost.setHeader("Authorization", "Basic Z21jbG91ZDpnbWNsb3Vk");
+                }
 //                httpPost.addHeader("Tenant-Id", TenantId);
 //                if (StringUtils.isNotEmpty(access_token)) {
 //                    httpPost.setHeader("Token-Auth", access_token);
@@ -167,6 +179,10 @@ public class RInterfaceUtil {
      * @return
      */
     public static JSONObject getRemote(String access_token, String url, JSONObject jsonParam, Map<String, Object> param) {
+        System.out.println("getRemote Start");
+        System.out.println("getRemote access_token === " + access_token);
+        System.out.println("getRemote url === " + url);
+        System.out.println("getRemote jsonParam === " + (jsonParam != null ? jsonParam.toJSONString() : ""));
         RequestConfig config = RequestConfig.custom()
                 .setConnectTimeout(0)
                 .setSocketTimeout(0)
@@ -199,7 +215,11 @@ public class RInterfaceUtil {
                 HttpEntity entity = mentity.build();
                 HttpUriRequest get = RequestBuilder.get().setUri(url).setEntity(entity).build();
                 //设置HTTP访问header
-                get.setHeader("Authorization", access_token);
+                if (StringUtils.isNotEmpty(access_token)) {
+                    get.setHeader("Authorization", access_token);
+                } else {
+                    get.setHeader("Authorization", "Basic Z21jbG91ZDpnbWNsb3Vk");
+                }
                 closeableHttpResponse = closeableHttpClient.execute(get);
             } else {
                 String newUrl = url + "?";
@@ -213,7 +233,11 @@ public class RInterfaceUtil {
                 //普通请求
                 HttpGet httpGet = new HttpGet(newUrl);
                 //设置HTTP访问header
-                httpGet.setHeader("Authorization", access_token);
+                if (StringUtils.isNotEmpty(access_token)) {
+                    httpGet.setHeader("Authorization", access_token);
+                } else {
+                    httpGet.setHeader("Authorization", "Basic Z21jbG91ZDpnbWNsb3Vk");
+                }
 //                httpGet.setParams(params);
                 //配置请求时间、超时时间
                 RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(10000).setConnectTimeout(10000).build();
@@ -371,6 +395,10 @@ public class RInterfaceUtil {
      * @return
      */
     public static JSONObject postRemoteFile(String access_token, String url, JSONObject jsonParam, Map<String, Object> param, HttpServletResponse response) {
+        System.out.println("postRemoteFile Start");
+        System.out.println("postRemoteFile access_token === " + access_token);
+        System.out.println("postRemoteFile url === " + url);
+        System.out.println("postRemoteFile jsonParam === " + (jsonParam != null ? jsonParam.toJSONString() : ""));
         CloseableHttpClient closeableHttpClient = HttpClients.createDefault();
         CloseableHttpResponse closeableHttpResponse = null;
         JSONObject jsonObject = new JSONObject();
@@ -396,7 +424,11 @@ public class RInterfaceUtil {
                 HttpEntity entity = mentity.build();
                 HttpUriRequest post = RequestBuilder.post().setUri(url).setEntity(entity).build();
                 //设置HTTP访问header
-                post.setHeader("Authorization", access_token);
+                if (StringUtils.isNotEmpty(access_token)) {
+                    post.setHeader("Authorization", access_token);
+                } else {
+                    post.setHeader("Authorization", "Basic Z21jbG91ZDpnbWNsb3Vk");
+                }
 //                post.addHeader("Tenant-Id", TenantId);
 //                if (StringUtils.isNotEmpty(access_token)) {
 //                    post.setHeader("Token-Auth", access_token);
@@ -406,7 +438,11 @@ public class RInterfaceUtil {
                 //普通请求
                 HttpPost httpPost = new HttpPost(url);
                 //设置HTTP访问header
-                httpPost.setHeader("Authorization", access_token);
+                if (StringUtils.isNotEmpty(access_token)) {
+                    httpPost.setHeader("Authorization", access_token);
+                } else {
+                    httpPost.setHeader("Authorization", "Basic Z21jbG91ZDpnbWNsb3Vk");
+                }
 //                httpPost.addHeader("Tenant-Id", TenantId);
 //                if (StringUtils.isNotEmpty(access_token)) {
 //                    httpPost.setHeader("Token-Auth", access_token);
@@ -517,4 +553,48 @@ public class RInterfaceUtil {
         inChannel.close();
         return curSliceSize;
     }
+
+    /**
+     * 切割文件  巴彦淖尔
+     *
+     * @param fromFileName 源文件的完整路径带文件名
+     * @param toFileName   目标文件的完整路径带文件名
+     * @return
+     * @throws IOException
+     */
+    public static long spiltByne(String fromFileName, String toFileName, String splice) throws IOException {
+        long curSliceSize = 0;
+        File f = new File(fromFileName);
+        FileInputStream in = new FileInputStream(f);
+        FileOutputStream out = null;
+        FileChannel inChannel = in.getChannel();
+        FileChannel outChannel = null;
+        // 计算最终会分成几个文件
+        int count = (int) (f.length() / sliceSize);
+        for (int i = 0; i <= count; i++) {
+            // 生成文件的路径
+            String t = toFileName + splice + "zip-" + (i + 1);
+            try {
+                out = new FileOutputStream(new File(t));
+                outChannel = out.getChannel();
+                // 从inChannel的m*i处，读取固定长度的数据，写入outChannel
+                if (i != count) {
+                    curSliceSize = sliceSize;
+                    inChannel.transferTo(sliceSize * i, curSliceSize, outChannel);
+                } else {// 最后一个文件，大小不固定，所以需要重新计算长度
+                    curSliceSize = f.length() - sliceSize * count;
+                    inChannel.transferTo(sliceSize * i, curSliceSize, outChannel);
+                }
+            } catch (IOException e) {
+                System.out.println(e.toString());
+                return curSliceSize;
+            } finally {
+                out.close();
+                outChannel.close();
+            }
+        }
+        in.close();
+        inChannel.close();
+        return curSliceSize;
+    }
 }