【7.6.0】【sys】【app】完善获取应用分页列表接口

kernel-s-sys/sys-business-permission/pom.xml

@@ -17,6 +17,14 @@
 
     <dependencies>
 
+        <!--文件api-->
+        <!--应用图片相关的操作-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>file-api</artifactId>
+            <version>${roses.version}</version>
+        </dependency>
+
         <!--基础核心业务api-->
         <dependency>
             <groupId>cn.stylefeng.roses</groupId>

kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/controller/SysAppController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * 系统应用控制器
@@ -76,17 +75,6 @@ public class SysAppController {
         return new SuccessResponseData<>(sysAppService.detail(sysAppRequest));
     }
 
-    /**
-     * 获取列表
-     *
-     * @author fengshuonan
-     * @date 2023/06/10 21:28
-     */
-    @GetResource(name = "获取列表", path = "/sysApp/list")
-    public ResponseData<List<SysApp>> list(SysAppRequest sysAppRequest) {
-        return new SuccessResponseData<>(sysAppService.findList(sysAppRequest));
-    }
-
     /**
      * 获取列表（带分页）
      *

kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/entity/SysApp.java

@@ -1,7 +1,9 @@
 package cn.stylefeng.roses.kernel.sys.modular.app.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity;
+import cn.stylefeng.roses.kernel.file.api.format.FileUrlFormatProcess;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
+import cn.stylefeng.roses.kernel.rule.annotation.SimpleFieldFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -48,6 +50,7 @@ public class SysApp extends BaseExpandFieldEntity {
      */
     @TableField("app_icon")
     @ChineseDescription("应用图标，存fileId，上传的图片")
+    @SimpleFieldFormat(processClass = FileUrlFormatProcess.class)
     private Long appIcon;
 
     /**

kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/service/impl/SysAppServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
 import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
+import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.sys.modular.app.entity.SysApp;
@@ -16,7 +17,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -56,8 +56,12 @@ public class SysAppServiceImpl extends ServiceImpl<SysAppMapper, SysApp> impleme
     @Override
     public PageResult<SysApp> findPage(SysAppRequest sysAppRequest) {
         LambdaQueryWrapper<SysApp> wrapper = createWrapper(sysAppRequest);
-        Page<SysApp> sysRolePage = this.page(PageFactory.defaultPage(), wrapper);
+
-        return PageResultFactory.createPageResult(sysRolePage);
+        // 只查询有用的列
+        wrapper.select(SysApp::getAppId, SysApp::getAppName, SysApp::getAppCode, SysApp::getAppIcon, SysApp::getStatusFlag, SysApp::getAppSort, BaseEntity::getCreateTime);
+
+        Page<SysApp> sysAppPage = this.page(PageFactory.defaultPage(), wrapper);
+        return PageResultFactory.createPageResult(sysAppPage);
     }
 
     @Override
@@ -89,29 +93,16 @@ public class SysAppServiceImpl extends ServiceImpl<SysAppMapper, SysApp> impleme
     private LambdaQueryWrapper<SysApp> createWrapper(SysAppRequest sysAppRequest) {
         LambdaQueryWrapper<SysApp> queryWrapper = new LambdaQueryWrapper<>();
 
-        Long appId = sysAppRequest.getAppId();
+        // 根据搜索条件查询
-        String appName = sysAppRequest.getAppName();
+        String searchText = sysAppRequest.getSearchText();
-        String appCode = sysAppRequest.getAppCode();
+        if (ObjectUtil.isNotEmpty(searchText)) {
-        Long appIcon = sysAppRequest.getAppIcon();
+            queryWrapper.like(SysApp::getAppCode, searchText);
-        Integer statusFlag = sysAppRequest.getStatusFlag();
+            queryWrapper.or().like(SysApp::getAppName, searchText);
-        BigDecimal appSort = sysAppRequest.getAppSort();
+            queryWrapper.or().like(SysApp::getRemark, searchText);
-        String remark = sysAppRequest.getRemark();
+        }
-        String expandField = sysAppRequest.getExpandField();
-        Long versionFlag = sysAppRequest.getVersionFlag();
-        String delFlag = sysAppRequest.getDelFlag();
-        Long tenantId = sysAppRequest.getTenantId();
 
-        queryWrapper.eq(ObjectUtil.isNotNull(appId), SysApp::getAppId, appId);
+        // 根据排序查询
-        queryWrapper.like(ObjectUtil.isNotEmpty(appName), SysApp::getAppName, appName);
+        queryWrapper.orderByAsc(SysApp::getAppSort);
-        queryWrapper.like(ObjectUtil.isNotEmpty(appCode), SysApp::getAppCode, appCode);
-        queryWrapper.eq(ObjectUtil.isNotNull(appIcon), SysApp::getAppIcon, appIcon);
-        queryWrapper.eq(ObjectUtil.isNotNull(statusFlag), SysApp::getStatusFlag, statusFlag);
-        queryWrapper.eq(ObjectUtil.isNotNull(appSort), SysApp::getAppSort, appSort);
-        queryWrapper.like(ObjectUtil.isNotEmpty(remark), SysApp::getRemark, remark);
-        queryWrapper.like(ObjectUtil.isNotEmpty(expandField), SysApp::getExpandField, expandField);
-        queryWrapper.eq(ObjectUtil.isNotNull(versionFlag), SysApp::getVersionFlag, versionFlag);
-        queryWrapper.like(ObjectUtil.isNotEmpty(delFlag), SysApp::getDelFlag, delFlag);
-        queryWrapper.eq(ObjectUtil.isNotNull(tenantId), SysApp::getTenantId, tenantId);
 
         return queryWrapper;
     }