整体格式调整

application-webadmin/src/main/java/com/yice/webadmin/app/config/WebSocketConfig.java

-package com.yice.webadmin.app.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.server.standard.ServerEndpointExporter;
-
-@Configuration
-public class WebSocketConfig {
-    /**
-     * 注入ServerEndpointExporter，
-     * 这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint
-     */
-    @Bean
-    public ServerEndpointExporter serverEndpointExporter() {
-        return new ServerEndpointExporter();
-    }
-
-}

application-webadmin/src/main/java/com/yice/webadmin/app/controller/TuningRunController.java

@@ -61,8 +61,8 @@ public class TuningRunController {
         List<TuningRun> reTuningRunList = this.tuningRunService.getTuningRunList(tuningRunFilter, "run_version");
         TuningTask tuningTask = this.tuningTaskService.getById(tuningRun.getTaskId());
         Integer lastRunVersion = reTuningRunList.get(reTuningRunList.size() - 1).getRunVersion();
-        tuningRun.setRunVersion(lastRunVersion);
-        tuningRun.setRunName(tuningTask.getTaskName() + " V" + lastRunVersion + 1);
+        tuningRun.setRunVersion(lastRunVersion + 1);
+        tuningRun.setRunName(tuningTask.getTaskName() + " V" + (lastRunVersion + 1));
         tuningRun = tuningRunService.saveNew(tuningRun);
         return ResponseResult.success(tuningRun.getRunId());
     }

application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/ModelManageMapper.xml

@@ -56,6 +56,9 @@
     <!-- 这里仅包含调用接口输入的主表过滤条件 -->
     <sql id="inputFilterRef">
         <if test="modelManageFilter != null">
+            <if test="modelManageFilter.isBaseModel != null">
+                AND lmp_model_manage.is_base_model = #{modelManageFilter.isBaseModel}
+            </if>
             <if test="modelManageFilter.searchString != null and modelManageFilter.searchString != ''">
                 <bind name="safeModelManageSearchString" value="'%' + modelManageFilter.searchString + '%'"/>
                 AND CONCAT(IFNULL(lmp_model_manage.model_name,''), IFNULL(lmp_model_manage.business_label,'')) LIKE

application-webadmin/src/main/java/com/yice/webadmin/app/websocket/WebSocket.java

-package com.yice.webadmin.app.websocket;
-
-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;
-
-@Component
-@Slf4j
-@ServerEndpoint("/websocket/{userId}")  // 接口路径 ws://localhost:8087/webSocket/userId;
-public class WebSocket {
-    private Session session;
-    private String userId;
-    private static CopyOnWriteArraySet<WebSocket> 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);
-        this.sendOneMessage(userId, 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 (WebSocket 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();
-                }
-            }
-        }
-    }
-}