搞定染整线新功能对比

jjt-admin/src/test/java/com/jjt/dyeing/EnergyTest.java

@@ -3,6 +3,7 @@ package com.jjt.dyeing;
 import com.jjt.JjtApplication;
 import com.jjt.dyeing.service.IDyeingHourAvgService;
 import com.jjt.dyeing.service.IDyeingHourEnergyService;
+import com.jjt.dyeing.service.IDyeingHourLineService;
 import com.jjt.utils.IotService;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.junit.jupiter.api.Test;
@@ -29,15 +30,30 @@ public class EnergyTest {
     private IDyeingHourAvgService avgService;
     @Resource
     private SqlSessionFactory factory;
+    @Resource
+    private IDyeingHourLineService lineService;
+    String st = "2025-10-19";
+    String ed = "2025-10-20";
+    LocalDate localDate = LocalDate.parse(st);
+    LocalDate endDate = LocalDate.parse(ed);
+    LocalDateTime start = LocalDateTime.of(localDate, LocalTime.MIN).plusHours(17);
+    @Test
+    public void line() {
+        LocalDateTime end = LocalDateTime.of(endDate.plusDays(1), LocalTime.MIN).plusHours(6);
+        LocalDateTime curr = LocalDateTime.now();
+        if (end.isAfter(curr)) {
+            end = curr.minusHours(1);
+        }
+        do {
+            int i = start.getHour();
+            lineService.calc(start.toLocalDate(), i);
+            start = start.plusHours(1);
+        } while (!start.isAfter(end));
+    }
 
     @Test
-    public void testCalc() {
+    public void testAvg() {
         iotService.setToken();
-        String st = "2025-10-12";
-        String ed = "2025-10-19";
-        LocalDate localDate = LocalDate.parse(st);
-        LocalDate endDate = LocalDate.parse(ed);
-        LocalDateTime start = LocalDateTime.of(localDate, LocalTime.MIN).plusHours(7);
         LocalDateTime end = LocalDateTime.of(endDate.plusDays(1), LocalTime.MIN).plusHours(6);
         LocalDateTime curr = LocalDateTime.now();
         if (end.isAfter(curr)) {
@@ -54,11 +70,6 @@ public class EnergyTest {
     @Test
     public void testEnergy() {
         iotService.setToken();
-        String st = "2025-10-12";
-        String ed = "2025-10-19";
-        LocalDate localDate = LocalDate.parse(st);
-        LocalDate endDate = LocalDate.parse(ed);
-        LocalDateTime start = LocalDateTime.of(localDate, LocalTime.MIN).plusHours(7);
         LocalDateTime end = LocalDateTime.of(endDate.plusDays(1), LocalTime.MIN).plusHours(6);
         LocalDateTime curr = LocalDateTime.now();
         if (end.isAfter(curr)) {

jjt-biz/src/main/java/com/jjt/dyeing/controller/DyeingHourLineController.java

@@ -0,0 +1,113 @@
+package com.jjt.dyeing.controller;
+
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.jjt.common.annotation.Log;
+import com.jjt.common.core.controller.BaseController;
+import com.jjt.common.core.domain.AjaxResult;
+import com.jjt.common.enums.BusinessType;
+import com.jjt.dyeing.domain.DyeingHourLine;
+import com.jjt.dyeing.service.IDyeingHourLineService;
+import com.jjt.common.utils.poi.ExcelUtil;
+import com.jjt.common.core.page.TableDataInfo;
+
+/**
+ * 染整线产线小时统计数据Controller
+ *
+ * @author wukai
+ * @date 2025-10-19
+ */
+@Api(tags="染整线产线小时统计数据")
+@RestController
+@RequestMapping("/dyeing/rzLine")
+public class DyeingHourLineController extends BaseController{
+    @Resource
+    private IDyeingHourLineService dyeingHourLineService;
+
+    /**
+     * 查询染整线产线小时统计数据列表
+     */
+    @ApiOperation("查询染整线产线小时统计数据列表")
+    @PreAuthorize("@ss.hasPermi('dyeing:rzLine:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DyeingHourLine dyeingHourLine)
+    {
+        startPage();
+        List<DyeingHourLine> list = dyeingHourLineService.selectDyeingHourLineList(dyeingHourLine);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出染整线产线小时统计数据列表
+     */
+    @ApiOperation("导出染整线产线小时统计数据列表")
+    @PreAuthorize("@ss.hasPermi('dyeing:rzLine:export')")
+    @Log(title = "染整线产线小时统计数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DyeingHourLine dyeingHourLine)
+    {
+        List<DyeingHourLine> list = dyeingHourLineService.selectDyeingHourLineList(dyeingHourLine);
+        ExcelUtil<DyeingHourLine> util = new ExcelUtil<DyeingHourLine>(DyeingHourLine.class);
+        util.exportExcel(response, list, "染整线产线小时统计数据数据");
+    }
+
+    /**
+     * 获取染整线产线小时统计数据详细信息
+     */
+    @ApiOperation("获取染整线产线小时统计数据详细信息")
+    @PreAuthorize("@ss.hasPermi('dyeing:rzLine:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(dyeingHourLineService.selectDyeingHourLineById(id));
+    }
+
+    /**
+     * 新增染整线产线小时统计数据
+     */
+    @ApiOperation("新增染整线产线小时统计数据")
+    @PreAuthorize("@ss.hasPermi('dyeing:rzLine:add')")
+    @Log(title = "染整线产线小时统计数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DyeingHourLine dyeingHourLine)
+    {
+        return toAjax(dyeingHourLineService.insertDyeingHourLine(dyeingHourLine));
+    }
+
+    /**
+     * 修改染整线产线小时统计数据
+     */
+    @ApiOperation("修改染整线产线小时统计数据")
+    @PreAuthorize("@ss.hasPermi('dyeing:rzLine:edit')")
+    @Log(title = "染整线产线小时统计数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DyeingHourLine dyeingHourLine)
+    {
+        return toAjax(dyeingHourLineService.updateDyeingHourLine(dyeingHourLine));
+    }
+
+    /**
+     * 删除染整线产线小时统计数据
+     */
+    @ApiOperation("删除染整线产线小时统计数据")
+    @PreAuthorize("@ss.hasPermi('dyeing:rzLine:remove')")
+    @Log(title = "染整线产线小时统计数据", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(dyeingHourLineService.deleteDyeingHourLineByIds(ids));
+    }
+}

jjt-biz/src/main/java/com/jjt/dyeing/domain/DyeingHourLine.java

@@ -0,0 +1,98 @@
+package com.jjt.dyeing.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.jjt.common.annotation.Excel;
+import com.jjt.common.core.domain.BaseEntity;
+
+/**
+ * 染整线产线小时统计数据对象 DYEING_HOUR_LINE
+ *
+ * @author wukai
+ * @date 2025-10-19
+ */
+@ApiModel(value = "DyeingHourLine", description = "染整线产线小时统计数据")
+@Data
+public class DyeingHourLine extends BaseEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @ApiModelProperty("ID")
+    @TableId
+    private Long id;
+
+    /** 日期 */
+    @ApiModelProperty("日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date dataDate;
+
+    /** 小时;0-23 */
+    @ApiModelProperty("小时;0-23")
+    @Excel(name = "小时;0-23")
+    private Integer hour;
+
+    /** 产线编号 */
+    @ApiModelProperty("产线编号")
+    @Excel(name = "产线编号")
+    private String line;
+
+    /** 开机率 */
+    @ApiModelProperty("开机率")
+    @Excel(name = "开机率")
+    private BigDecimal openRate;
+
+    /** 长度 */
+    @ApiModelProperty("长度")
+    @Excel(name = "长度")
+    private BigDecimal length;
+
+    /** 温度 */
+    @ApiModelProperty("温度")
+    @Excel(name = "温度")
+    private BigDecimal tmp;
+
+    /** 速度 */
+    @ApiModelProperty("速度")
+    @Excel(name = "速度")
+    private BigDecimal speed;
+
+    /** 电量 */
+    @ApiModelProperty("电量")
+    @Excel(name = "电量")
+    private BigDecimal energy;
+
+    /** 电流 */
+    @ApiModelProperty("电流")
+    @Excel(name = "电流")
+    private BigDecimal amp;
+
+    /** 创建人 */
+    @ApiModelProperty("创建人")
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdTime;
+
+    /** 更新人 */
+    @ApiModelProperty("更新人")
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedTime;
+
+}

jjt-biz/src/main/java/com/jjt/dyeing/mapper/DyeingHourLineMapper.java

@@ -0,0 +1,71 @@
+package com.jjt.dyeing.mapper;
+
+import java.util.Date;
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jjt.dyeing.domain.DyeingHourLine;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 染整线产线小时统计数据Mapper接口
+ *
+ * @author wukai
+ * @date 2025-10-19
+ */
+public interface DyeingHourLineMapper extends BaseMapper<DyeingHourLine>
+{
+    /**
+     * 查询染整线产线小时统计数据
+     *
+     * @param id 染整线产线小时统计数据主键
+     * @return 染整线产线小时统计数据
+     */
+    public DyeingHourLine selectDyeingHourLineById(Long id);
+
+    /**
+     * 查询染整线产线小时统计数据列表
+     *
+     * @param dyeingHourLine 染整线产线小时统计数据
+     * @return 染整线产线小时统计数据集合
+     */
+    public List<DyeingHourLine> selectDyeingHourLineList(DyeingHourLine dyeingHourLine);
+
+    /**
+     * 新增染整线产线小时统计数据
+     *
+     * @param dyeingHourLine 染整线产线小时统计数据
+     * @return 结果
+     */
+    public int insertDyeingHourLine(DyeingHourLine dyeingHourLine);
+
+    /**
+     * 修改染整线产线小时统计数据
+     *
+     * @param dyeingHourLine 染整线产线小时统计数据
+     * @return 结果
+     */
+    public int updateDyeingHourLine(DyeingHourLine dyeingHourLine);
+
+    /**
+     * 删除染整线产线小时统计数据
+     *
+     * @param id 染整线产线小时统计数据主键
+     * @return 结果
+     */
+    public int deleteDyeingHourLineById(Long id);
+
+    /**
+     * 批量删除染整线产线小时统计数据
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDyeingHourLineByIds(Long[] ids);
+
+    /**
+     * 按小时删除数据
+     * @param date 时间
+     * @param hour 小时
+     */
+    void deleteByHour(@Param("date") Date date, @Param("hour") int hour);
+}

jjt-biz/src/main/java/com/jjt/dyeing/service/IDyeingDeviceService.java

@@ -66,4 +66,10 @@ public interface IDyeingDeviceService {
      * @return 结果
      */
     Map<String, List<DyeingDevice>> deviceByLine();
+    /**
+     * 按设备ID分组的列表
+     *
+     * @return 列表
+     */
+    Map<Long, DyeingDevice> deviceMap();
 }

jjt-biz/src/main/java/com/jjt/dyeing/service/IDyeingHourAvgService.java

@@ -1,8 +1,10 @@
 package com.jjt.dyeing.service;
 
+import com.jjt.dyeing.domain.DyeingHourAvg;
+
 import java.time.LocalDate;
 import java.util.List;
-import com.jjt.dyeing.domain.DyeingHourAvg;
+import java.util.Map;
 
 /**
  * 染整线小时平均统计数据Service接口
@@ -71,4 +73,13 @@ public interface IDyeingHourAvgService {
      * @param hour 小时
      */
     void calc(LocalDate date, int hour);
+
+    /**
+     * 按产线查询数据
+     *
+     * @param date 时间
+     * @param hour 小时
+     * @return 结果
+     */
+    List<DyeingHourAvg> selectByLine(LocalDate date, int hour);
 }

jjt-biz/src/main/java/com/jjt/dyeing/service/IDyeingHourEnergyService.java

@@ -73,5 +73,12 @@ public interface IDyeingHourEnergyService {
      */
     void calc(LocalDate date, int hour);
 
-
+    /**
+     * 按产线查询数据
+     *
+     * @param date 时间
+     * @param hour 小时
+     * @return 结果
+     */
+    List<DyeingHourEnergy> selectByLine(LocalDate date, int hour);
 }

jjt-biz/src/main/java/com/jjt/dyeing/service/IDyeingHourLineService.java

@@ -0,0 +1,74 @@
+package com.jjt.dyeing.service;
+
+import com.jjt.dyeing.domain.DyeingHourLine;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 染整线产线小时统计数据Service接口
+ *
+ * @author wukai
+ * @date 2025-10-19
+ */
+public interface IDyeingHourLineService {
+    /**
+     * 查询染整线产线小时统计数据
+     *
+     * @param id 染整线产线小时统计数据主键
+     * @return 染整线产线小时统计数据
+     */
+    public DyeingHourLine selectDyeingHourLineById(Long id);
+
+    /**
+     * 查询染整线产线小时统计数据列表
+     *
+     * @param dyeingHourLine 染整线产线小时统计数据
+     * @return 染整线产线小时统计数据集合
+     */
+    public List<DyeingHourLine> selectDyeingHourLineList(DyeingHourLine dyeingHourLine);
+
+    /**
+     * 新增染整线产线小时统计数据
+     *
+     * @param dyeingHourLine 染整线产线小时统计数据
+     * @return 结果
+     */
+    public int insertDyeingHourLine(DyeingHourLine dyeingHourLine);
+
+    /**
+     * 修改染整线产线小时统计数据
+     *
+     * @param dyeingHourLine 染整线产线小时统计数据
+     * @return 结果
+     */
+    public int updateDyeingHourLine(DyeingHourLine dyeingHourLine);
+
+    /**
+     * 批量删除染整线产线小时统计数据
+     *
+     * @param ids 需要删除的染整线产线小时统计数据主键集合
+     * @return 结果
+     */
+    public int deleteDyeingHourLineByIds(Long[] ids);
+
+    /**
+     * 删除染整线产线小时统计数据信息
+     *
+     * @param id 染整线产线小时统计数据主键
+     * @return 结果
+     */
+    public int deleteDyeingHourLineById(Long id);
+
+    /**
+     * 计算上一小时数据
+     */
+    void calcLastHour();
+    /**
+     * 计算指定时间指定小时数据
+     *
+     * @param date 时间
+     * @param hour 小时
+     */
+    void calc(LocalDate date, int hour);
+}

jjt-biz/src/main/java/com/jjt/dyeing/service/impl/DyeingDeviceServiceImpl.java

@@ -98,4 +98,15 @@ public class DyeingDeviceServiceImpl implements IDyeingDeviceService {
         // 按照line字段对设备进行分组
         return list.stream().collect(Collectors.groupingBy(DyeingDevice::getLine));
     }
+
+    /**
+     * 按设备ID分组的列表
+     *
+     * @return 列表
+     */
+    @Override
+    public Map<Long, DyeingDevice> deviceMap() {
+        List<DyeingDevice> list = selectDyeingDeviceList(new DyeingDevice());
+        return list.stream().collect(Collectors.toMap(DyeingDevice::getDeviceId, d -> d));
+    }
 }

jjt-biz/src/main/java/com/jjt/dyeing/service/impl/DyeingHourAvgServiceImpl.java

@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 染整线小时平均统计数据Service业务层处理
@@ -38,7 +39,7 @@ public class DyeingHourAvgServiceImpl implements IDyeingHourAvgService {
     @Resource
     private DyeingHourAvgMapper dyeingHourAvgMapper;
     @Resource
-    private IDyeingDeviceService dyeingDeviceService;
+    private IDyeingDeviceService deviceService;
     @Resource
     private IotService iotService;
     @Resource
@@ -131,7 +132,7 @@ public class DyeingHourAvgServiceImpl implements IDyeingHourAvgService {
         LocalDateTime start = LocalDateTime.of(date, LocalTime.MIN).plusHours(hour);
         LocalDateTime end = start.plusHours(1);
         dyeingHourAvgMapper.deleteByHour(DateUtils.toDate(date), hour);
-        Map<String, List<DyeingDevice>> deviceByLine = dyeingDeviceService.deviceByLine();
+        Map<String, List<DyeingDevice>> deviceByLine = deviceService.deviceByLine();
         deviceByLine.forEach((line, devices) -> {
             Map<Long, DyeingHourAvg> avgMap = new HashMap<>();
             List<String> fieldList = new ArrayList<>();
@@ -201,4 +202,27 @@ public class DyeingHourAvgServiceImpl implements IDyeingHourAvgService {
             }
         });
     }
+
+    /**
+     * 按产线查询数据
+     *
+     * @param date 时间
+     * @param hour 小时
+     * @return 结果
+     */
+    @Override
+    public List<DyeingHourAvg> selectByLine(LocalDate date, int hour) {
+        DyeingHourAvg search = new DyeingHourAvg();
+        search.setDataDate(DateUtils.toDate(date));
+        search.setHour(hour);
+        List<DyeingHourAvg> list = selectDyeingHourAvgList(search);
+        Map<Long, DyeingDevice> deviceMap = deviceService.deviceMap();
+        list.forEach(d -> {
+            DyeingDevice device = deviceMap.get(d.getDeviceId());
+            if (device != null) {
+                d.setRemark(device.getLine());
+            }
+        });
+        return list;
+    }
 }

jjt-biz/src/main/java/com/jjt/dyeing/service/impl/DyeingHourEnergyServiceImpl.java

@@ -1,29 +1,30 @@
 package com.jjt.dyeing.service.impl;
 
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import com.jjt.common.utils.DateUtils;
 import com.jjt.dyeing.domain.DyeingDevice;
+import com.jjt.dyeing.domain.DyeingHourEnergy;
+import com.jjt.dyeing.mapper.DyeingHourEnergyMapper;
 import com.jjt.dyeing.service.IDyeingDeviceService;
+import com.jjt.dyeing.service.IDyeingHourEnergyService;
 import com.jjt.utils.IotService;
 import com.jjt.utils.Tools;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.stereotype.Service;
-import com.jjt.dyeing.mapper.DyeingHourEnergyMapper;
-import com.jjt.dyeing.domain.DyeingHourEnergy;
-import com.jjt.dyeing.service.IDyeingHourEnergyService;
+
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 染整线小时能耗统计数据Service业务层处理
@@ -41,6 +42,7 @@ public class DyeingHourEnergyServiceImpl implements IDyeingHourEnergyService {
     private IotService iotService;
     @Resource
     private SqlSessionFactory factory;
+
     /**
      * 查询染整线小时能耗统计数据
      *
@@ -71,7 +73,7 @@ public class DyeingHourEnergyServiceImpl implements IDyeingHourEnergyService {
      */
     @Override
     public int insertDyeingHourEnergy(DyeingHourEnergy dyeingHourEnergy) {
-            return dyeingHourEnergyMapper.insertDyeingHourEnergy(dyeingHourEnergy);
+        return dyeingHourEnergyMapper.insertDyeingHourEnergy(dyeingHourEnergy);
     }
 
     /**
@@ -180,4 +182,27 @@ public class DyeingHourEnergyServiceImpl implements IDyeingHourEnergyService {
             }
         });
     }
+
+    /**
+     * 按产线查询数据
+     *
+     * @param date 时间
+     * @param hour 小时
+     * @return 结果
+     */
+    @Override
+    public List<DyeingHourEnergy> selectByLine(LocalDate date, int hour) {
+        DyeingHourEnergy search = new DyeingHourEnergy();
+        search.setDataDate(DateUtils.toDate(date));
+        search.setHour(hour);
+        List<DyeingHourEnergy> list = selectDyeingHourEnergyList(search);
+        Map<Long, DyeingDevice> deviceMap = dyeingDeviceService.deviceMap();
+        list.forEach(d -> {
+            DyeingDevice device = deviceMap.get(d.getDeviceId());
+            if (device != null) {
+                d.setRemark(device.getLine());
+            }
+        });
+        return list;
+    }
 }

jjt-biz/src/main/java/com/jjt/dyeing/service/impl/DyeingHourLineServiceImpl.java

@@ -0,0 +1,220 @@
+package com.jjt.dyeing.service.impl;
+
+import com.jjt.common.utils.DateUtils;
+import com.jjt.dyeing.domain.DyeingDevice;
+import com.jjt.dyeing.domain.DyeingHourAvg;
+import com.jjt.dyeing.domain.DyeingHourEnergy;
+import com.jjt.dyeing.domain.DyeingHourLine;
+import com.jjt.dyeing.mapper.DyeingHourLineMapper;
+import com.jjt.dyeing.service.IDyeingDeviceService;
+import com.jjt.dyeing.service.IDyeingHourAvgService;
+import com.jjt.dyeing.service.IDyeingHourEnergyService;
+import com.jjt.dyeing.service.IDyeingHourLineService;
+import com.jjt.dyeing.vo.DyeingCalcHourVO;
+import com.jjt.utils.Tools;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * 染整线产线小时统计数据Service业务层处理
+ *
+ * @author wukai
+ * @date 2025-10-19
+ */
+@Service
+public class DyeingHourLineServiceImpl implements IDyeingHourLineService {
+    @Resource
+    private DyeingHourLineMapper dyeingHourLineMapper;
+    @Resource
+    private IDyeingHourEnergyService energyService;
+    @Resource
+    private IDyeingHourAvgService avgService;
+    @Resource
+    private IDyeingDeviceService deviceService;
+
+    /**
+     * 查询染整线产线小时统计数据
+     *
+     * @param id 染整线产线小时统计数据主键
+     * @return 染整线产线小时统计数据
+     */
+    @Override
+    public DyeingHourLine selectDyeingHourLineById(Long id) {
+        return dyeingHourLineMapper.selectDyeingHourLineById(id);
+    }
+
+    /**
+     * 查询染整线产线小时统计数据列表
+     *
+     * @param dyeingHourLine 染整线产线小时统计数据
+     * @return 染整线产线小时统计数据
+     */
+    @Override
+    public List<DyeingHourLine> selectDyeingHourLineList(DyeingHourLine dyeingHourLine) {
+        return dyeingHourLineMapper.selectDyeingHourLineList(dyeingHourLine);
+    }
+
+    /**
+     * 新增染整线产线小时统计数据
+     *
+     * @param dyeingHourLine 染整线产线小时统计数据
+     * @return 结果
+     */
+    @Override
+    public int insertDyeingHourLine(DyeingHourLine dyeingHourLine) {
+        return dyeingHourLineMapper.insertDyeingHourLine(dyeingHourLine);
+    }
+
+    /**
+     * 修改染整线产线小时统计数据
+     *
+     * @param dyeingHourLine 染整线产线小时统计数据
+     * @return 结果
+     */
+    @Override
+    public int updateDyeingHourLine(DyeingHourLine dyeingHourLine) {
+        return dyeingHourLineMapper.updateDyeingHourLine(dyeingHourLine);
+    }
+
+    /**
+     * 批量删除染整线产线小时统计数据
+     *
+     * @param ids 需要删除的染整线产线小时统计数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDyeingHourLineByIds(Long[] ids) {
+        return dyeingHourLineMapper.deleteDyeingHourLineByIds(ids);
+    }
+
+    /**
+     * 删除染整线产线小时统计数据信息
+     *
+     * @param id 染整线产线小时统计数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDyeingHourLineById(Long id) {
+        return dyeingHourLineMapper.deleteDyeingHourLineById(id);
+    }
+
+    /**
+     * 计算上一小时数据
+     */
+    @Override
+    public void calcLastHour() {
+        LocalDateTime end = Tools.currWholeTime();
+        LocalDateTime start = end.minusHours(1);
+        calc(start.toLocalDate(), start.getHour());
+    }
+
+    /**
+     * 计算指定时间指定小时数据
+     *
+     * @param date 时间
+     * @param hour 小时
+     */
+    @Override
+    public void calc(LocalDate date, int hour) {
+        dyeingHourLineMapper.deleteByHour(DateUtils.toDate(date), hour);
+        List<DyeingHourAvg> avgList = avgService.selectByLine(date, hour);
+        List<DyeingHourEnergy> energyList = energyService.selectByLine(date, hour);
+        //1.查询所有设备
+        Map<Long, DyeingDevice> deviceMap = deviceService.deviceMap();
+        Map<String, List<DyeingDevice>> deviceByLine = deviceService.deviceByLine();
+        //2.初始化产线统计
+        List<DyeingCalcHourVO> voList = new ArrayList<>();
+        Map<Long, DyeingHourAvg> avgMap = avgList.stream().collect(Collectors.toMap(DyeingHourAvg::getDeviceId, DyeingHourAvg -> DyeingHourAvg));
+        Map<Long, DyeingHourEnergy> energyMap = energyList.stream().collect(Collectors.toMap(DyeingHourEnergy::getDeviceId, DyeingHourEnergy -> DyeingHourEnergy));
+        avgMap.forEach((deviceId, avg) -> {
+            DyeingHourEnergy energy = energyMap.get(deviceId);
+            DyeingCalcHourVO vo = new DyeingCalcHourVO();
+            DyeingDevice device = deviceMap.get(deviceId);
+            vo.setDataDate(DateUtils.toDate(date));
+            vo.setHour(hour);
+            vo.setLine(device.getLine());
+            vo.setDevice(device);
+            vo.setSpeed(avg.getSpeed());
+            vo.setLength(avg.getLength());
+            vo.setTmp(avg.getTmp());
+            vo.setEnergy(energy.getEnergy());
+            vo.setAmp(energy.getAmp());
+            vo.setOnline(avg.getOnline() == null || avg.getOnline() < 2000L);
+            voList.add(vo);
+        });
+
+        Map<String, List<DyeingCalcHourVO>> voMap = voList.stream().collect(Collectors.groupingBy(DyeingCalcHourVO::getLine));
+        voMap.forEach((line, list) -> {
+            DyeingHourLine hourLine = new DyeingHourLine();
+            hourLine.setLine(line);
+            hourLine.setDataDate(DateUtils.toDate(date));
+            hourLine.setHour(hour);
+            //开机率
+            hourLine.setOpenRate(BigDecimal.valueOf(list.stream().filter(DyeingCalcHourVO::getOnline).count() * 100.0 / list.size()));
+            //计算出布速度，只用定型机计算
+            long speedCount = list.stream()
+                    .filter(vo -> vo.getDevice() != null && vo.getDevice().getTypeId() != null && vo.getDevice().getTypeId() == 2)
+                    .count();
+
+            BigDecimal averageSpeed = BigDecimal.ZERO;
+            if (speedCount > 0) {
+                averageSpeed = list.stream()
+                        .filter(vo -> vo.getDevice() != null && vo.getDevice().getTypeId() != null && vo.getDevice().getTypeId() == 2)
+                        .map(DyeingCalcHourVO::getSpeed)
+                        .filter(Objects::nonNull)
+                        .reduce(BigDecimal::add)
+                        .orElse(BigDecimal.ZERO)
+                        .divide(BigDecimal.valueOf(speedCount), 2, RoundingMode.HALF_UP);
+            }
+            hourLine.setSpeed(averageSpeed);
+
+            //计算平均温度
+            long tempCount = list.stream()
+                    .filter(vo -> vo.getDevice() != null && vo.getDevice().getTypeId() != null && vo.getDevice().getTypeId() == 3)
+                    .count();
+
+            BigDecimal averageTemp = BigDecimal.ZERO;
+            if (tempCount > 0) {
+                averageTemp = list.stream()
+                        .filter(vo -> vo.getDevice() != null && vo.getDevice().getTypeId() != null && vo.getDevice().getTypeId() == 3)
+                        .map(DyeingCalcHourVO::getTmp) // 修正：应该使用getTmp而不是getSpeed
+                        .filter(Objects::nonNull)
+                        .reduce(BigDecimal::add)
+                        .orElse(BigDecimal.ZERO)
+                        .divide(BigDecimal.valueOf(tempCount), 2, RoundingMode.HALF_UP);
+            }
+            hourLine.setTmp(averageTemp);
+
+            //计算总能耗
+            BigDecimal totalEnergy = list.stream()
+                    .map(DyeingCalcHourVO::getEnergy)
+                    .filter(Objects::nonNull)
+                    .reduce(BigDecimal::add)
+                    .orElse(BigDecimal.ZERO);
+            hourLine.setEnergy(totalEnergy);
+
+            //计算A相平均电流
+            BigDecimal avgAmp = BigDecimal.ZERO;
+            if (!list.isEmpty()) {
+                avgAmp = list.stream()
+                        .map(DyeingCalcHourVO::getAmp)
+                        .filter(Objects::nonNull)
+                        .reduce(BigDecimal::add)
+                        .orElse(BigDecimal.ZERO)
+                        .divide(BigDecimal.valueOf(list.size()), 2, RoundingMode.HALF_UP);
+            }
+            hourLine.setAmp(avgAmp);
+            insertDyeingHourLine(hourLine);
+        });
+    }
+}

jjt-biz/src/main/java/com/jjt/dyeing/vo/DyeingCalcHourVO.java

@@ -0,0 +1,44 @@
+package com.jjt.dyeing.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jjt.common.core.domain.BaseEntity;
+import com.jjt.dyeing.domain.DyeingDevice;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 染整线设备管理对象 DYEING_DEVICE
+ *
+ * @author wukai
+ * @date 2025-10-19
+ */
+@Data
+public class DyeingCalcHourVO extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("产线编号")
+    private String line;
+    @ApiModelProperty("设备")
+    private DyeingDevice device;
+    @ApiModelProperty("日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dataDate;
+    @ApiModelProperty("小时;0-23")
+    private Integer hour;
+    @ApiModelProperty("开机率")
+    private Boolean online;
+    @ApiModelProperty("长度")
+    private BigDecimal length;
+    @ApiModelProperty("温度")
+    private BigDecimal tmp;
+    @ApiModelProperty("速度")
+    private BigDecimal speed;
+    @ApiModelProperty("电量")
+    private BigDecimal energy;
+    @ApiModelProperty("电流")
+    private BigDecimal amp;
+
+}

jjt-biz/src/main/java/com/jjt/task/YhjTask.java

@@ -2,8 +2,10 @@ package com.jjt.task;
 
 import com.jjt.calc.service.ITwinCalcDayYhjService;
 import com.jjt.calc.service.ITwinCalcHourYhjService;
+import com.jjt.dyeing.service.IDyeingHourAvgService;
+import com.jjt.dyeing.service.IDyeingHourEnergyService;
+import com.jjt.dyeing.service.IDyeingHourLineService;
 import com.jjt.rz.service.ITwinCalcHourRzService;
-import com.jjt.utils.Tools;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -23,13 +25,29 @@ public class YhjTask {
     private ITwinCalcDayYhjService dayService;
     @Resource
     private ITwinCalcHourRzService rzService;
+    @Resource
+    private IDyeingHourAvgService avgService;
+    @Resource
+    private IDyeingHourEnergyService energyService;
+    @Resource
+    private IDyeingHourLineService lineService;
 
     /**
      * 统计上一时段数据
      */
     public void last() {
-        yhjService.last();
-        rzService.last();
+        try {
+            yhjService.last();
+        } catch (Exception ignored) {
+        }
+
+        try {
+            rzService.last();
+        } catch (Exception ignored) {
+        }
+        avgService.calcLastHour();
+        energyService.calcLastHour();
+        lineService.calcLastHour();
     }
 
     /**

jjt-biz/src/main/resources/mapper/dyeing/DyeingHourLineMapper.xml

@@ -0,0 +1,144 @@
+<?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.jjt.dyeing.mapper.DyeingHourLineMapper">
+
+    <resultMap type="DyeingHourLine" id="DyeingHourLineResult">
+        <result property="id" column="ID"/>
+        <result property="dataDate" column="DATA_DATE"/>
+        <result property="hour" column="HOUR"/>
+        <result property="line" column="LINE"/>
+        <result property="openRate" column="OPEN_RATE"/>
+        <result property="length" column="LENGTH"/>
+        <result property="tmp" column="TMP"/>
+        <result property="speed" column="SPEED"/>
+        <result property="energy" column="ENERGY"/>
+        <result property="amp" column="AMP"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="remark" column="REMARK"/>
+    </resultMap>
+
+    <sql id="selectDyeingHourLineVo">
+        select ID,
+               DATA_DATE,
+               HOUR,
+               LINE,
+               OPEN_RATE,
+               LENGTH,
+               TMP,
+               SPEED,
+               ENERGY,
+               AMP,
+               CREATED_BY,
+               CREATED_TIME,
+               UPDATED_BY,
+               UPDATED_TIME,
+               REMARK
+        from DYEING_HOUR_LINE
+    </sql>
+
+    <select id="selectDyeingHourLineList" parameterType="DyeingHourLine" resultMap="DyeingHourLineResult">
+        <include refid="selectDyeingHourLineVo"/>
+        <where>
+            <if test="dataDate != null ">and DATA_DATE = #{dataDate}</if>
+            <if test="hour != null ">and HOUR = #{hour}</if>
+            <if test="line != null  and line != ''">and LINE = #{line}</if>
+            <if test="openRate != null ">and OPEN_RATE = #{openRate}</if>
+            <if test="length != null ">and LENGTH = #{length}</if>
+            <if test="tmp != null ">and TMP = #{tmp}</if>
+            <if test="speed != null ">and SPEED = #{speed}</if>
+            <if test="energy != null ">and ENERGY = #{energy}</if>
+            <if test="amp != null ">and AMP = #{amp}</if>
+            <if test="createdBy != null  and createdBy != ''">and CREATED_BY = #{createdBy}</if>
+            <if test="createdTime != null ">and CREATED_TIME = #{createdTime}</if>
+            <if test="updatedBy != null  and updatedBy != ''">and UPDATED_BY = #{updatedBy}</if>
+            <if test="updatedTime != null ">and UPDATED_TIME = #{updatedTime}</if>
+            <if test="remark != null  and remark != ''">and REMARK = #{remark}</if>
+        </where>
+    </select>
+
+    <select id="selectDyeingHourLineById" parameterType="Long" resultMap="DyeingHourLineResult">
+        <include refid="selectDyeingHourLineVo"/>
+        where ID = #{id}
+    </select>
+
+    <insert id="insertDyeingHourLine" parameterType="DyeingHourLine">
+        insert into DYEING_HOUR_LINE
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="dataDate != null">DATA_DATE,</if>
+            <if test="hour != null">HOUR,</if>
+            <if test="line != null">LINE,</if>
+            <if test="openRate != null">OPEN_RATE,</if>
+            <if test="length != null">LENGTH,</if>
+            <if test="tmp != null">TMP,</if>
+            <if test="speed != null">SPEED,</if>
+            <if test="energy != null">ENERGY,</if>
+            <if test="amp != null">AMP,</if>
+            <if test="createdBy != null">CREATED_BY,</if>
+            <if test="createdTime != null">CREATED_TIME,</if>
+            <if test="updatedBy != null">UPDATED_BY,</if>
+            <if test="updatedTime != null">UPDATED_TIME,</if>
+            <if test="remark != null">REMARK,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="dataDate != null">#{dataDate},</if>
+            <if test="hour != null">#{hour},</if>
+            <if test="line != null">#{line},</if>
+            <if test="openRate != null">#{openRate},</if>
+            <if test="length != null">#{length},</if>
+            <if test="tmp != null">#{tmp},</if>
+            <if test="speed != null">#{speed},</if>
+            <if test="energy != null">#{energy},</if>
+            <if test="amp != null">#{amp},</if>
+            <if test="createdBy != null">#{createdBy},</if>
+            <if test="createdTime != null">#{createdTime},</if>
+            <if test="updatedBy != null">#{updatedBy},</if>
+            <if test="updatedTime != null">#{updatedTime},</if>
+            <if test="remark != null">#{remark},</if>
+        </trim>
+    </insert>
+
+    <update id="updateDyeingHourLine" parameterType="DyeingHourLine">
+        update DYEING_HOUR_LINE
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="dataDate != null">DATA_DATE = #{dataDate},</if>
+            <if test="hour != null">HOUR = #{hour},</if>
+            <if test="line != null">LINE = #{line},</if>
+            <if test="openRate != null">OPEN_RATE = #{openRate},</if>
+            <if test="length != null">LENGTH = #{length},</if>
+            <if test="tmp != null">TMP = #{tmp},</if>
+            <if test="speed != null">SPEED = #{speed},</if>
+            <if test="energy != null">ENERGY = #{energy},</if>
+            <if test="amp != null">AMP = #{amp},</if>
+            <if test="createdBy != null">CREATED_BY = #{createdBy},</if>
+            <if test="createdTime != null">CREATED_TIME = #{createdTime},</if>
+            <if test="updatedBy != null">UPDATED_BY = #{updatedBy},</if>
+            <if test="updatedTime != null">UPDATED_TIME = #{updatedTime},</if>
+            <if test="remark != null">REMARK = #{remark},</if>
+        </trim>
+        where ID = #{id}
+    </update>
+
+    <delete id="deleteDyeingHourLineById" parameterType="Long">
+        delete
+        from DYEING_HOUR_LINE
+        where ID = #{id}
+    </delete>
+
+    <delete id="deleteDyeingHourLineByIds" parameterType="String">
+        delete from DYEING_HOUR_LINE where ID in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteByHour">
+        delete
+        from DYEING_HOUR_LINE
+        where DATA_DATE = #{date}
+          and HOUR = #{hour}
+    </delete>
+</mapper>