一些优化
This commit is contained in:
曹鹏飞
parent
47096ac6de
commit
0f2342cdcf
|
|
@ -4,12 +4,15 @@ import cn.hutool.core.collection.CollectionUtil;
|
|||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.nflg.mobilebroken.admin.annotation.ApiMark;
|
||||
import com.nflg.mobilebroken.admin.service.TableInfoService;
|
||||
import com.nflg.mobilebroken.common.pojo.ApiResult;
|
||||
import com.nflg.mobilebroken.common.pojo.PageData;
|
||||
import com.nflg.mobilebroken.common.pojo.request.*;
|
||||
import com.nflg.mobilebroken.common.pojo.vo.DescVO;
|
||||
import com.nflg.mobilebroken.common.pojo.vo.FormColumnVO;
|
||||
import com.nflg.mobilebroken.common.pojo.vo.FormVO;
|
||||
import com.nflg.mobilebroken.common.pojo.vo.PermissionApiItemVO;
|
||||
import com.nflg.mobilebroken.common.util.AdminUserUtil;
|
||||
import com.nflg.mobilebroken.common.util.VUtils;
|
||||
|
|
@ -77,6 +80,30 @@ public class FormController extends ControllerBase {
|
|||
return ApiResult.success(tableInfoService.getTableColumnInfos(tableName));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取表单列表
|
||||
*/
|
||||
@PostMapping("search")
|
||||
public ApiResult<PageData<FormVO>> search(@RequestBody FormSearchRequest request) {
|
||||
IPage<FormVO> datas = permissionTableService.search(request);
|
||||
if (CollectionUtil.isEmpty(datas.getRecords())) {
|
||||
return ApiResult.success(PageData.empty());
|
||||
}
|
||||
List<AdminPermissionApi> apis = permissionApiService
|
||||
.lambdaQuery()
|
||||
.in(AdminPermissionApi::getTableId, datas.getRecords().stream().map(FormVO::getId).collect(Collectors.toList()))
|
||||
.list();
|
||||
datas.getRecords().forEach(form -> {
|
||||
form.setApis(
|
||||
apis.stream()
|
||||
.filter(api -> Objects.equals(api.getTableId(), form.getId()))
|
||||
.map(AdminPermissionApi::getApiName)
|
||||
.collect(Collectors.toList())
|
||||
);
|
||||
});
|
||||
return ApiResult.success(datas);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增表单
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public class PageData<T> implements Serializable {
|
|||
//总页数
|
||||
private int totalPages;
|
||||
|
||||
public static PageData<AdminUserVO> empty() {
|
||||
public static <T> PageData<T> empty() {
|
||||
return new PageData<>();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
package com.nflg.mobilebroken.common.pojo.request;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
@Data
|
||||
public class FormSearchRequest extends PageRequest{
|
||||
|
||||
/**
|
||||
* 表单编号
|
||||
*/
|
||||
private String tableName;
|
||||
|
||||
/**
|
||||
* 表单名称
|
||||
*/
|
||||
private String tableDesc;
|
||||
}
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
package com.nflg.mobilebroken.common.pojo.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class FormVO {
|
||||
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 表名
|
||||
*/
|
||||
private String tableName;
|
||||
|
||||
/**
|
||||
* 表描述
|
||||
*/
|
||||
private String tableDesc;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 操作类型列表
|
||||
*/
|
||||
private List<String> apis;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/**
|
||||
* 最后更新人
|
||||
*/
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 最后更新时间
|
||||
*/
|
||||
private LocalDateTime updateTime;
|
||||
}
|
||||
|
|
@ -1,6 +1,10 @@
|
|||
package com.nflg.mobilebroken.repository.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.nflg.mobilebroken.common.pojo.request.FormSearchRequest;
|
||||
import com.nflg.mobilebroken.common.pojo.vo.FormVO;
|
||||
import com.nflg.mobilebroken.repository.entity.AdminPermissionTable;
|
||||
|
||||
/**
|
||||
|
|
@ -13,4 +17,5 @@ import com.nflg.mobilebroken.repository.entity.AdminPermissionTable;
|
|||
*/
|
||||
public interface AdminPermissionTableMapper extends BaseMapper<AdminPermissionTable> {
|
||||
|
||||
IPage<FormVO> search(FormSearchRequest request, Page<?> objectPage);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
package com.nflg.mobilebroken.repository.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.nflg.mobilebroken.common.pojo.request.FormSearchRequest;
|
||||
import com.nflg.mobilebroken.common.pojo.vo.FormVO;
|
||||
import com.nflg.mobilebroken.repository.entity.AdminPermissionTable;
|
||||
|
||||
/**
|
||||
|
|
@ -13,4 +16,5 @@ import com.nflg.mobilebroken.repository.entity.AdminPermissionTable;
|
|||
*/
|
||||
public interface IAdminPermissionTableService extends IService<AdminPermissionTable> {
|
||||
|
||||
IPage<FormVO> search(FormSearchRequest request);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
package com.nflg.mobilebroken.repository.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.nflg.mobilebroken.common.pojo.request.FormSearchRequest;
|
||||
import com.nflg.mobilebroken.common.pojo.vo.FormVO;
|
||||
import com.nflg.mobilebroken.repository.entity.AdminPermissionTable;
|
||||
import com.nflg.mobilebroken.repository.mapper.AdminPermissionTableMapper;
|
||||
import com.nflg.mobilebroken.repository.service.IAdminPermissionTableService;
|
||||
|
|
@ -17,4 +21,8 @@ import org.springframework.stereotype.Service;
|
|||
@Service
|
||||
public class AdminPermissionTableServiceImpl extends ServiceImpl<AdminPermissionTableMapper, AdminPermissionTable> implements IAdminPermissionTableService {
|
||||
|
||||
@Override
|
||||
public IPage<FormVO> search(FormSearchRequest request) {
|
||||
return baseMapper.search(request,new Page<>(request.getPage(),request.getPageSize()));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -169,12 +169,13 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
|
|||
List<AdminUser> users = lambdaQuery().list();
|
||||
List<AdminUserRoleMap> roleMaps = adminUserRoleMapService.lambdaQuery().list();
|
||||
List<AdminRole> roles = roleService.lambdaQuery().list();
|
||||
List<DictionaryItem> categories = dictionaryItemService.lambdaQuery()
|
||||
.in(DictionaryItem::getId, page.getRecords().stream()
|
||||
List<Long> categoryIds = page.getRecords().stream()
|
||||
.map(AdminUser::getCategoryId)
|
||||
.filter(Objects::nonNull)
|
||||
.collect(Collectors.toList())
|
||||
).list();
|
||||
.collect(Collectors.toList());
|
||||
List<DictionaryItem> categories = CollectionUtil.isEmpty(categoryIds) ? Collections.emptyList() : dictionaryItemService.lambdaQuery()
|
||||
.in(DictionaryItem::getId, categoryIds)
|
||||
.list();
|
||||
pageData.setItems(page.getRecords().stream().map(u -> {
|
||||
AdminUser userCreate = users.stream()
|
||||
.filter(it -> Objects.equals(it.getId(), u.getCreateBy()))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<mapper namespace="com.nflg.mobilebroken.repository.mapper.AdminPermissionRoleUserMapMapper">
|
||||
|
||||
<select id="search" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminUserSimpleVO">
|
||||
SELECT u.id,u.user_name,u.avatar,u.user_code,dept.dept_name as 'department_name'
|
||||
SELECT u.id as 'userId',u.user_name,u.avatar,u.user_code,dept.dept_name as 'department_name'
|
||||
FROM admin_permission_role role
|
||||
INNER JOIN admin_permission_role_user_map map ON role.id=map.role_id
|
||||
INNER JOIN admin_user u ON map.user_id=u.id
|
||||
|
|
|
|||
|
|
@ -2,4 +2,17 @@
|
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nflg.mobilebroken.repository.mapper.AdminPermissionTableMapper">
|
||||
|
||||
<select id="search" resultType="com.nflg.mobilebroken.common.pojo.vo.FormVO">
|
||||
SELECT *
|
||||
FROM admin_permission_table
|
||||
<where>
|
||||
<if test="request.tableName!=null and request.tableName!=''">
|
||||
table_name like CONCAT('%',#{request.tableName},'%')
|
||||
</if>
|
||||
<if test="request.tableDesc!=null and request.tableDesc!=''">
|
||||
table_desc like CONCAT('%',#{request.tableDesc},'%')
|
||||
</if>
|
||||
</where>
|
||||
order by id desc
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -14,8 +14,9 @@
|
|||
</sql>
|
||||
<select id="getList" resultType="com.nflg.mobilebroken.common.pojo.vo.TBaseAreaVO">
|
||||
select a.*,di.name as 'category_name'
|
||||
from t_base_area a where del_is=0
|
||||
from t_base_area a
|
||||
left join dictionary_item di on a.category_id=di.id
|
||||
where a.del_is=0
|
||||
<if test="(query.areaCodeOrName==null or query.areaCodeOrName=='') and query.areaState==null ">
|
||||
and a.parent_area_row_id=0
|
||||
</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue