From 000cfe6e70d89c06634decc07985d23640bfc508 Mon Sep 17 00:00:00 2001 From: liuyiliang Date: Wed, 10 Jul 2024 13:51:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/leger/controller/EquipmentLedgerController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java index 7dc2dc6..03dec0c 100644 --- a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java +++ b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java @@ -219,6 +219,12 @@ public class EquipmentLedgerController extends DafController { @ApiOperation(value = "导出", notes = "传入") @ApiLog public void exportUser(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { + if (entity.containsKey("station_equal")) { + entity.put("station_equal", Integer.parseInt((String) entity.get("station_equal"))); + } + if (entity.containsKey("userStatus_equal")) { + entity.put("userStatus_equal", Integer.parseInt((String) entity.get("userStatus_equal"))); + } QueryWrapper queryWrapper = Condition.getQueryWrapper(entity, EquipmentLedger.class); queryWrapper.lambda().eq(EquipmentLedger::getIsDeleted, DafConstant.DB_NOT_DELETED); List list = equipmentLedgerService.export(queryWrapper); From 8b06bbca2ea784c37b7929a813a3d09a839907b0 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Wed, 10 Jul 2024 14:07:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=87=BA=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectionResultController.java | 126 ++++++++++++++++++ .../controller/InspectionTasksController.java | 126 ++++++++++++++++++ .../inspection/dto/InspectionResultDTO.java | 18 +++ .../inspection/dto/InspectionTasksDTO.java | 18 +++ .../inspection/entity/InspectionResult.java | 67 ++++++++++ .../inspection/entity/InspectionTasks.java | 112 ++++++++++++++++ .../mapper/InspectionResultMapper.java | 26 ++++ .../mapper/InspectionResultMapper.xml | 28 ++++ .../mapper/InspectionTasksMapper.java | 26 ++++ .../mapper/InspectionTasksMapper.xml | 37 +++++ .../service/IInspectionResultService.java | 25 ++++ .../service/IInspectionTasksService.java | 25 ++++ .../impl/InspectionResultServiceImpl.java | 25 ++++ .../impl/InspectionTasksServiceImpl.java | 25 ++++ .../inspection/vo/InspectionResultVO.java | 20 +++ .../inspection/vo/InspectionTasksVO.java | 20 +++ 16 files changed, 724 insertions(+) create mode 100644 src/main/java/org/energy/modules/inspection/controller/InspectionResultController.java create mode 100644 src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java create mode 100644 src/main/java/org/energy/modules/inspection/dto/InspectionResultDTO.java create mode 100644 src/main/java/org/energy/modules/inspection/dto/InspectionTasksDTO.java create mode 100644 src/main/java/org/energy/modules/inspection/entity/InspectionResult.java create mode 100644 src/main/java/org/energy/modules/inspection/entity/InspectionTasks.java create mode 100644 src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.java create mode 100644 src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml create mode 100644 src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java create mode 100644 src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml create mode 100644 src/main/java/org/energy/modules/inspection/service/IInspectionResultService.java create mode 100644 src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java create mode 100644 src/main/java/org/energy/modules/inspection/service/impl/InspectionResultServiceImpl.java create mode 100644 src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java create mode 100644 src/main/java/org/energy/modules/inspection/vo/InspectionResultVO.java create mode 100644 src/main/java/org/energy/modules/inspection/vo/InspectionTasksVO.java diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionResultController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionResultController.java new file mode 100644 index 0000000..84eb61e --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionResultController.java @@ -0,0 +1,126 @@ +/** + * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). + *

+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.gnu.org/licenses/lgpl.html + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.energy.modules.inspection.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import com.dayu.daf.core.mp.support.Condition; +import com.dayu.daf.core.mp.support.Query; +import com.dayu.daf.core.tool.api.R; +import com.dayu.daf.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestParam; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.energy.modules.inspection.entity.InspectionResult; +import org.energy.modules.inspection.vo.InspectionResultVO; +import org.energy.modules.inspection.service.IInspectionResultService; +import com.dayu.daf.core.boot.ctrl.DafController; + +/** + * 巡检结果 控制器 + * + * @author Daf + * @since 2024-07-10 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/inspection/inspectionresult") +@Api(value = "巡检结果", tags = "巡检结果接口") +public class InspectionResultController extends DafController { + + private IInspectionResultService inspectionResultService; + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入inspectionResult") + public R detail(InspectionResult inspectionResult) { + InspectionResult detail = inspectionResultService.getOne(Condition.getQueryWrapper(inspectionResult)); + return R.data(detail); + } + + /** + * 分页 巡检结果 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入inspectionResult") + public R> list(InspectionResult inspectionResult, Query query) { + IPage pages = inspectionResultService.page(Condition.getPage(query), Condition.getQueryWrapper(inspectionResult)); + return R.data(pages); + } + + /** + * 自定义分页 巡检结果 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入inspectionResult") + public R> page(InspectionResultVO inspectionResult, Query query) { + IPage pages = inspectionResultService.selectInspectionResultPage(Condition.getPage(query), inspectionResult); + return R.data(pages); + } + + /** + * 新增 巡检结果 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入inspectionResult") + public R save(@Valid @RequestBody InspectionResult inspectionResult) { + return R.status(inspectionResultService.save(inspectionResult)); + } + + /** + * 修改 巡检结果 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入inspectionResult") + public R update(@Valid @RequestBody InspectionResult inspectionResult) { + return R.status(inspectionResultService.updateById(inspectionResult)); + } + + /** + * 新增或修改 巡检结果 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入inspectionResult") + public R submit(@Valid @RequestBody InspectionResult inspectionResult) { + return R.status(inspectionResultService.saveOrUpdate(inspectionResult)); + } + + + /** + * 删除 巡检结果 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(inspectionResultService.deleteLogic(Func.toLongList(ids))); + } + + +} diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java new file mode 100644 index 0000000..de4b510 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java @@ -0,0 +1,126 @@ +/** + * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). + *

+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.gnu.org/licenses/lgpl.html + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.energy.modules.inspection.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import com.dayu.daf.core.mp.support.Condition; +import com.dayu.daf.core.mp.support.Query; +import com.dayu.daf.core.tool.api.R; +import com.dayu.daf.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestParam; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.energy.modules.inspection.entity.InspectionTasks; +import org.energy.modules.inspection.vo.InspectionTasksVO; +import org.energy.modules.inspection.service.IInspectionTasksService; +import com.dayu.daf.core.boot.ctrl.DafController; + +/** + * 巡检任务 控制器 + * + * @author Daf + * @since 2024-07-10 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/inspection/inspectiontasks") +@Api(value = "巡检任务", tags = "巡检任务接口") +public class InspectionTasksController extends DafController { + + private IInspectionTasksService inspectionTasksService; + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入inspectionTasks") + public R detail(InspectionTasks inspectionTasks) { + InspectionTasks detail = inspectionTasksService.getOne(Condition.getQueryWrapper(inspectionTasks)); + return R.data(detail); + } + + /** + * 分页 巡检任务 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入inspectionTasks") + public R> list(InspectionTasks inspectionTasks, Query query) { + IPage pages = inspectionTasksService.page(Condition.getPage(query), Condition.getQueryWrapper(inspectionTasks)); + return R.data(pages); + } + + /** + * 自定义分页 巡检任务 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入inspectionTasks") + public R> page(InspectionTasksVO inspectionTasks, Query query) { + IPage pages = inspectionTasksService.selectInspectionTasksPage(Condition.getPage(query), inspectionTasks); + return R.data(pages); + } + + /** + * 新增 巡检任务 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入inspectionTasks") + public R save(@Valid @RequestBody InspectionTasks inspectionTasks) { + return R.status(inspectionTasksService.save(inspectionTasks)); + } + + /** + * 修改 巡检任务 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入inspectionTasks") + public R update(@Valid @RequestBody InspectionTasks inspectionTasks) { + return R.status(inspectionTasksService.updateById(inspectionTasks)); + } + + /** + * 新增或修改 巡检任务 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入inspectionTasks") + public R submit(@Valid @RequestBody InspectionTasks inspectionTasks) { + return R.status(inspectionTasksService.saveOrUpdate(inspectionTasks)); + } + + + /** + * 删除 巡检任务 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(inspectionTasksService.deleteLogic(Func.toLongList(ids))); + } + + +} diff --git a/src/main/java/org/energy/modules/inspection/dto/InspectionResultDTO.java b/src/main/java/org/energy/modules/inspection/dto/InspectionResultDTO.java new file mode 100644 index 0000000..0b8dfb2 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/dto/InspectionResultDTO.java @@ -0,0 +1,18 @@ +package org.energy.modules.inspection.dto; + +import org.energy.modules.inspection.entity.InspectionResult; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 巡检结果数据传输对象实体类 + * + * @author Daf + * @since 2024-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionResultDTO extends InspectionResult { + private static final long serialVersionUID = 1L; + +} diff --git a/src/main/java/org/energy/modules/inspection/dto/InspectionTasksDTO.java b/src/main/java/org/energy/modules/inspection/dto/InspectionTasksDTO.java new file mode 100644 index 0000000..eb8426e --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/dto/InspectionTasksDTO.java @@ -0,0 +1,18 @@ +package org.energy.modules.inspection.dto; + +import org.energy.modules.inspection.entity.InspectionTasks; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 巡检任务数据传输对象实体类 + * + * @author Daf + * @since 2024-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionTasksDTO extends InspectionTasks { + private static final long serialVersionUID = 1L; + +} diff --git a/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java b/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java new file mode 100644 index 0000000..93b0677 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java @@ -0,0 +1,67 @@ +package org.energy.modules.inspection.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.dayu.daf.core.mp.base.BaseEntity; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * 巡检结果实体类 + * + * @author Daf + * @since 2024-07-10 + */ +@Data +@TableName("i_inspection_result") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "InspectionResult对象", description = "巡检结果") +public class InspectionResult extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键") + private Long id; + /** + * 巡检任务主键 + */ + @ApiModelProperty(value = "巡检任务主键") + private Long inspectionRaskId; + /** + * 任务执行开始时间 + */ + @ApiModelProperty(value = "任务执行开始时间") + private String executeStartDate; + /** + * 发生原因 + */ + @ApiModelProperty(value = "发生原因") + private String happenReason; + /** + * 任务执行结束时间 + */ + @ApiModelProperty(value = "任务执行结束时间") + private String executeEndDate; + /** + * 巡检结果 + */ + @ApiModelProperty(value = "巡检结果") + private String inspectiontResult; + /** + * 处理过程描述 + */ + @ApiModelProperty(value = "处理过程描述") + private String processDescription; + /** + * 巡检报告 + */ + @ApiModelProperty(value = "巡检报告") + private String inspectionReport; + + +} diff --git a/src/main/java/org/energy/modules/inspection/entity/InspectionTasks.java b/src/main/java/org/energy/modules/inspection/entity/InspectionTasks.java new file mode 100644 index 0000000..920a23f --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/entity/InspectionTasks.java @@ -0,0 +1,112 @@ +package org.energy.modules.inspection.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.dayu.daf.core.mp.base.BaseEntity; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * 巡检任务实体类 + * + * @author Daf + * @since 2024-07-10 + */ +@Data +@TableName("i_inspection_tasks") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "InspectionTasks对象", description = "巡检任务") +public class InspectionTasks extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键") + private Long id; + /** + * 巡检对象主键 + */ + @ApiModelProperty(value = "巡检对象主键") + private Long inspectionObjId; + /** + * 巡检路线主键 + */ + @ApiModelProperty(value = "巡检路线主键") + private Long inspectionRouteId; + /** + * 巡检计划主键 + */ + @ApiModelProperty(value = "巡检计划主键") + private Long inspectionPlanId; + /** + * 任务名称 + */ + @ApiModelProperty(value = "任务名称") + private String taskName; + /** + * 场站 + */ + @ApiModelProperty(value = "场站") + private String station; + /** + * 责任人 + */ + @ApiModelProperty(value = "责任人") + private String responsiblePerson; + /** + * 任务生成日期时间 + */ + @ApiModelProperty(value = "任务生成日期时间") + private String taskStartDate; + /** + * 任务结束日期时间 + */ + @ApiModelProperty(value = "任务结束日期时间") + private String taskEndDate; + /** + * 取消原因 + */ + @ApiModelProperty(value = "取消原因") + private String cancelReason; + /** + * 任务状态 + */ + @ApiModelProperty(value = "任务状态") + private String taskStatus; + /** + * 对象名称 + */ + @ApiModelProperty(value = "对象名称") + private String objectName; + /** + * 对象类型 + */ + @ApiModelProperty(value = "对象类型") + private String objectType; + /** + * 路线名称 + */ + @ApiModelProperty(value = "路线名称") + private String routeName; + /** + * 路线类型 + */ + @ApiModelProperty(value = "路线类型") + private String routeType; + /** + * 计划名称 + */ + @ApiModelProperty(value = "计划名称") + private String planName; + /** + * 计划类型 + */ + @ApiModelProperty(value = "计划类型") + private String planType; + + +} diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.java b/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.java new file mode 100644 index 0000000..b669d19 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.java @@ -0,0 +1,26 @@ +package org.energy.modules.inspection.mapper; + +import org.energy.modules.inspection.entity.InspectionResult; +import org.energy.modules.inspection.vo.InspectionResultVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.List; + +/** + * 巡检结果 Mapper 接口 + * + * @author Daf + * @since 2024-07-10 + */ +public interface InspectionResultMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param inspectionResult + * @return + */ + List selectInspectionResultPage(IPage page, InspectionResultVO inspectionResult); + +} diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml new file mode 100644 index 0000000..2a9bc9c --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java new file mode 100644 index 0000000..b5e0bc4 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java @@ -0,0 +1,26 @@ +package org.energy.modules.inspection.mapper; + +import org.energy.modules.inspection.entity.InspectionTasks; +import org.energy.modules.inspection.vo.InspectionTasksVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.List; + +/** + * 巡检任务 Mapper 接口 + * + * @author Daf + * @since 2024-07-10 + */ +public interface InspectionTasksMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param inspectionTasks + * @return + */ + List selectInspectionTasksPage(IPage page, InspectionTasksVO inspectionTasks); + +} diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml new file mode 100644 index 0000000..88e331c --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/energy/modules/inspection/service/IInspectionResultService.java b/src/main/java/org/energy/modules/inspection/service/IInspectionResultService.java new file mode 100644 index 0000000..76cba7a --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/service/IInspectionResultService.java @@ -0,0 +1,25 @@ +package org.energy.modules.inspection.service; + +import org.energy.modules.inspection.entity.InspectionResult; +import org.energy.modules.inspection.vo.InspectionResultVO; +import com.dayu.daf.core.mp.base.BaseService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +/** + * 巡检结果 服务类 + * + * @author Daf + * @since 2024-07-10 + */ +public interface IInspectionResultService extends BaseService { + + /** + * 自定义分页 + * + * @param page + * @param inspectionResult + * @return + */ + IPage selectInspectionResultPage(IPage page, InspectionResultVO inspectionResult); + +} diff --git a/src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java b/src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java new file mode 100644 index 0000000..b4700c6 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java @@ -0,0 +1,25 @@ +package org.energy.modules.inspection.service; + +import org.energy.modules.inspection.entity.InspectionTasks; +import org.energy.modules.inspection.vo.InspectionTasksVO; +import com.dayu.daf.core.mp.base.BaseService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +/** + * 巡检任务 服务类 + * + * @author Daf + * @since 2024-07-10 + */ +public interface IInspectionTasksService extends BaseService { + + /** + * 自定义分页 + * + * @param page + * @param inspectionTasks + * @return + */ + IPage selectInspectionTasksPage(IPage page, InspectionTasksVO inspectionTasks); + +} diff --git a/src/main/java/org/energy/modules/inspection/service/impl/InspectionResultServiceImpl.java b/src/main/java/org/energy/modules/inspection/service/impl/InspectionResultServiceImpl.java new file mode 100644 index 0000000..f76d423 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/service/impl/InspectionResultServiceImpl.java @@ -0,0 +1,25 @@ +package org.energy.modules.inspection.service.impl; + +import org.energy.modules.inspection.entity.InspectionResult; +import org.energy.modules.inspection.vo.InspectionResultVO; +import org.energy.modules.inspection.mapper.InspectionResultMapper; +import org.energy.modules.inspection.service.IInspectionResultService; +import com.dayu.daf.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; + +/** + * 巡检结果 服务实现类 + * + * @author Daf + * @since 2024-07-10 + */ +@Service +public class InspectionResultServiceImpl extends BaseServiceImpl implements IInspectionResultService { + + @Override + public IPage selectInspectionResultPage(IPage page, InspectionResultVO inspectionResult) { + return page.setRecords(baseMapper.selectInspectionResultPage(page, inspectionResult)); + } + +} diff --git a/src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java b/src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java new file mode 100644 index 0000000..4f327f4 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java @@ -0,0 +1,25 @@ +package org.energy.modules.inspection.service.impl; + +import org.energy.modules.inspection.entity.InspectionTasks; +import org.energy.modules.inspection.vo.InspectionTasksVO; +import org.energy.modules.inspection.mapper.InspectionTasksMapper; +import org.energy.modules.inspection.service.IInspectionTasksService; +import com.dayu.daf.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; + +/** + * 巡检任务 服务实现类 + * + * @author Daf + * @since 2024-07-10 + */ +@Service +public class InspectionTasksServiceImpl extends BaseServiceImpl implements IInspectionTasksService { + + @Override + public IPage selectInspectionTasksPage(IPage page, InspectionTasksVO inspectionTasks) { + return page.setRecords(baseMapper.selectInspectionTasksPage(page, inspectionTasks)); + } + +} diff --git a/src/main/java/org/energy/modules/inspection/vo/InspectionResultVO.java b/src/main/java/org/energy/modules/inspection/vo/InspectionResultVO.java new file mode 100644 index 0000000..1e49e80 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/vo/InspectionResultVO.java @@ -0,0 +1,20 @@ +package org.energy.modules.inspection.vo; + +import org.energy.modules.inspection.entity.InspectionResult; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; + +/** + * 巡检结果视图实体类 + * + * @author Daf + * @since 2024-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "InspectionResultVO对象", description = "巡检结果") +public class InspectionResultVO extends InspectionResult { + private static final long serialVersionUID = 1L; + +} diff --git a/src/main/java/org/energy/modules/inspection/vo/InspectionTasksVO.java b/src/main/java/org/energy/modules/inspection/vo/InspectionTasksVO.java new file mode 100644 index 0000000..453c3b0 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/vo/InspectionTasksVO.java @@ -0,0 +1,20 @@ +package org.energy.modules.inspection.vo; + +import org.energy.modules.inspection.entity.InspectionTasks; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; + +/** + * 巡检任务视图实体类 + * + * @author Daf + * @since 2024-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "InspectionTasksVO对象", description = "巡检任务") +public class InspectionTasksVO extends InspectionTasks { + private static final long serialVersionUID = 1L; + +}