From a3344947e1ff54fcae8f09140ab0d05e2ba26f31 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 25 十月 2024 15:17:36 +0800
Subject: [PATCH] 新增配方记录功能并优化相关实体和VO
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java | 271 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 249 insertions(+), 22 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 3e33bb9..c2c7ff0 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,25 +5,38 @@
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.CommonAPI;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.config.TenantContext;
+import org.jeecg.common.config.mqtoken.UserTokenContext;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.util.RedisUtil;
+import org.jeecg.common.util.SpringContextUtils;
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.util.DryUtil;
+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 {
@@ -36,16 +49,41 @@
private IDryHerbService herbService;
@Autowired
+ private IDryHerbFormulaService dryHerbFormulaService;
+
+ @Autowired
private IDryEquipmentService equipmentService;
@Autowired
private RedisUtil redisUtil;
+ @Autowired
+ private IDryProdRecordService prodRecordService;
+
+
+ private String token;
+
+
+
+ public String getTemporaryToken() {
+ if (token == null) {
+ RedisUtil redisUtil = SpringContextUtils.getBean(RedisUtil.class);
+ // 妯℃嫙鐧诲綍鐢熸垚Token
+ token = JwtUtil.sign("admin", "b668043e3ea4bc2d");
+ // 璁剧疆Token缂撳瓨鏈夋晥鏃堕棿涓� 5 鍒嗛挓
+ redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
+ redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, 5 * 60 * 1000);
+ }
+
+ return token;
+ }
+
@Override
@Transactional
public Result<?> realTimeDataHandle(RealTimeDataVo realTimeDataVo) {
TenantContext.setTenant(realTimeDataVo.getTenantid()+"");
- log.info("瀹炴椂鏁版嵁锛�"+realTimeDataVo.toString());
+ // log.info("瀹炴椂鏁版嵁锛�"+realTimeDataVo.toString());
+
// 1 鏌ヨ鎴栧垱寤哄伐鍗�
// 1.1 浠巖edis鍙栧嚭宸ュ崟缂撳瓨
@@ -63,6 +101,7 @@
// 2 鏇存柊宸ュ崟瀹炴椂鏁版嵁
// 2.1 灏嗗伐鍗曚腑鐨勬暟鎹浛鎹负鏈�鏂版暟鎹�
realTimeDataVo.setOrderId(orderVo.getId());
+
orderVo.setInitial(realTimeDataVo.getMoisture1());
orderVo.setDryTime(realTimeDataVo.getTime3());
orderVo.setDelay(realTimeDataVo.getDelay());
@@ -74,14 +113,82 @@
orderVo.setLowalarm(realTimeDataVo.getLowalarm());
orderVo.setWind(realTimeDataVo.getWind());
orderVo.setOriginWeight(realTimeDataVo.getWeight2());
+ orderVo.setWatt(realTimeDataVo.getWatt());
+ orderVo.setSteam(realTimeDataVo.getSteam());
+ orderVo.setEnvHum(realTimeDataVo.getEnvhum());
+ orderVo.setEnvTemp(realTimeDataVo.getEnvtemp());
+ orderVo.setRemain(realTimeDataVo.getAi_total_time());
+ orderVo.setCurRemain(realTimeDataVo.getAi_time());
+ orderVo.setState_fan(realTimeDataVo.getState_fan());
+ orderVo.setState_roller(realTimeDataVo.getState_roller());
+ orderVo.setState_auto(realTimeDataVo.getState_auto());
+ orderVo.setState_windbox(realTimeDataVo.getState_windbox());
+ orderVo.setState_valve(realTimeDataVo.getState_valve());
+ orderVo.setOrderStatus(realTimeDataVo.getWorkorder_status());
+ orderVo.setEqp_status(realTimeDataVo.getEqp_status());
+ orderVo.setEqp_state(realTimeDataVo.getEqp_state());
+ orderVo.setWarning(realTimeDataVo.getEqp_warning());
+ orderVo.setFault(realTimeDataVo.getEqp_fault());
+ orderVo.setLevel(realTimeDataVo.getLevel());
+
+
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());
// 2.3 鏇存柊鍒皉edis缂撳瓨
redisUtil.hset(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(),
- realTimeDataVo.getTenantid()+"_"+realTimeDataVo.getMachineid(),orderVo, 600000);
+ realTimeDataVo.getTenantid()+"_"+realTimeDataVo.getMachineid(),orderVo, 60*60);
return Result.ok();
}
@@ -114,6 +221,7 @@
}
// 3 鏁版嵁搴撴病鏈夊垯鏂板涓�鏉℃暟鎹�
} else {
+
orderVo = saveNewOrder(realTimeDataVo);
}
return orderVo;
@@ -128,13 +236,13 @@
private DryOrderVo saveNewOrder(RealTimeDataVo realTimeDataVo) {
DryOrderVo orderVo;
// 鏌ヨ鑽潗
- DryHerb herb = queryHerbByIndexTenant(realTimeDataVo);
+ DryHerbFormula herbFormula = queryHerbByIndexTenant(realTimeDataVo);
// 鏌ヨ璁惧
DryEquipment equ = queryEquipmentByCodeTenant(realTimeDataVo);
// 鍒涘缓鏂板伐鍗�
orderVo = new DryOrderVo(realTimeDataVo);
- orderVo.setHerbId(herb.getId());
+ orderVo.setHerbId(herbFormula.getId());
orderVo.setEquId(equ.getId());
DryOrder dryOrder = BeanUtil.toBean(orderVo, DryOrder.class);
boolean save = dryOrderService.save(dryOrder);
@@ -164,15 +272,15 @@
* @param realTimeDataVo
* @return
*/
- private DryHerb queryHerbByIndexTenant(RealTimeDataVo realTimeDataVo) {
- LambdaQueryWrapper<DryHerb> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(DryHerb::getTenantId, realTimeDataVo.getTenantid());
- queryWrapper.eq(DryHerb::getCode, realTimeDataVo.getIndex());
- DryHerb one = herbService.getOne(queryWrapper);
- if (one == null) {
- one = new DryHerb(realTimeDataVo);
- herbService.save(one);
- }
+ private DryHerbFormula queryHerbByIndexTenant(RealTimeDataVo realTimeDataVo) {
+ LambdaQueryWrapper<DryHerbFormula> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(DryHerbFormula::getTenantId, realTimeDataVo.getTenantid());
+ queryWrapper.eq(DryHerbFormula::getCode, realTimeDataVo.getIndex());
+ DryHerbFormula one = dryHerbFormulaService.getOne(queryWrapper);
+// if (one == null) {
+// one = new DryHerb(realTimeDataVo);
+// herbService.save(one);
+// }
return one;
}
@@ -183,7 +291,7 @@
*/
private void saveOrderTrendVo(DryOrderTrendVo trendVo, DryOrderVo orderVo) {
//鍒ゆ柇 瀹炴椂鍚按鐜� 鎴� 瀹炴椂閲嶉噺鏈夋病鏈夊彉鍖栵紝鏈夊彉鍖栧垯鏇存柊
- if(orderVo.getTrendVo() == null
+ if(orderVo.getTrendVo() == null && trendVo != null && trendVo.getWeight() > 0
|| trendVo.getWeight() < orderVo.getTrendVo().getWeight()
) {
DryOrder byId = dryOrderService.getById(orderVo.getId());
@@ -209,7 +317,126 @@
@Override
public Result<?> queryMachineRealTImeData(RealTimeDataVo realTimeDataVo) {
TenantContext.setTenant(realTimeDataVo.getTenantid()+"");
- DryOrderVo orderVo = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid()+"_"+realTimeDataVo.getMachineid());
+
+ // 鏌ヨ鎵�鏈夋満鍙版煡璇㈢粍瑁�
+ LambdaQueryWrapper<DryEquipment> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(DryEquipment::getTenantId, realTimeDataVo.getTenantid());
+ queryWrapper.eq(DryEquipment::getEnable, "Y");
+ queryWrapper.orderByAsc(DryEquipment::getCode);
+ // 鏌ヨ鎵�鏈夋満鍙�
+ List<DryEquipment> dryEquipments = equipmentService.list(queryWrapper);
+ // 鏈哄彴鍒楄〃锛岀敤浜庢晥鐜囧姣�
+ List<String> list = new ArrayList<>();
+ // 鏁堢巼鍒楄〃锛岀敤浜庢晥鐜囧姣�
+ List<Double> dList = new ArrayList<>();
+ // 鏌ヨ褰撳墠鏈哄彴宸ュ崟
+ DryOrderVo orderVo = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + realTimeDataVo.getMachineid());
+ 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());
+ list.add(item.getName().substring(0, item.getName().indexOf('#')+1));
+ if (order != null) {
+ // 璁＄畻骞茬嚗鏁堢巼锛岀敤浜庡姣�
+ DryOrderTrendVo dryOrderTrendVo = order.getDetailList().get(order.getDetailList().size() - 1);
+ double v = order.getOriginWeight() - dryOrderTrendVo.getWeight();
+
+ if (v > 0 && dryOrderTrendVo.getTotalTime()>0) {
+ DecimalFormat df = new DecimalFormat("#.00");
+ dList.add(Double.valueOf(df.format(v / dryOrderTrendVo.getTotalTime() * 60)));
+ } else {
+ dList.add(50d);
+ }
+
+ }
+ // 濡傛灉娌℃湁鐢熶骇锛屾晥鐜囩疆0
+ dList.add(0d);
+ });
+ }
+
+ if (orderVo != null) {
+ // 灏嗘晥鐜囧姣旀暟鎹斁鍏ュ綋鍓嶆満鍙板疄鏃舵暟鎹腑杩斿洖
+ orderVo.setCompEqpNum(list);
+ orderVo.setCompEqpEffic(dList);
+ // 鏌ヨ杩戝崄娆℃晥鐜囧拰鑳借兘鑰楀钩鍧�
+ dryOrderService.queryRecentOrderAvg(orderVo);
+ }
+ }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 {
+
+ }
+ // });
+ return Result.OK();
+ }
+
+
+ @Override
+ public Result<?> queryWorkshopStatistics(RealTimeDataVo realTimeDataVo) {
+ LambdaQueryWrapper<DryEquipment> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(DryEquipment::getTenantId, realTimeDataVo.getTenantid());
+ queryWrapper.eq(DryEquipment::getEnable, "Y");
+ List<DryEquipment> dryEquipments = equipmentService.list(queryWrapper);
+ DryOrderVo orderVo = new DryOrderVo();
+ 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) {
+ orderVo.setEnvHum(order.getEnvHum());
+ orderVo.setEnvTemp(order.getEnvTemp());
+ double watt = order.getWatt() - order.getDetailList().get(0).getWatt();
+ orderVo.setWatt(orderVo.getWatt()==null? watt : orderVo.getWatt() + watt);
+ double steam = order.getSteam() - order.getDetailList().get(0).getSteam();
+ orderVo.setSteam(orderVo.getSteam()==null? steam : orderVo.getSteam() + steam);
+ orderVo.setOriginWeight(orderVo.getOriginWeight()==null? order.getOriginWeight(): orderVo.getOriginWeight() + order.getOriginWeight());
+
+ double yield = order.getOriginWeight()*(1-(order.getInitial()/100))/(1-(order.getTarget()/100));
+ orderVo.setYield(orderVo.getYield()==null? yield: orderVo.getYield() + yield);
+ double sub = order.getOriginWeight() - order.getYield();
+ orderVo.setReduce(orderVo.getReduce()==null? sub: orderVo.getReduce() + sub);
+
+
+ }
+ });
+ }
+ //redisUtil.get(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode()
+ return Result.OK(orderVo);
+ }
+
+ @Override
+ public Result<?> statisticsDataHandle(StatisticsDataVo statsDataVo) {
+ return null;
+ }
}
--
Gitblit v1.9.3