浏览代码

更新uuid

wuweihao 3 年之前
父节点
当前提交
29be44bb8e

+ 3 - 29
gis_db/src/main/java/com/gis/db/service/impl/FieldServiceImpl.java

@@ -116,7 +116,6 @@ public class FieldServiceImpl extends ServiceImpl<FieldMapper, FieldEntity> impl
             updateWrapper.eq(FieldEntity::getTableId, tableId);
             updateWrapper.set(FieldEntity::getIsDelete, 1);
             this.update(updateWrapper);
-//            getBaseMapper().delByTableId(tableId);
         }
     }
 
@@ -152,7 +151,6 @@ public class FieldServiceImpl extends ServiceImpl<FieldMapper, FieldEntity> impl
             }
         }
 
-        // ddlMapper.delFields(tableName, fieldNames);
         // 逻辑删除字段记录
         this.removeByIds(ids);
 
@@ -164,10 +162,6 @@ public class FieldServiceImpl extends ServiceImpl<FieldMapper, FieldEntity> impl
         return Result.success();
     }
 
-    private String getTableNameByFieldId(Integer id) {
-        return getBaseMapper().getTableNameByFieldId(id);
-    }
-
 
 
     @Override
@@ -286,6 +280,7 @@ public class FieldServiceImpl extends ServiceImpl<FieldMapper, FieldEntity> impl
         fileNames.add("create_time");
         fileNames.add("update_time");
         fileNames.add("creator_id");
+        fileNames.add("uuid");
         return fileNames;
     }
 
@@ -307,27 +302,7 @@ public class FieldServiceImpl extends ServiceImpl<FieldMapper, FieldEntity> impl
 
 
 
-    private Map getMapByTableId(Long tableId){
-        List<FieldEntity> list = cacheByTableId(tableId);
 
-        Map filedMap = new HashMap();
-        FieldVo vo ;
-        for (FieldEntity entity : list) {
-            filedMap.put(entity.getName(), entity.getType());
-            vo = new FieldVo();
-            BeanUtils.copyProperties(entity, vo);
-            filedMap.put(entity.getName(), vo);
-        }
-
-        // 添加默认字段: 使用数据库下划线命名
-        filedMap.put("id", new FieldVo("id", "int", "业务id", 8));
-        filedMap.put("create_time", new FieldVo("create_time", "date", "创建时间", 0));
-        filedMap.put("update_time", new FieldVo("update_time", "date", "修改时间", 0));
-        filedMap.put("creator_id", new FieldVo("creator_id", "int", "创建者id", 8));
-
-
-        return filedMap;
-    }
 
     private List<Object>  gertFieldListByTableId(Long tableId){
         List<FieldEntity> list = cacheByTableId(tableId);
@@ -341,7 +316,8 @@ public class FieldServiceImpl extends ServiceImpl<FieldMapper, FieldEntity> impl
         }
 
         // 添加默认字段: 使用数据库下划线命名
-        fields.add(new FieldVo("id", "int", "业务id", 8));
+        fields.add(new FieldVo("id", "int", "对象id", 8));
+        fields.add(new FieldVo("uuid", "varchar", "业务id", 0));
         fields.add(new FieldVo("update_time", "date", "修改时间", 0));
         return fields;
     }
@@ -355,8 +331,6 @@ public class FieldServiceImpl extends ServiceImpl<FieldMapper, FieldEntity> impl
         BaseRuntimeException.isNull(tableEntity, ErrorEnum.FAILURE_CODE_3001);
 
         List<String> searchField = getSearchField(tableId);
-        List<String> fileNames = getFileNames(tableId);
-//        IPage<Map> resPage = getBaseMapper().page(tableEntity.getName(), fileNames, searchField, param.getSearchKey(), page);
         IPage<Map> resPage = getBaseMapper().page(tableEntity.getName(), searchField, param.getSearchKey(), page);
 
         Map resultMap = new HashMap();

+ 1 - 0
gis_db/src/main/resources/mybatis-mapper/DdlMapper.xml

@@ -10,6 +10,7 @@
           `is_delete` int(1) NULL DEFAULT 0 COMMENT '状态,0:激活,1:删除',
           `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '更新时间',
           `creator_id` int(10) NULL DEFAULT NULL COMMENT '创建者id',
+          `uuid` varchar (64) NULL DEFAULT NULL COMMENT 'uuid',
           PRIMARY KEY (`id`)
         ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = #{remark}
     </insert>