diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml index f860d53..e48629d 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml @@ -82,7 +82,7 @@ and obj.is_deleted = '0' where task.is_deleted = '0' - and obj.kks_no = #{toolsCodeId} + and obj.tools_code_id = #{toolsCodeId} diff --git a/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java b/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java index 9c11e39..d9849c4 100644 --- a/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java +++ b/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java @@ -94,40 +94,7 @@ public class OperationTicketController extends DafController { @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入operationTicket") public R> page(OperationTicketVO operationTicket, Query query) { - QueryWrapper qw = new QueryWrapper<>(); - //场站 - if (null != operationTicket.getStation()) { - qw.lambda().eq(OperationTicketVO::getStation, operationTicket.getStation()); - } - //操作票编号 - if (StringUtil.isNotEmpty(operationTicket.getOperationTicketNo())) { - qw.lambda().like(OperationTicketVO::getOperationTicketNo, operationTicket.getOperationTicketNo()); - } - //操作票类型 - if (StringUtil.isNotEmpty(operationTicket.getOperationTicketType())){ - qw.lambda().like(OperationTicketVO::getOperationTicketType, operationTicket.getOperationTicketType()); - } - //工作负责人 - if (StringUtil.isNotEmpty(operationTicket.getWorkLeader())) { - qw.lambda().like(OperationTicketVO::getWorkLeader, operationTicket.getWorkLeader()); - } - //作业风险等级 - if (StringUtil.isNotEmpty(operationTicket.getJobRiskLevel())) { - qw.lambda().like(OperationTicketVO::getJobRiskLevel, operationTicket.getJobRiskLevel()); - } - //控制等级 - if (StringUtil.isNotEmpty(operationTicket.getControlLevel())) { - qw.lambda().like(OperationTicketVO::getControlLevel, operationTicket.getControlLevel()); - } - //计划开始时间 - if (StringUtil.isNotEmpty(operationTicket.getPlannedStartTime())) { - qw.lambda().like(OperationTicketVO::getPlannedStartTime, operationTicket.getPlannedStartTime()); - } - //状态 - if (null != operationTicket.getSts()) { - qw.lambda().eq(OperationTicketVO::getSts, operationTicket.getSts()); - } - IPage pages = operationTicketService.selectOperationTicketPageExt(Condition.getPage(query), qw); + IPage pages = operationTicketService.selectOperationTicketPageExt(Condition.getPage(query), operationTicket); return R.data(pages); } diff --git a/src/main/java/org/energy/modules/smart/controller/WorkOrderController.java b/src/main/java/org/energy/modules/smart/controller/WorkOrderController.java index 59be10f..e3371b5 100644 --- a/src/main/java/org/energy/modules/smart/controller/WorkOrderController.java +++ b/src/main/java/org/energy/modules/smart/controller/WorkOrderController.java @@ -130,7 +130,7 @@ public class WorkOrderController extends DafController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(workOrderService.deleteLogic(Func.toLongList(ids))); + return R.status(workOrderService.removeByIds(Func.toLongList(ids))); } /** diff --git a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java index 10583d3..8cee9ff 100644 --- a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java +++ b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java @@ -30,5 +30,5 @@ public interface OperationTicketMapper extends BaseMapper { List exportData(@Param("entity")OperationTicket operationTicket); - List selectOperationTicketPageExt(IPage page, @Param("ew") Wrapper queryWrapper); + List selectOperationTicketPageExt(IPage page, @Param("entity")OperationTicket operationTicket); } diff --git a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml index 295a063..9c4001f 100644 --- a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml +++ b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml @@ -99,20 +99,44 @@ diff --git a/src/main/java/org/energy/modules/system/controller/RoleController.java b/src/main/java/org/energy/modules/system/controller/RoleController.java index 7f3f404..2d3cc6d 100644 --- a/src/main/java/org/energy/modules/system/controller/RoleController.java +++ b/src/main/java/org/energy/modules/system/controller/RoleController.java @@ -29,8 +29,10 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.energy.modules.system.entity.Role; +import org.energy.modules.system.service.IRoleDataService; import org.energy.modules.system.service.IRoleService; import org.energy.modules.system.vo.GrantVO; +import org.energy.modules.system.vo.HomePageVO; import org.energy.modules.system.vo.RoleVO; import org.energy.modules.system.wrapper.RoleWrapper; import org.springframework.web.bind.annotation.*; @@ -56,6 +58,8 @@ public class RoleController extends DafController { private IRoleService roleService; + private IRoleDataService roleDataService; + /** * 详情 */ @@ -153,4 +157,11 @@ public class RoleController extends DafController { return R.status(temp); } + @GetMapping("/honePageData") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "首页数据", notes = "传入") + public R honePageData() { + return R.data(roleDataService.findCurrHomePageInfo()); + } + } diff --git a/src/main/java/org/energy/modules/system/service/IRoleDataService.java b/src/main/java/org/energy/modules/system/service/IRoleDataService.java new file mode 100644 index 0000000..5351ff9 --- /dev/null +++ b/src/main/java/org/energy/modules/system/service/IRoleDataService.java @@ -0,0 +1,29 @@ +/** + * 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.system.service; + +import org.energy.modules.system.vo.HomePageVO; + +/** + * 服务类 + * + * @author DafX + */ +public interface IRoleDataService { + + HomePageVO findCurrHomePageInfo(); + +} diff --git a/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java b/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java new file mode 100644 index 0000000..baa9881 --- /dev/null +++ b/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java @@ -0,0 +1,141 @@ +/** + * 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.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dayu.daf.core.tool.constant.DafConstant; +import org.energy.modules.inspection.entity.InspectionTasks; +import org.energy.modules.inspection.service.IInspectionTasksService; +import org.energy.modules.leger.entity.EquipmentLedger; +import org.energy.modules.leger.entity.ToolInventoryRecord; +import org.energy.modules.leger.service.IEquipmentLedgerService; +import org.energy.modules.leger.service.IToolInventoryRecordService; +import org.energy.modules.smart.entity.OperationTicket; +import org.energy.modules.smart.entity.WorkOrder; +import org.energy.modules.smart.entity.WorkPermit; +import org.energy.modules.smart.service.IOperationTicketService; +import org.energy.modules.smart.service.IWorkOrderService; +import org.energy.modules.smart.service.IWorkPermitService; +import org.energy.modules.spares.entity.ManufacturerInfo; +import org.energy.modules.spares.entity.Material; +import org.energy.modules.spares.entity.SupplierInfo; +import org.energy.modules.spares.entity.Warehouse; +import org.energy.modules.spares.service.IManufacturerInfoService; +import org.energy.modules.spares.service.IMaterialService; +import org.energy.modules.spares.service.ISupplierInfoService; +import org.energy.modules.spares.service.IWarehouseService; +import org.energy.modules.system.service.IRoleDataService; +import org.energy.modules.system.vo.HomePageVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author DafX + */ +@Service +public class RoleDataServiceImpl implements IRoleDataService { + + @Autowired + private IEquipmentLedgerService equipmentLedgerService; + @Autowired + private IToolInventoryRecordService toolInventoryRecordService; + @Autowired + private IOperationTicketService operationTicketService; + @Autowired + private IWorkPermitService workPermitService; + @Autowired + private IWarehouseService warehouseService; + @Autowired + private IManufacturerInfoService manufacturerInfoService; + @Autowired + private ISupplierInfoService supplierInfoService; + @Autowired + private IMaterialService materialService; + @Autowired + private IWorkOrderService workOrderService; + @Autowired + private IInspectionTasksService inspectionTasksService; + + @Override + public HomePageVO findCurrHomePageInfo() { + HomePageVO hp = new HomePageVO(); + + // Equipment Ledger Service + QueryWrapper qw1 = new QueryWrapper<>(); + qw1.lambda().eq(EquipmentLedger::getCheckStatus, 1); + qw1.lambda().eq(EquipmentLedger::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setEquipmentLedgerAudit(equipmentLedgerService.list(qw1)); + + // Tool Inventory Record Service + QueryWrapper qw2 = new QueryWrapper<>(); + qw2.lambda().eq(ToolInventoryRecord::getCheckStatus, 1); + qw2.lambda().eq(ToolInventoryRecord::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setToolInventoryRecordsAudit(toolInventoryRecordService.list(qw2)); + + // Operation Ticket Service + QueryWrapper qw3 = new QueryWrapper<>(); + qw3.lambda().eq(OperationTicket::getReviewStatus, 1); + qw3.lambda().eq(OperationTicket::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setOperationTicketAudit(operationTicketService.list(qw3)); + + // Work Permit Service + QueryWrapper qw4 = new QueryWrapper<>(); + qw4.lambda().eq(WorkPermit::getCheckStatus, 1); + qw4.lambda().eq(WorkPermit::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setWorkPermitAudit(workPermitService.list(qw4)); + + // Warehouse Service + QueryWrapper qw5 = new QueryWrapper<>(); + qw5.lambda().eq(Warehouse::getApprovalStatus, 1); + qw5.lambda().eq(Warehouse::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setWarehouseAudit(warehouseService.list(qw5)); + + // Manufacturer Info Service + QueryWrapper qw6 = new QueryWrapper<>(); + qw6.lambda().eq(ManufacturerInfo::getApprovalStatus, 1); + qw6.lambda().eq(ManufacturerInfo::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setManufacturerInfoAudit(manufacturerInfoService.list(qw6)); + + // Supplier Info Service + QueryWrapper qw7 = new QueryWrapper<>(); + qw7.lambda().eq(SupplierInfo::getApprovalStatus, 1); + qw7.lambda().eq(SupplierInfo::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setSupplierInfoAudit(supplierInfoService.list(qw7)); + + // Material Service + QueryWrapper qw8 = new QueryWrapper<>(); + qw8.lambda().eq(Material::getIstatus, 1L); + qw8.lambda().eq(Material::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setMaterialAudit(materialService.list(qw8)); + + // Work Order Service (already implemented) + QueryWrapper qw9 = new QueryWrapper<>(); + qw9.lambda().eq(WorkOrder::getApprovalStatus, 1); + qw9.lambda().eq(WorkOrder::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setWorkOrderAudit(workOrderService.list(qw9)); + + // Inspection Tasks Service + QueryWrapper qw10 = new QueryWrapper<>(); + qw10.lambda().eq(InspectionTasks::getTaskStatus, 1); + qw10.lambda().eq(InspectionTasks::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setInspectionTasksAudit(inspectionTasksService.list(qw10)); + + return hp; + } + +} diff --git a/src/main/java/org/energy/modules/system/vo/HomePageVO.java b/src/main/java/org/energy/modules/system/vo/HomePageVO.java new file mode 100644 index 0000000..f92a6a9 --- /dev/null +++ b/src/main/java/org/energy/modules/system/vo/HomePageVO.java @@ -0,0 +1,36 @@ +package org.energy.modules.system.vo; + +import lombok.Data; +import org.energy.modules.inspection.entity.InspectionTasks; +import org.energy.modules.leger.entity.EquipmentLedger; +import org.energy.modules.leger.entity.ToolInventoryRecord; +import org.energy.modules.smart.entity.OperationTicket; +import org.energy.modules.smart.entity.WorkOrder; +import org.energy.modules.smart.entity.WorkPermit; +import org.energy.modules.spares.entity.ManufacturerInfo; +import org.energy.modules.spares.entity.Material; +import org.energy.modules.spares.entity.SupplierInfo; +import org.energy.modules.spares.entity.Warehouse; + +import java.util.List; + +@Data +public class HomePageVO { + + // 巡检任务 + private List inspectionTasksAudit; + + // 设备台账 + private List equipmentLedgerAudit; + private List toolInventoryRecordsAudit; + // 智能两票 + private List operationTicketAudit; + private List workPermitAudit; + // 备件管理 + private List warehouseAudit; + private List manufacturerInfoAudit; + private List supplierInfoAudit; + private List materialAudit; + // 工单 + private List workOrderAudit; +}