添加上片历史任务接口

ZengTao

2025-03-12 91c0155937f3177c41cfd91636d5094454fff855

添加上片历史任务接口

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/request/LoadGlassDeviceTaskHistoryRequest.java

New file
@@ -0,0 +1,68 @@
package com.mes.opctask.entity.request;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mes.base.entity.PageRequest;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;
import java.util.List;

/**
 * (LoadGlassDeviceTaskHistory)表实体类
 *
 * @author makejava
 * @since 2024-11-06 22:23:00
 */
@SuppressWarnings("serial")
@Data
public class LoadGlassDeviceTaskHistoryRequest extends PageRequest {
    /**
     * 原片宽
     */
    private String rawGlassWidth;
    /**
     * 原片高
     */
    private String rawGlassHeight;
    /**
     * 原片宽
     */
    private String rawGlassThickness;
    /**
     * 原片高
     */
    private String rawGlassfilmsId;
    /**
     * 上片设备编号
     */
    private Integer station;
    /**
     * 上片位编号
     */
    private Integer slot;
    /**
     * 任务状态 0默认空任务 1执行中 2结束任务
     */
    private List<Integer> taskStateList;
    /**
     * 开始时间
     */
    @ApiModelProperty(value = "开始时间", position = 6)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date beginDate;

    /**
     * 结束时间
     */
    @ApiModelProperty(value = "结束时间", position = 7)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date endDate;

}


 hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/LoadGlassDeviceTaskHistoryService.java

@@ -1,7 +1,9 @@
package com.mes.opctask.service;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
import com.mes.opctask.entity.request.LoadGlassDeviceTaskHistoryRequest;

/**
 * (LoadGlassDeviceTaskHistory)表服务接口
@@ -11,5 +13,6 @@
 */
public interface LoadGlassDeviceTaskHistoryService extends IService<LoadGlassDeviceTaskHistory> {

    Page<LoadGlassDeviceTaskHistory> queryLoadGlassHistoryTask(LoadGlassDeviceTaskHistoryRequest request);
}


 hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/impl/LoadGlassDeviceTaskHistoryServiceImpl.java

@@ -1,9 +1,15 @@
package com.mes.opctask.service.impl;

import cn.hutool.core.collection.CollectionUtil;
import cn.smallbun.screw.core.util.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
import com.mes.opctask.entity.request.LoadGlassDeviceTaskHistoryRequest;
import com.mes.opctask.mapper.LoadGlassDeviceTaskHistoryDao;
import com.mes.opctask.service.LoadGlassDeviceTaskHistoryService;
import com.mes.tools.DateUtil;
import org.springframework.stereotype.Service;

/**
@@ -15,5 +21,24 @@
@Service
public class LoadGlassDeviceTaskHistoryServiceImpl extends ServiceImpl<LoadGlassDeviceTaskHistoryDao, LoadGlassDeviceTaskHistory> implements LoadGlassDeviceTaskHistoryService {

    @Override
    public Page<LoadGlassDeviceTaskHistory> queryLoadGlassHistoryTask(LoadGlassDeviceTaskHistoryRequest request){
        if (null == request.getBeginDate()) {
            request.setBeginDate(DateUtil.getBeginDate());
            request.setEndDate(DateUtil.getEndDate());
        }
        Page<LoadGlassDeviceTaskHistory> page = new Page<>(request.getPageNo(), request.getPageSize());
        LambdaQueryWrapper<LoadGlassDeviceTaskHistory> wrapper = new LambdaQueryWrapper<LoadGlassDeviceTaskHistory>()
                .like(StringUtils.isNotBlank(request.getRawGlassWidth()), LoadGlassDeviceTaskHistory::getRawGlassWidth, request.getRawGlassWidth())
                .like(StringUtils.isNotBlank(request.getRawGlassHeight()), LoadGlassDeviceTaskHistory::getRawGlassHeight, request.getRawGlassHeight())
                .like(StringUtils.isNotBlank(request.getRawGlassWidth()), LoadGlassDeviceTaskHistory::getRawGlassWidth, request.getRawGlassWidth())
                .like(StringUtils.isNotBlank(request.getRawGlassWidth()), LoadGlassDeviceTaskHistory::getRawGlassWidth, request.getRawGlassWidth())
                .eq(request.getStation() != 0, LoadGlassDeviceTaskHistory::getStation, request.getStation())
                .eq(request.getSlot() != 0, LoadGlassDeviceTaskHistory::getSlot, request.getSlot())
                .in(CollectionUtil.isNotEmpty(request.getTaskStateList()), LoadGlassDeviceTaskHistory::getTaskState, request.getTaskStateList())
                .between(LoadGlassDeviceTaskHistory::getCreateTime, request.getBeginDate(), request.getEndDate())
                .orderByDesc(LoadGlassDeviceTaskHistory::getCreateTime);
        return this.page(page, wrapper);
    }
}


 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java

New file
@@ -0,0 +1,100 @@
package com.mes.pp.entity.dto;

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-07-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class FlowCardDTO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 项目名称
     */
    private String productName;

    /**
     * 玻璃名称
     */
    private String glassChild;

    /**
     * 订单类型
     */
    private String orderType;

    /**
     * 流程卡号
     */
    private String processId;

    /**
     * 订单序号
     */
    private Integer orderNumber;

    /**
     * 层号
     */
    private Integer technologyNumber;

    /**
     * 订单数量
     */
    private Integer quantity;

    /**
     * 报工数量
     */
    private String reportWorkQuantity;

    /**
     * 报工数量
     */
    private String reportWorkQuantityCount;

    /**
     * 报工时间
     */
    private String reportWorkTime;

    /**
     * 破损数量
     */
    private String broken_num;

    /**
     * 库存数量
     */
    private Integer inventory;

    /**
     * 库存面积
     */
    private Double inventoryArea;

    /**
     * 发货数量
     */
    private Integer shippedQuantity;

    /**
     * 玻璃No
     */
    private String glassNumber;

}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java

@@ -31,7 +31,7 @@

        // 3、数据源配置
        DataSourceConfig dsc = new DataSourceConfig();
        dsc.setUrl("jdbc:mysql://10.153.19.150:3306/yiwumes?serverTimezone=GMT%2b8");
        dsc.setUrl("jdbc:mysql://localhost:3306/north_glass_mes?serverTimezone=GMT%2b8");
        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
        dsc.setUsername("root");
        dsc.setPassword("beibo.123/");
@@ -41,7 +41,7 @@
        // 4、包配置
        PackageConfig pc = new PackageConfig();
        pc.setParent("com.mes");
        pc.setModuleName("raw_glass_storage_station"); //模块名
        pc.setModuleName("loadglassdevicetaskhistory"); //模块名
        pc.setController("controller");
        pc.setService("service");
        pc.setMapper("mapper");
@@ -52,7 +52,7 @@

//        strategy.setInclude("raw_glass_storage_details");
//        strategy.setInclude("raw_glass_storage_station");
        strategy.setInclude("raw_glass_storage_station");
        strategy.setInclude("load_glass_device_task_history");

        strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略


 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java

@@ -29,7 +29,7 @@
                .eq(StringUtils.checkValNotNull(request.getTaskState()), EdgStorageDeviceTaskHistory::getTaskState, request.getTaskState())
                .eq(StringUtils.checkValNotNull(request.getTaskType()), EdgStorageDeviceTaskHistory::getTaskType, request.getTaskType())
                .between(StringUtils.checkValNotNull(request.getStartTime()), EdgStorageDeviceTaskHistory::getCreateTime, request.getStartTime(),
                        request.getEndTime()).orderByDesc(EdgStorageDeviceTaskHistory::getCreateTime).last("limit 20");
                        request.getEndTime()).orderByDesc(EdgStorageDeviceTaskHistory::getCreateTime);
        if (StringUtils.isNotBlank(request.getGlassId())) {
            wrapper.and(e -> e.like(EdgStorageDeviceTaskHistory::getGlassIdIn, request.getGlassId())
                    .or().like(EdgStorageDeviceTaskHistory::getGlassIdOut, request.getGlassId()));

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java

@@ -175,7 +175,12 @@
            List<RawGlassStorageDetails> stationTwoList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == 6).collect(Collectors.toList());
            jsonObject.append("stationOne", stationOneList);
            jsonObject.append("stationTwo", stationTwoList);

            //是否开始工程
            Engineering engineering = engineeringService.selectInitiate(1);
            jsonObject.append("engineering", engineering);
            //工位信息
            List<UpWorkstation> upWorkstations = upWorkstationService.list();
            jsonObject.append("list", upWorkstations);
            ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
            if (sendwServer != null) {
                for (WebSocketServer webserver : sendwServer) {
@@ -218,6 +223,7 @@
        String inkageStatus = plcParameterObject.getPlcParameter("InkageStatus").getValue();
//        String inkageStatus ="1";
        jsonObject.append("InkageStatus", inkageStatus);

        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
        if (sendwServer != null) {
            for (WebSocketServer webserver : sendwServer) {
@@ -230,26 +236,21 @@
        }
    }

    @Scheduled(fixedDelay = 1000)
    public void loadGlassIsRun() {
        JSONObject jsonObject = new JSONObject();
        //是否开始工程
        Engineering engineering = engineeringService.selectInitiate(1);
        jsonObject.append("engineering", engineering);
        //工位信息
        List<UpWorkstation> upWorkstations = upWorkstationService.list();
        jsonObject.append("list", upWorkstations);
        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlassIsRun");
        if (sendwServer != null) {
            for (WebSocketServer webserver : sendwServer) {
                if (webserver != null) {
                    webserver.sendMessage(jsonObject.toString());
                } else {
                    log.info("loadGlassIsRun is closed");
                }
            }
        }
    }
//    @Scheduled(fixedDelay = 1000)
//    public void loadGlassIsRun() {
//        JSONObject jsonObject = new JSONObject();
//
//        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlassIsRun");
//        if (sendwServer != null) {
//            for (WebSocketServer webserver : sendwServer) {
//                if (webserver != null) {
//                    webserver.sendMessage(jsonObject.toString());
//                } else {
//                    log.info("loadGlassIsRun is closed");
//                }
//            }
//        }
//    }

    public void overTask(String loadStatus, int state) {


 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java

New file
@@ -0,0 +1,41 @@
package com.mes.loadglassdevicetaskhistory.controller;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
import com.mes.opctask.entity.request.LoadGlassDeviceTaskHistoryRequest;
import com.mes.opctask.service.LoadGlassDeviceTaskHistoryService;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author wf
 * @since 2025-03-12
 */
@RestController
@RequestMapping("/loadglassdevicetaskhistory")
public class LoadGlassDeviceTaskHistoryController {

    @Autowired
    private LoadGlassDeviceTaskHistoryService loadGlassDeviceTaskHistoryService;

    @ApiOperation("按照查询条件查询上片历史任务")
    @PostMapping("/queryLoadGlassHistoryTask") //查询现在上片机的玻璃信息
    @ResponseBody
    public Result<Page<LoadGlassDeviceTaskHistory>> queryBigStorageCageHistoryTask(@RequestBody @Validated LoadGlassDeviceTaskHistoryRequest request) {
        return Result.build(200, "查询成功", loadGlassDeviceTaskHistoryService.queryLoadGlassHistoryTask(request));
    }

}