增加接收类，和推送数据补充

wu

2024-08-22 4b595a9522d2bbb862104c939518b66116730ecb

增加接收类，和推送数据补充

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/DamagePrint.java

New file
@@ -0,0 +1,69 @@
package com.mes.damage.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.sql.Timestamp;

/**
 * <p>
 *
 * </p>
 *
 * @author wu
 * @since 2024-06-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class DamagePrint implements Serializable {

    /**
     * 流程卡
     */
    private String flowCardId;

    /**
     * 工程号
     */
    private String engineerId;
    /**
     * 层号
     */
    private String layer;

    /**
     * 版图id
     */
    private String temperingLayoutId;

    /**
     * 片序
     */
    private String temperingFeedSequence;

    /**
     * 玻璃id
     */
    private String glassId;

    /**
     * 宽度
     */
    private double width;

    /**
     * 高度
     */
    private double height;

    /**
     * 厚度
     */
    private Integer thickness;



}

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java

@@ -52,7 +52,7 @@
        String startOfPeriodStr = startOfPeriod.format(formatter);
        String endOfPeriodStr = endOfPeriod.format(formatter);
        // 设置为最近七天的时间范围
        reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr);
        reportingdamage.setReportingWorkTime("2024-05-11" + " to " + endOfPeriodStr);
        //reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr);
        //扇形图各设备的加工破损数量
        List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java

@@ -6,8 +6,10 @@
import com.mes.common.config.Const;

import com.mes.common.utils.RedisUtil;

import com.mes.downglassinfo.entity.DownGlassInfo;

import com.mes.downglassinfo.entity.DownGlassTask;

import com.mes.downglassinfo.entity.request.DownGlassInfoRequest;

import com.mes.downglassinfo.service.DownGlassInfoService;

import com.mes.downglassinfo.service.DownGlassTaskService;

import com.mes.downstorage.service.DownStorageCageService;

import com.mes.downworkstation.entity.DownWorkstation;

import com.mes.downworkstation.service.DownWorkstationService;

@@ -34,6 +36,9 @@
    private DownStorageCageService downStorageCageService;

    @Autowired

    private DownGlassInfoService downGlassInfoService;

    @Autowired

    private DownGlassTaskService downGlassTaskService;





    @Autowired

    private RedisUtil redisUtil;

@@ -160,6 +165,8 @@
        //正在进行的任务

        List<DownWorkstation> downWorkstation = downWorkstationService.getoneDownWorkstations(1, 6);

        jsonObject.append("downWorkstation", downWorkstation);

        List<DownGlassTask> downGlassTask = downGlassTaskService.selectOutTaskCache();

        jsonObject.append("downGlassTask", downGlassTask);

        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unLoadGlassIsRun");

        if (sendwServer != null) {

            for (WebSocketServer webserver : sendwServer) {