上片修改webseocket，导入工添加数据库注解

ZengTao

2025-08-22 04801febfbdf46d6cb34724862c640f27887be96

上片修改webseocket，导入工添加数据库注解

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -18,6 +19,7 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("pp.optimize_detail")
public class OptimizeDetail implements Serializable {

    private static final long serialVersionUID = 1L;

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -18,6 +19,7 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("pp.optimize_heat_detail")
public class OptimizeHeatDetail implements Serializable {

    private static final long serialVersionUID = 1L;

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -19,6 +20,7 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("pp.optimize_heat_layout")
public class OptimizeHeatLayout implements Serializable {

    private static final long serialVersionUID = 1L;

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -19,6 +20,7 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("pp.optimize_layout")
public class OptimizeLayout implements Serializable {

    private static final long serialVersionUID = 1L;

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

@@ -1,8 +1,10 @@
package com.mes.pp.entity;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -18,6 +20,7 @@
 * @since 2024-04-16
 */
@Data
@TableName("pp.optimize_project")
@EqualsAndHashCode(callSuper = false)
public class OptimizeProject implements Serializable {


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

@@ -16,7 +16,7 @@
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Semaphore;

@ServerEndpoint(value = "/api/talk/{username}")
@ServerEndpoint(value = "/api/talk/{webSocketName}")
@Component
public class WebSocketServer {


 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java

@@ -1,7 +1,6 @@
package com.mes.engineering.controller;



import com.mes.damage.entity.Damage;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.damage.service.DamageService;
@@ -24,7 +23,7 @@

/**
 * <p>
 *  前端控制器
 * 前端控制器
 * </p>
 *
 * @author wu
@@ -49,25 +48,25 @@
    @ApiOperation("开始/暂停任务/传递工程号和状态,开始是1 暂停是0")
    @PostMapping("/pauseTask") //暂停上片任务
    @ResponseBody
    public  Result <List<UpPattenUsage>> pauseTask(@RequestBody Engineering engineering) {
        boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
    public Result<List<UpPattenUsage>> pauseTask(@RequestBody Engineering engineering) {
        boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());
        List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
        if(work){
            return Result.build(200,"成功",glass);
        }else {
            return Result.build(100,"失败",glass);
        if (work) {
            return Result.build(200, "成功", glass);
        } else {
            return Result.build(100, "失败", glass);
        }
    }

    @ApiOperation("暂停")
    @PostMapping("/pause") //暂停上片任务
    @ResponseBody
    public  Result <List<UpPattenUsage>> pause(@RequestBody Engineering engineering) {
        boolean work=engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState());
    public Result<List<UpPattenUsage>> pause(@RequestBody Engineering engineering) {
        boolean work = engineeringService.pauseTask(engineering.getEngineerId(), engineering.getState());
//        List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
        if(work){
        if (work) {
            return Result.build(200, "成功", null);
        }else {
        } else {
            return Result.build(100, "失敗", null);
        }
    }
@@ -75,60 +74,66 @@
    @ApiOperation("开始上片")
    @PostMapping("/changeTask") //调用上片任务
    @ResponseBody
    @Transactional
    public synchronized Result<Boolean> changeTask(@RequestBody Engineering engineering) {
        log.info("engineeringId:{}", engineering);
        UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
        Engineering engineerings = engineeringService.selectUpInitiate(engineering.getEngineerId());
        GlassInfo glassInfos = engineeringService.selectGlassinfoIsnull(engineering.getEngineerId());
        if (upPattenUsage != null && engineerings != null && glassInfos != null) {
            boolean work = engineeringService.changeTasks(engineering);
            List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
            optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
            return Result.build(200, "开始上片", work);
        } else if (upPattenUsage == null && engineerings == null && glassInfos == null) {
            List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
            log.info("将查询出的UpPattenUsage数据保存到数据库表里");
            upPattenUsageService.saveUpPattenUsage(upPattenUsages);
            log.info("从PP表查询glassinfo的数据并保存到表里");
            List<GlassInfo> glassinfo = glassInfoService.selectGlassInfo(engineering);
            glassInfoService.saveGlassInfo(glassinfo);
            log.info("从PP表查询engineering的数据并保存到表里");
            List<Engineering> listEngineering = engineeringService.selectEngineering(engineering.getEngineerId());
            engineeringService.saveEngineering(listEngineering);
            log.info("更改pp表状态为已领取");
            //将engineering表状态为正在上片
            boolean work = engineeringService.changeTasks(engineering);
            List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
            optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
            if (work) {
                return Result.build(200, "保存成功"+engineering.getEngineerId(), true);
            }else {
                return Result.build(200, "保存失败"+engineering.getEngineerId(), false);
        try {
            log.info("engineeringId:{}", engineering);
            UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
            Engineering engineerings = engineeringService.selectUpInitiate(engineering.getEngineerId());
            GlassInfo glassInfos = engineeringService.selectGlassinfoIsnull(engineering.getEngineerId());
            if (upPattenUsage != null && engineerings != null && glassInfos != null) {
                boolean work = engineeringService.changeTasks(engineering);
                List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
                optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
                return Result.build(200, "开始上片", work);
            } else if (upPattenUsage == null && engineerings == null && glassInfos == null) {
                List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
                log.info("将查询出的UpPattenUsage数据保存到数据库表里");
                upPattenUsageService.saveUpPattenUsage(upPattenUsages);
                log.info("从PP表查询glassinfo的数据并保存到表里");
                List<GlassInfo> glassinfo = glassInfoService.selectGlassInfo(engineering);
                glassInfoService.saveGlassInfo(glassinfo);
                log.info("从PP表查询engineering的数据并保存到表里");
                List<Engineering> listEngineering = engineeringService.selectEngineering(engineering.getEngineerId());
                engineeringService.saveEngineering(listEngineering);
                log.info("更改pp表状态为已领取");
                //将engineering表状态为正在上片
                boolean work = engineeringService.changeTasks(engineering);
                optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
                if (work) {
                    return Result.build(200, "保存成功" + engineering.getEngineerId(), true);
                } else {
                    return Result.build(200, "保存失败" + engineering.getEngineerId(), false);
                }
            } else {
                upPattenUsageService.deleteTask(engineering.getEngineerId());
                engineeringService.deleteTask(engineering.getEngineerId());
                glassInfoService.deleteTask(engineering.getEngineerId());
                return Result.build(200, "请重新点击上片" + engineering.getEngineerId(), true);
            }
        } else {
        } catch (Exception e) {
            log.info("异常信息:{}", e);
            log.error("异常信息:{}", e);
            upPattenUsageService.deleteTask(engineering.getEngineerId());
            engineeringService.deleteTask(engineering.getEngineerId());
            glassInfoService.deleteTask(engineering.getEngineerId());
            return Result.build(200, "请重新点击上片" + engineering.getEngineerId(), true);
            return Result.build(200, "保存失败" + engineering.getEngineerId(), false);
        }

    }

    @ApiOperation("删除工程上片")
    @PostMapping("/deleteTask") //调用上片任务
    @ResponseBody
    public  Result <List<GlassInfo>> deleteTask(@RequestBody Engineering engineering) {
    public Result<List<GlassInfo>> deleteTask(@RequestBody Engineering engineering) {
        //删除工程表、小片表、上片表，更改优化表状态
//        boolean work=engineeringService.deleteTask(engineering.getEngineerId());
//        glassInfoService.deleteTask(engineering.getEngineerId());
//        upPattenUsageService.deleteTask(engineering.getEngineerId());
//        optimizeProjectService.changeTask(engineering.getEngineerId(), 100);
        //暂停工程
        engineeringService.pauseTask(engineering.getEngineerId(),0);
          //查询未上片的小片信息
        List<GlassInfo>glasslist=glassInfoService.selectEdgGlassInfo(engineering.getEngineerId());
        return Result.build(200, "删除成功"+engineering.getEngineerId(), glasslist);
        engineeringService.pauseTask(engineering.getEngineerId(), 0);
        //查询未上片的小片信息
        List<GlassInfo> glasslist = glassInfoService.selectEdgGlassInfo(engineering.getEngineerId());
        return Result.build(200, "删除成功" + engineering.getEngineerId(), glasslist);


    }
@@ -136,15 +141,15 @@
    @ApiOperation("查询可以上片的工程号")
    @GetMapping("/selectTask") //调用上片任务
    @ResponseBody
    public Result <List<Engineering>> selectTask() {
        List<Engineering> engineering=engineeringService.selectTask();
    public Result<List<Engineering>> selectTask() {
        List<Engineering> engineering = engineeringService.selectTask();
        log.info("可领取任务返回:{}", engineering);
        return Result.build(200, "",engineering);
        return Result.build(200, "", engineering);
    }

    @ApiOperation("//上片破损拿走")
    @PostMapping("/insetDamage") //上片破损拿走
    public Result <Integer> updateTemperingState(@RequestBody Damage damage) {
    public Result<Integer> updateTemperingState(@RequestBody Damage damage) {
        damageService.insertDamage(damage);
        return Result.build(200, "操作成功", null);
    }