Merge remote-tracking branch 'origin/master'

zhoushihao

2025-09-04 2a3c00cc5b07d1bb96463f7ed1703461e95de6ea

Merge remote-tracking branch 'origin/master'

 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;
@@ -75,8 +74,8 @@
    @ApiOperation("开始上片")
    @PostMapping("/changeTask") //调用上片任务
    @ResponseBody
    @Transactional
    public synchronized Result<Boolean> changeTask(@RequestBody Engineering engineering) {
        try {
        log.info("engineeringId:{}", engineering);
        UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
        Engineering engineerings = engineeringService.selectUpInitiate(engineering.getEngineerId());
@@ -99,7 +98,6 @@
            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);
@@ -112,7 +110,14 @@
            glassInfoService.deleteTask(engineering.getEngineerId());
            return Result.build(200, "请重新点击上片" + engineering.getEngineerId(), true);
        }

        } 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(), false);
        }
    }

    @ApiOperation("删除工程上片")