From a00e1b3a8ff8cdadb7f8d897742097b30a5924fc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 03 十二月 2025 17:16:16 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 1548 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 1,541 insertions(+), 7 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 b53e355..a3f2b8e 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,30 +4,1564 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.example.erp.common.RabbitMQUtil;
+import com.example.erp.entity.pp.*;
+import com.example.erp.entity.sd.Delivery;
 import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.sd.OrderGlassDetail;
+import com.example.erp.entity.userInfo.Log;
+import com.example.erp.entity.userInfo.SysError;
 import com.example.erp.mapper.pp.GlassOptimizeMapper;
-import com.example.erp.mapper.pp.WorkOrderMapper;
+import com.example.erp.service.userInfo.SysErrorService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.sql.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
 
 @Service
+@Transactional(rollbackFor = Exception.class)
 @DS("sd")
 public class GlassOptimizeService {
     @Autowired
     GlassOptimizeMapper glassOptimizeMapper;
+    @Autowired
+    SysErrorService sysErrorService;
 
+    @Value("${mesIp:localhost}")
+    private String mesIp;
 
+    RabbitMQUtil rabbitMQUtil;
+    //妯℃嫙璁$畻
 
-    public Map<String, Object> getFlowCardList(String optionVal, Integer radio) {
+    /*public Map<String, Object> SimulationCalculation(Map<String,Object> message) {
         Map<String, Object> map = new HashMap<>();
-        map.put("data", glassOptimizeMapper.getFlowCardListMp(optionVal, radio));
+        try {
+            rabbitMQUtil = new RabbitMQUtil();
+            // 鍙戦�佹秷鎭�
+
+
+            // 鑾峰彇 computeData 鍜� cardData
+            *//*Object computeData = message.get("computeData");
+            Object cardData = message.get("cardData");*//*
+
+            rabbitMQUtil.sendMessage(message.toString());
+            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 Map<String, Object> SimulationCalculation(Map<String,Object> message) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            URL url = new URL("https://example.com"); // 鏇挎崲涓轰綘鐨勭洰鏍� URL
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+
+            conn.setRequestMethod("POST");
+            conn.setDoOutput(true); // 鍏佽鍐欏叆璇锋眰浣�
+            conn.setConnectTimeout(5000);
+            // 璇诲彇瓒呮椂锛堢瓑寰呮湇鍔″櫒鍝嶅簲鐨勬渶澶ф椂闂达級
+            conn.setReadTimeout(108000);
+
+            // 鍐欏叆璇锋眰浣撴暟鎹�
+            String postData = message.toString();
+            try (OutputStream os = conn.getOutputStream()) {
+                byte[] input = postData.getBytes(StandardCharsets.UTF_8);
+                os.write(input, 0, input.length);
+            }
+
+            // 3. 鑾峰彇鐘舵�佺爜
+            int statusCode = conn.getResponseCode();
+            System.out.println("鐘舵�佺爜: " + statusCode);
+
+            // 4. 璇诲彇鍝嶅簲鍐呭
+            BufferedReader reader = new BufferedReader(
+                    new InputStreamReader(conn.getInputStream())
+            );
+            String line;
+            StringBuilder response = new StringBuilder();
+            while ((line = reader.readLine()) != null) {
+                response.append(line);
+            }
+            reader.close();
+
+            // 杈撳嚭鍝嶅簲鍐呭
+            System.out.println("鍝嶅簲鍐呭:\n" + response.toString());
+
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
 
         return map;
     }
+
+
+//妯℃嫙璁$畻淇濆瓨
+    public Boolean addSimulation(Map<String, Object> object) {
+        try {
+            Map<String, Object> objectMap = (Map<String, Object>) object.get("inputValues");
+            String projectNo = objectMap.get("project_no").toString();
+            String userName = object.get("userName").toString();
+            Map<String, Object> optimizeProjectMap = glassOptimizeMapper.selectProjectCount(projectNo);
+
+            if(Integer.valueOf(object.get("state").toString())==3){
+                List<Map<String, Object>> flowCardList = glassOptimizeMapper.selectProjectComputeMp(projectNo);
+                int index=0;
+                for (Map<String, Object> flowCard:flowCardList){
+                    List<Map<String, Object>> glassDetailList=new ArrayList<>();
+                    if(Integer.valueOf(flowCard.get("patch_state").toString())==0){
+                         glassDetailList = glassOptimizeMapper.selectComputeDetailMp(flowCard.get("processId").toString(),
+                                Integer.valueOf(flowCard.get("technologyNumber").toString()));
+
+                    }else{
+                         glassDetailList = glassOptimizeMapper.selectComputeDetailMpPatchState(flowCard.get("processId").toString(),
+                                Integer.valueOf(flowCard.get("technologyNumber").toString()));
+                    }
+                    for (Map<String, Object> glassDetail:glassDetailList){
+                        for(int i=0;i<Integer.valueOf(glassDetail.get("quantity").toString());i++){
+                            index+=1;
+                            glassOptimizeMapper.insertOptimizeHeatDetail(
+                                    projectNo,flowCard.get("processId").toString(),
+                                    Integer.valueOf(flowCard.get("technologyNumber").toString()),
+                                    Integer.valueOf(flowCard.get("patch_state").toString()),
+                                    Integer.valueOf(glassDetail.get("order_number").toString()),
+                                    Double.valueOf(glassDetail.get("width").toString()),
+                                    Double.valueOf(glassDetail.get("height").toString()),index,userName
+                            );
+
+                        }
+                    }
+                    glassOptimizeMapper.updateProjectTemperingStateMp(projectNo,1);
+                }
+            }else{
+                List<Map<String, Object>> objectList = (List<Map<String, Object>>) object.get("projectdetail");
+                for (Map<String, Object> objectMap1:objectList){
+                    Integer count = glassOptimizeMapper.selectPatchLogState(objectMap1.get("process_id").toString(),
+                            Integer.valueOf(objectMap1.get("layers_number").toString()),Integer.valueOf(objectMap1.get("order_number").toString()),projectNo);
+                    if(count>0){
+                        objectMap1.put("patchState",1);
+                    }else {
+                        objectMap1.put("patchState",0);
+                    }
+                }
+                glassOptimizeMapper.addSimulation(object);
+                glassOptimizeMapper.addratioResult(object);
+                glassOptimizeMapper.addratioProjectResult(object);
+
+
+                if(Integer.valueOf(object.get("state").toString())==2){
+                    List<Map<String, Object>> flowCardList = glassOptimizeMapper.selectProjectComputeMp(projectNo);
+                    List<String> rackinfosList = (List<String>) object.get("rackinfos");
+                    Iterator<Map<String, Object>> iterator = flowCardList.iterator();
+                    while (iterator.hasNext()) {
+                        Map<String, Object> map = iterator.next();
+                        for(String rackinfos:rackinfosList){
+                            String processId=rackinfos.substring(0,14);
+                            String processId1=map.get("processId").toString();
+                            Integer technologyNumber= Integer.valueOf(rackinfos.substring(15));
+                            Integer technologyNumber1= Integer.valueOf(map.get("technologyNumber").toString());
+                            if(map.get("processId").toString().equals(processId) && Integer.valueOf(map.get("technologyNumber").toString())==technologyNumber){
+                                iterator.remove();
+                            }
+                        }
+                    }
+
+                    int index=0;
+                    for (Map<String, Object> flowCard:flowCardList){
+                        List<Map<String, Object>> glassDetailList=new ArrayList<>();
+                        if(flowCard.get("patch_state").toString()=="0"){
+                            glassDetailList = glassOptimizeMapper.selectComputeDetailMp(flowCard.get("processId").toString(),
+                                    Integer.valueOf(flowCard.get("technologyNumber").toString()));
+
+                        }else{
+                            glassDetailList = glassOptimizeMapper.selectComputeDetailMp(flowCard.get("processId").toString(),
+                                    Integer.valueOf(flowCard.get("technologyNumber").toString()));
+                        }
+                        for (Map<String, Object> glassDetail:glassDetailList){
+                            for(int i=0;i<Integer.valueOf(glassDetail.get("quantity").toString());i++){
+                                index+=1;
+                                glassOptimizeMapper.insertOptimizeHeatDetail(
+                                        projectNo,flowCard.get("processId").toString(),
+                                        Integer.valueOf(flowCard.get("technologyNumber").toString()),
+                                        Integer.valueOf(flowCard.get("patch_state").toString()),
+                                        Integer.valueOf(glassDetail.get("order_number").toString()),
+                                        Double.valueOf(glassDetail.get("width").toString()),
+                                        Double.valueOf(glassDetail.get("height").toString()),index,userName
+                                );
+
+                            }
+                        }
+                    }
+                }
+
+            }
+            if(Integer.valueOf(optimizeProjectMap.get("optimize_state").toString())==1){
+                List<OptimizeHeatDetail> optimizeHeatDetail = glassOptimizeMapper.selectOptimizeHeatDetail(projectNo);
+                for (OptimizeHeatDetail projectdetail:optimizeHeatDetail){
+                    OptimizeDetail optimizeDetail=glassOptimizeMapper.selectOptimizeDetailById(projectNo,projectdetail.getProcessId(),
+                            projectdetail.getOrderSort(),projectdetail.getLayer());
+                    glassOptimizeMapper.updateOptimizeDetail(optimizeDetail.getId(),projectdetail.getLayoutId(),projectdetail.getSort());
+                }
+            }
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    //浼樺寲璁剧疆淇濆瓨
+    public Boolean optimizeParmsSave(Map<String, Object> object,String username) {
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            String jsonString = mapper.writeValueAsString(object);
+
+            glassOptimizeMapper.optimizeParmsSave(jsonString,username);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+
+    //浼樺寲璋冩暣缁撴灉淇濆瓨
+    public Boolean saveOptimizeResult(Map<String, Object> object,String projectId) {
+        try {
+            Map<String, Object> optimalResults = (Map<String, Object>) object.get("optimalResults");
+            List<Map<String, Object>> originalFilm = (List<Map<String, Object>>) object.get("originalFilm");
+            glassOptimizeMapper.addOptimizeUse(originalFilm,projectId,"admin");
+
+            Map<String, Object> glassInfo = glassOptimizeMapper.getGlassInfo(projectId);
+
+            ObjectMapper mapper = new ObjectMapper();
+            String json = mapper.writeValueAsString(optimalResults);
+            glassOptimizeMapper.addOptimizeProjectFile(json,projectId,"admin");
+
+            List<Map<String, Object>> objectMapList = (List<Map<String, Object>>) optimalResults.get("layouts");
+            glassOptimizeMapper.addOptimizeLayout(objectMapList,projectId);
+            // 鏀堕泦鎵�鏈夐渶瑕佷繚瀛樼殑鐜荤拑鏄庣粏鏁版嵁
+            List<Map<String, Object>> allGlassDetails = new ArrayList<>();
+
+            for(Map<String, Object> objectMap:objectMapList){
+                List<Map<String, Object>> objectMap2 = (List<Map<String, Object>>) objectMap.get("glassDetails");
+                //杩唬鐜荤拑鏄庣粏闆嗗悎澶勭悊浣欐枡鍜屽叾浠�
+                Iterator<Map<String, Object>> iterator = objectMap2.iterator();
+                while (iterator.hasNext()) {
+                    Map<String, Object> map = iterator.next();
+                    // 淇敼isRemain鍒ゆ柇閫昏緫锛屾敮鎸佹暟瀛�0/1鍜屽瓧绗︿覆"0"/"1"
+                    boolean isRemain = false;
+                    if (map.containsKey("isRemain")) {
+                        Object isRemainObj = map.get("isRemain");
+                        if (isRemainObj != null) {
+                            if (isRemainObj instanceof Number) {
+                                // 鏁板瓧绫诲瀷: 1琛ㄧずtrue锛�0琛ㄧずfalse
+                                isRemain = ((Number) isRemainObj).intValue() == 1;
+                            } else {
+                                // 瀛楃涓茬被鍨�: "1"琛ㄧずtrue锛�"0"琛ㄧずfalse
+                                isRemain = "1".equals(isRemainObj.toString());
+                            }
+                        }
+                    }
+
+                    if (isRemain) {
+                        System.out.println( map);
+                        if (glassInfo != null) {
+                            String glassType = (String) glassInfo.get("glass_type");
+                            String glassThickness = (String) glassInfo.get("glass_thickness");
+                            // 浣欐枡瀛樺叆optimizeoffcut
+                            glassOptimizeMapper.addOptimizeOffcut(map, projectId, glassType, glassThickness);
+                        }
+                        iterator.remove(); // 浠庡師鍒楄〃涓Щ闄�
+                    }else {
+                        // 澶勭悊isRotate瀛楁杞崲 (鐜板湪鏄�0/1)
+                        if (map.containsKey("isRotate")) {
+                            Object isRotateObj = map.get("isRotate");
+                            if (isRotateObj != null) {
+                                if (isRotateObj instanceof Number) {
+                                    // 鐩存帴浣跨敤鏁板瓧鍊�
+                                    map.put("isRotate", ((Number) isRotateObj).intValue());
+                                } else {
+                                    // 瀛楃涓插舰寮忕殑"0"/"1"
+                                    String isRotateStr = isRotateObj.toString();
+                                    if ("1".equals(isRotateStr)) {
+                                        map.put("isRotate", 1);
+                                    } else {
+                                        map.put("isRotate", 0);
+                                    }
+                                }
+                            } else {
+                                map.put("isRotate", 0); // 榛樿鍊�
+                            }
+                        }
+                    }
+                }
+                // 鍦ㄤ繚瀛樹箣鍓嶅鐞� glassPoint 鏁版嵁
+                for (Map<String, Object> detail : objectMap2) {
+                    if (detail.containsKey("glassPoint")) {
+                        Object glassPointObj = detail.get("glassPoint");
+                        if (glassPointObj != null) {
+                            try {
+                                // 濡傛灉 glassPointObj 宸茬粡鏄瓧绗︿覆锛屽垯涓嶉渶瑕佽浆鎹�
+                                if (!(glassPointObj instanceof String)) {
+                                    // 灏嗗璞¤浆鎹负 JSON 瀛楃涓�
+                                    String glassPointStr = mapper.writeValueAsString(glassPointObj);
+                                    detail.put("glassPoint", glassPointStr);
+                                }
+                            } catch (Exception e) {
+                                // 濡傛灉杞崲澶辫触锛岃褰曢敊璇苟绉婚櫎璇ュ瓧娈�
+                                System.err.println("杞崲 glassPoint 澶辫触: " + e.getMessage());
+                                detail.remove("glassPoint");
+                            }
+                        } else {
+                            // 濡傛灉 glassPointObj 涓� null锛岀Щ闄よ瀛楁
+                            detail.remove("glassPoint");
+                        }
+                    }
+                }
+                // 灏嗗綋鍓嶆壒娆$殑鐜荤拑鏄庣粏娣诲姞鍒版�诲垪琛ㄤ腑
+                allGlassDetails.addAll(objectMap2);
+            }
+
+            Map<String, Object> projectInfo = glassOptimizeMapper.getGlassProjectList(projectId);
+            if (projectInfo != null && Integer.parseInt(projectInfo.get("tempering_state").toString()) == 1) {
+                // tempering_state 涓� 1 鏃剁殑澶勭悊閫昏緫
+                glassOptimizeMapper.addOptimizeDetail(allGlassDetails,projectId);
+                List<OptimizeHeatDetail> optimizeHeatDetail = glassOptimizeMapper.selectOptimizeHeatDetail(projectId);
+                for (OptimizeHeatDetail projectdetail:optimizeHeatDetail){
+                    OptimizeDetail optimizeDetail=glassOptimizeMapper.selectOptimizeDetailById(projectId,projectdetail.getProcessId(),
+                            projectdetail.getOrderSort(),projectdetail.getLayer());
+                    glassOptimizeMapper.updateOptimizeDetail(optimizeDetail.getId(),projectdetail.getLayoutId(),projectdetail.getSort());
+                }
+            } else {
+                // tempering_state 涓� 0 鏃剁殑澶勭悊閫昏緫
+                glassOptimizeMapper.addOptimizeDetail(allGlassDetails,projectId);
+            }
+            List<Map<String, Object>> materialStoreList = glassOptimizeMapper.materialStoreOptimizeUse(projectId);
+            double totalUseArea = 0.0;
+            for (Map<String, Object> material : materialStoreList) {
+                if (material.containsKey("totalArea")) {
+                    Object totalAreaObj = material.get("totalArea");
+                    if (totalAreaObj != null) {
+                        try {
+                            double area = Double.parseDouble(totalAreaObj.toString());
+                            totalUseArea += area;
+                        } catch (NumberFormatException e) {
+                            System.err.println("鏃犳硶瑙f瀽鎬婚潰绉暟鎹�: " + totalAreaObj);
+                        }
+                    }
+                }
+            }
+            glassOptimizeMapper.updateProjectOptimize(projectId, 1, optimalResults, totalUseArea);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public Boolean updateOptimizeResult(Map<String, Object> object, String processId) {
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+
+            List<Map<String, Object>> objectMapList = (List<Map<String, Object>>) object.get("layouts");
+
+            Map<String, Object> glassInfo = glassOptimizeMapper.getGlassInfo(processId);
+            glassOptimizeMapper.deleteOffcutDetails(processId);
+
+            int stockId = 1;
+            for (Map<String, Object> objectMap : objectMapList) {
+                List<Map<String, Object>> objectMap2 = (List<Map<String, Object>>) objectMap.get("glassDetails");
+
+                // 鍒嗙 glassDetails 涓轰袱閮ㄥ垎
+                List<Map<String, Object>> normalDetails = new ArrayList<>();  // isRemain 涓� false 鐨勯儴鍒�
+                List<Map<String, Object>> offCutDetails = new ArrayList<>();  // isRemain 涓� true 鐨勯儴鍒�
+
+                for (Map<String, Object> detail : objectMap2) {
+                    boolean isRemain = false;
+                    if (detail.containsKey("isRemain")) {
+                        Object isRemainObj = detail.get("isRemain");
+                        if (isRemainObj != null) {
+                            if (isRemainObj instanceof Number) {
+                                // 鏁板瓧绫诲瀷: 1琛ㄧずtrue锛�0琛ㄧずfalse
+                                isRemain = ((Number) isRemainObj).intValue() == 1;
+                            } else if (isRemainObj instanceof Boolean) {
+                                // 甯冨皵绫诲瀷
+                                isRemain = (Boolean) isRemainObj;
+                            } else {
+                                // 瀛楃涓茬被鍨�: "1"/"true"琛ㄧずtrue锛�"0"/"false"琛ㄧずfalse
+                                String isRemainStr = isRemainObj.toString().toLowerCase();
+                                isRemain = "1".equals(isRemainStr) || "true".equals(isRemainStr);
+                            }
+                        }
+                    }
+                    // 澶勭悊 glassPoint 搴忓垪鍖�
+                    if (detail.containsKey("glassPoint")) {
+                        Object glassPointObj = detail.get("glassPoint");
+                        if (glassPointObj != null) {
+                            try {
+                                // 濡傛灉 glassPointObj 宸茬粡鏄瓧绗︿覆锛屽垯涓嶉渶瑕佽浆鎹�
+                                if (!(glassPointObj instanceof String)) {
+                                    // 灏嗗璞¤浆鎹负 JSON 瀛楃涓�
+                                    String glassPointStr = mapper.writeValueAsString(glassPointObj);
+                                    detail.put("glassPoint", glassPointStr);
+                                }
+                            } catch (Exception e) {
+                                // 濡傛灉杞崲澶辫触锛岃褰曢敊璇苟绉婚櫎璇ュ瓧娈�
+                                System.err.println("杞崲 glassPoint 澶辫触: " + e.getMessage());
+                                detail.remove("glassPoint");
+                            }
+                        }
+                    }
+
+                    if (isRemain) {
+                        offCutDetails.add(detail);
+                    } else {
+                        normalDetails.add(detail);
+                    }
+                }
+
+                // 淇濆瓨鎵�鏈夋暟鎹埌 optimize_detail
+                if (!normalDetails.isEmpty()) {
+                    for (Map<String, Object> detail : normalDetails) {
+                        glassOptimizeMapper.updateNormalDetails(detail, processId);
+                    }
+                }
+
+                // 瀵� remainDetails 閮ㄥ垎鍏堝垹闄� offcut 鍐嶅鐞�
+                if (!offCutDetails.isEmpty()) {
+                    if (glassInfo != null) {
+                        String glassType = (String) glassInfo.get("glass_type");
+                        String glassThickness = (String) glassInfo.get("glass_thickness");
+                        // 浣欐枡瀛樺叆optimizeoffcut
+                        for (Map<String, Object> detail : offCutDetails) {
+                            glassOptimizeMapper.addUpdateOffcut(detail, processId, glassType, glassThickness, stockId);
+                        }
+                    }
+                }
+                stockId++;
+            }
+            // 鏇存柊浼樺寲缁撴灉鏂囦欢
+            String jsonString = mapper.writeValueAsString(object);
+            glassOptimizeMapper.updateOptimizeResult(jsonString, processId);
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+   //浼樺寲璋冩暣缁撴灉鏌ヨ
+    public Map<String, Object> selectOptimizeResult(String processId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.selectOptimizeResult(processId));
+        map.put("optimizeUse", glassOptimizeMapper.materialStoreOptimizeUse(processId));
+        return map;
+    }
+
+
+
+    public Object getOptimizeInfoSv(String processId) {
+        // 鑾峰彇甯冨眬淇℃伅
+        List<Map<String, Object>> layouts = glassOptimizeMapper.getOptimizeLayoutsInfo(processId);
+        // 鑾峰彇鐜荤拑鏄庣粏淇℃伅
+        List<Map<String, Object>> glassDetails = glassOptimizeMapper.getOptimizeDetailsInfo(processId);
+        // 鑾峰彇浣欐枡淇℃伅
+        List<Map<String, Object>> offsets = glassOptimizeMapper.getOptimizeOffsetsInfo(processId);
+        // 灏嗙幓鐠冩槑缁嗗拰浣欐枡鍚堝苟鍒颁竴涓垪琛ㄤ腑
+        List<Map<String, Object>> allDetails = new ArrayList<>();
+        if (glassDetails != null) {
+            allDetails.addAll(glassDetails);
+        }
+        if (offsets != null) {
+            allDetails.addAll(offsets);
+        }
+
+        // 瑙f瀽 glassPoint 瀛楃涓�
+        ObjectMapper mapper = new ObjectMapper();
+        for (Map<String, Object> detail : allDetails) {
+            if (detail.containsKey("glassPoint")) {
+                Object glassPointObj = detail.get("glassPoint");
+                if (glassPointObj instanceof String) {
+                    String glassPointStr = (String) glassPointObj;
+                    if (glassPointStr != null && !glassPointStr.isEmpty() && !glassPointStr.equals("null")) {
+                        try {
+                            // 瑙f瀽 JSON 瀛楃涓蹭负瀵硅薄
+                            Object parsedGlassPoint = mapper.readValue(glassPointStr, Object.class);
+                            detail.put("glassPoint", parsedGlassPoint);
+                        } catch (Exception e) {
+                            System.err.println("瑙f瀽 glassPoint 澶辫触: " + e.getMessage());
+                            // 瑙f瀽澶辫触鏃朵繚鐣欏師瀛楃涓叉垨璁剧疆榛樿鍊�
+                            detail.put("glassPoint", new ArrayList<>());
+                        }
+                    } else {
+                        // 绌哄瓧绗︿覆鎴� null 鏃惰缃粯璁ゅ��
+                        detail.put("glassPoint", new ArrayList<>());
+                    }
+                }
+            }
+        }
+
+        // 鎸夌収stockId灏嗘槑缁嗗垎缁勫苟娣诲姞鍒板搴旂殑甯冨眬涓�
+        if (layouts != null && !layouts.isEmpty()) {
+            for (Map<String, Object> layout : layouts) {
+                Object stockIdObj = layout.get("stockId");
+                if (stockIdObj != null) {
+                    Integer stockId = null;
+                    if (stockIdObj instanceof Number) {
+                        stockId = ((Number) stockIdObj).intValue();
+                    } else {
+                        try {
+                            stockId = Integer.valueOf(stockIdObj.toString());
+                        } catch (NumberFormatException e) {
+                            // 濡傛灉鏃犳硶杞崲涓烘暟瀛楋紝鍒欒烦杩囪甯冨眬
+                            continue;
+                        }
+                    }
+                    List<Map<String, Object>> matchedDetails = new ArrayList<>();
+                    for (Map<String, Object> detail : allDetails) {
+                        Object layoutIdObj = detail.get("layoutId");
+                        Object stockSortObj = detail.get("stockSort");
+                        Integer detailStockId = null;
+                        if (layoutIdObj != null) {
+                            if (layoutIdObj instanceof Number) {
+                                detailStockId = ((Number) layoutIdObj).intValue();
+                            } else {
+                                try {
+                                    detailStockId = Integer.valueOf(layoutIdObj.toString());
+                                } catch (NumberFormatException e) {
+                                    // 璺宠繃鏃犳晥鐨刲ayoutId
+                                    continue;
+                                }
+                            }
+                        } else if (stockSortObj != null) {
+                            if (stockSortObj instanceof Number) {
+                                detailStockId = ((Number) stockSortObj).intValue();
+                            } else {
+                                try {
+                                    detailStockId = Integer.valueOf(stockSortObj.toString());
+                                } catch (NumberFormatException e) {
+                                    // 璺宠繃鏃犳晥鐨剆tockSort
+                                    continue;
+                                }
+                            }
+                        }
+                        // 濡傛灉detail鐨剆tockId涓巐ayout鐨剆tockId鍖归厤锛屽垯娣诲姞鍒板尮閰嶅垪琛ㄤ腑
+                        if (detailStockId != null && detailStockId.equals(stockId)) {
+                            matchedDetails.add(detail);
+                        }
+                    }
+                    // 灏嗗尮閰嶇殑鏄庣粏娣诲姞鍒板竷灞�鐨刧lassDetails瀛楁涓�
+                    layout.put("glassDetails", matchedDetails);
+                }
+            }
+        }
+//        Map<String, Object> result = new HashMap<>();
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("layouts", layouts);
+        result.put("optimizeUse", glassOptimizeMapper.materialOptimizeUse(processId));
+        return result;
+    }
+
+
+    //宸ョ▼淇℃伅
+    public Map<String, Object> projectInfoSv(String projectNo,String username) {
+        Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNo);
+        Map<String, Object> map = new HashMap<>();
+//        if(Integer.parseInt(stringObjectMap.get("optimize_state").toString())==1){
+//            map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
+//            map.put("data", glassOptimizeMapper.getOptimizeDetail(projectNo));
+//            map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+//            map.put("grindingTrimming", null);
+//        } else if (Integer.parseInt(stringObjectMap.get("tempering_state").toString())==1) {
+//            map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
+//            map.put("data", glassOptimizeMapper.analogComputationOptimization(projectNo));
+//            map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+//            map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
+//        } else{
+//            map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
+//            map.put("data", glassOptimizeMapper.firstOptimization(projectNo));
+//            map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+//            map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
+//        }
+        map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
+        map.put("data", glassOptimizeMapper.firstOptimization(projectNo));
+        map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+        map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
+        return map;
+    }
+
+
+
+
+    public Object optimizeInfoSv(String projectNo, String username) {
+        Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNo);
+        Map<String, Object> map = new HashMap<>();
+        List<Map<String, Object>> dataList = null;
+        if (Integer.parseInt(stringObjectMap.get("tempering_state").toString())==1){
+            dataList = glassOptimizeMapper.computeAndOptimization(projectNo);
+        } else {
+            dataList = glassOptimizeMapper.directOptimization(projectNo);
+        }
+        List<Map<String, Object>> tempDataList = null;
+        if (Integer.parseInt(stringObjectMap.get("optimize_state").toString())==1) {
+            tempDataList = glassOptimizeMapper.optimizeTemp(projectNo);
+        }
+
+        // 鑾峰彇纾ㄩ噺閰嶇疆鏁版嵁
+        List<Map<String, Object>> grindingTrimmingList = glassOptimizeMapper.getGrindingOptimize(username);
+        // 灏嗙(閲忛厤缃暟鎹嫾鎺ュ埌姣忔潯涓绘暟鎹悗闈�
+        if (dataList != null && !dataList.isEmpty() && grindingTrimmingList != null && !grindingTrimmingList.isEmpty()) {
+            // 鑾峰彇绗竴鏉$(閲忛厤缃暟鎹紙閫氬父鍙湁涓�鏉¤褰曪級
+            Map<String, Object> grindingConfig = grindingTrimmingList.get(0);
+            // 灏嗙(閲忛厤缃坊鍔犲埌姣忔潯涓绘暟鎹腑
+            for (Map<String, Object> dataItem : dataList) {
+                // 灏嗙(閲忛厤缃殑瀛楁娣诲姞鍒版瘡鏉℃暟鎹腑
+                for (Map.Entry<String, Object> entry : grindingConfig.entrySet()) {
+                    // 閬垮厤瑕嗙洊鍘熸湁瀛楁
+                    if (!dataItem.containsKey(entry.getKey())) {
+                        dataItem.put(entry.getKey(), entry.getValue());
+                    }
+                }
+            }
+        }
+        if (tempDataList != null && !tempDataList.isEmpty()) {
+            dataList.addAll(tempDataList);
+        }
+        map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
+        map.put("data", dataList);
+        map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+        map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
+        return map;
+    }
+
+
+    //宸ョ▼淇℃伅娴佺▼鍗�
+    public Map<String, Object> getProcessCardSv(String projectNo) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.getProcessCardMp(projectNo));
+        return map;
+    }
+
+    //搴撳瓨淇℃伅
+    public Map<String, Object> materialStoreSv(String thickness, String model, String projectNumber,Integer type,String username) {
+        Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNumber);
+        Map<String, Object> map = new HashMap<>();
+        if(Integer.parseInt(stringObjectMap.get("optimize_state").toString())==0){
+            if(type==1){
+                map.put("data", glassOptimizeMapper.materialStoreMp(thickness,model));
+            }else if(type==2){
+                map.put("data", glassOptimizeMapper.surplusMaterialsMp(thickness,model));
+            }else{
+                map.put("data", glassOptimizeMapper.materialStoreSurplusMp(thickness,model));
+            }
+            map.put("edgeTrimming", glassOptimizeMapper.getEdgeTrimming(username));
+        }else{
+            map.put("data", glassOptimizeMapper.materialStoreOptimizeUse(projectNumber));
+            map.put("edgeTrimming", null);
+        }
+        map.put("state", Integer.parseInt(stringObjectMap.get("state").toString()));
+
+        return map;
+    }
+
+
+    //宸ョ▼鏌ヨ娴佺▼鍗�
+    public Map<String, Object> getFlowCardList(String optionVal, Integer radio) {
+        Map<String, Object> map = new HashMap<>();
+        if(radio==1){
+            map.put("data", glassOptimizeMapper.getFlowCardListWhole(optionVal));
+        }else if(radio==2){
+            map.put("data", glassOptimizeMapper.getFlowCardListNormal(optionVal));
+        }else{
+            map.put("data", glassOptimizeMapper.getFlowCardListPatch(optionVal));
+        }
+
+
+        return map;
+    }
+
+    public Map<String, Object> getUpdateFlowCardList(String type,String thickness, Integer radio,String projectNo) {
+        Map<String, Object> map = new HashMap<>();
+        if(radio==1){
+            map.put("data", glassOptimizeMapper.getFlowCardListModify(type,thickness,projectNo));
+        }else if(radio==2){
+            map.put("data", glassOptimizeMapper.getFlowCardListNormal(type));
+        }else{
+            map.put("data", glassOptimizeMapper.getFlowCardListPatch(type));
+        }
+
+
+        return map;
+    }
+
+    //宸ョ▼绠$悊鏌ヨ
+    public Map<String, Object> OptimizeProjectMange(Date startSelectTime, Date endSelectTime, OptimizeProjectMange optimizeProjectMange) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.optimizeProjectMangeMp(startSelectTime, endSelectTime , optimizeProjectMange));
+        return map;
+    }
+
+    //淇敼鎺掔増鐘舵��
+    public Boolean updateProjectState(String projectNumber, Integer state,Integer states, Integer code) throws JsonProcessingException {
+        if (!projectNumber.isEmpty()) {
+            //鎾ら攢妯℃嫙璁$畻
+            if(code==1){
+                glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
+                glassOptimizeMapper.deleteOptimizeHeatLayout(projectNumber);
+                glassOptimizeMapper.updateProjectTemperingStateMp(projectNumber, states);
+                Map<String, Object> temperingState = glassOptimizeMapper.getProjectState(projectNumber);
+
+                if (temperingState != null && temperingState.containsKey("optimize_state")) {
+                    Object optimizeStateObj = temperingState.get("optimize_state");
+                    if (optimizeStateObj != null) {
+                        try {
+                            int optimizeState = Integer.parseInt(optimizeStateObj.toString());
+                            if (optimizeState == 1) {
+                                glassOptimizeMapper.updateProjectTemperingId(projectNumber);
+                            }
+                        } catch (NumberFormatException e) {
+                            // 澶勭悊杞崲寮傚父锛岃褰曟棩蹇楁垨閲囧彇鍏朵粬閫傚綋鎺柦
+                            System.err.println("瑙f瀽 optimize_state 澶辫触: " + e.getMessage());
+                        }
+                    }
+                }
+            }
+            //鎾ら攢浼樺寲鎺掔増
+            else if(code==2){
+                glassOptimizeMapper.deleteOptimizeDetail(projectNumber);
+                glassOptimizeMapper.deleteOptimizeLayout(projectNumber);
+                glassOptimizeMapper.deleteOptimizeOffcut(projectNumber);
+                glassOptimizeMapper.deleteOptimizeProjectFile(projectNumber);
+                glassOptimizeMapper.updateOptimizeUse(projectNumber);
+                glassOptimizeMapper.updateProjectOptimizeStateMp(projectNumber, states);
+            }
+            //鍏佽鐢熶骇
+            else if(code==3){
+                Boolean isSeccess = issuingProjects(projectNumber);
+                if(isSeccess){
+                    glassOptimizeMapper.updateProjectStateMp(projectNumber, state);
+                }else{
+                    return false;
+                }
+            }
+            //鐢熶骇涓嶅彲瑙�
+            else if(code==4){
+                Map<String, Object> cancelResult = issuingCancelProject(projectNumber);
+                // 鑾峰彇杩斿洖缁撴灉涓殑data瀛楁
+                Map<String, Object> responseData = (Map<String, Object>) cancelResult.get("data");
+                // 妫�鏌ュ搷搴斾腑鐨刢ode瀛楁锛屽彧鏈夊綋code涓�200鎴�202鏃舵墠鍏佽鏇存柊鐘舵��
+                if (responseData != null && responseData.containsKey("code")) {
+                    Object responseCode = responseData.get("code");
+                    if (responseCode.equals(200) || responseCode.equals(202)) {
+                        glassOptimizeMapper.updateProjectStateMp(projectNumber, state);
+                    } else if (responseCode.equals(201)) {
+                        // 褰撹繑鍥�201鏃讹紝鎶涘嚭鑷畾涔夊紓甯告垨杩斿洖閿欒淇℃伅
+                        throw new RuntimeException(responseData.get("message").toString());
+                    } else {
+                        return false;
+                    }
+                } else {
+                    return false;
+                }
+
+            }
+            //鍒濆鍖栧伐绋�
+            else if(code==5){
+                glassOptimizeMapper.updateProjectStateMp(projectNumber, state);
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    //鍒犻櫎宸ョ▼
+    public boolean deleteProject(String projectNumber,Integer type) {
+        Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNumber);
+        if(stringObjectMap.get("tempering_state").equals(1)){
+            glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
+            glassOptimizeMapper.deleteOptimizeHeatLayout(projectNumber);
+        }
+        if(stringObjectMap.get("optimize_state").equals(1)){
+            glassOptimizeMapper.deleteOptimizeDetail(projectNumber);
+            glassOptimizeMapper.deleteOptimizeLayout(projectNumber);
+            glassOptimizeMapper.deleteOptimizeLayout(projectNumber);
+            glassOptimizeMapper.updateOptimizeUse(projectNumber);
+            glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
+            glassOptimizeMapper.deleteOptimizeHeatLayout(projectNumber);
+        }
+        List<FlowCard> flowCardList =glassOptimizeMapper.getFlowCardList(projectNumber);
+        List<PatchLog> patchLogList =glassOptimizeMapper.getPatchLogList(projectNumber);
+        if(flowCardList!=null){
+            for (FlowCard flowCard:flowCardList){
+                glassOptimizeMapper.updateFlowCardProjectReturn(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectNumber);
+            }
+        }
+        if(patchLogList!=null){
+            for (PatchLog patchLog:patchLogList){
+                glassOptimizeMapper.updatePatchLogProjectReturn(patchLog.getProcessId(),patchLog.getTechnologyNumber(),projectNumber);
+            }
+        }
+        //鍒ゆ柇鏄惁鏄慨鏀瑰伐绋�
+        if(type.equals(1)){
+            glassOptimizeMapper.deleteProjectMp(projectNumber);
+        }
+        return true;
+    }
+
+
+    public Map<String, Object> getProjectListSv() {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.getProjectListMp());
+        return map;
+    }
+
+    //妯℃嫙璁$畻宸ョ▼鍙锋煡璇�
+    public Map<String, Object>selectProjectComputeSv(String projectNumber) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.selectProjectComputeMp(projectNumber));
+        //map.put("project", glassOptimizeMapper.selectProjectCount(projectNumber));
+        return map;
+    }
+
+    public Map<String, Object>selectProjectComputeAll(String projectNumber) {
+        Map<String, Object> map = new HashMap<>();
+        List<Map<String, Object>> projectComputeMpList=glassOptimizeMapper.selectProjectComputeMp(projectNumber);
+        for (Map<String, Object> stringObjectMap : projectComputeMpList) {
+            stringObjectMap.get("process_id");
+            stringObjectMap.get("technology_number");
+        }
+        map.put("data", glassOptimizeMapper.selectProjectComputeMp(projectNumber));
+        //map.put("project", glassOptimizeMapper.selectProjectCount(projectNumber));
+        return map;
+    }
+
+    //妯℃嫙璁$畻娴佺▼鍗¤鎯�
+    public Map<String, Object>selectComputeDetailSv(String processId,Integer technologyNumber,String patchState) {
+        Map<String, Object> map = new HashMap<>();
+        if(patchState.equals("0")){
+            map.put("data", glassOptimizeMapper.selectComputeDetailMp(processId,technologyNumber));
+        }else{
+            map.put("data", glassOptimizeMapper.selectComputeDetailMpPatchState(processId,technologyNumber));
+        }
+        return map;
+    }
+
+    public Map<String, Object> getProcessCardDetailSv(String processId, Integer technologyNumber) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.getProcessCardDetailmMp(processId,technologyNumber));
+        return map;
+    }
+
+    public Map<String, Object> selectGlassTypeSv() {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.selectGlassTypeMp());
+        return map;
+    }
+
+
+    public Map<String, Object> getProjectIdSv() {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.getProjectIdSv());
+        return map;
+    }
+
+    public String addProjectSv(String optionVal, String projectId, String projectNmae, Map<String, Object> object) {
+        String saveState = "true";
+        //璁剧疆鍥炴粴鐐�
+        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+        try {
+            String userName = "";
+            if (object.get("userName") != null) {
+                userName = object.get("userName").toString();
+            }
+            String projectType = "";
+            if (object.get("projectType") != null) {
+                projectType = object.get("projectType").toString();
+            }
+            if ("null".equals(projectNmae)) {
+                projectNmae = "";
+            }
+            BigDecimal sumArea = new BigDecimal(0);
+            double area = 0;
+            Integer sumQuantity = 0;
+            Integer type = 0;
+            int state1 = 0;
+            int state2 = 0;
+            StringBuilder processId= new StringBuilder();
+            List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("projectdetail")), FlowCard.class);
+            if(projectType.equals("2")){
+                deleteProject(projectId,2);
+            }
+
+            // 鍒涘缓涓�涓槧灏勬潵瀛樺偍 (processId-technologyNumber) 缁勫悎鍒� rack 缂栧彿鐨勬槧灏�
+            Map<String, Integer> rackMap = new HashMap<>();
+            int rackCounter = 1;
+
+            // 濡傛灉涓虹┖娴佺▼鍗★紝鍒欏皢 type 璁剧疆涓� 1
+            if (flowCardList == null || flowCardList.isEmpty()) {
+                type = 1;
+            }
+            for (FlowCard flowCard : flowCardList) {
+                // 涓烘瘡涓敮涓�鐨� processId-technologyNumber 缁勫悎鍒嗛厤 rack 缂栧彿
+                String key = flowCard.getProcessId() + "-" + flowCard.getTechnologyNumber();
+                if (!rackMap.containsKey(key)) {
+                    rackMap.put(key, rackCounter++);
+                }
+                int rackValue = rackMap.get(key);
+
+                if(flowCard.getPatchState().equals(0)){
+                    state1=1;
+                    //缁欐祦绋嬪崱琛ㄦ坊鍔犲搴旂殑宸ョ▼鍙�
+                    Boolean a = glassOptimizeMapper.updateFlowCardProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
+                    // 鏇存柊娴佺▼鍗$殑rack瀛楁
+                    glassOptimizeMapper.updateFlowCardRack(flowCard.getProcessId(), flowCard.getTechnologyNumber(), rackValue);
+                    area = glassOptimizeMapper.getSelectArea(flowCard.getProcessId(),flowCard.getTechnologyNumber()).doubleValue();
+                    sumArea = sumArea.add(BigDecimal.valueOf(area));
+                    sumQuantity +=flowCard.getQuantity();
+                    processId.append(flowCard.getProcessId()).append("-").append(flowCard.getTechnologyNumber()).append(";");
+                }else{
+                    state2=1;
+                    Boolean a=glassOptimizeMapper.updatePatchLogProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
+                    area = glassOptimizeMapper.getSelectAreaPatchLog(flowCard.getProcessId(),flowCard.getTechnologyNumber()).doubleValue();
+                    sumArea = sumArea.add(BigDecimal.valueOf(area));
+                    sumQuantity +=flowCard.getQuantity();
+                    processId.append(flowCard.getProcessId()).append("-").append(flowCard.getTechnologyNumber()).append(";");
+                }
+
+            }
+            if(state1==1&&state2==0){
+                type=1;
+            }else if(state1==1&&state2==1){
+                type=2;
+            }
+
+            int index = optionVal.indexOf("mm");
+            // 鑾峰彇 "mm" 鍓嶉潰鐨勯儴鍒�
+            String glass_thickness = optionVal.substring(0, index);
+            // 鑾峰彇 "mm" 鍚庨潰鐨勯儴鍒�
+            String glass_type = optionVal.substring(index + 2);
+            if(projectType.equals("2")){
+                glassOptimizeMapper.updateProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea.doubleValue(),userName,
+                        flowCardList.size(), String.valueOf(processId),type);
+            }else{
+                if(glassOptimizeMapper.selectProjectCount(projectId)==null){
+                    glassOptimizeMapper.addProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea.doubleValue(),userName,
+                            flowCardList.size(), String.valueOf(processId),type);
+                }else{
+                    TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+                    return "false1";
+                }
+            }
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+            //灏嗗紓甯镐紶鍏ユ暟鎹簱
+            SysError sysError = new SysError();
+            sysError.setError(e+Arrays.toString(e.getStackTrace()));
+            sysError.setFunc("addProjectSv");
+            sysErrorService.insert(sysError);
+            saveState = "false";
+
+        }
+        return saveState;
+
+    }
+
+    public Map<String, Object> getConfiguration(String type,String username) {
+        Map<String, Object> map = new HashMap<>();
+        if(type.equals("閽㈠寲")){
+            map.put("data", glassOptimizeMapper.getTemperedConfiguration(username));
+        }else if(type.equals("纾ㄩ噺")){
+            map.put("data", glassOptimizeMapper.getGrindingTrimming(username));
+        }else if(type.equals("淇竟")){
+            map.put("data", glassOptimizeMapper.getEdgeTrimming(username));
+        }
+
+        return map;
+    }
+
+    public Boolean saveConfiguration(Map<String,Object> object,String type,String username) {
+        String json = "";
+        if (object.get("json") != null) {
+            json = object.get("json").toString();
+        }
+        if(type.equals("閽㈠寲")){
+            String existingConfig = glassOptimizeMapper.selectConfigByUserAndType(username, 1);
+            if (existingConfig == null) {
+                String configName = "閽㈠寲鎺ㄨ崘";
+                glassOptimizeMapper.insertOptimizeConfig(json,1,username,configName);
+            }else {
+                glassOptimizeMapper.updateOptimizeConfig(json,1,username);
+            }
+        } else if (type.equals("淇竟")) {
+            String existingConfig = glassOptimizeMapper.selectConfigByUserAndType(username, 5);
+            if (existingConfig == null) {
+                String configName = "淇竟閰嶇疆";
+                glassOptimizeMapper.insertOptimizeConfig(json,5,username,configName);
+            }else {
+                glassOptimizeMapper.updateOptimizeConfig(json,5,username);
+            }
+        }else if (type.equals("纾ㄩ噺")) {
+            String existingConfig = glassOptimizeMapper.selectConfigByUserAndType(username, 4);
+            if (existingConfig == null) {
+                String configName = "纾ㄩ噺閰嶇疆";
+                glassOptimizeMapper.insertOptimizeConfig(json,4,username,configName);
+            }else{
+                glassOptimizeMapper.updateOptimizeConfig(json,4,username);
+            }
+
+        }
+        return true;
+
+    }
+
+
+
+
+    public String simulatedTypesetting1(Map<String, Object> object) {
+
+        String optionVal = "";
+        int quantity;
+        Double area;
+        if (object.get("optionVal") != null) {
+            optionVal = object.get("optionVal").toString();
+        }
+        if (object.get("quantity") != null) {
+            quantity = Integer.valueOf(object.get("quantity").toString());
+        } else {
+            quantity = 0;
+        }
+        if (object.get("area") != null) {
+            area = Double.valueOf(object.get("area").toString());
+        } else {
+            area = 0.0;
+        }
+
+        JSONArray materialStore = JSONArray.parseArray(JSONObject.toJSONString(object.get("materialStore")));
+
+
+        List<Map<String, Object>> flowCardListNormal = glassOptimizeMapper.getFlowCardListSimulated(optionVal);
+
+
+        Queue<Map<String, Object>> queue = flowCardListNormal.stream()
+                .filter(item -> {
+                    if ((quantity>0 ? (Integer.valueOf(item.get("quantity").toString()) > quantity):false) || (area>0 ? (Double.valueOf(item.get("area").toString()) > area):false)) {
+                        return false;
+                    }
+                    return true;
+                })
+                .collect(Collectors.toCollection(LinkedList::new));
+
+        List<Map<String, Object>> result = new ArrayList<>();
+
+        while (!queue.isEmpty()) {
+            List<Map<String, Object>> currentGroup = new ArrayList<>();
+            Map<String, Object> currentGroupMap = new HashMap<>();
+            int currentCount = 0;
+            double currentArea = 0;
+
+            // 澶勭悊褰撳墠杞闃熷垪涓殑鎵�鏈夊厓绱�
+            int queueSize = queue.size();
+            boolean addedAny = false;
+
+            String processId="";
+            for (int i = 0; i < queueSize; i++) {
+                Map<String, Object> item = queue.poll();
+                if ((quantity>0?currentCount + Integer.valueOf(item.get("quantity").toString()) <= quantity:true)
+                && (area>0?currentArea + Double.valueOf(item.get("area").toString()) <= area:true)) {
+                    if(i+1==queueSize){
+                        processId=processId+item.get("process_id").toString()+"/"+item.get("technology_number").toString();
+                    }else{
+                        processId=processId+item.get("process_id").toString()+"/"+item.get("technology_number").toString()+";";
+                    }
+                    currentGroup.add(item);
+                    currentCount += Integer.valueOf(item.get("quantity").toString());
+                    currentArea += Double.valueOf(item.get("area").toString());
+                    addedAny = true;
+                } else {
+                    queue.offer(item); // 鏀惧洖闃熷垪绛夊緟涓嬫澶勭悊
+                }
+            }
+
+            if (currentGroup.isEmpty()) {
+                throw new RuntimeException("鏃犳硶缁х画鍒嗙粍锛屽墿浣欐暟鎹棤娉曟斁鍏ヤ换浣曞垎缁�");
+            }
+            currentGroupMap.put("processId",processId);
+            currentGroupMap.put("count",currentCount);
+            currentGroupMap.put("area",Math.round(currentArea * 100) / 100.0);
+            result.add(currentGroupMap);
+            //System.out.println("娴佺▼鍗�:"+processId+"鏁伴噺:"+currentCount+"闈㈢Н:"+Math.round(currentArea * 100) / 100.0);
+        }
+
+        for (Map<String, Object> objectMap:result){
+            Map<String,Object> map = new HashMap<>();
+            String[] substrings = objectMap.get("processId").toString().split(";");
+            List<Map<String, Object>> flowCardMap = new ArrayList<>();
+            List<String> processIdList=new ArrayList<>();
+            List<Integer> technologyNumberList=new ArrayList<>();
+            for(String substring : substrings) {
+                String processId = substring.substring(0, 14);
+                Integer technologyNumber = Integer.valueOf(substring.substring(15));
+                processIdList.add(processId);
+                technologyNumberList.add(technologyNumber);
+            }
+            map.put("data",glassOptimizeMapper.simulatedTypesettingUsingOpt(processIdList,technologyNumberList));
+            objectMap.put("cuttingRate",90);
+        }
+        System.out.println(result);
+
+        return "";
+
+    }
+
+
+
+
+
+
+
+
+
+
+    //妯℃嫙璁$畻宸ョ▼鍙锋煡璇�
+    public Map<String, Object>selectProjectComputeMpThirdParty(String projectNumber) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.selectProjectComputeMpThirdParty(projectNumber));
+        return map;
+    }
+
+    //妯℃嫙璁$畻娴佺▼鍗¤鎯�
+    public Map<String, Object>selectComputeDetailThirdParty(String processId,Integer technologyNumber) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.selectComputeDetailMpThirdParty(processId,technologyNumber));
+        return map;
+    }
+
+    public Boolean simulationSaveThirdParty(Map<String, Object> object) {
+        try {
+            Map<String, Object> objectMap = (Map<String, Object>) object.get("inputValues");
+            String projectNo = objectMap.get("project_no").toString();
+            Map<String, Object> optimizeProjectMap = glassOptimizeMapper.selectProjectCount(projectNo);
+            glassOptimizeMapper.addSimulation(object);
+            glassOptimizeMapper.addratioResult(object);
+            glassOptimizeMapper.addratioProjectResult(object);
+
+            List<OptimizeHeatDetail> optimizeHeatDetail = glassOptimizeMapper.selectOptimizeHeatDetail(projectNo);
+            for (OptimizeHeatDetail projectdetail:optimizeHeatDetail){
+                OptimizeDetail optimizeDetail=glassOptimizeMapper.selectOptimizeDetailById(projectNo,projectdetail.getProcessId(),
+                        projectdetail.getOrderSort(),projectdetail.getLayer());
+                glassOptimizeMapper.updateOptimizeDetail(optimizeDetail.getId(),projectdetail.getLayoutId(),projectdetail.getSort());
+            }
+
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    //鍒犻櫎宸ョ▼
+    public boolean deleteProjectThirdParty(String projectNumber) {
+        Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNumber);
+        if(stringObjectMap.get("state").equals(2)){
+            glassOptimizeMapper.deleteOptimizeDetailThirdParty(projectNumber);
+            glassOptimizeMapper.deleteOptimizeDetail(projectNumber);
+        }else if(stringObjectMap.get("state").equals(10)){
+            glassOptimizeMapper.deleteOptimizeDetailThirdParty(projectNumber);
+            glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
+            glassOptimizeMapper.deleteOptimizeHeatLayout(projectNumber);
+        }
+        glassOptimizeMapper.deleteProjectMp(projectNumber);
+
+        return true;
+    }
+
+    //宸ョ▼淇℃伅
+    public Map<String, Object> projectInfoThirdParty(String projectNo) {
+        Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNo);
+        Map<String, Object> map = new HashMap<>();
+        if(stringObjectMap.get("state").equals(2)){
+            map.put("data", glassOptimizeMapper.firstOptimizationThirdParty(projectNo));
+            map.put("grindingTrimming", null);
+        }else{
+            map.put("data", glassOptimizeMapper.firstOptimizationThirdParty(projectNo));
+            map.put("grindingTrimming", null);
+        }
+        return map;
+    }
+
+    //搴撳瓨淇℃伅
+    public Map<String, Object> materialStoreSvThirdParty(String projectNumber) {
+        Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNumber);
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.materialStoreOptimizeUse(projectNumber));
+        map.put("edgeTrimming", null);
+        map.put("state", Integer.parseInt(stringObjectMap.get("state").toString()));
+        return map;
+    }
+
+    //宸ョ▼淇℃伅娴佺▼鍗�
+    public Map<String, Object> getProcessCardMpThirdParty(String projectNo) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.getProcessCardMpThirdParty(projectNo));
+        return map;
+    }
+
+
+    public Map<String, Object> getProjectByProjectNoSv(String projectNo) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.getProjectByProjectNoSv(projectNo));
+        return map;
+    }
+
+
+    public Boolean issuingProjects(String projectNo) throws JsonProcessingException {
+        boolean  saveState=false;
+        try {
+            System.out.println(mesIp);
+            // 1. 鍒涘缓URL瀵硅薄
+            URL url = new URL("http://" + mesIp + ":88/api/loadGlass/engineering/importEngineer");
+
+            // 2. 鎵撳紑杩炴帴
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("POST");
+            conn.setRequestProperty("Content-Type", "application/json");
+            conn.setRequestProperty("Accept", "application/json");
+            conn.setDoOutput(true);
+
+            // 3. 鍑嗗璇锋眰浣�
+            Map<String, Object> optimizeProject=glassOptimizeMapper.selectOptimizeProject(projectNo);
+            optimizeProject.put("engineeringRawQueueList", glassOptimizeMapper.selectOptimizeLayout(projectNo));
+            optimizeProject.put("glassInfolList", glassOptimizeMapper.selectOptimizeDetail(projectNo));
+            optimizeProject.put("flowCardInfoList", glassOptimizeMapper.selectFlowCardInfoList(projectNo));
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.registerModule(new JavaTimeModule());
+            String jsonInputString = mapper.writeValueAsString(optimizeProject);
+
+            //鍙戦�佽姹�
+            try(OutputStream os = conn.getOutputStream()) {
+                byte[] input = jsonInputString.getBytes(StandardCharsets.UTF_8);
+                os.write(input, 0, input.length);
+            }
+
+            // 鑾峰彇鍝嶅簲
+            try(BufferedReader br = new BufferedReader(
+                    new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+                StringBuilder response = new StringBuilder();
+                String responseLine;
+                while ((responseLine = br.readLine()) != null) {
+                    response.append(responseLine.trim());
+                }
+                System.out.println("Response: " + response.toString());
+                JSONObject obj = JSONObject.parseObject(response.toString());
+                if(obj.get("code").equals(200)&&obj.get("data").equals(true)){
+                    saveState=true;
+                }
+
+            }
+
+            //鍏抽棴杩炴帴
+            conn.disconnect();
+        } catch (Exception e) {
+            e.printStackTrace();
+            saveState= false;
+        }
+        return saveState;
+    }
+
+
+    public Map<String, Object> getReportDataSv(String processId) {
+        Map<String, Object> perimap = new HashMap<>();
+        perimap.put("peridata", glassOptimizeMapper.getPeriMeterDataSv(processId));
+
+        Map<String, Object> map = new HashMap<>();
+        Object layoutSetObj = glassOptimizeMapper.getReportDataProcessIdSv(processId);
+        map.put("reportData", layoutSetObj);
+        List<Map<String, Object>> peridata = (List<Map<String, Object>>) perimap.get("peridata");
+        double totalPerimeter = 0.0;
+        if (peridata != null && !peridata.isEmpty()) {
+            for (Map<String, Object> perimeterData : peridata) {
+                if (perimeterData.containsKey("perimeter") && perimeterData.get("perimeter") != null) {
+                    try {
+                        Object perimeterObj = perimeterData.get("perimeter");
+                        if (perimeterObj instanceof Number) {
+                            totalPerimeter += ((Number) perimeterObj).doubleValue();
+                        } else {
+                            totalPerimeter += Double.parseDouble(perimeterObj.toString());
+                        }
+                    } catch (NumberFormatException e) {
+                        System.err.println("鏃犳硶瑙f瀽鍛ㄩ暱鏁版嵁: " + perimeterData.get("perimeter"));
+                    }
+                }
+            }
+        }
+
+        if (layoutSetObj instanceof List) {
+            List<Map<String, Object>> layoutSet = (List<Map<String, Object>>) layoutSetObj;
+            if (!layoutSet.isEmpty()) {
+                layoutSet.get(0).put("rectanglePerimeter", totalPerimeter);
+            }
+        }
+        return map;
+    }
+
+    public Map<String, Object> getMaterialInfoSv(String processId) {
+        Map<String, Object> map = new HashMap<>();
+//        List<Map<String, Object>> materialList = glassOptimizeMapper.getMaterialInfoSv(processId);
+        List<Map<String, Object>> layoutSet = glassOptimizeMapper.getLayoutSetSv(processId);
+
+//        // 鍒涘缓涓�涓狹ap鏉ュ瓨鍌ㄦ瘡涓猻tock_code鐨勬�婚潰绉�
+//        Map<String, Double> stockCodeAreaMap = new HashMap<>();
+//
+//        // 閬嶅巻layoutSet璁$畻姣忎釜stock_code鐨勬�婚潰绉�(闈㈢Н*浣跨敤鐜�)
+//        for (Map<String, Object> layout : layoutSet) {
+//            Object stockCodeObj = layout.get("stock_code");
+//            Object widthObj = layout.get("width");
+//            Object heightObj = layout.get("height");
+//            Object usageRateObj = layout.get("usage_rate");
+//
+//            if (stockCodeObj != null && widthObj != null && heightObj != null && usageRateObj != null) {
+//                try {
+//                    String stockCode = stockCodeObj.toString();
+//                    double width = Double.parseDouble(widthObj.toString());
+//                    double height = Double.parseDouble(heightObj.toString());
+//                    double usageRate = Double.parseDouble(usageRateObj.toString());
+//
+//                    // 璁$畻鍗曟潯鏁版嵁鐨勯潰绉�(骞虫柟绫�)
+//                    double area = (width * height * usageRate) / 1000000.0;
+//
+//                    // 绱姞鍒板搴攕tock_code鐨勬�婚潰绉�
+//                    stockCodeAreaMap.put(stockCode, stockCodeAreaMap.getOrDefault(stockCode, 0.0) + area);
+//                } catch (NumberFormatException e) {
+//                    System.err.println("鏁版嵁杞崲閿欒: " + e.getMessage());
+//                }
+//            }
+//        }
+//
+//        // 灏嗚绠楀嚭鐨勬�婚潰绉坊鍔犲埌materialList涓搴旂殑鐗╂枡鏁版嵁
+//        for (Map<String, Object> material : materialList) {
+//            Object stockCodeObj = material.get("code");
+//            if (stockCodeObj != null) {
+//                String stockCode = stockCodeObj.toString();
+//                if (stockCodeAreaMap.containsKey(stockCode)) {
+//                    material.put("totalArea", stockCodeAreaMap.get(stockCode));
+//                }
+//            }
+//        }
+
+        map.put("materialList", layoutSet);
+        return map;
+    }
+
+
+    public Map<String, Object> getProductListSv(String processId) {
+        Map<String, Object> productMap = new HashMap<>();
+        List<Map<String, Object>> productInfo = glassOptimizeMapper.selectProjectList(processId);
+        List<Map<String, Object>> tempProductInfo = glassOptimizeMapper.selectTempProject(processId);
+        productInfo.addAll(tempProductInfo);
+        productMap.put("productInfo", productInfo);
+        Map<String, Object> map = new HashMap<>();
+
+        if (productInfo != null && !productInfo.isEmpty()) {
+            // 鎸夌収 processCard 鍒嗙粍
+            Map<String, List<Map<String, Object>>> groupedByProcessCard = new HashMap<>();
+            for (Map<String, Object> item : productInfo) {
+                String processCard = String.valueOf(item.get("processCard"));
+                if (processCard != null) {
+                    groupedByProcessCard.computeIfAbsent(processCard, k -> new ArrayList<>()).add(item);
+                }
+            }
+
+            // 涓烘瘡涓� processCard 璁$畻缁熻淇℃伅
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (Map.Entry<String, List<Map<String, Object>>> entry : groupedByProcessCard.entrySet()) {
+                String processCard = entry.getKey();
+                List<Map<String, Object>> items = entry.getValue();
+
+                // 璁$畻缁熻淇℃伅
+                double longestSide = 0;
+                double shortestSide = Double.MAX_VALUE;
+                int specQuantity = items.size();
+                int totalQuantity = 0;
+
+                // 浣跨敤 BigDecimal 绮剧‘璁$畻闈㈢Н
+                BigDecimal totalArea = BigDecimal.ZERO;
+
+                for (Map<String, Object> item : items) {
+                    // 瀹夊叏鑾峰彇闀垮拰瀹�
+                    Number widthObj = (Number) item.get("width");
+                    Number heightObj = (Number) item.get("height");
+
+                    if (widthObj == null || heightObj == null) {
+                        continue;
+                    }
+
+                    double width = widthObj.doubleValue();
+                    double height = heightObj.doubleValue();
+
+                    // 鏇存柊鏈�闀胯竟鍜屾渶鐭竟
+                    double maxSide = Math.max(width, height);
+                    double minSide = Math.min(width, height);
+
+                    if (maxSide > longestSide) {
+                        longestSide = maxSide;
+                    }
+                    if (minSide < shortestSide) {
+                        shortestSide = minSide;
+                    }
+
+                    // 瀹夊叏鑾峰彇鏁伴噺
+                    Number quantityObj = (Number) item.get("quantity");
+                    if (quantityObj != null) {
+                        totalQuantity += quantityObj.intValue();
+                    }
+
+                    // 瀹夊叏鑾峰彇闈㈢Н 鈥斺�� 浣跨敤 BigDecimal 绮剧‘绱姞
+                    Object areaObj = item.get("Area");
+                    if (areaObj != null) {
+                        // 鍏抽敭锛氶�氳繃 toString() 杞负瀛楃涓插啀鏋勯�� BigDecimal锛岄伩鍏� double 绮惧害鎹熷け
+                        BigDecimal area = new BigDecimal(areaObj.toString());
+                        totalArea = totalArea.add(area);
+                    }
+                }
+
+                // 澶勭悊 shortestSide 鐨勮竟鐣屾儏鍐�
+                if (shortestSide == Double.MAX_VALUE) {
+                    shortestSide = 0;
+                }
+
+                // 鏋勯�犺繑鍥炴暟鎹�
+                Map<String, Object> resultMap = new HashMap<>();
+                resultMap.put("processCard", processCard);
+                resultMap.put("longestSide", longestSide);
+                resultMap.put("shortestSide", shortestSide);
+                resultMap.put("specQuantity", specQuantity);
+                resultMap.put("totalQuantity", totalQuantity);
+                resultMap.put("totalArea", totalArea);
+
+                result.add(resultMap);
+            }
+
+            map.put("productList", result);
+        }
+        return map;
+    }
+
+
+    public Map<String, Object>  getProjectState(String projectNo) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.getProjectState(projectNo));
+        return map;
+    }
+
+    public Map<String, Object> issuingCancelProject(String projectNo){
+        Map<String, Object> result = new HashMap<>();
+        Map<String, Object> responseData = new HashMap<>();
+
+        try {
+            // 1. 鍒涘缓URL瀵硅薄
+            URL url = new URL("http://" + mesIp + ":88/api/loadGlass/engineering/optimizeCancelTask");
+//            URL url = new URL("http://localhost:88/api/loadGlass/engineering/optimizeCancelTask");
+
+
+            // 2. 鎵撳紑杩炴帴
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("POST");
+            conn.setRequestProperty("Content-Type", "application/json");
+            conn.setRequestProperty("Accept", "application/json");
+            conn.setDoOutput(true);
+
+            // 3. 鍑嗗璇锋眰浣� - 灏唒rojectNo杞崲涓篹ngineerId鏍煎紡
+            String engineerId = projectNo;
+            // 濡傛灉浼犲叆鐨勬槸JSON瀛楃涓诧紝闇�瑕佹彁鍙栫湡姝g殑projectNo鍊�
+            if (projectNo.startsWith("{") && projectNo.contains("\"projectNo\"")) {
+                try {
+                    JSONObject jsonObject = JSONObject.parseObject(projectNo);
+                    engineerId = jsonObject.getString("projectNo");
+                } catch (Exception e) {
+                    // 瑙f瀽澶辫触鏃朵娇鐢ㄥ師濮嬪��
+                    System.err.println("瑙f瀽projectNo JSON澶辫触: " + e.getMessage());
+                }
+            }
+
+            // 鏋勫缓鏂扮殑JSON璇锋眰浣擄紝浣跨敤engineerId瀛楁
+            String jsonInputString = "{\"engineerId\":\"" + engineerId + "\"}";
+            System.out.println("engineerId: " + engineerId);
+            System.out.println("Request: " + jsonInputString);
+
+            //鍙戦�佽姹�
+            try(OutputStream os = conn.getOutputStream()) {
+                byte[] input = jsonInputString.getBytes(StandardCharsets.UTF_8);
+                os.write(input, 0, input.length);
+            }
+
+            // 鑾峰彇鍝嶅簲
+            try(BufferedReader br = new BufferedReader(
+                    new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+                StringBuilder response = new StringBuilder();
+                String responseLine;
+                while ((responseLine = br.readLine()) != null) {
+                    response.append(responseLine.trim());
+                }
+                String fullResponse = response.toString();
+                System.out.println("Response: " + fullResponse);
+
+                // 鐩存帴灏嗗搷搴斿唴瀹硅В鏋愪负Map
+                responseData = JSONObject.parseObject(fullResponse, Map.class);
+            }
+
+            //鍏抽棴杩炴帴
+            conn.disconnect();
+        } catch (Exception e) {
+            e.printStackTrace();
+            // 寮傚父鎯呭喌涓嬪皢寮傚父淇℃伅鏀惧叆data
+            responseData.put("error", e.getMessage());
+        }
+
+        // 鏋勯�犳渶缁堣繑鍥炵粨鏋�
+        result.put("data", responseData);
+
+        return result;
+    }
+
+
+
 }

--
Gitblit v1.8.0