root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzq
2024-01-23 13:49:10 +08:00
parent 2698f6c897 0b0b5d849f
commit 14225144e7
10 changed files with 564 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/AsyncLuceneAppender.java
View File

@@ -7,43 +7,34 @@ package org.nl.common.lucene;
*/
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.classic.spi.LoggingEvent;
import ch.qos.logback.core.AppenderBase;
import com.alibaba.ttl.TransmittableThreadLocal;
import com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender;
import org.apache.commons.lang3.StringUtils;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.*;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.nl.common.domain.Property;
import org.nl.common.utils.YmlConfigFileUtil;
import org.nl.common.lucene.netty.RemoteLogServer;
import org.slf4j.MDC;
import org.wltea.analyzer.lucene.IKAnalyzer;
import java.io.IOException;
import java.nio.file.Paths;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
public class AsyncLuceneAppender extends AspectLogbackAsyncAppender {
public AsyncLuceneAppender() {
RemoteLogServer.asyncLuceneAppender = this;
}
@Override
protected void append(ILoggingEvent event) {
String traceId = LuceneAppender.traceIdTL.get();
if (StringUtils.isNotEmpty(traceId)){
MDC.put("traceId",traceId);
MDC.put("traceId",traceId);
Map<String, String> mdcPropertyMap = event.getMDCPropertyMap();
if (mdcPropertyMap.getClass().getName().contains("SynchronizedMap")){
mdcPropertyMap.put("traceId",traceId);
}
MDC.clear();
}
RemoteLogServer.writeLog(event);
}
public void appendSync(ILoggingEvent event){
super.append(event);
}

45
mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/netty/AbstraceServer.java Normal file
View File

@@ -0,0 +1,45 @@
package org.nl.common.lucene.netty;
import io.netty.bootstrap.AbstractBootstrap;
import io.netty.channel.Channel;
import java.net.SocketAddress;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
/*
* @author ZZQ
* @Date 2024/1/22 10:01
*/
public abstract class AbstraceServer {
public AbstraceServer(SocketAddress address) {
this.address = address;
if (channel!=null){
channel.close();
}
doOpen();
doConnect();
}
public AbstractBootstrap server;
public SocketAddress address;
public Channel channel;
private final Lock connectLock = new ReentrantLock();
public abstract void doOpen();
public void doClose(){
if (channel!=null){
channel.close();
}
};
public abstract void doConnect();
public void doDisConnect() throws Throwable{
channel.close();
};
}

100
mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/netty/RemoteLogServer.java Normal file
View File

@@ -0,0 +1,100 @@
package org.nl.common.lucene.netty;
import ch.qos.logback.classic.spi.ILoggingEvent;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.util.CharsetUtil;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.lucene.AsyncLuceneAppender;
import org.nl.common.lucene.netty.AbstraceServer;
import org.nl.common.lucene.netty.impl.ClientServer;
import org.nl.common.lucene.netty.impl.RemoteServer;
import org.nl.common.utils.MapOf;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.SmartLifecycle;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.HashMap;
import java.util.Map;
/*
* @author ZZQ
* @Date 2024/1/22 09:06
*/
@Component
public class RemoteLogServer implements SmartLifecycle {
@Autowired
private StringRedisTemplate redisTemplate;
public static volatile Boolean LOCAL_LOG = Boolean.TRUE;
private Integer port = 20888;
public static AbstraceServer server;
public static AsyncLuceneAppender asyncLuceneAppender;
public static void writeLog(ILoggingEvent event){
if (LOCAL_LOG){
asyncLuceneAppender.appendSync(event);
}else {
ByteBuf log = Unpooled.copiedBuffer(JSON.toJSONString(event), CharsetUtil.UTF_8);
server.channel.writeAndFlush(log);
}
};
@SneakyThrows
@Override
public void start() {
try {
String provider = redisTemplate.opsForValue().get("providers");
if (StringUtils.isEmpty(provider)){
String ip = Inet4Address.getLocalHost().getHostAddress();
Map<String,Object> config = MapOf.of("ip", ip, "port", port);
redisTemplate.opsForValue().set("provider", JSON.toJSONString(config));
Runtime.getRuntime().addShutdownHook(new Thread(() ->{
System.out.println("------服务关闭-升级从变主-------");
server.doClose();
redisTemplate.delete("providers");
try {
Thread.sleep(5000);
}catch (Exception ex){}
}));
server = new RemoteServer(new InetSocketAddress(ip, port));
LOCAL_LOG =Boolean.TRUE;
}else {
Map<String,String> map = JSONObject.parseObject(provider, HashMap.class);
String ip = map.get("ip");
Integer port = Integer.valueOf(map.get("port"));
server = new ClientServer(new InetSocketAddress(ip, port));
LOCAL_LOG = Boolean.FALSE;
}
}catch (Exception ex){
ex.printStackTrace();
throw ex;
}
}
@Override
public void stop() {
}
@Override
public boolean isRunning() {
return false;
}
}

44
mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/netty/coder/LogConsumerHandler.java Normal file
View File

@@ -0,0 +1,44 @@
package org.nl.common.lucene.netty.coder;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.handler.timeout.IdleStateEvent;
import org.nl.common.lucene.netty.RemoteLogServer;
/*
* @author ZZQ
* @Date 2024/1/22 10:24
*/
public class LogConsumerHandler extends ChannelInboundHandlerAdapter {
@Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
System.out.println("断开连接---");
RemoteLogServer.LOCAL_LOG = Boolean.TRUE;
RemoteLogServer.server.doClose();
//重新建立
super.channelInactive(ctx);
}
@Override
public void channelActive(ChannelHandlerContext ctx) throws Exception {
System.out.println("连接");
super.channelActive(ctx);
}
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
System.out.println("接收到消息");
super.channelRead(ctx, msg);
}
@Override
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
if (evt instanceof IdleStateEvent){
IdleStateEvent stateEvent = (IdleStateEvent) evt;
System.out.println(stateEvent.state());
}
super.userEventTriggered(ctx, evt);
}
}

33
mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/netty/coder/LogProviderHandler.java Normal file
View File

@@ -0,0 +1,33 @@
package org.nl.common.lucene.netty.coder;
import ch.qos.logback.classic.spi.LoggingEvent;
import com.alibaba.fastjson.JSONObject;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import org.nl.common.lucene.netty.RemoteLogServer;
/*
* @author ZZQ
* @Date 2024/1/22 10:24
*/
public class LogProviderHandler extends SimpleChannelInboundHandler<String> {
@Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
System.out.println("断开连接---");
super.channelInactive(ctx);
}
@Override
protected void channelRead0(ChannelHandlerContext ctx, String c){
LoggingEvent event = JSONObject.parseObject(c, LoggingEvent.class);
RemoteLogServer.asyncLuceneAppender.appendSync(event);
}
@Override
public void channelActive(ChannelHandlerContext ctx) throws Exception {
System.out.println("创建了连接----");
super.channelActive(ctx);
}
}

75
mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/netty/impl/ClientServer.java Normal file
View File

@@ -0,0 +1,75 @@
package org.nl.common.lucene.netty.impl;
import io.netty.bootstrap.Bootstrap;
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.handler.codec.LengthFieldPrepender;
import io.netty.handler.timeout.IdleStateHandler;
import io.netty.util.concurrent.Future;
import org.nl.common.lucene.netty.AbstraceServer;
import org.nl.common.lucene.netty.coder.LogConsumerHandler;
import java.net.SocketAddress;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
/*
* @author ZZQ
* @Date 2024/1/22 10:01
*/
public class ClientServer extends AbstraceServer {
private static EventLoopGroup group = new NioEventLoopGroup();
public ClientServer(SocketAddress address) {
super(address);
}
// 非阻塞IO线程组
@Override
public void doOpen() {
server = new Bootstrap();
server.group(group)
.option(ChannelOption.SO_KEEPALIVE, true)
.option(ChannelOption.TCP_NODELAY, true)
.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT)
.channel(NioSocketChannel.class);
server.handler(new ChannelInitializer<SocketChannel>() {
@Override
protected void initChannel(SocketChannel ch) throws Exception {
ch.pipeline()
.addLast("client-idle-handler", new IdleStateHandler(500, 0,0 , MILLISECONDS))
.addLast(new LengthFieldPrepender(2))
.addLast( new LogConsumerHandler());
}
});
}
@Override
public void doClose() {
super.doClose();
Future<?> bossGroupShutdownFuture = group.shutdownGracefully();
bossGroupShutdownFuture.syncUninterruptibly();
}
@Override
public void doConnect() {
try {
ChannelFuture connect = ((Bootstrap) server).connect(address);
connect.syncUninterruptibly();
channel = connect.channel();
} catch (Throwable t) {
this.doClose();
throw t;
}
}
}

83
mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/netty/impl/RemoteServer.java Normal file
View File

@@ -0,0 +1,83 @@
package org.nl.common.lucene.netty.impl;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.channel.*;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
import io.netty.handler.codec.LengthFieldPrepender;
import io.netty.handler.codec.string.StringDecoder;
import io.netty.handler.timeout.IdleStateHandler;
import io.netty.util.concurrent.Future;
import org.nl.common.lucene.netty.AbstraceServer;
import org.nl.common.lucene.netty.coder.LogProviderHandler;
import java.net.SocketAddress;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
/*
* @author ZZQ
* @Date 2024/1/22 10:01
*/
public class RemoteServer extends AbstraceServer {
private static EventLoopGroup boss = new NioEventLoopGroup();
private static EventLoopGroup worker = new NioEventLoopGroup();
public RemoteServer(SocketAddress address) {
super(address);
}
// 非阻塞IO线程组
@Override
public void doOpen() {
ServerBootstrap bootstrap = new ServerBootstrap();
bootstrap
.group(boss, worker)
.channel(NioServerSocketChannel.class)
.option(ChannelOption.SO_REUSEADDR, Boolean.TRUE)
.childOption(ChannelOption.TCP_NODELAY, Boolean.TRUE)
.childOption(ChannelOption.SO_KEEPALIVE, Boolean.TRUE)
.childOption(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT)
.childHandler(new ChannelInitializer<SocketChannel>() {
@Override
protected void initChannel(SocketChannel ch) throws Exception {
ch.pipeline()
.addLast("client-idle-handler", new IdleStateHandler(500, 0, 0, MILLISECONDS))
.addLast(new LengthFieldBasedFrameDecoder(8089, 0, 2, 0, 2))
.addLast(new LengthFieldPrepender(2))
.addLast("encode",new StringDecoder())
.addLast(new LogProviderHandler());
}
});
server = bootstrap;
}
@Override
public void doClose(){
Future<?> bossGroupShutdownFuture = boss.shutdownGracefully();
Future<?> workerGroupShutdownFuture = worker.shutdownGracefully();
bossGroupShutdownFuture.syncUninterruptibly();
workerGroupShutdownFuture.syncUninterruptibly();
}
@Override
public void doConnect() {
ChannelFuture future = server.bind(address);
boolean ret = future.awaitUninterruptibly(3000, MILLISECONDS);
if (ret && future.isSuccess()) {
Channel newChannel = future.channel();
if (channel != null) {
channel.close();
channel = newChannel;
}
} else if (future.cause() != null) {
Throwable cause = future.cause();
cause.printStackTrace();
}
}
}

2
mes/hd/nladmin-system/src/main/resources/config/application.yml
View File

@@ -2,7 +2,7 @@ spring:
freemarker:
check-template-location: false
profiles:
active: prod
active: dev3
jackson:
time-zone: GMT+8
data:

22
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrOrder/hrorder.js Normal file
View File

@@ -0,0 +1,22 @@
import request from '@/utils/request'
export function del(ids) {
return request({
url: '/api/pda/hrBcp/order',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: '/api/pda/hrBcp/order',
method: 'post',
data
})
}
export default {
edit,
del
}

152
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrOrder/index.vue Normal file
View File

@@ -0,0 +1,152 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="箱码">
<label slot="label">箱码:</label>
<el-input
v-model="query.type"
clearable
style="width: 180px"
placeholder="载具号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="单据类型">
<el-select
v-model="query.type"
multiple
style="width: 200px"
placeholder="单据类型"
class="filter-item"
@keyup.enter.native="crud.toQuery"
>
<el-option
v-for="item in taskStatusList"
:key="item.code"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="workshop_id" label="车间" min-width="100" show-overflow-tooltip />
<el-table-column prop="type" label="出入库类型" min-width="100" show-overflow-tooltip />
<el-table-column prop="order_id" label="顺序id" min-width="100" show-overflow-tooltip />
<el-table-column prop="stor_id" label="仓库" min-width="100" show-overflow-tooltip />
<el-table-column prop="in_device" label="入库点" min-width="100" show-overflow-tooltip />
<el-table-column prop="out_device" label="出库点" min-width="100" show-overflow-tooltip />
<el-table-column prop="bar_code" label="箱码" min-width="100" show-overflow-tooltip />
<el-table-column prop="weight" label="重量" min-width="100" show-overflow-tooltip />
<el-table-column prop="workorder_id" label="工单编号" min-width="100" show-overflow-tooltip />
<el-table-column prop="workprocedure_id" label="工序" min-width="100" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" width="135">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.create_time) }}</span>
</template>
</el-table-column>
<el-table-column prop="is_delete" label="删除" min-width="100" show-overflow-tooltip />
<el-table-column
v-permission="['admin','instruction:edit','instruction:del']"
fixed="right"
label="操作"
width="160px"
align="center"
>
<template slot-scope="scope">
<el-button
type="text"
icon="el-icon-success"
@click="doOperate(scope.row, 'a')"
>编辑</el-button>
<el-button
type="text"
icon="el-icon-error"
@click="doOperate(scope.row, 'b')"
>取消</el-button>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudHrorder from '@/views/wms/storage_manage/semiproducthr/semiproducthrOrder/hrorder'
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
export default {
name: 'Task',
dicts: ['SCH_TASK_TYPE_DTL', 'vehicle_type', 'task_finished_type', 'product_area'],
components: {
pagination, crudOperation, rrOperation, udOperation
},
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '任务',
url: '/api/pda/hrBcp/order',
idField: 'order_id',
sort: 'order_id,desc',
crudMethod: { ...crudHrorder },
query: {
},
optShow: {
add: false,
edit: false,
del: false,
download: false,
reset: true
}
})
},
data() {
return {
viewDialogVisible: false,
create_time: [],
taskStatusList: [{"label":"出","value":1},{"label":"入","value":2}],
permission: {
},
rules: {},
classes1: []
}
},
created() {
},
methods: {
}
}
</script>
<style scoped>
</style>