Changes15 websocket

Fixiaobai

2023-11-17 6ee9d58d62dbbccf95ce809f358ec9f8d088b705

Changes15  websocket

 mes-common/pom.xml

@@ -31,7 +31,11 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-websocket</artifactId>
        </dependency>

        <dependency>
            <groupId>jakarta.websocket</groupId>
            <artifactId>jakarta.websocket-api</artifactId>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>commons-net</groupId>
            <artifactId>commons-net</artifactId>

 mes-common/src/main/java/com/chinaztt/mes/common/server/WebSocketMessage.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,128 @@
package com.chinaztt.mes.common.server;


import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

import javax.websocket.*;
import javax.websocket.server.PathParam;
import javax.websocket.server.ServerEndpoint;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArraySet;

/**
 * @Author å¼ å®¾
 * @Date 2023/11/16
 */
@Component
@Slf4j
@ServerEndpoint("/websocket/{userId}")  // æŽ¥å£è·¯å¾„ ws://ip:端口/webSocket/userId;
public class WebSocketMessage {

    //与某个客户端的连接会话，需要通过它来给客户端发送数据
    private Session session;
    /**
     * ç”¨æˆ·ID
     */
    private String userId;

    //concurrent包的线程安全Set，用来存放每个客户端对应的MyWebSocket对象。
    //虽然@Component默认是单例模式的，但springboot还是会为每个websocket连接初始化一个bean，所以可以用一个静态set保存起来。
    //  æ³¨ï¼šåº•ä¸‹WebSocket是当前类名
    private static CopyOnWriteArraySet<WebSocketMessage> webSockets =new CopyOnWriteArraySet<>();
    // ç”¨æ¥å­˜åœ¨çº¿è¿žæŽ¥ç”¨æˆ·ä¿¡æ¯
    private static ConcurrentHashMap<String,Session> sessionPool = new ConcurrentHashMap<String,Session>();

    /**
     * é“¾æŽ¥æˆåŠŸè°ƒç”¨çš„方法
     */
    @OnOpen
    public void onOpen(Session session, @PathParam(value="userId")String userId) {
        try {
            this.session = session;
            this.userId = userId;
            webSockets.add(this);
            sessionPool.put(userId, session);
            log.info("【websocket消息】有新的连接，总数为:"+webSockets.size());
        } catch (Exception e) {
        }
    }

    /**
     * é“¾æŽ¥å…³é—­è°ƒç”¨çš„方法
     */
    @OnClose
    public void onClose() {
        try {
            webSockets.remove(this);
            sessionPool.remove(this.userId);
            log.info("【websocket消息】连接断开，总数为:"+webSockets.size());
        } catch (Exception e) {
        }
    }
    /**
     * æ”¶åˆ°å®¢æˆ·ç«¯æ¶ˆæ¯åŽè°ƒç”¨çš„方法
     *
     * @param message
     */
    @OnMessage
    public void onMessage(String message) {
        log.info("【websocket消息】收到客户端消息:"+message);
    }

    /** å‘送错误时的处理
     * @param session
     * @param error
     */
    @OnError
    public void onError(Session session, Throwable error) {

        log.error("用户错误,原因:"+error.getMessage());
        error.printStackTrace();
    }


    // æ­¤ä¸ºå¹¿æ’­æ¶ˆæ¯
    public void sendAllMessage(String message) {
        log.info("【websocket消息】广播消息:"+message);
        for(WebSocketMessage webSocket : webSockets) {
            try {
                if(webSocket.session.isOpen()) {
                    webSocket.session.getAsyncRemote().sendText(message);
                }
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
    }

    // æ­¤ä¸ºå•ç‚¹æ¶ˆæ¯
    public void sendOneMessage(String userId, String message) {
        Session session = sessionPool.get(userId);
        if (session != null&&session.isOpen()) {
            try {
                log.info("【websocket消息】 å•ç‚¹æ¶ˆæ¯:"+message);
                session.getAsyncRemote().sendText(message);
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
    }

    // æ­¤ä¸ºå•ç‚¹æ¶ˆæ¯(多人)
    public void sendMoreMessage(String[] userIds, String message) {
        for(String userId:userIds) {
            Session session = sessionPool.get(userId);
            if (session != null&&session.isOpen()) {
                try {
                    log.info("【websocket消息】 å•ç‚¹æ¶ˆæ¯:"+message);
                    session.getAsyncRemote().sendText(message);
                } catch (Exception e) {
                    e.printStackTrace();
                }
            }
        }

    }

}

 mes-common/src/main/java/com/chinaztt/mes/common/server/WebSocketServer.java

ÎļþÒÑɾ³ý

 mes-plan/src/main/java/com/chinaztt/mes/plan/entity/CustomerOrder.java

@@ -108,6 +108,9 @@
     */
    @ApiModelProperty(value = "零件号：用于生产的零件号")
    private String partNo;

    @ApiModelProperty(value = "零件编号：用于生产的零件号")
    private String partId;
    /**
     * æ•°é‡
     */

 mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java

@@ -257,8 +257,9 @@
    private void changeAudit(CustomerOrder customerOrder, String isAudit) {
        //审核状态 é€šè¿‡ è®¢å•çŠ¶æ€å¾…计划
        if (isAudit.equals(AuditStateStringValues.ACCEPTED)) {
            //TODO: è¦åŠ é›¶ä»¶id参数
            Document document = documentMapper.selectById(customerOrder.getTechnologyDocumentId());
            Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getEngChgLevel, "1").eq(Part::getPartNo, customerOrder.getPartNo()));
            Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getEngChgLevel, "1").eq(Part::getId,customerOrder.getPartId() ));
            if (null == part) {
                throw new RuntimeException("根据零件编号 = ã€" + customerOrder.getPartNo() + "】MES本地查无匹配零件对象");
            }

 mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/MasterProductionScheduleServiceImpl.java

@@ -20,10 +20,7 @@
import com.chinaztt.mes.common.oa.OAResult;
import com.chinaztt.mes.common.util.StateResult;
import com.chinaztt.mes.plan.dto.*;
import com.chinaztt.mes.plan.entity.MasterProductionSchedule;
import com.chinaztt.mes.plan.entity.MasterProductionScheduleTheoryQuantity;
import com.chinaztt.mes.plan.entity.MpsStructureComponent;
import com.chinaztt.mes.plan.entity.OperationTaskProduce;
import com.chinaztt.mes.plan.entity.*;
import com.chinaztt.mes.plan.mapper.*;
import com.chinaztt.mes.plan.service.CustomerOrderService;
import com.chinaztt.mes.plan.service.MasterProductionScheduleService;
@@ -90,7 +87,7 @@
    private StructureMapper structureMapper;
    private StateMachineFactory<MasterProductionScheduleStates, MasterProductionScheduleEvents> masterproductionscheduleStateMachineFactory;
    private StateMachinePersister<MasterProductionScheduleStates, MasterProductionScheduleEvents, MasterProductionSchedule> persister;

    private MoStructureComponentMapper moStructureComponentMapper;

    @Override
    public IPage<List<MasterProductionScheduleDTO>> getMasterProductionSchedulePage(Page page, QueryWrapper<MasterProductionScheduleDTO> masterProductionScheduleDTO) {
@@ -474,10 +471,14 @@
            Long technologyDocumentId = p.getTechnologyDocumentId();
            Document document = documentMapper.selectById(technologyDocumentId);
            Long firstPart = document.getPartId();
            String url="http://192.168.20.47:8008/PurchService.ashx?contract=ZTKJ&contractKey=4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=&procedureName=QUERY_INVENTORY_INFO_STD&userId=7632&inAttr={\"LOCATION_NO\": \"1019\",\"PART_NO\":"+p+"}";
            String body = HttpRequest.get(url).execute().body();
            JSONObject partInfo = JSONObject.parseObject(body);
            log.info("库存零件======>"+partInfo);
            List<MoStructureComponent> moStructureComponents = moStructureComponentMapper.selectList(new QueryWrapper<MoStructureComponent>().lambda().eq(MoStructureComponent::getPlanManufacturingOrderId, p.getId()));
            moStructureComponents.forEach(m->{
                Part part = partMapper.selectById(m.getPartId());
                String url="http://192.168.20.47:8008/PurchService.ashx?contract=ZTKJ&contractKey=4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=&procedureName=QUERY_INVENTORY_INFO_STD&userId=7632&inAttr={\"LOCATION_NO\": \"1019\",\"PART_NO\":"+part.getPartNo()+"}";
                String body = HttpRequest.get(url).execute().body();
                JSONObject partInfo = JSONObject.parseObject(body);
                log.info("库存零件==================================>"+partInfo);
            });
        });
        return false;
    }