kangwei：优化设备月报

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

+package com.skua.modules.statistics.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 设备时长日报
+ */
+@Data
+@TableName("equipment_info_duration")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="equipment_info_duration对象", description="设备时长日报")
+public class EquipmentInfoDuration {
+
+	/**id*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "id")
+	private String id;
+	/**厂站编号*/
+	@Excel(name = "厂站编号", width = 15)
+    @ApiModelProperty(value = "厂站编号")
+	private String departId;
+	/**设备编号*/
+	@Excel(name = "设备编号", width = 15)
+    @ApiModelProperty(value = "设备编号")
+	private String infoId;
+	/**日期*/
+	@Excel(name = "日期", width = 15)
+    @ApiModelProperty(value = "日期")
+	private String dataTime;
+	/**故障运行时长*/
+	@Excel(name = "故障运行时长", width = 15)
+    @ApiModelProperty(value = "故障运行时长")
+	private Double gzDuration;
+	/**运行运行时长*/
+	@Excel(name = "运行运行时长", width = 15)
+    @ApiModelProperty(value = "运行运行时长")
+	private Double yzDuration;
+	/**暂停运行时长*/
+	@Excel(name = "暂停运行时长", width = 15)
+    @ApiModelProperty(value = "暂停运行时长")
+	private Double ztDuration;
+	/**累计总时长*/
+	@Excel(name = "累计总时长", width = 15)
+    @ApiModelProperty(value = "累计总时长")
+	private Double totalDuration;
+}

+package com.skua.modules.statistics.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.skua.modules.ajh.vo.AjhPlanScheduleDataVO;
+import org.apache.ibatis.annotations.Param;
+import com.skua.modules.statistics.entity.EquipmentInfoDuration;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 设备时长日报
+ */
+public interface EquipmentInfoDurationMapper extends BaseMapper<EquipmentInfoDuration> {
+
+
+    @Select("select eid.*,ei.equipment_type,ei.equipment_name from equipment_info_duration eid " +
+            " left join equipment_info ei on ei.id = eid.info_id  ${ew.customSqlSegment}")
+    IPage<EquipmentInfoDuration> queryPageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+}

@@ -18,5 +18,5 @@ public interface EquipmentStatisticsMapper {
      * @return
      * @return
      */
      */
     @Anonymous
     @Anonymous
-    IPage<EquipmentFailurelVO> queryEquipmentFailurePage(Page<EquipmentFailurelVO> page,@Param("param") EquipmentFailurelVO equipmentFailurelVO ,@Param("startTime") String startTime);
+    IPage<EquipmentFailurelVO> queryEquipmentFailurePage(Page<EquipmentFailurelVO> page, @Param("param") EquipmentFailurelVO equipmentFailurelVO, @Param("startTime") String startTime);
 }
 }

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.skua.modules.statistics.mapper.EquipmentInfoDurationMapper">
+
+</mapper>
\ No newline at end of file

+package com.skua.modules.statistics.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.skua.modules.statistics.entity.EquipmentInfoDuration;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 设备时长日报
+ */
+public interface IEquipmentInfoDurationService extends IService<EquipmentInfoDuration> {
+    /***
+     *  分页列表
+     * @param page
+     * @param queryWrapper
+     * @return
+     */
+    IPage<EquipmentInfoDuration> queryPageList(Page page, QueryWrapper queryWrapper);
+}

@@ -64,5 +64,5 @@ public interface IEquipmentStatisticsService {
      * @param endTime
      * @param endTime
      * @return
      * @return
      */
      */
-    List<Map<String, Object>> queryEquipmentOperationRecordDetail(String departId,String equipmentId, String startTime, String endTime);
+    List<Map<String, Object>> queryEquipmentOperationRecordDetail(String departId, String equipmentId, String startTime, String endTime);
 }
 }

+package com.skua.modules.statistics.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.skua.modules.statistics.entity.EquipmentInfoDuration;
+import com.skua.modules.statistics.mapper.EquipmentInfoDurationMapper;
+import com.skua.modules.statistics.service.IEquipmentInfoDurationService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 设备时长日报
+ */
+@Service
+public class EquipmentInfoDurationServiceImpl extends ServiceImpl<EquipmentInfoDurationMapper, EquipmentInfoDuration> implements IEquipmentInfoDurationService {
+
+    /***
+     *  分页列表
+     * @param page
+     * @param queryWrapper
+     * @return
+     */
+    public IPage<EquipmentInfoDuration> queryPageList(Page page, QueryWrapper queryWrapper){
+        return this.baseMapper.queryPageList(page,queryWrapper);
+    }
+}

@@ -56,7 +56,7 @@ public class EquipmentStatisticsServiceImpl  implements IEquipmentStatisticsServ
         sql += " from equipment_maintain_task  emt  ,equipment_maintain_plan emp  where  emt.plan_id = emp.id  	";
         sql += " from equipment_maintain_task  emt  ,equipment_maintain_plan emp  where  emt.plan_id = emp.id  	";
         sql += " and emt.maintain_time >= '"+startTime+" 00:00:00' and emt.maintain_time <='"+endTime+" 23:59:59'  group  by emt.depart_id 	";
         sql += " and emt.maintain_time >= '"+startTime+" 00:00:00' and emt.maintain_time <='"+endTime+" 23:59:59'  group  by emt.depart_id 	";
         sql += ") bbb on bbb.depart_id = d.id  where d.depart_type = 1 ";
         sql += ") bbb on bbb.depart_id = d.id  where d.depart_type = 1 ";
-        if(org.apache.commons.lang3.StringUtils.isNotEmpty(departIds)){
+        if(StringUtils.isNotEmpty(departIds)){
             sql += "  and d.id in ("+ departIds +") ";
             sql += "  and d.id in ("+ departIds +") ";
         }
         }
         List<EquipmentRepairMaintainTaskCostVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<EquipmentRepairMaintainTaskCostVO>(EquipmentRepairMaintainTaskCostVO.class));
         List<EquipmentRepairMaintainTaskCostVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<EquipmentRepairMaintainTaskCostVO>(EquipmentRepairMaintainTaskCostVO.class));

+package com.skua.modules.statistics.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 设备时长日报
+ */
+@Data
+@ApiModel(value="equipment_info_duration数据传输对象", description="设备时长日报")
+public class EquipmentInfoDurationVO {
+
+	/**id*/
+    @ApiModelProperty(value = "id")
+	private String id;
+	/**厂站编号*/
+	@Excel(name = "厂站编号", width = 15)
+    @ApiModelProperty(value = "厂站编号")
+	private String departId;
+	/**设备编号*/
+	@Excel(name = "设备编号", width = 15)
+    @ApiModelProperty(value = "设备编号")
+	private String infoId;
+
+	@ApiModelProperty(value = "设备类型")
+	private String equipmentName;
+
+	@ApiModelProperty(value = "设备类型")
+	private String equipmentType;
+	/**日期*/
+	@Excel(name = "日期", width = 15)
+    @ApiModelProperty(value = "日期")
+	private String dataTime;
+
+	/**运行运行时长*/
+	@Excel(name = "运行运行时长", width = 15)
+    @ApiModelProperty(value = "运行运行时长")
+	private Double yzDuration;
+
+
+	@ApiModelProperty(value = "当月运行时长")
+	private String monthDuration;
+
+	/**累计总时长*/
+	@Excel(name = "累计总时长", width = 15)
+    @ApiModelProperty(value = "累计总时长")
+	private Double totalDuration;
+
+	//维修次数
+	@ApiModelProperty(value = "设备运行比例")
+	private String sbyxRate;
+
+}

+package com.skua.modules.statistics.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @auther kangwei
+ * @create 2025-03-13-10:50
+ */
+@Data
+@ApiModel(value="EquipmentSearchVO ", description="设备查询对象")
+public class EquipmentSearchVO {
+
+
+}

@@ -126,7 +126,6 @@ public class WorkAnalysisController {
         return result;
         return result;
     }
     }
 
 
-
     @ApiOperation(value = "安全管理进度-数据列表", notes = "安全管理进度-数据列表 timeType = 1 表示月份，timeType=2 表示年")
     @ApiOperation(value = "安全管理进度-数据列表", notes = "安全管理进度-数据列表 timeType = 1 表示月份，timeType=2 表示年")
     @GetMapping("/analysisBySafeProgress")
     @GetMapping("/analysisBySafeProgress")
     public Result<List<SafeProgressVO>> analysisBySafeProgress(@RequestParam(defaultValue = "1") Integer departType,String departId,@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {
     public Result<List<SafeProgressVO>> analysisBySafeProgress(@RequestParam(defaultValue = "1") Integer departType,String departId,@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {

 package com.skua.modules.equipment.service;
 package com.skua.modules.equipment.service;
 
 
-import java.util.List;
-import java.util.Map;
-
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -13,6 +10,9 @@ import com.skua.modules.equipment.vo.EquipmentInfoForMonitorVO;
 import com.skua.modules.equipment.vo.EquipmentVO;
 import com.skua.modules.equipment.vo.EquipmentVO;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
 
+import java.util.List;
+import java.util.Map;
+
 /**
 /**
  * 设备信息
  * 设备信息
  */
  */
@@ -49,7 +49,7 @@ public interface IEquipmentInfoService extends IService<EquipmentInfo> {
 	 * @author Li Yuanyuan, 2022年7月1日 下午1:50:15
 	 * @author Li Yuanyuan, 2022年7月1日 下午1:50:15
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 */
 	 */
-	Map<String, List<Map<String, Object>>> getExtField(String categoryId,String equipmentId,String departId);
+	Map<String, List<Map<String, Object>>> getExtField(String categoryId, String equipmentId, String departId);
 	/**
 	/**
 	 * <pre>
 	 * <pre>
 	 * 修改
 	 * 修改

@@ -2,6 +2,7 @@ package com.skua.modules.equipment.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.skua.modules.alarmtmp.entity.AlarmRecordHistory;
 import com.skua.modules.alarmtmp.entity.AlarmRecordHistory;
+
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -18,7 +19,7 @@ public interface IEquipmentSingleStatisticsService extends IService<AlarmRecordH
 	 * @author Li Yuanyuan, 2024年2月4日 下午2:41:05
 	 * @author Li Yuanyuan, 2024年2月4日 下午2:41:05
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 */
 	 */
-	Map<String, Object> getAlarmOverview(String equipmentId,String timePeriod, String startTime, String endTime);
+	Map<String, Object> getAlarmOverview(String equipmentId, String timePeriod, String startTime, String endTime);
 	/**
 	/**
 	 * <pre>
 	 * <pre>
 	 * 	设备故障分析-故障类型分布
 	 * 	设备故障分析-故障类型分布
@@ -31,7 +32,7 @@ public interface IEquipmentSingleStatisticsService extends IService<AlarmRecordH
 	 * @author Li Yuanyuan, 2024年2月5日 下午1:56:37
 	 * @author Li Yuanyuan, 2024年2月5日 下午1:56:37
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 */
 	 */
-	List<Map<String,Object>> getEquipmentFaultTypeDistribution(String equipmentId, String timePeriod, String startTime,String endTime);
+	List<Map<String,Object>> getEquipmentFaultTypeDistribution(String equipmentId, String timePeriod, String startTime, String endTime);
 	/**
 	/**
 	 * <pre>
 	 * <pre>
 	 * 	设备故障分析-故障程度分布
 	 * 	设备故障分析-故障程度分布
@@ -44,7 +45,7 @@ public interface IEquipmentSingleStatisticsService extends IService<AlarmRecordH
 	 * @author Li Yuanyuan, 2024年2月5日 下午2:12:40
 	 * @author Li Yuanyuan, 2024年2月5日 下午2:12:40
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 */
 	 */
-	List<Map<String,Object>> getEquipmentFaultLevelDistribution(String equipmentId, String timePeriod,String startTime, String endTime);
+	List<Map<String,Object>> getEquipmentFaultLevelDistribution(String equipmentId, String timePeriod, String startTime, String endTime);
 	/**
 	/**
 	 * <pre>
 	 * <pre>
 	 * 	设备故障分析-维修工单情况
 	 * 	设备故障分析-维修工单情况
@@ -57,7 +58,7 @@ public interface IEquipmentSingleStatisticsService extends IService<AlarmRecordH
 	 * @author Li Yuanyuan, 2024年2月5日 下午2:26:31
 	 * @author Li Yuanyuan, 2024年2月5日 下午2:26:31
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 */
 	 */
-	List<Map<String, Object>> getEquipmentWorkOrderInfo(String equipmentId, String timePeriod, String startTime,String endTime);
+	List<Map<String, Object>> getEquipmentWorkOrderInfo(String equipmentId, String timePeriod, String startTime, String endTime);
 	/**
 	/**
 	 * <pre>
 	 * <pre>
 	 * 	设备报警类型
 	 * 	设备报警类型
@@ -70,7 +71,7 @@ public interface IEquipmentSingleStatisticsService extends IService<AlarmRecordH
 	 * @author Li Yuanyuan, 2024年2月5日 下午3:33:24
 	 * @author Li Yuanyuan, 2024年2月5日 下午3:33:24
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 */
 	 */
-	Map<String, Object> getEquipmentAlarmInfo(String equipmentId, String timePeriod, String startTime,String endTime);
+	Map<String, Object> getEquipmentAlarmInfo(String equipmentId, String timePeriod, String startTime, String endTime);
 	/**
 	/**
 	 * <pre>
 	 * <pre>
 	 * 	设备维护情况
 	 * 	设备维护情况
@@ -83,7 +84,7 @@ public interface IEquipmentSingleStatisticsService extends IService<AlarmRecordH
 	 * @author Li Yuanyuan, 2024年2月6日 上午9:43:53
 	 * @author Li Yuanyuan, 2024年2月6日 上午9:43:53
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 */
 	 */
-	Map<String, Object> getEquipmentMaintainInfo(String equipmentId, String timePeriod, String startTime,String endTime);
+	Map<String, Object> getEquipmentMaintainInfo(String equipmentId, String timePeriod, String startTime, String endTime);
 	/**
 	/**
 	 * <pre>
 	 * <pre>
 	 * 	设备巡检情况
 	 * 	设备巡检情况
@@ -96,7 +97,7 @@ public interface IEquipmentSingleStatisticsService extends IService<AlarmRecordH
 	 * @author Li Yuanyuan, 2024年2月6日 上午9:58:19
 	 * @author Li Yuanyuan, 2024年2月6日 上午9:58:19
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 */
 	 */
-	Map<String, Object> getEquipmentInspectionInfo(String equipmentId, String timePeriod, String startTime,String endTime);
+	Map<String, Object> getEquipmentInspectionInfo(String equipmentId, String timePeriod, String startTime, String endTime);
 	/**
 	/**
 	 * <pre>
 	 * <pre>
 	 *	 设备备件更换情况
 	 *	 设备备件更换情况
@@ -109,7 +110,7 @@ public interface IEquipmentSingleStatisticsService extends IService<AlarmRecordH
 	 * @author Li Yuanyuan, 2024年2月6日 上午11:47:22
 	 * @author Li Yuanyuan, 2024年2月6日 上午11:47:22
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 */
 	 */
-	List<Map<String, Object>> getEquipmentSparepartInfo(String equipmentId, String timePeriod, String startTime,String endTime);
+	List<Map<String, Object>> getEquipmentSparepartInfo(String equipmentId, String timePeriod, String startTime, String endTime);
 
 
 
 
 }
 }