From a6ccb31191385dd9c3d2e9d75e1bcda7ff6a4ed3 Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期二, 12 九月 2023 14:47:57 +0800
Subject: [PATCH] 增加socket通讯，增加移动端控制接口
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java | 157 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 128 insertions(+), 29 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
index ff8c0df..a28e5cd 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
@@ -5,27 +5,32 @@
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.session.IoSession;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.config.TenantContext;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.dry.common.CacheConstants;
-import org.jeecg.modules.dry.entity.DryEquipment;
-import org.jeecg.modules.dry.entity.DryHerb;
-import org.jeecg.modules.dry.entity.DryOrder;
-import org.jeecg.modules.dry.entity.DryOrderTrend;
+import org.jeecg.modules.dry.entity.*;
import org.jeecg.modules.dry.service.*;
-import org.jeecg.modules.dry.vo.DryOrderTrendVo;
-import org.jeecg.modules.dry.vo.DryOrderVo;
-import org.jeecg.modules.dry.vo.RealTimeDataVo;
+import org.jeecg.modules.dry.socket.ServerHandler;
+import org.jeecg.modules.dry.socket.SocketServerConfig;
+import org.jeecg.modules.dry.vo.*;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.net.Socket;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+
@Slf4j
@Service
public class DryRealTimeDataServiceImpl implements IDryRealTimeDataService {
@@ -42,6 +47,12 @@
@Autowired
private RedisUtil redisUtil;
+
+ @Autowired
+ private IDryProdRecordService prodRecordService;
+
+ @Autowired
+ private IoAcceptor ioAcceptor;
@Override
@Transactional
@@ -88,8 +99,64 @@
orderVo.setState_windbox(realTimeDataVo.getState_windbox());
orderVo.setState_valve(realTimeDataVo.getState_valve());
orderVo.setOrderStatus(realTimeDataVo.getWorkorder_status());
+
+ String fault = realTimeDataVo.getFault();
+// String[] split = fault.split(",");
+// for (String s : split) {
+//
+// }
+
DryOrderTrendVo trendVo = new DryOrderTrendVo(realTimeDataVo);
// 2.2 淇濆瓨宸ュ崟鍚按鐜囧彉鍖� 鎴� 閲嶉噺鍙樺寲
+
+ if(realTimeDataVo.getReport_flag()) {
+ DryProdRecord prodRecord = new DryProdRecord();
+ prodRecord.setReportHeadName(realTimeDataVo.getReport_head_name());
+ prodRecord.setReportHeadBatch(realTimeDataVo.getReport_head_batch());
+ prodRecord.setReportHeadNum(realTimeDataVo.getReport_head_num());
+ prodRecord.setReportHeadMachine(realTimeDataVo.getReport_head_machine());
+ prodRecord.setReportHeadAccepter(realTimeDataVo.getReport_head_accepter());
+ prodRecord.setReportHeadDate(realTimeDataVo.getReport_head_date());
+ prodRecord.setReportHeadLeader(realTimeDataVo.getReport_head_leader());
+ prodRecord.setReportHeadTecher(realTimeDataVo.getReport_head_techer());
+
+ prodRecord.setReportCheckField(realTimeDataVo.getReport_check_field()?1:0);
+ prodRecord.setReportCheckFile(realTimeDataVo.getReport_check_file()?1:0);
+ prodRecord.setReportCheckTag(realTimeDataVo.getReport_check_tag()?1:0);
+ prodRecord.setReportCheckTool(realTimeDataVo.getReport_check_tool()?1:0);
+ prodRecord.setReportCheckMan(realTimeDataVo.getReport_check_man());
+ prodRecord.setReportCheckStatus(realTimeDataVo.getReport_check_status()?1:0);
+ prodRecord.setReportCheckQa(realTimeDataVo.getReport_check_qa());
+ prodRecord.setReportCheckRecord(realTimeDataVo.getReport_check_record());
+
+ prodRecord.setReportProductView(realTimeDataVo.getReport_product_view()?1:0);
+ prodRecord.setReportProductWind(realTimeDataVo.getReport_product_wind()?1:0);
+ prodRecord.setReportProductSun(realTimeDataVo.getReport_product_sun()?1:0);
+ prodRecord.setReportProductLowDry(realTimeDataVo.getReport_product_low_dry()?1:0);
+ prodRecord.setReportProductDry(realTimeDataVo.getReport_product_dry()?1:0);
+ prodRecord.setReportProductStart(realTimeDataVo.getReport_product_start());
+ prodRecord.setReportProductEnd(realTimeDataVo.getReport_product_end());
+ prodRecord.setReportProductTotal(realTimeDataVo.getReport_product_total());
+ prodRecord.setReportProductCheck(realTimeDataVo.getReport_product_check()?1:0);
+ prodRecord.setReportProductMan1(realTimeDataVo.getReport_product_man1());
+ prodRecord.setReportProductMan2(realTimeDataVo.getReport_product_man2());
+ prodRecord.setReportProductWeight(realTimeDataVo.getReport_product_weight());
+ prodRecord.setReportProductWaste(realTimeDataVo.getReport_product_waste());
+ prodRecord.setReportProductUse(realTimeDataVo.getReport_product_use());
+ prodRecord.setReportProductQa(realTimeDataVo.getReport_product_qa());
+
+ prodRecord.setReportCleanMachine(realTimeDataVo.getReport_clean_machine()?1:0);
+ prodRecord.setReportCleanWaste(realTimeDataVo.getReport_clean_waste()?1:0);
+ prodRecord.setReportCleanTool(realTimeDataVo.getReport_clean_tool()?1:0);
+ prodRecord.setReportCleanDoor(realTimeDataVo.getReport_clean_door()?1:0);
+ prodRecord.setReportCleanBox(realTimeDataVo.getReport_clean_box()?1:0);
+ prodRecord.setReportCleanRecord(realTimeDataVo.getReport_clean_record()?1:0);
+ prodRecord.setReportCleanDate(realTimeDataVo.getReport_clean_date());
+ prodRecord.setReportCleanMan(realTimeDataVo.getReport_clean_man());
+ prodRecord.setReportCleanConfirm(realTimeDataVo.getReport_clean_confirm()?1:0);
+ prodRecord.setReportCleanQa(realTimeDataVo.getReport_clean_qa());
+ prodRecordService.save(prodRecord);
+ }
saveOrderTrendVo(trendVo, orderVo);
orderVo.setTrendVo(trendVo);
orderVo.getBellowsTemp().put(realTimeDataVo.getTime3(), realTimeDataVo.getTemp2());
@@ -234,32 +301,64 @@
List<Double> dList = new ArrayList<>();
DryOrderVo orderVo = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + realTimeDataVo.getMachineid());
-try {
+ try {
- if (dryEquipments != null && dryEquipments.size() > 0) {
- dryEquipments.stream().forEach(item -> {
- DryOrderVo order = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + item.getCode());
- if (order != null) {
- double v = order.getOriginWeight() - order.getYield();
- list.add(item.getName().substring(0, item.getName().indexOf('#')+1));
- if (v > 0) {
- DecimalFormat df = new DecimalFormat("#.00");
- dList.add(Double.valueOf(df.format(v / order.getDryTime() * 60)));
- } else {
- dList.add(50d);
+ if (dryEquipments != null && dryEquipments.size() > 0) {
+ dryEquipments.stream().forEach(item -> {
+ DryOrderVo order = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + item.getCode());
+ if (order != null) {
+ double v = order.getOriginWeight() - order.getYield();
+ list.add(item.getName().substring(0, item.getName().indexOf('#')+1));
+ if (v > 0 && order.getDryTime()>0) {
+ DecimalFormat df = new DecimalFormat("#.00");
+ dList.add(Double.valueOf(df.format(v / order.getDryTime() * 60)));
+ } else {
+ dList.add(50d);
+ }
+
+ }
+ });
}
+ if (orderVo != null) {
+ orderVo.setCompEqpNum(list);
+ orderVo.setCompEqpEffic(dList);
+ }
+ }catch (Exception e) {
+ e.printStackTrace();
+ }
+ return Result.ok(orderVo);
+ }
+
+
+ @Override
+ public Result<?> sendSocketMsg(CommandMessageVo msgVo) {
+
+
+ DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(msgVo.getTenantId() + "", msgVo.getMachineId());
+ log.info("鑾峰彇璁惧锛�" + dryEquipment.toString());
+
+ // managedSessions.keySet().forEach(addr -> {
+ // ObjectOutputStream oos = null;
+ try {
+// Socket socket = SocketServerConfig.clientMap.get(addr);
+ IoSession session = ServerHandler.clientSocket.get(dryEquipment.getIp());
+ if (session == null) {
+ return Result.error("鏈幏鍙栧埌session,璇锋鏌ュ鎴风閰嶇疆鎴栬澶噄p閰嶇疆鏄惁姝ｅ父");
+ }
+ SocketMsgVo smv = new SocketMsgVo(msgVo);
+ session.write(JSONObject.toJSONString(smv));
+// oos = new ObjectOutputStream(socket.getOutputStream());
+// String s = JSONObject.toJSONString(new SocketMsgVo(msgVo));
+// oos.writeUTF(s);
+// oos.flush();
+
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ } finally {
}
- });
- }
- if (orderVo != null) {
- orderVo.setCompEqpNum(list);
- orderVo.setCompEqpEffic(dList);
- }
-}catch (Exception e) {
- e.printStackTrace();
-}
- return Result.ok(orderVo);
+ // });
+ return Result.OK();
}
}
--
Gitblit v1.9.3