宗地变化情况调整

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/CadastreManageController.java

@@ -65,9 +65,9 @@ public class CadastreManageController extends BaseController {
      * @return
      */
     @PostMapping("/checkUploadDquality")
-    public R<CheckInfoResultVo> checkData(String theFileName, String theFilePath, String fileType, String updateType) {
+    public R<CheckInfoResultVo> checkData(String theFileName, String theFilePath, String fileType, String updateType,String landRightType,String landChangeMode) {
         try {
-            CheckInfoResultVo res = cadastreManageService.checkFileData(theFileName, theFilePath, fileType, updateType);
+            CheckInfoResultVo res = cadastreManageService.checkFileData(theFileName, theFilePath, fileType, updateType,landRightType,landChangeMode);
             return R.ok(res);
         } catch (Exception e) {
             e.printStackTrace();

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/CadastreFile.java

@@ -33,4 +33,12 @@ public class CadastreFile extends BaseId {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
     private Long fileSize;
+
+    //宗地权利类型(1-使用权；2-所有权)
+    private String landRightType;
+    //宗地变化方式(1-合并；2-拆分)
+    private String landChangeMode;
+
+
+
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/CadastreManageService.java

@@ -16,13 +16,13 @@ public interface CadastreManageService {
 
     CompareResultVo getCompareData(String uploadId) ;
 
-    CadastreFile saveUploadFile(String theFileName, String theFilePath, String fileType,String updateType);
+    CadastreFile saveUploadFile(String theFileName, String theFilePath, String fileType,String updateType,String landRightType,String landChangeMode);
 
     String addBatchGdbData(String uploadId);
 
     String addBatchMdbData(String uploadId);
 
-    CheckInfoResultVo checkFileData(String theFileName, String theFilePath, String fileType,String updateType);
+    CheckInfoResultVo checkFileData(String theFileName, String theFilePath, String fileType,String updateType,String landRightType,String landChangeMode);
 
     /**
      * 获取列表

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/CadastreManageServiceImpl.java

@@ -276,7 +276,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
      * @return
      */
     @Override
-    public CadastreFile saveUploadFile(String theFileName, String theFilePath, String fileType, String updateType) {
+    public CadastreFile saveUploadFile(String theFileName, String theFilePath, String fileType, String updateType,String landRightType,String landChangeMode) {
         try {
             if (theFilePath == null || theFilePath.trim().isEmpty()) {
                 log.warn("处理文件失败：filePath不能为空");
@@ -344,11 +344,19 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                     if (StringUtils.isNotBlank(fileType)) {
                         cadastreFile.setFileType(fileType);
                     }
-
                     //0 为全量更新，1为增量更新
                     if (StringUtils.isNotBlank(updateType)) {
                         cadastreFile.setReadStatus(updateType);
                     }
+                    //权利类型
+                    if (StringUtils.isNotBlank(landRightType)) {
+                        cadastreFile.setLandRightType(landRightType);
+                    }
+                    //合并方式
+                    if (StringUtils.isNotBlank(landChangeMode)) {
+                        cadastreFile.setLandChangeMode(landChangeMode);
+                    }
+
                     cadastreFile.setFileSize(fileSize);
                     cadastreFile.setStatus("0");
                     cadastreFile.setUploadUser("admin");
@@ -382,13 +390,13 @@ public class CadastreManageServiceImpl implements CadastreManageService {
      * @return
      */
     @Override
-    public CheckInfoResultVo checkFileData(String theFileName, String theFilePath, String fileType, String updateType) {
+    public CheckInfoResultVo checkFileData(String theFileName, String theFilePath, String fileType, String updateType,String landRightType,String landChangeMode) {
         CheckInfoResultVo checkInfoResult = new CheckInfoResultVo();
         checkInfoResult.setResultStatus(true);
         List<CheckInfoVo> checkInfoSuccessList = new ArrayList<>();
         List<CheckInfoVo> checkInfoFailList = new ArrayList<>();
 
-        CadastreFile uploadFile = this.saveUploadFile(theFileName, theFilePath, fileType, updateType);
+        CadastreFile uploadFile = this.saveUploadFile(theFileName, theFilePath, fileType, updateType,landRightType,landChangeMode);
 
         if (Objects.nonNull(uploadFile)) {
             //入库成功