增加状态校验

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

@@ -177,7 +177,7 @@ public class CadastreManageController extends BaseController {
     @RequestMapping("/testRun")
     public R<Object> testRun() {
         try {
-            cadastreManageService.testRun();
+            //cadastreManageService.testRun();
             return R.ok(null);
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -213,6 +213,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                         cadastreFile.setReadStatus(updateType);
                     }
 
+                    cadastreFile.setStatus("0");
                     cadastreFile.setUploadUser("admin");
                     cadastreFile.setUploadTime(new Date());
                     cadastreFile.setReadMessage("入库成功");
@@ -283,6 +284,11 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                     checkInfoFailList.add(checkRes);
                     checkInfoResult.setResultStatus(false);
                 } else if (checkRes.getCheckStatus().equals(true)) {
+                    //成功则更新文件上传状态
+                    CadastreFile cadastreFile = new CadastreFile();
+                    cadastreFile.setId(uploadFile.getId());
+                    cadastreFile.setStatus("3");//校验通过
+                    cadastreFileMapper.update(cadastreFile);
                     checkInfoSuccessList.add(checkRes);
                 }
             }
@@ -328,6 +334,9 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         if (dbFieldNameList.contains("geom")) {
             haveGeom = true;
         }
+        //这里移除校验字段（非属mdb中的字段）
+        dbFieldNameList.remove("valid_flag");
+
 
         List<String> layerFieldNameList = this.getFieldName(layer, haveGeom);
         // 判断是否包含相同的元素（不考虑顺序）
@@ -341,7 +350,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         //todo 这里根据表名获取相关校验字段信息
         List<String> checkFieldList = new ArrayList<>();
         //checkFieldList.add("111");
-        checkFieldList.add("bz");
+        //checkFieldList.add("bz");
         //仅获取图层属性
         List<Map<String, Object>> theValueList = getValueList(layer,new LinkedHashMap<>(), false);
         for (Map<String, Object> theMap : theValueList) {