修改查询条件

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

@@ -8,11 +8,13 @@ import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsIsolationPoint;
+import com.ktg.iscs.domain.dto.point.PagePointDTO;
 import com.ktg.iscs.service.IIsIsolationPointService;
 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.*;
@@ -39,12 +41,19 @@ public class IsIsolationPointController extends BaseController {
     @ApiOperation("查询隔离点-分页")
     @Parameters({
             @Parameter(name = "page", description = "Page"),
-            @Parameter(name = "sysTeam", description = "实体参数")
+            @Parameter(name = "dto", description = "实体参数")
     })
     @PreAuthorize("@ss.hasPermi('iscs:point:page')")
     @GetMapping("/getIsIsolationPointPage")
-    public CommonResult<Page<IsIsolationPoint>> getIsIsolationPointPage(Page<IsIsolationPoint> page, IsIsolationPoint isIsolationPoint) {
+    public CommonResult<Page<IsIsolationPoint>> getIsIsolationPointPage(Page<IsIsolationPoint> page, PagePointDTO dto) {
         Page<IsIsolationPoint> result = isIsolationPointService.page(page, Wrappers.<IsIsolationPoint>lambdaQuery()
+                .like(StringUtils.isNotBlank(dto.getPointCode()), IsIsolationPoint::getPointCode, dto.getPointCode())
+                .like(StringUtils.isNotBlank(dto.getPointName()), IsIsolationPoint::getPointName, dto.getPointName())
+                .eq(StringUtils.isNotBlank(dto.getDelFlag()), IsIsolationPoint::getDelFlag, dto.getDelFlag())
+                .eq(StringUtils.isNotBlank(dto.getPointType()), IsIsolationPoint::getPointType, dto.getPointType())
+                .eq(StringUtils.isNotBlank(dto.getPowerType()), IsIsolationPoint::getPowerType, dto.getPowerType())
+                .ge(StringUtils.isNotBlank(dto.getStartTime()), IsIsolationPoint::getCreateTime, dto.getStartTime())
+                .le(StringUtils.isNotBlank(dto.getEndTime()), IsIsolationPoint::getCreateTime, dto.getEndTime())
                 .orderByDesc(IsIsolationPoint::getPointId));
         return CommonResult.success(result);
     }

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

@@ -13,6 +13,7 @@ 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.*;
@@ -29,8 +30,7 @@ import java.util.List;
 @Api(tags = "工作区域")
 @RestController
 @RequestMapping("/iscs/workarea")
-public class IsWorkareaController extends BaseController
-{
+public class IsWorkareaController extends BaseController {
     @Autowired
     private IIsWorkareaService isWorkareaService;
 
@@ -40,13 +40,16 @@ public class IsWorkareaController extends BaseController
     @ApiOperation("查询工作区域-分页")
     @Parameters({
             @Parameter(name = "page", description = "Page"),
-            @Parameter(name = "isWorkarea", description = "实体参数")
+            @Parameter(name = "dto", description = "实体参数")
     })
     @PreAuthorize("@ss.hasPermi('iscs:workarea:page')")
     @GetMapping("/getIsWorkareaPage")
-    public CommonResult<Page<IsWorkarea>> getIsWorkareaPage(Page page, IsWorkarea isWorkarea)
-    {
+    public CommonResult<Page<IsWorkarea>> getIsWorkareaPage(Page page, IsWorkarea dto) {
         Page<IsWorkarea> result = isWorkareaService.page(page, Wrappers.<IsWorkarea>lambdaQuery()
+                .like(StringUtils.isNotBlank(dto.getWorkareaCode()), IsWorkarea::getWorkareaCode, dto.getWorkareaCode())
+                .like(StringUtils.isNotBlank(dto.getWorkareaName()), IsWorkarea::getWorkareaName, dto.getWorkareaName())
+                .eq(StringUtils.isNotBlank(dto.getWorkareaType()), IsWorkarea::getWorkareaType, dto.getWorkareaType())
+                .eq(dto.getWorkshopId() != null, IsWorkarea::getWorkshopId, dto.getWorkshopId())
                 .orderByDesc(IsWorkarea::getWorkareaId));
         return CommonResult.success(result);
     }
@@ -57,10 +60,9 @@ public class IsWorkareaController extends BaseController
     })
     @PreAuthorize("@ss.hasPermi('iscs:workarea:list')")
     @GetMapping("/getIsWorkareaList")
-    public CommonResult<List<IsWorkarea>> getIsWorkareaList(Long workshopId)
-    {
+    public CommonResult<List<IsWorkarea>> getIsWorkareaList(Long workshopId) {
         List<IsWorkarea> result = isWorkareaService.list(Wrappers.<IsWorkarea>lambdaQuery()
-                        .eq(IsWorkarea::getWorkshopId, workshopId)
+                .eq(IsWorkarea::getWorkshopId, workshopId)
                 .orderByDesc(IsWorkarea::getWorkareaId));
         return CommonResult.success(result);
     }
@@ -73,8 +75,7 @@ public class IsWorkareaController extends BaseController
     @PreAuthorize("@ss.hasPermi('iscs:workarea:export')")
     @Log(title = "工作区域", businessType = BusinessType.EXPORT)
     @PostMapping("/exportIsWorkarea")
-    public void exportIsWorkarea(HttpServletResponse response, IsWorkarea isWorkarea)
-    {
+    public void exportIsWorkarea(HttpServletResponse response, IsWorkarea isWorkarea) {
         List<IsWorkarea> list = isWorkareaService.selectIsWorkareaList(isWorkarea);
         ExcelUtil<IsWorkarea> util = new ExcelUtil<IsWorkarea>(IsWorkarea.class);
         util.exportExcel(response, list, "工作区域数据");
@@ -87,8 +88,7 @@ public class IsWorkareaController extends BaseController
     @Parameter(name = "workareaId", description = "workareaId")
     @PreAuthorize("@ss.hasPermi('iscs:workarea:query')")
     @GetMapping(value = "/selectIsWorkareaById")
-    public CommonResult<IsWorkarea> selectIsWorkareaById(Long workareaId)
-    {
+    public CommonResult<IsWorkarea> selectIsWorkareaById(Long workareaId) {
         return CommonResult.success(isWorkareaService.selectIsWorkareaByWorkareaId(workareaId));
     }
 
@@ -99,8 +99,7 @@ public class IsWorkareaController extends BaseController
     @PreAuthorize("@ss.hasPermi('iscs:workarea:add')")
     @Log(title = "工作区域", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsWorkarea")
-    public CommonResult<Boolean> insertIsWorkarea(@RequestBody @Parameter(name = "isWorkarea", description = "新增数据类,放到body") IsWorkarea isWorkarea)
-    {
+    public CommonResult<Boolean> insertIsWorkarea(@RequestBody @Parameter(name = "isWorkarea", description = "新增数据类,放到body") IsWorkarea isWorkarea) {
         return CommonResult.success(isWorkareaService.insertIsWorkarea(isWorkarea) == 1);
     }
 
@@ -111,8 +110,7 @@ public class IsWorkareaController extends BaseController
     @PreAuthorize("@ss.hasPermi('iscs:workarea:edit')")
     @Log(title = "工作区域", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsWorkarea")
-    public CommonResult<Boolean> updateIsWorkarea(@RequestBody @Parameter(name = "isWorkarea", description = "修改数据类,放到body") IsWorkarea isWorkarea)
-    {
+    public CommonResult<Boolean> updateIsWorkarea(@RequestBody @Parameter(name = "isWorkarea", description = "修改数据类,放到body") IsWorkarea isWorkarea) {
         return CommonResult.success(isWorkareaService.updateIsWorkarea(isWorkarea) == 1);
     }
 
@@ -122,9 +120,8 @@ public class IsWorkareaController extends BaseController
     @ApiOperation("删除工作区域")
     @PreAuthorize("@ss.hasPermi('iscs:workarea:remove')")
     @Log(title = "工作区域", businessType = BusinessType.DELETE)
-	@PostMapping("/deleteIsWorkareaByWorkareaIds")
-    public CommonResult<Boolean> deleteIsWorkareaByWorkareaIds(String workareaIds)
-    {
+    @PostMapping("/deleteIsWorkareaByWorkareaIds")
+    public CommonResult<Boolean> deleteIsWorkareaByWorkareaIds(String workareaIds) {
         return CommonResult.success(isWorkareaService.deleteIsWorkareaByWorkareaIds(workareaIds) != 0);
     }
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/point/PagePointDTO.java

@@ -0,0 +1,36 @@
+package com.ktg.iscs.domain.dto.point;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 隔离点对象 is_isolation_point
+ *
+ * @author cgj
+ * @date 2024-10-18
+ */
+@Data
+public class PagePointDTO
+{
+
+    @Schema(description = "隔离点编号")
+    private String pointCode;
+
+    @Schema(description = "隔离点名称")
+    private String pointName;
+
+    @Schema(description = "隔离点类型")
+    private String pointType;
+
+    @Schema(description = "危险能量类型")
+    private String powerType;
+
+    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @Schema(description = "开始时间")
+    private String startTime;
+
+    @Schema(description = "结束时间")
+    private String endTime;
+}