优化项目规范

ktg-generator/src/main/resources/vm/java/controller.java.vm

@@ -58,8 +58,7 @@ public class ${ClassName}Controller extends BaseController
 #if($table.crud || $table.sub)
     public CommonResult<Page<${ClassName}>> get${ClassName}Page(Page<${ClassName}> page, ${ClassName} ${className})
     {
-        Page<${ClassName}> result = ${className}Service.page(page, Wrappers.<${ClassName}>lambdaQuery()
-                .orderByDesc(${ClassName}::get${pkColumn.capJavaField}));
+        Page<${ClassName}> result = ${className}Service.get${ClassName}Page(page, ${className});
         return CommonResult.success(result);
     }
 #elseif($table.tree)

ktg-generator/src/main/resources/vm/java/service.java.vm

@@ -12,4 +12,6 @@ import ${packageName}.domain.${ClassName};
  */
 public interface I${ClassName}Service extends IService<${ClassName}> {
 
+    Page<${ClassName}> get${ClassName}Page(Page<${ClassName}> page, ${ClassName} ${className});
+
 }

ktg-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -34,4 +34,11 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     @Autowired
     private ${ClassName}Mapper ${className}Mapper;
 
+    @Override
+    public Page<${ClassName}> get${ClassName}Page(Page<${ClassName}> page, ${ClassName} ${className}) {
+        Page<${ClassName}> result = page(page, Wrappers.<${ClassName}>lambdaQuery()
+                .orderByDesc(${ClassName}::get${pkColumn.capJavaField}));
+        return result;
+    }
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsHardwareController.java

@@ -1,6 +1,5 @@
 package com.ktg.iscs.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.annotation.Log;
 import com.ktg.common.core.controller.BaseController;
@@ -15,7 +14,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -50,17 +48,8 @@ public class IsHardwareController extends BaseController
     @GetMapping("/getIsHardwarePage")
     public CommonResult<Page<IsHardware>> getIsHardwarePage(Page page, HardwarePageDTO dto)
     {
-        Page<IsHardware> result = isHardwareService.page(page, Wrappers.<IsHardware>lambdaQuery()
-                .like(StringUtils.isNotBlank(dto.getHardwareCode()), IsHardware::getHardwareCode, dto.getHardwareCode())
-                .like(StringUtils.isNotBlank(dto.getHardwareName()), IsHardware::getHardwareName, dto.getHardwareName())
-                .eq(StringUtils.isNotBlank(dto.getStatus()), IsHardware::getStatus, dto.getStatus())
-                .eq(dto.getHardwareTypeId() != null, IsHardware::getHardwareTypeId, dto.getHardwareTypeId())
-                .like(StringUtils.isNotBlank(dto.getHardwareSpec()), IsHardware::getHardwareSpec, dto.getHardwareSpec())
-                .ge(StringUtils.isNotBlank(dto.getStartTime()), IsHardware::getCreateTime, dto.getStartTime())
-                .le(StringUtils.isNotBlank(dto.getEndTime()), IsHardware::getCreateTime, dto.getEndTime())
-                .eq(dto.getWorkshopId() != null, IsHardware::getWorkshopId, dto.getWorkshopId())
-                .orderByDesc(IsHardware::getId));
-        return CommonResult.success(result);
+        Page<IsHardware> isHardwarePage = isHardwareService.getIsHardwarePage(page, dto);
+        return CommonResult.success(isHardwarePage);
     }
 
     /**

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsHardwareService.java

@@ -1,8 +1,10 @@
 package com.ktg.iscs.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.iscs.domain.IsHardware;
 import com.ktg.iscs.domain.dto.hardware.HardwareAutomaticDTO;
+import com.ktg.iscs.domain.dto.hardware.HardwarePageDTO;
 
 import java.util.List;
 
@@ -79,4 +81,6 @@ public interface IIsHardwareService extends IService<IsHardware>
      * @return 结果
      */
     Boolean insertIsHardware(HardwareAutomaticDTO dto);
+
+    Page<IsHardware> getIsHardwarePage(Page page, HardwarePageDTO dto);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsHardwareServiceImpl.java

@@ -2,10 +2,12 @@ package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
 import com.ktg.iscs.domain.IsHardware;
 import com.ktg.iscs.domain.dto.hardware.HardwareAutomaticDTO;
+import com.ktg.iscs.domain.dto.hardware.HardwarePageDTO;
 import com.ktg.iscs.mapper.IsHardwareMapper;
 import com.ktg.iscs.service.IIsHardwareService;
 import org.apache.commons.lang3.StringUtils;
@@ -163,4 +165,19 @@ public class IsHardwareServiceImpl extends ServiceImpl<IsHardwareMapper, IsHardw
         }
         return true;
     }
+
+    @Override
+    public Page<IsHardware> getIsHardwarePage(Page page, HardwarePageDTO dto) {
+        Page<IsHardware> result = page(page, Wrappers.<IsHardware>lambdaQuery()
+                .like(StringUtils.isNotBlank(dto.getHardwareCode()), IsHardware::getHardwareCode, dto.getHardwareCode())
+                .like(StringUtils.isNotBlank(dto.getHardwareName()), IsHardware::getHardwareName, dto.getHardwareName())
+                .eq(StringUtils.isNotBlank(dto.getStatus()), IsHardware::getStatus, dto.getStatus())
+                .eq(dto.getHardwareTypeId() != null, IsHardware::getHardwareTypeId, dto.getHardwareTypeId())
+                .like(StringUtils.isNotBlank(dto.getHardwareSpec()), IsHardware::getHardwareSpec, dto.getHardwareSpec())
+                .ge(StringUtils.isNotBlank(dto.getStartTime()), IsHardware::getCreateTime, dto.getStartTime())
+                .le(StringUtils.isNotBlank(dto.getEndTime()), IsHardware::getCreateTime, dto.getEndTime())
+                .eq(dto.getWorkshopId() != null, IsHardware::getWorkshopId, dto.getWorkshopId())
+                .orderByDesc(IsHardware::getId));
+        return result;
+    }
 }