kangwei: 优化设备月报

          设备统计分析，添加设备时长列表接口

@@ -11,6 +11,8 @@ import com.skua.modules.equipment.entity.EquipmentInfo;
 import com.skua.modules.equipment.service.IEquipmentInfoService;
 import com.skua.modules.equipment.service.IEquipmentInfoService;
 import com.skua.modules.equipment.vo.EquipmentNewMaintenancePlanVO;
 import com.skua.modules.equipment.vo.EquipmentNewMaintenancePlanVO;
 import com.skua.modules.erp.entity.ErpProblem;
 import com.skua.modules.erp.entity.ErpProblem;
+import com.skua.modules.statistics.entity.EquipmentInfoDuration;
+import com.skua.modules.statistics.service.IEquipmentInfoDurationService;
 import com.skua.modules.statistics.vo.EquipmentFailurelVO;
 import com.skua.modules.statistics.vo.EquipmentFailurelVO;
 import com.skua.modules.statistics.service.IEquipmentStatisticsService;
 import com.skua.modules.statistics.service.IEquipmentStatisticsService;
 import com.skua.modules.statistics.vo.EquipmentOperationRecordVO;
 import com.skua.modules.statistics.vo.EquipmentOperationRecordVO;
@@ -42,9 +44,10 @@ import java.util.Map;
 public class EquipmentStatisticsController {
 public class EquipmentStatisticsController {
     @Autowired
     @Autowired
     private IEquipmentStatisticsService equipmentStatisticsService;
     private IEquipmentStatisticsService equipmentStatisticsService;
-
     @Autowired
     @Autowired
     private IEquipmentInfoService  equipmentInfoService;
     private IEquipmentInfoService  equipmentInfoService;
+    @Autowired
+    private IEquipmentInfoDurationService equipmentInfoDurationService;
     //
     //
     @ApiOperation(value = "设备看板-维修维护费用列表", notes = "设备看板-维修维护费用列表")
     @ApiOperation(value = "设备看板-维修维护费用列表", notes = "设备看板-维修维护费用列表")
     @GetMapping(value = "/repairMaintainTaskCostList")
     @GetMapping(value = "/repairMaintainTaskCostList")
@@ -152,6 +155,30 @@ public class EquipmentStatisticsController {
     }
     }
 
 
 
 
+    @AutoLog(value = "A类设备运行情况-运行时长")
+    @ApiOperation(value = "A类设备运行情况-运行时长", notes = "A类设备运行情况-运行时长")
+    @GetMapping(value = "/queryEquipmentInfoDurationByPage")
+    public Result<IPage<EquipmentInfoDuration>> allList(EquipmentInfoDuration equipmentInfo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize , HttpServletRequest req ) throws Exception {
+        Result<IPage<EquipmentInfoDuration>> result = new Result<IPage<EquipmentInfoDuration>>();
+        QueryWrapper<EquipmentInfoDuration> queryWrapper = QueryGenerator.initQueryWrapper(equipmentInfo, req.getParameterMap());
+        // queryWrapper.eq("depart_id", BaseContextHandler.getRealDepartId());
+      /*  if(equipmentInfo.getDepartId()==null){
+            equipmentInfo.setDepartId(BaseContextHandler.getDeparts());
+        }*/
+       /* if(model==1){
+            queryWrapper.isNotNull("digital_twins_struct_code");
+            queryWrapper.last(" and digital_twins_struct_code != ''");
+        }*/
+        Page<EquipmentInfoDuration> page = new Page<EquipmentInfoDuration>(pageNo, pageSize);
+        //  queryWrapper.orderByDesc("create_time");
+        IPage<EquipmentInfoDuration> pageList = equipmentInfoDurationService.queryPageList(page,queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+
     @ApiOperation(value = "A类设备运行-设备运行时长列表", notes = "A类设备运行-设备运行时长列表")
     @ApiOperation(value = "A类设备运行-设备运行时长列表", notes = "A类设备运行-设备运行时长列表")
     @GetMapping(value = "/equipmentOperationRecordList")
     @GetMapping(value = "/equipmentOperationRecordList")
     public Result<List<Map<String, Object>>> equipmentOperationRecordDetail(String  departId,String equipmentId, String startTime, String endTime) {
     public Result<List<Map<String, Object>>> equipmentOperationRecordDetail(String  departId,String equipmentId, String startTime, String endTime) {