From b8982b86a15d186c4cf6144fface700d9769fa95 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 21 三月 2025 09:13:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
index 1296451..3d5c1f1 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
@@ -4,16 +4,21 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.common.RabbitMQUtil;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.OptimizeProjectMange;
import com.example.erp.mapper.pp.GlassOptimizeMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.IOException;
import java.sql.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.TimeoutException;
@Service
@DS("sd")
@@ -21,13 +26,59 @@
@Autowired
GlassOptimizeMapper glassOptimizeMapper;
+ RabbitMQUtil rabbitMQUtil;
+ //妯℃嫙璁＄畻
+ public Map<String, Object> SimulationCalculation(Map<String,Object> message) {
+ Map<String, Object> map = new HashMap<>();
+ try {
+ rabbitMQUtil = new RabbitMQUtil();
+ // 鍙戦�佹秷鎭�
+
+
+ // 鑾峰彇 computeData 鍜� cardData
+ Object computeData = message.get("computeData");
+ Object cardData = message.get("cardData");
+
+ rabbitMQUtil.sendMessage("6");
+ System.out.println("send message: " + message);
+ String date = rabbitMQUtil.receiveMessages();
+ System.out.println("Received message: " + date);
+
+ // 鍏抽棴杩炴帴
+ rabbitMQUtil.close();
+ map.put("data", date);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (TimeoutException | InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ return map;
+ }
+
+
+//妯℃嫙璁＄畻淇濆瓨
+ public Boolean addSimulation(Map<String, Object> object) {
+ try {
+ glassOptimizeMapper.addSimulation(object);
+ glassOptimizeMapper.addratioResult(object);
+ glassOptimizeMapper.addratioProjectResult(object);
+
+ return true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ }
//宸ョ▼淇℃伅
public Map<String, Object> projectInfoSv(String projectNo) {
Map<String, Object> map = new HashMap<>();
map.put("data", glassOptimizeMapper.projectInfoMp(projectNo));
return map;
}
+
//宸ョ▼淇℃伅娴佺▼鍗�
public Map<String, Object> getProcessCardSv(String projectNo) {
@@ -121,6 +172,9 @@
if (object.get("userName") != null) {
userName = object.get("userName").toString();
}
+ if ("null".equals(projectNmae)) {
+ projectNmae = "";
+ }
Double sumArea = (double) 0;
Double area = (double) 0;
Integer sumQuantity = 0;
--
Gitblit v1.8.0