Browse Source

优化人员上传-下发流程

qzyReal 2 years ago
parent
commit
14224daea4

+ 2 - 0
sp-core/src/main/java/com/pj/current/config/MyConfig.java

@@ -59,4 +59,6 @@ public class MyConfig {
 	private String heartPrefix;
 	private int gatePort;
 
+	private long limitUserCount;
+
 }

+ 6 - 0
sp-core/src/main/java/com/pj/current/netty/command/handler/impl/TerminalOptionHandler.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.XmlUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.pj.current.config.MyConfig;
 import com.pj.current.netty.command.constants.CommandType;
 import com.pj.current.netty.command.handler.IHandler;
 import com.pj.current.netty.dto.OKMsg;
@@ -25,6 +26,8 @@ public class TerminalOptionHandler implements IHandler {
 
     @Resource
     private TbTerminalService tbTerminalService;
+    @Resource
+    private MyConfig myConfig;
 
     @Override
     public CommandType commandType() {
@@ -41,6 +44,9 @@ public class TerminalOptionHandler implements IHandler {
         TbTerminal tbTerminal = tbTerminalService.findBySN(sn);
         tbTerminal.setPersonNum(userCount).setIpAddress(ip).setLastOnLine(DateUtil.now());
         tbTerminalService.updateById(tbTerminal);
+        if (myConfig.getLimitUserCount()<=userCount) {
+
+        }
         ctx.write(OKMsg.ok());
         ctx.flush();
     }

+ 3 - 0
sp-core/src/main/java/com/pj/project/tb_terminal/TbTerminalService.java

@@ -123,6 +123,9 @@ public class TbTerminalService extends ServiceImpl<TbTerminalMapper, TbTerminal>
             tbTerminal.setIpAddress(clientIp).setState(TbTerminal.StateType.ONLINE.getState())
                     .setSn(sn).setCreateTime(new Date());
             this.save(tbTerminal);
+            tbPersonFilingService.issued(tbTerminal);
+            tbPersonBlackService.issued(tbTerminal);
+            this.startHeartCommand(tbTerminal.getSn());
             return;
         }
         if (!StrUtil.equals(tbTerminal.getState(), TbTerminal.StateType.ONLINE.getState())) {

+ 1 - 0
sp-start/pom.xml

@@ -77,6 +77,7 @@
 
 	<!-- 构建配置 -->
     <build>
+        <finalName>face-system</finalName>
         <plugins>
             <!-- 打包jar文件时,配置manifest文件,加入lib包的jar依赖 -->
             <plugin>

+ 3 - 1
sp-start/src/main/resources/application-dev.yml

@@ -1,7 +1,8 @@
 # 端口
 server:
     port: 8099
-
+    servlet:
+        context-path: /pro
 spring: 
     # 数据源配置
     datasource: 
@@ -52,6 +53,7 @@ spring:
         command-prefix: "command:"
         heart-prefix: "heart:"
         gate-port: 8131
+        limit-user-count: 45000
 wx:
     enable: true
     app-id: wxd40a34141872bf0c