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/InspectionRouteController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java new file mode 100644 index 0000000..e308fa4 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java @@ -0,0 +1,249 @@ +/** + * 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 com.alibaba.excel.EasyExcel; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dayu.daf.core.log.annotation.ApiLog; +import com.dayu.daf.core.tool.constant.DafConstant; +import com.xkcoding.http.util.StringUtil; +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.servlet.http.HttpServletResponse; +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 lombok.SneakyThrows; +import org.apache.commons.codec.Charsets; +import org.energy.modules.inspection.excel.InspectionRouteExcel; +import org.energy.modules.leger.entity.EquipmentLedger; +import org.energy.modules.system.entity.Dict; +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.InspectionRoute; +import org.energy.modules.inspection.vo.InspectionRouteVO; +import org.energy.modules.inspection.service.IInspectionRouteService; +import com.dayu.daf.core.boot.ctrl.DafController; +import springfox.documentation.annotations.ApiIgnore; + +import java.net.URLEncoder; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * 巡检路线 控制器 + * + * @author Daf + * @since 2024-07-10 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/inspection/inspectionRoute") +@Api(value = "巡检路线", tags = "巡检路线接口") +public class InspectionRouteController extends DafController { + + private IInspectionRouteService inspectionRouteService; + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入inspectionRoute") + public R detail(InspectionRoute inspectionRoute) { + InspectionRoute detail = inspectionRouteService.getOne(Condition.getQueryWrapper(inspectionRoute)); + return R.data(detail); + } + + /** + * 分页 巡检路线 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入inspectionRoute") + public R> list(InspectionRoute inspectionRoute, Query query) { + QueryWrapper qw = new QueryWrapper<>(); + qw.orderByAsc("route_no"); + if (StringUtil.isNotEmpty(inspectionRoute.getRouteNo())) { + qw.lambda().like(InspectionRoute::getRouteNo, inspectionRoute.getRouteNo()); + } + if (StringUtil.isNotEmpty(inspectionRoute.getRouteName())) { + qw.lambda().like(InspectionRoute::getRouteName, inspectionRoute.getRouteName()); + } + if (null != inspectionRoute.getStations()) { + qw.lambda().eq(InspectionRoute::getStations, inspectionRoute.getStations()); + } + if (StringUtil.isNotEmpty(inspectionRoute.getType())) { + qw.lambda().like(InspectionRoute::getType, inspectionRoute.getType()); + } + if (null != inspectionRoute.getIstatus()) { + qw.lambda().eq(InspectionRoute::getIstatus, inspectionRoute.getIstatus()); + } + IPage pages = inspectionRouteService.page(Condition.getPage(query), qw); + return R.data(pages); + } + + /** + * 自定义分页 巡检路线 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入inspectionRoute") + public R> page(InspectionRouteVO inspectionRoute, Query query) { + IPage pages = inspectionRouteService.selectInspectionRoutePage(Condition.getPage(query), inspectionRoute); + return R.data(pages); + } + + /** + * 新增 巡检路线 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入inspectionRoute") + public R save(@Valid @RequestBody InspectionRoute inspectionRoute) { + return R.status(inspectionRouteService.save(inspectionRoute)); + } + + /** + * 修改 巡检路线 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入inspectionRoute") + public R update(@Valid @RequestBody InspectionRoute inspectionRoute) { + return R.status(inspectionRouteService.updateById(inspectionRoute)); + } + + /** + * 新增或修改 巡检路线 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入inspectionRoute") + public R submit(@Valid @RequestBody InspectionRoute inspectionRoute) { + inspectionRoute.setIstatus(1); + String date = LocalDate.now().toString().replace("-",""); + String maxNo = inspectionRouteService.getMaxNo("'%" + date + "%'"); + int number; + if (StringUtil.isNotEmpty(maxNo)){ + number = Integer.parseInt(maxNo.substring(9)); + number++; + }else{ + number = 1; + } + String numFormat = String.format("%04d", number); + String no = "R" + date + numFormat; + inspectionRoute.setRouteNo(no); + return R.status(inspectionRouteService.saveOrUpdate(inspectionRoute)); + } + + + /** + * 删除 巡检路线 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(inspectionRouteService.deleteLogic(Func.toLongList(ids))); + } + + + + /** + * 生效 + */ + @PostMapping("/takeEffect") + @ApiOperationSupport(order = 8) + @ApiOperation(value = "生效", notes = "传入ids") + public R takeEffect(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return this.updateInspectionRoute(1,ids); + } + + /** + * 失效 + */ + @PostMapping("/lapse") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "失效", notes = "传入ids") + public R lapse(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return this.updateInspectionRoute(0,ids); + } + + /** + * 生效OR失效 + */ + public R updateInspectionRoute(Integer status, String ids) { + List list = new ArrayList<>(); + for (String id : ids.split(",")) { + InspectionRoute inspectionRoute = new InspectionRoute(); + inspectionRoute.setId(Long.parseLong(id)); + inspectionRoute.setIstatus(status); + list.add(inspectionRoute); + } + return R.status(inspectionRouteService.updateBatchById(list)); + } + + + /** + * 导出 + */ + @SneakyThrows + @GetMapping("export") + @ApiOperationSupport(order = 10) + @ApiOperation(value = "导出", notes = "传入") + @ApiLog + public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { + if (entity.containsKey("stations_equal")) { + entity.put("stations_equal", Integer.parseInt((String) entity.get("stations_equal"))); + } + if (entity.containsKey("istatus_equal")) { + entity.put("istatus_equal", Integer.parseInt((String) entity.get("istatus_equal"))); + } + QueryWrapper queryWrapper = Condition.getQueryWrapper(entity, InspectionRoute.class); + queryWrapper.lambda().eq(InspectionRoute::getIsDeleted, DafConstant.DB_NOT_DELETED); + queryWrapper.orderByAsc("route_no"); + + List list = inspectionRouteService.export(queryWrapper); + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding(Charsets.UTF_8.name()); + String fileName = URLEncoder.encode("巡检路线数据导出", Charsets.UTF_8.name()); + response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); + EasyExcel.write(response.getOutputStream(), InspectionRouteExcel.class).sheet("巡检路线").doWrite(list); + } + + /** + * 获取路线编号 + */ + @GetMapping("/getRouteList") + @ApiOperationSupport(order = 11) + @ApiOperation(value = "获取路线编号", notes = "获取路线编号") + public R> getRouteList() { + List routeList = inspectionRouteService.getRouteList(); + return R.data(routeList); + } + +} 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..12f5bc8 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java @@ -0,0 +1,246 @@ +/** + * 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 com.alibaba.excel.EasyExcel; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dayu.daf.core.log.annotation.ApiLog; +import com.dayu.daf.core.tool.constant.DafConstant; +import com.xkcoding.http.util.StringUtil; +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.servlet.http.HttpServletResponse; +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 lombok.SneakyThrows; +import org.apache.commons.codec.Charsets; +import org.energy.modules.inspection.excel.InspectionTasksExcel; +import org.energy.modules.leger.entity.EquipmentLedger; +import org.energy.modules.leger.excel.EquipmentLedgerExcel; +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; +import springfox.documentation.annotations.ApiIgnore; + +import java.net.URLEncoder; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * 巡检任务 控制器 + * + * @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) { + QueryWrapper qw = new QueryWrapper<>(); + // 场站 + if (null != inspectionTasks.getStation()) { + qw.lambda().eq(InspectionTasks::getStation, inspectionTasks.getStation()); + } + // 状态 + if (null != inspectionTasks.getTaskStatus()) { + qw.lambda().eq(InspectionTasks::getTaskStatus, inspectionTasks.getTaskStatus()); + } + // 任务编号 + if (StringUtil.isNotEmpty(inspectionTasks.getTaskNo())) { + qw.lambda().like(InspectionTasks::getTaskNo, inspectionTasks.getTaskNo()); + } + // 任务名称 + if (StringUtil.isNotEmpty(inspectionTasks.getTaskName())) { + qw.lambda().like(InspectionTasks::getTaskName, inspectionTasks.getTaskName()); + } + // 任务生成日期 + if (StringUtil.isNotEmpty(inspectionTasks.getTaskStartDate())) { + qw.lambda().like(InspectionTasks::getTaskStartDate, inspectionTasks.getTaskStartDate()); + } + // 任务完成日期 + if (StringUtil.isNotEmpty(inspectionTasks.getTaskEndDate())) { + qw.lambda().like(InspectionTasks::getTaskEndDate, inspectionTasks.getTaskEndDate()); + } + // 责任人 + if (StringUtil.isNotEmpty(inspectionTasks.getResponsiblePerson())) { + qw.lambda().like(InspectionTasks::getResponsiblePerson, inspectionTasks.getResponsiblePerson()); + } + IPage pages = inspectionTasksService.page(Condition.getPage(query), qw); + 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) { + inspectionTasks.setTaskStatus(1L); + String date = LocalDate.now().toString().replace("-",""); + String maxTaskNo = inspectionTasksService.getMaxTaskNo("'%" + date + "%'"); + int number; + if (StringUtil.isNotEmpty(maxTaskNo)){ + number = Integer.parseInt(maxTaskNo.substring(9)); + number++; + }else{ + number = 1; + } + String numFormat = String.format("%04d", number); + String taskNo = "R" + date + numFormat; + inspectionTasks.setTaskNo(taskNo); + 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))); + } + + /** + * 启动 巡检任务 + */ + @PostMapping("/action") + @ApiOperationSupport(order = 8) + @ApiOperation(value = "更新", notes = "传入ids") + public R auditing(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return this.approve("1",ids); + } + + /** + * 停止 巡检任务 + */ + @PostMapping("/stop") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "更新", notes = "传入ids") + public R reject(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return this.approve("2",ids); + } + + /** + * 启动OR停止 巡检任务 + */ + public R approve(String status, String ids) { + List list = new ArrayList<>(); + for (String id : ids.split(",")) { + InspectionTasks inspectionTasks = new InspectionTasks(); + inspectionTasks.setId(Long.parseLong(id)); + inspectionTasks.setTaskStatus(Long.parseLong(status)); + list.add(inspectionTasks); + } + return R.status(inspectionTasksService.updateBatchById(list)); + } + + /** + * 导出 + */ + @SneakyThrows + @GetMapping("export") + @ApiOperationSupport(order = 10) + @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("taskStatus_equal")) { + entity.put("taskStatus_equal", Integer.parseInt((String) entity.get("taskStatus_equal"))); + } + QueryWrapper queryWrapper = Condition.getQueryWrapper(entity, InspectionTasks.class); + queryWrapper.lambda().eq(InspectionTasks::getIsDeleted, DafConstant.DB_NOT_DELETED); + List list = inspectionTasksService.export(queryWrapper); + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding(Charsets.UTF_8.name()); + String fileName = URLEncoder.encode("巡检任务数据导出", Charsets.UTF_8.name()); + response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); + EasyExcel.write(response.getOutputStream(), InspectionTasksExcel.class).sheet("巡检任务").doWrite(list); + } + + +} 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/InspectionRouteDTO.java b/src/main/java/org/energy/modules/inspection/dto/InspectionRouteDTO.java new file mode 100644 index 0000000..0b3f333 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/dto/InspectionRouteDTO.java @@ -0,0 +1,18 @@ +package org.energy.modules.inspection.dto; + +import org.energy.modules.inspection.entity.InspectionRoute; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 巡检路线数据传输对象实体类 + * + * @author Daf + * @since 2024-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionRouteDTO extends InspectionRoute { + 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..f96cb3d --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java @@ -0,0 +1,76 @@ +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 com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * 巡检结果实体类 + * + * @author Daf + * @since 2024-07-11 + */ +@Data +@TableName("i_inspection_result") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "InspectionResult对象", description = "巡检结果") +public class InspectionResult extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "主键") + private Long id; + /** + * 结果编码 + */ + @ApiModelProperty(value = "结果编码") + private String resultNo; + /** + * 巡检任务主键 + */ + @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/InspectionRoute.java b/src/main/java/org/energy/modules/inspection/entity/InspectionRoute.java new file mode 100644 index 0000000..8d05f92 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/entity/InspectionRoute.java @@ -0,0 +1,71 @@ +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 com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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_route") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "InspectionRoute对象", description = "巡检路线") +public class InspectionRoute extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "主键") + private Long id; + /** + * 路线编号 + */ + @ApiModelProperty(value = "路线编号") + private String routeNo; + /** + * 路线名称 + */ + @ApiModelProperty(value = "路线名称") + private String routeName; + /** + * 场站 + */ + @ApiModelProperty(value = "场站") + private Integer stations; + /** + * 类型 + */ + @ApiModelProperty(value = "类型") + private String type; + /** + * 巡检状态 + */ + @ApiModelProperty(value = "巡检状态") + private Integer istatus; + /** + * 维护工厂 + */ + @ApiModelProperty(value = "维护工厂") + private String factory; + /** + * 取消原因 + */ + @ApiModelProperty(value = "取消原因") + private String cancelReason; + + +} 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..284254c --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/entity/InspectionTasks.java @@ -0,0 +1,121 @@ +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 com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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; + + /** + * 主键 + */ + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "主键") + private Long id; + /** + * 任务编码 + */ + @ApiModelProperty(value = "任务编码") + private String taskNo; + /** + * 巡检对象主键 + */ + @ApiModelProperty(value = "巡检对象主键") + private Long inspectionObjId; + /** + * 巡检路线主键 + */ + @ApiModelProperty(value = "巡检路线主键") + private Long inspectionRouteId; + /** + * 巡检计划主键 + */ + @ApiModelProperty(value = "巡检计划主键") + private Long inspectionPlanId; + /** + * 任务名称 + */ + @ApiModelProperty(value = "任务名称") + private String taskName; + /** + * 场站 + */ + @ApiModelProperty(value = "场站") + private Long station; + /** + * 责任人 + */ + @ApiModelProperty(value = "责任人") + private String responsiblePerson; + /** + * 任务生成日期时间 + */ + @ApiModelProperty(value = "任务生成日期时间") + private String taskStartDate; + /** + * 任务结束日期时间 + */ + @ApiModelProperty(value = "任务结束日期时间") + private String taskEndDate; + /** + * 取消原因 + */ + @ApiModelProperty(value = "取消原因") + private String cancelReason; + /** + * 任务状态 + */ + @ApiModelProperty(value = "任务状态") + private Long 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/excel/InspectionRouteExcel.java b/src/main/java/org/energy/modules/inspection/excel/InspectionRouteExcel.java new file mode 100644 index 0000000..1a59383 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/excel/InspectionRouteExcel.java @@ -0,0 +1,65 @@ +/** + * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * 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.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; + +/** + * EquipmentLedge model export + * @author edwong + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(16) +public class InspectionRouteExcel implements Serializable { + private static final long serialVersionUID = 1L; + + @ColumnWidth(20) + @ExcelProperty(value = "路线编号") + private String routeNo; + + @ColumnWidth(15) + @ExcelProperty(value = "路线名称") + private String routeName; + + @ColumnWidth(15) + @ExcelProperty(value = "场站") + private String stationsName; + + @ColumnWidth(15) + @ExcelProperty(value = "类型") + private String type; + + @ColumnWidth(15) + @ExcelProperty(value = "巡检状态") + private String istatusName; + + @ColumnWidth(15) + @ExcelProperty(value = "维护工厂") + private String factory; + + @ColumnWidth(15) + @ExcelProperty(value = "取消原因") + private String cancelReason; + +} diff --git a/src/main/java/org/energy/modules/inspection/excel/InspectionTasksExcel.java b/src/main/java/org/energy/modules/inspection/excel/InspectionTasksExcel.java new file mode 100644 index 0000000..9b6896a --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/excel/InspectionTasksExcel.java @@ -0,0 +1,70 @@ +/** + * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * 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.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; + +/** + * EquipmentLedge model export + * @author edwong + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(16) +public class InspectionTasksExcel implements Serializable { + private static final long serialVersionUID = 1L; + + @ColumnWidth(20) + @ExcelProperty(value = "任务编号") + private String taskNo; + + @ColumnWidth(15) + @ExcelProperty(value = "任务名称") + private String taskName; + + @ColumnWidth(15) + @ExcelProperty(value = "场站") + private String stationExt; + + @ColumnWidth(15) + @ExcelProperty(value = "任务生成日期") + private String taskStartDate; + + @ColumnWidth(15) + @ExcelProperty(value = "任务完成日期") + private String taskEndDate; + + @ColumnWidth(15) + @ExcelProperty(value = "责任人") + private String responsiblePerson; + + @ColumnWidth(15) + @ExcelProperty(value = "状态") + private String taskStatusExt; + + @ColumnWidth(15) + @ExcelProperty(value = "取消原因") + private String cancelReason; + + +} 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..32128b0 --- /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-11 + */ +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..6d7ecaa --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.java b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.java new file mode 100644 index 0000000..332a45b --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.java @@ -0,0 +1,42 @@ +package org.energy.modules.inspection.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.apache.ibatis.annotations.Param; +import org.energy.modules.inspection.entity.InspectionRoute; +import org.energy.modules.inspection.excel.InspectionRouteExcel; +import org.energy.modules.inspection.vo.InspectionRouteVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.energy.modules.system.entity.Dict; + +import java.util.List; + +/** + * 巡检路线 Mapper 接口 + * + * @author Daf + * @since 2024-07-10 + */ +public interface InspectionRouteMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param inspectionRoute + * @return + */ + List selectInspectionRoutePage(IPage page, InspectionRouteVO inspectionRoute); + + List exportData(@Param("ew") Wrapper queryWrapper); + + /** + * 获取路线编号 + */ + List getRouteList(); + + /** + * 获取最大编号 + */ + String getMaxNo(String date); +} diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml new file mode 100644 index 0000000..9237d3a --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..a113ec5 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java @@ -0,0 +1,42 @@ +package org.energy.modules.inspection.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.apache.ibatis.annotations.Param; +import org.energy.modules.inspection.entity.InspectionTasks; +import org.energy.modules.inspection.excel.InspectionTasksExcel; +import org.energy.modules.inspection.vo.InspectionTasksVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.energy.modules.leger.entity.EquipmentLedger; +import org.energy.modules.leger.excel.EquipmentLedgerExcel; + +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); + + /** + * 导出 + */ + List exportData(@Param("ew") Wrapper queryWrapper); + + /** + * 获取最大任务编号 + */ + String getMaxTaskNO(String date); + +} 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..1a8c6c3 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/IInspectionRouteService.java b/src/main/java/org/energy/modules/inspection/service/IInspectionRouteService.java new file mode 100644 index 0000000..e091212 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/service/IInspectionRouteService.java @@ -0,0 +1,48 @@ +package org.energy.modules.inspection.service; + +import org.energy.modules.inspection.entity.InspectionRoute; +import org.energy.modules.inspection.vo.InspectionRouteVO; +import com.dayu.daf.core.mp.base.BaseService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.energy.modules.inspection.excel.InspectionRouteExcel; + +import java.util.List; + +/** + * 巡检路线 服务类 + * + * @author Daf + * @since 2024-07-10 + */ +public interface IInspectionRouteService extends BaseService { + + /** + * 自定义分页 + * + * @param page + * @param inspectionRoute + * @return + */ + IPage selectInspectionRoutePage(IPage page, InspectionRouteVO inspectionRoute); + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List export(Wrapper queryWrapper); + + /** + * 获取路线编号 + */ + List getRouteList(); + + /** + * 获取最大任务编号 + * + * @param date + */ + String getMaxNo(String date); +} 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..eca4878 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java @@ -0,0 +1,46 @@ +package org.energy.modules.inspection.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.energy.modules.inspection.entity.InspectionTasks; +import org.energy.modules.inspection.excel.InspectionTasksExcel; +import org.energy.modules.inspection.vo.InspectionTasksVO; +import com.dayu.daf.core.mp.base.BaseService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.energy.modules.leger.entity.EquipmentLedger; +import org.energy.modules.leger.excel.EquipmentLedgerExcel; + +import java.util.List; + +/** + * 巡检任务 服务类 + * + * @author Daf + * @since 2024-07-10 + */ +public interface IInspectionTasksService extends BaseService { + + /** + * 自定义分页 + * + * @param page + * @param inspectionTasks + * @return + */ + IPage selectInspectionTasksPage(IPage page, InspectionTasksVO inspectionTasks); + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List export(Wrapper queryWrapper); + + /** + * 获取最大任务编号 + * + * @param date + */ + String getMaxTaskNo(String date); + +} 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/InspectionRouteServiceImpl.java b/src/main/java/org/energy/modules/inspection/service/impl/InspectionRouteServiceImpl.java new file mode 100644 index 0000000..43e9ed8 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/service/impl/InspectionRouteServiceImpl.java @@ -0,0 +1,47 @@ +package org.energy.modules.inspection.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.energy.modules.inspection.entity.InspectionRoute; +import org.energy.modules.inspection.excel.InspectionRouteExcel; +import org.energy.modules.inspection.vo.InspectionRouteVO; +import org.energy.modules.inspection.mapper.InspectionRouteMapper; +import org.energy.modules.inspection.service.IInspectionRouteService; +import com.dayu.daf.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.List; + +/** + * 巡检路线 服务实现类 + * + * @author Daf + * @since 2024-07-10 + */ +@Service +public class InspectionRouteServiceImpl extends BaseServiceImpl implements IInspectionRouteService { + + @Override + public IPage selectInspectionRoutePage(IPage page, InspectionRouteVO inspectionRoute) { + return page.setRecords(baseMapper.selectInspectionRoutePage(page, inspectionRoute)); + } + + @Override + public List export(Wrapper queryWrapper) { + List list = baseMapper.exportData(queryWrapper); + return list; + } + + @Override + public List getRouteList() { + List list = baseMapper.getRouteList(); + return list; + } + + @Override + public String getMaxNo(String date){ + String maxNo = baseMapper.getMaxNo(date); + return maxNo; + } + +} 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..2918508 --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java @@ -0,0 +1,48 @@ +package org.energy.modules.inspection.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.energy.modules.inspection.entity.InspectionTasks; +import org.energy.modules.inspection.excel.InspectionTasksExcel; +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.energy.modules.leger.entity.EquipmentLedger; +import org.energy.modules.leger.excel.EquipmentLedgerExcel; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.List; + +/** + * 巡检任务 服务实现类 + * + * @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)); + } + + @Override + public List export(Wrapper queryWrapper) { + List list = baseMapper.exportData(queryWrapper); + return list; + } + + /** + * 获取最大任务编号 + * + * @param date + */ + @Override + public String getMaxTaskNo(String date){ + String maxTakNo = baseMapper.getMaxTaskNO(date); + return maxTakNo; + } + +} 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/InspectionRouteVO.java b/src/main/java/org/energy/modules/inspection/vo/InspectionRouteVO.java new file mode 100644 index 0000000..784134a --- /dev/null +++ b/src/main/java/org/energy/modules/inspection/vo/InspectionRouteVO.java @@ -0,0 +1,20 @@ +package org.energy.modules.inspection.vo; + +import org.energy.modules.inspection.entity.InspectionRoute; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; + +/** + * 巡检路线视图实体类 + * + * @author Daf + * @since 2024-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "InspectionRouteVO对象", description = "巡检路线") +public class InspectionRouteVO extends InspectionRoute { + 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; + +} 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..1d7edf4 100644 --- a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java +++ b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java @@ -170,8 +170,8 @@ public class EquipmentLedgerController extends DafController { @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { for (String id : ids.split(",")) { - inventoryDocumentService.delInventoryDocument(Integer.parseInt(id)); - techParametersService.delTechParameters(Integer.parseInt(id)); + inventoryDocumentService.delInventoryDocument(Long.parseLong(id)); + techParametersService.delTechParameters(Long.parseLong(id)); } return R.status(equipmentLedgerService.deleteLogic(Func.toLongList(ids))); } @@ -203,7 +203,7 @@ public class EquipmentLedgerController extends DafController { List list = new ArrayList<>(); for (String id : ids.split(",")) { EquipmentLedger equipmentLedger = new EquipmentLedger(); - equipmentLedger.setId(Integer.parseInt(id)); + equipmentLedger.setId(Long.parseLong(id)); equipmentLedger.setCheckStatus(status); list.add(equipmentLedger); } @@ -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); diff --git a/src/main/java/org/energy/modules/leger/controller/InspectionStandardsController.java b/src/main/java/org/energy/modules/leger/controller/InspectionStandardsController.java index ba7c6ba..1312e0b 100644 --- a/src/main/java/org/energy/modules/leger/controller/InspectionStandardsController.java +++ b/src/main/java/org/energy/modules/leger/controller/InspectionStandardsController.java @@ -142,7 +142,7 @@ public class InspectionStandardsController extends DafController { @GetMapping("/del") @ApiOperationSupport(order = 9) @ApiOperation(value = "逻辑删除", notes = "传入toolscodeid") - public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer toolsCodeId) { + public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Long toolsCodeId) { return R.status(inspectionStandardsService.delInspectionStandards(toolsCodeId)); } diff --git a/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java b/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java index f44ebe0..4b60da1 100644 --- a/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java +++ b/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java @@ -142,7 +142,7 @@ public class InventoryDocumentController extends DafController { @GetMapping("/del") @ApiOperationSupport(order = 9) @ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId") - public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer eqLedgerId) { + public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Long eqLedgerId) { return R.status(inventoryDocumentService.delInventoryDocument(eqLedgerId)); } } diff --git a/src/main/java/org/energy/modules/leger/controller/TechParametersController.java b/src/main/java/org/energy/modules/leger/controller/TechParametersController.java index 6e9fba3..f927b54 100644 --- a/src/main/java/org/energy/modules/leger/controller/TechParametersController.java +++ b/src/main/java/org/energy/modules/leger/controller/TechParametersController.java @@ -142,7 +142,7 @@ public class TechParametersController extends DafController { @GetMapping("/del") @ApiOperationSupport(order = 9) @ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId") - public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer eqLedgerId) { + public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Long eqLedgerId) { return R.status(techParametersService.delTechParameters(eqLedgerId)); } } diff --git a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java index 955deb9..d19206e 100644 --- a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java +++ b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java @@ -33,6 +33,7 @@ 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.energy.modules.leger.entity.TechParameters; import org.energy.modules.leger.excel.ToolInventoryRecordExcel; import org.energy.modules.leger.service.*; import org.springframework.web.bind.annotation.*; @@ -161,9 +162,9 @@ public class ToolInventoryRecordController extends DafController { @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { for (String id : ids.split(",")) { - inventoryDocumentService.delInventoryDocument(Integer.parseInt(id)); - techParametersService.delTechParameters(Integer.parseInt(id)); - inspectionStandardsService.delInspectionStandards(Integer.parseInt(id)); + inventoryDocumentService.delInventoryDocument(Long.parseLong(id)); + techParametersService.delTechParameters(Long.parseLong(id)); + inspectionStandardsService.delInspectionStandards(Long.parseLong(id)); } return R.status(toolInventoryRecordService.deleteLogic(Func.toLongList(ids))); } @@ -220,4 +221,14 @@ public class ToolInventoryRecordController extends DafController { EasyExcel.write(response.getOutputStream(), ToolInventoryRecordExcel.class).sheet("工器具台账").doWrite(list); } +// /** +// * 删除 检验标准一览 +// */ +// @GetMapping("/del") +// @ApiOperationSupport(order = 9) +// @ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId") +// public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer eqLedgerId) { +// return R.status(toolInventoryRecordService.delTechParameters(eqLedgerId)); +// } + } diff --git a/src/main/java/org/energy/modules/leger/entity/EquipmentLedger.java b/src/main/java/org/energy/modules/leger/entity/EquipmentLedger.java index 7e19ea8..171bcab 100644 --- a/src/main/java/org/energy/modules/leger/entity/EquipmentLedger.java +++ b/src/main/java/org/energy/modules/leger/entity/EquipmentLedger.java @@ -3,6 +3,9 @@ package org.energy.modules.leger.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.EqualsAndHashCode; import io.swagger.annotations.ApiModel; @@ -25,8 +28,9 @@ public class EquipmentLedger extends BaseEntity { /** * 主键 */ + @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "主键") - private Integer id; + private Long id; /** * 设备台账编码 */ diff --git a/src/main/java/org/energy/modules/leger/entity/InspectionStandards.java b/src/main/java/org/energy/modules/leger/entity/InspectionStandards.java index 1d5803a..24572ae 100644 --- a/src/main/java/org/energy/modules/leger/entity/InspectionStandards.java +++ b/src/main/java/org/energy/modules/leger/entity/InspectionStandards.java @@ -3,6 +3,9 @@ package org.energy.modules.leger.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.EqualsAndHashCode; import io.swagger.annotations.ApiModel; @@ -25,11 +28,13 @@ public class InspectionStandards extends BaseEntity { /** * 主键 */ + @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "主键") private Long id; /** * 工器具编码 */ + @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "工器具编码") private Long toolsCodeId; /** diff --git a/src/main/java/org/energy/modules/leger/entity/InventoryDocument.java b/src/main/java/org/energy/modules/leger/entity/InventoryDocument.java index 14ecb0f..5ca0419 100644 --- a/src/main/java/org/energy/modules/leger/entity/InventoryDocument.java +++ b/src/main/java/org/energy/modules/leger/entity/InventoryDocument.java @@ -3,6 +3,9 @@ package org.energy.modules.leger.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.EqualsAndHashCode; import io.swagger.annotations.ApiModel; @@ -25,18 +28,21 @@ public class InventoryDocument extends BaseEntity { /** * 主键 */ + @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "主键") - private Integer id; + private Long id; /** * 设备台账主键 */ + @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "设备台账主键") - private Integer eqLedgerId; + private Long eqLedgerId; /** * 工器具编码主键 */ + @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "工器具编码主键") - private Integer toolsCodeId; + private Long toolsCodeId; /** * 标题 */ diff --git a/src/main/java/org/energy/modules/leger/entity/TechParameters.java b/src/main/java/org/energy/modules/leger/entity/TechParameters.java index 669a0b5..d22b5d8 100644 --- a/src/main/java/org/energy/modules/leger/entity/TechParameters.java +++ b/src/main/java/org/energy/modules/leger/entity/TechParameters.java @@ -3,6 +3,9 @@ package org.energy.modules.leger.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.EqualsAndHashCode; import io.swagger.annotations.ApiModel; @@ -25,18 +28,21 @@ public class TechParameters extends BaseEntity { /** * 主键 */ + @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "主键") - private Integer id; + private Long id; /** * 设备台账编码主键 */ + @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "设备台账编码主键") - private Integer eqLedgerId; + private Long eqLedgerId; /** * 工器具编码主键 */ + @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "工器具编码主键") - private Integer toolsCodeId; + private Long toolsCodeId; /** * 分类 */ diff --git a/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java b/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java index 8fa5565..476ea7e 100644 --- a/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java +++ b/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java @@ -3,6 +3,9 @@ package org.energy.modules.leger.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.EqualsAndHashCode; import io.swagger.annotations.ApiModel; @@ -25,6 +28,7 @@ public class ToolInventoryRecord extends BaseEntity { /** * 主键 */ + @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "主键") private Long id; /** diff --git a/src/main/java/org/energy/modules/leger/excel/ToolInventoryRecordExcel.java b/src/main/java/org/energy/modules/leger/excel/ToolInventoryRecordExcel.java index ae70efa..58c9ddb 100644 --- a/src/main/java/org/energy/modules/leger/excel/ToolInventoryRecordExcel.java +++ b/src/main/java/org/energy/modules/leger/excel/ToolInventoryRecordExcel.java @@ -35,56 +35,60 @@ public class ToolInventoryRecordExcel implements Serializable { private static final long serialVersionUID = 1L; @ColumnWidth(20) - @ExcelProperty(value = "设备台账编码") - private String eqLedgerCode; + @ExcelProperty(value = "工器具编码") + private String toolsCodeId; @ColumnWidth(15) - @ExcelProperty(value = "设备描述") - private String deviceDescription; + @ExcelProperty(value = "工器具名称") + private String toolName; @ColumnWidth(15) - @ExcelProperty(value = "KKS编码") - private String kksEncoding; + @ExcelProperty(value = "规格型号") + private String modelSpecification; @ColumnWidth(15) - @ExcelProperty(value = "设备种类") - private String eqType; + @ExcelProperty(value = "配置日期") + private String configurationDate; @ColumnWidth(15) - @ExcelProperty(value = "资产编码") - private String assetCode; + @ExcelProperty(value = "责任班组") + private String responsibleTeam; @ColumnWidth(15) - @ExcelProperty(value = "制造商") - private String manufacturer; + @ExcelProperty(value = "场站") + private String stationsExt; @ColumnWidth(15) - @ExcelProperty(value = "制造商国家") - private String manufacturerCountry; + @ExcelProperty(value = "工器具类别") + private String toolCategory; @ColumnWidth(15) - @ExcelProperty(value = "制造商零件号") - private String manufacturerPartNo; + @ExcelProperty(value = "工器具状态") + private String toolStatus; @ColumnWidth(15) - @ExcelProperty(value = "制造年月") - private String manufactureDate; + @ExcelProperty(value = "已用年限") + private String yearsInUsed; @ColumnWidth(15) - @ExcelProperty(value = "制造序列号") - private String manufacturingSerialNo; + @ExcelProperty(value = "责任人") + private String responsiblPerson; @ColumnWidth(15) - @ExcelProperty(value = "型号") - private String model; + @ExcelProperty(value = "工器具类别描述") + private String toolTypeDescription; @ColumnWidth(15) - @ExcelProperty(value = "大小尺寸") - private String sizeAndSize; + @ExcelProperty(value = "工器具状态描述") + private String toolStatusDescription; @ColumnWidth(15) - @ExcelProperty(value = "对象重量") - private String objectWeight; + @ExcelProperty(value = "出厂编号") + private String factoryNo; + + @ColumnWidth(15) + @ExcelProperty(value = "是否检验周期内") + private String isInspectionPeriodExt; @ColumnWidth(15) @ExcelProperty(value = "审核状态") diff --git a/src/main/java/org/energy/modules/leger/mapper/InspectionStandardsMapper.java b/src/main/java/org/energy/modules/leger/mapper/InspectionStandardsMapper.java index 5e8f431..7117e98 100644 --- a/src/main/java/org/energy/modules/leger/mapper/InspectionStandardsMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/InspectionStandardsMapper.java @@ -29,6 +29,6 @@ public interface InspectionStandardsMapper extends BaseMapper { * @param eqLedgerId * @return */ - boolean delInventoryDocument(Integer eqLedgerId); + boolean delInventoryDocument(Long eqLedgerId); } diff --git a/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java b/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java index a792c80..9355cae 100644 --- a/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java @@ -29,6 +29,6 @@ public interface TechParametersMapper extends BaseMapper { * @param eqLedgerId * @return */ - boolean delTechParameters(Integer eqLedgerId); + boolean delTechParameters(Long eqLedgerId); } diff --git a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml index 1828a97..cb0447f 100644 --- a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml @@ -34,9 +34,30 @@