NM-gaoshuguang
/
CentralizedMonitoring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

变更

Browse Source
main
han-l 2 years ago
parent c9901ce8c3
commit 890f253583
9 changed files with 149 additions and 1146 deletions
Show Stats Download Patch File Download Diff File

2
CentralizedMonitoring/src/main/java/com/nmgs/config/ThreadPoolConfig.java
Unescape Escape View File

@ -21,6 +21,8 @@ public class ThreadPoolConfig {
executor.setQueueCapacity(300);
executor.setKeepAliveSeconds(300);
executor.setThreadNamePrefix("NORMAL--");
executor.setAwaitTerminationSeconds(60);
executor.setWaitForTasksToCompleteOnShutdown(true);
executor.setRejectedExecutionHandler(new ThreadPoolExecutor.AbortPolicy());
executor.initialize();
return executor;

40
CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.xml
Unescape Escape View File

@ -5,12 +5,26 @@
<mapper namespace="com.nmgs.mapper.CarLineMapper">
<select id="selectStaList" resultType="java.util.Map">
SELECT a.*
FROM NAME_TABLE_DCOM a INNER JOIN USER_STA_TABLE b on a.STANO=b.STANO
WHERE a.USERTYPE = 1
AND (a.SUBCOMNO = ${STANO} OR a.STANO = ${STANO})
FROM NAME_TABLE_DCOM a INNER JOIN
(select
<if test="manNo !=null and manNo!=0">
AND b.MANNO=${manNo}
*
</if>
<if test="manNo ==null or manNo==0">
STANO
</if>
from USER_STA_TABLE
<where>
<if test="manNo !=null and manNo!=0">
MANNO=${manNo}
</if>
</where>
<if test="manNo ==null or manNo==0">
GROUP BY STANO
</if>
) b on a.STANO=b.STANO
WHERE a.USERTYPE = 1
AND (a.SUBCOMNO = ${STANO} OR a.STANO = ${STANO})
</select>
<select id="selectPortBySta" resultType="java.util.Map">
SELECT CAST(PORTNO AS VARCHAR(100)) + '车道' + '-' + b.TEXT labelName,
@ -88,7 +102,23 @@
</if>
</select>
<select id="getStaNameByManNo" resultType="java.util.Map">
SELECT a.STANO,b.STANAME FROM USER_STA_TABLE a INNER JOIN NAME_TABLE_DCOM b on a.STANO=b.STANO
SELECT a.STANO,b.STANAME FROM (select
<if test="manNo !=null and manNo!=0">
*
</if>
<if test="manNo ==null or manNo==0">
STANO
</if>
from USER_STA_TABLE
<where>
<if test="manNo !=null and manNo!=0">
MANNO=${manNo}
</if>
</where>
<if test="manNo ==null or manNo==0">
GROUP BY STANO
</if>
) a INNER JOIN NAME_TABLE_DCOM b on a.STANO=b.STANO
<if test="manNo !=null and manNo!=0">
WHERE a.MANNO=${manNo}
</if>

1
CentralizedMonitoring/src/main/java/com/nmgs/util/LogUtil.java
Unescape Escape View File

@ -71,7 +71,6 @@ public class LogUtil {
reader.seek(reader.length());
reader.write(sb.toString().getBytes());
} catch (IOException e) {
e.printStackTrace();
System.out.println(e.getMessage());

2
CentralizedMonitoring/src/main/resources/static/View/assets/index.881f4cc0.js → CentralizedMonitoring/src/main/resources/static/View/assets/index.975a1f81.js
View File

File diff suppressed because one or more lines are too long

2
CentralizedMonitoring/src/main/resources/static/View/index.html
Unescape Escape View File

@ -5,7 +5,7 @@
<link rel="icon" href="/favicon.ico"/>
<title></title>
<script type="module" crossorigin src="./assets/index.881f4cc0.js"></script>
<script type="module" crossorigin src="./assets/index.975a1f81.js"></script>
<link rel="stylesheet" href="./assets/index.38f67042.css">
</head>
<body>

1033
CentralizedMonitoringView/.idea/workspace.xml
View File

File diff suppressed because it is too large Load Diff

2
CentralizedMonitoringView/CentralizedMonitoring/assets/index.881f4cc0.js → CentralizedMonitoringView/CentralizedMonitoring/assets/index.975a1f81.js
View File

File diff suppressed because one or more lines are too long

2
CentralizedMonitoringView/CentralizedMonitoring/index.html
Unescape Escape View File

@ -5,7 +5,7 @@
<link rel="icon" href="/favicon.ico"/>
<title></title>
<script type="module" crossorigin src="./assets/index.881f4cc0.js"></script>
<script type="module" crossorigin src="./assets/index.975a1f81.js"></script>
<link rel="stylesheet" href="./assets/index.38f67042.css">
</head>
<body>

31
CentralizedMonitoringView/src/views/CarLine/components/PortInfo.vue
Unescape Escape View File

@ -11,7 +11,7 @@
/>
</div>
</template>
<div class="text item" >
<div class="text item">
<el-row>
<el-row style="width: 100%">
<el-image
@ -76,9 +76,9 @@ export default {
},
data() {
return {
spanStyle:'font-size: 15px;margin-top: 2px;margin-bottom: 2px',
textStyle:' font-size: 14px;',
rowNum:6,
spanStyle: 'font-size: 15px;margin-top: 2px;margin-bottom: 2px',
textStyle: ' font-size: 14px;',
rowNum: 6,
WindowsHeight: 20,
itemNum: 20,
socket: null,
@ -97,12 +97,12 @@ export default {
watch: {
rowNum: {
handler(newValue, oldValue) {
if(newValue==8){
this.textStyle='font-size: 9px;'
this.spanStyle='font-size: 12px;margin-top: 2px;margin-bottom: 2px'
}else{
this.textStyle='font-size: 14px;'
this.spanStyle='font-size: 15px;margin-top: 2px;margin-bottom: 2px'
if (newValue == 8) {
this.textStyle = 'font-size: 9px;'
this.spanStyle = 'font-size: 12px;margin-top: 2px;margin-bottom: 2px'
} else {
this.textStyle = 'font-size: 14px;'
this.spanStyle = 'font-size: 15px;margin-top: 2px;margin-bottom: 2px'
}
},
}
@ -156,13 +156,12 @@ export default {
this.socketOnOpen(); //
this.socketOnError();
this.socketOnMessage();
},
socketOnOpen() {
this.socket.onopen = () => {
this.$emit('changeLoading', false)
this.socketLoading = false
const _this=this;
const _this = this;
this.$emit('reCheckData')
window.setInterval(() => {
setTimeout(() => {
@ -228,17 +227,15 @@ export default {
socketOnClose() {
this.socket.onclose = () => {
console.log("close socket");
this.initSocket();
};
},
socketOnError() {
this.socket.onerror = () => {
this.socketIsNoOpen = true;
const _this = this;
console.log("socket 链接失败 重新链接");
this.socketOnClose();
window.setTimeout(() => {
_this.initSocket();
}, 3000)
this.initSocket();
console.log("socket 链接失败");
};
},
@ -272,7 +269,7 @@ export default {
this.labelName = stanLabelName
this.logsDialog = true
},
sendUntitled(staNo){
sendUntitled(staNo) {
let _bar = {"manNo": this.manNo, "command": "Untitled", "staNo": staNo}
this.socket.send(JSON.stringify(_bar));
}

Write Preview
Loading…
Cancel
Save