适配提交

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

@@ -144,52 +144,58 @@ public class ResultSearchServiceImpl implements ResultSearchService {
 
     @Override
     public RequestResult reuploadThirdpartyRevise(String id, String instid, MultipartFile file, String title) {
-        //TODO wanger 存储修编申请  旗县上报到市级  市级负责将修编申请上报到自治区
-        if (StringUtils.isEmpty(id)) {
-            return RequestResult.error("id参数不允许为空！");
-        } else if (StringUtils.isEmpty(instid)) {
-            return RequestResult.error("instid参数不允许为空！");
-        } else if (StringUtils.isEmpty(title)) {
-            return RequestResult.error("title参数不允许为空！");
-        }
-        TSysOpenUser user = getOpenUser();
-        if (user == null) {
-            return RequestResult.error("用户信息获取失败！");
-        }
-        QueryWrapper<tCgglRevise> wrapper = new QueryWrapper();
-        wrapper.eq("instid", instid);
-        wrapper.eq("shzt", "0");
-        List<tCgglRevise> tCgglReviseList = tCgglReviseMapper.selectList(wrapper);
-        if (tCgglReviseList.size() > 0) {
-            System.out.println("revise repeat -- 该流程主键已存在修编申请，请勿重复提交！");
+        System.out.println("reuploadThirdpartyRevise");
+        try {
+            //TODO wanger 存储修编申请  旗县上报到市级  市级负责将修编申请上报到自治区
+            if (StringUtils.isEmpty(id)) {
+                return RequestResult.error("id参数不允许为空！");
+            } else if (StringUtils.isEmpty(instid)) {
+                return RequestResult.error("instid参数不允许为空！");
+            } else if (StringUtils.isEmpty(title)) {
+                return RequestResult.error("title参数不允许为空！");
+            }
+            TSysOpenUser user = getOpenUser();
+            if (user == null) {
+                return RequestResult.error("用户信息获取失败！");
+            }
+            QueryWrapper<tCgglRevise> wrapper = new QueryWrapper();
+            wrapper.eq("instid", instid);
+            wrapper.eq("shzt", "0");
+            List<tCgglRevise> tCgglReviseList = tCgglReviseMapper.selectList(wrapper);
+            if (tCgglReviseList.size() > 0) {
+                System.out.println("revise repeat -- 该流程主键已存在修编申请，请勿重复提交！");
 //            return RequestResult.error("该流程主键已存在修编申请，请勿重复提交！");
-        }
-        String filepath = "";
-        if (file != null) {
-            String folder = String.format("%s旗县修编申请\\%s\\%s\\", tempfolder, user.getXzqmc(), instid);
-            makedir(folder);
-            filepath = folder + "" + file.getOriginalFilename();
-            try {
-                file.transferTo(Paths.get(filepath));
-            } catch (IOException e) {
-                e.printStackTrace();
             }
-        }
-        tCgglRevise dto = new tCgglRevise();
-        dto.setId(id);
-        dto.setInstid(instid);
-        dto.setName(title);
-        dto.setPath(filepath);
-        dto.setUploadtime(new Date());
-        dto.setXzqdm(user.getXzqdm());
-        dto.setXzqmc(user.getXzqmc());
-        dto.setShzt("0");
+            String filepath = "";
+            if (file != null) {
+                String folder = String.format("%s旗县修编申请\\%s\\%s\\", tempfolder, user.getXzqmc(), instid);
+                makedir(folder);
+                filepath = folder + "" + file.getOriginalFilename();
+                try {
+                    file.transferTo(Paths.get(filepath));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            tCgglRevise dto = new tCgglRevise();
+            dto.setId(id);
+            dto.setInstid(instid);
+            dto.setName(title);
+            dto.setPath(filepath);
+            dto.setUploadtime(new Date());
+            dto.setXzqdm(user.getXzqdm());
+            dto.setXzqmc(user.getXzqmc());
+            dto.setShzt("0");
 //        dto.setShyh("");
 //        dto.setShsj(new Date());
 //        dto.setPlantype("村庄规划");
 //        dto.setRemark("");
-        tCgglReviseMapper.insert(dto);
-        return RequestResult.success("操作成功！");
+            tCgglReviseMapper.insert(dto);
+            return RequestResult.success("修编成功！");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return RequestResult.error("修编失败！");
     }
 
     @Override

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

@@ -247,12 +247,13 @@ public class ResultsServiceImpl implements ResultsService {
             return RequestResult.error("1------合包失败，合包失败---");
         }
         File targetfile = new File(targetfilepath);
-        String fileMd5 = getMD5(targetfile);
-        if (!fileMd5.equals(md5)) {
-            deleteQxsbrw(md5);
-            deleteCurDirectory(targetfile.getParent());
-            return RequestResult.error("2-----警告：文件的MD5不一致");
-        }
+//        String fileMd5 = getMD5(targetfile);
+//        if (!fileMd5.equals(md5)) {
+//            System.out.println("2-----警告：文件的MD5不一致");
+//            deleteQxsbrw(md5);
+//            deleteCurDirectory(targetfile.getParent());
+//            return RequestResult.error("2-----警告：文件的MD5不一致");
+//        }
         //TODO wanger 进行数据解压
         String filetype = StringUtils.getFileKzmx(filename);
         String fileRelName = StringUtils.getFileRelName(filename);
@@ -447,12 +448,12 @@ public class ResultsServiceImpl implements ResultsService {
     }
 
     private void deleteCurDirectory(String parent) {
-        try {
-            FileUtils.deleteDirectory(new File(parent));
-        } catch (IOException e) {
-            e.printStackTrace();
-            System.out.println(String.format("文件夹删除失败：%s", parent));
-        }
+//        try {
+//            FileUtils.deleteDirectory(new File(parent));
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//            System.out.println(String.format("文件夹删除失败：%s", parent));
+//        }
     }
 
     /**