表 分页

README.md

@@ -9,6 +9,7 @@ gis_biguiyuan  AR-碧桂园项目-文通部门
 
 
 # 开发进度日志
+  参考：https://www.bmob.cn  微信扫码登录
  2022-3-21 删除表      已完成
  2022-3-21 删除字段    未完成
  

gis_db/src/main/java/com/gis/db/controller/TableController.java

@@ -1,9 +1,9 @@
 package com.gis.db.controller;
 
-import com.gis.common.base.entity.dto.PageDto;
 import com.gis.common.util.Result;
 import com.gis.db.entity.dto.IdsDto;
 import com.gis.db.entity.dto.TableDto;
+import com.gis.db.entity.dto.TablePageDto;
 import com.gis.db.service.TableService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,7 +33,7 @@ public class TableController {
 
     @ApiOperation(value = "列表")
     @PostMapping("getList")
-    public Result getList(@Valid @RequestBody PageDto param){
+    public Result getList(@Valid @RequestBody TablePageDto param){
         return tableService.getList(param);
     }
 

gis_db/src/main/java/com/gis/db/entity/dto/TablePageDto.java

@@ -0,0 +1,18 @@
+package com.gis.db.entity.dto;
+
+import com.gis.common.base.entity.dto.PageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Created by owen on 2022/3/10 0010 17:34
+ */
+@Data
+public class TablePageDto extends PageDto {
+
+    @NotBlank(message = "项目id不能为空")
+    @ApiModelProperty(value = "项目id",required = true)
+    private String projectId;
+}

gis_db/src/main/java/com/gis/db/mapper/FieldMapper.java

@@ -7,6 +7,7 @@ import com.gis.db.entity.po.FieldEntity;
 import com.gis.db.entity.po.TableEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -19,4 +20,5 @@ public interface FieldMapper extends BaseMapper<FieldEntity> {
     IPage<Map> page(@Param("tableName") String tableName, @Param("fieldNames") List<String> fieldNames, IPage<Map> page);
 
     Map detail(@Param("tableName") String tableName, @Param("fieldNames") List<String> fileNames, @Param("id") Long id);
+
 }

gis_db/src/main/java/com/gis/db/service/TableService.java

@@ -5,6 +5,7 @@ import com.gis.common.base.entity.dto.PageDto;
 import com.gis.common.util.Result;
 import com.gis.db.entity.dto.IdsDto;
 import com.gis.db.entity.dto.TableDto;
+import com.gis.db.entity.dto.TablePageDto;
 import com.gis.db.entity.po.TableEntity;
 
 import java.util.List;
@@ -16,7 +17,7 @@ public interface TableService extends IService<TableEntity> {
 
     Result createTable(TableDto param);
 
-    Result getList(PageDto param);
+    Result getList(TablePageDto param);
 
     Result removes(IdsDto ids);
 

gis_db/src/main/java/com/gis/db/service/impl/FieldServiceImpl.java

@@ -116,6 +116,7 @@ public class FieldServiceImpl extends ServiceImpl<FieldMapper, FieldEntity> impl
             updateWrapper.eq(FieldEntity::getTableId, tableId);
             updateWrapper.set(FieldEntity::getIsDelete, 1);
             this.update(updateWrapper);
+//            getBaseMapper().delByTableId(tableId);
         }
     }
 

gis_db/src/main/java/com/gis/db/service/impl/ProjectServiceImpl.java

@@ -1,5 +1,7 @@
 package com.gis.db.service.impl;
 
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -33,7 +35,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectEntity
         IPage<ProjectEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
         LambdaQueryWrapper<ProjectEntity> wrapper = new LambdaQueryWrapper<>();
         String searchKey = param.getSearchKey();
-        wrapper.like(searchKey!= null, ProjectEntity::getName, searchKey);
+        wrapper.like(StrUtil.isNotBlank(searchKey), ProjectEntity::getName, searchKey);
         wrapper.orderByDesc(ProjectEntity::getCreateTime);
         IPage<ProjectEntity> iPage = this.page(page, wrapper);
         return Result.success(iPage);
@@ -46,6 +48,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectEntity
         Long id = param.getId();
         if (id == null){
             entity = new ProjectEntity();
+            entity.setAppId(RandomUtil.randomString(9));
         } else {
             entity = getById(id);
             BaseRuntimeException.isNull(entity, ErrorEnum.FAILURE_SYS_2001);

gis_db/src/main/java/com/gis/db/service/impl/TableServiceImpl.java

@@ -15,6 +15,7 @@ import com.gis.common.util.BaseUtil;
 import com.gis.common.util.Result;
 import com.gis.db.entity.dto.IdsDto;
 import com.gis.db.entity.dto.TableDto;
+import com.gis.db.entity.dto.TablePageDto;
 import com.gis.db.entity.po.TableEntity;
 import com.gis.db.mapper.DdlMapper;
 import com.gis.db.mapper.TableMapper;
@@ -63,13 +64,15 @@ public class TableServiceImpl extends ServiceImpl<TableMapper, TableEntity> impl
     }
 
     @Override
-    public Result getList(PageDto param) {
+    public Result getList(TablePageDto param) {
         BaseUtil.startPage(param);
         IPage<TableEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
         LambdaQueryWrapper<TableEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.orderByDesc(BaseEntity::getCreateTime);
+        wrapper.eq(TableEntity::getProjectId, param.getProjectId());
+        String searchKey = param.getSearchKey();
+        wrapper.like(StrUtil.isNotBlank(searchKey), TableEntity::getName, searchKey);
+        wrapper.orderByDesc(TableEntity::getCreateTime);
         IPage<TableEntity> iPage = this.page(page, wrapper);
-
         return Result.success(iPage);
     }
 
@@ -81,10 +84,12 @@ public class TableServiceImpl extends ServiceImpl<TableMapper, TableEntity> impl
         List<Integer> tableIds = param.getIds();
         List<String> tableNames = this.getTableNameByTableId(tableIds);
 
-        // 删除表数据
+        // 真删除表
         this.delTables(tableNames);
+        // 逻辑删除表记录
+        this.removeByIds(tableIds);
 
-        // 删除字段
+        // 逻辑删除字段
         fieldService.removeBatchByTableId(tableIds);
 
         return Result.success(tableNames);