From 44504bd041f8dc3c97d1a9079c773a2f88b3d977 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 08 二月 2025 09:39:33 +0800
Subject: [PATCH] fix(datasource): 修改默认数据源名称和数据库名称
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 100 +++++++++-----------------------------------------
1 files changed, 18 insertions(+), 82 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index a4bc42f..61f6836 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -19,9 +19,9 @@
import com.mes.work_assignment.entity.WorkAssignment;
import com.mes.work_assignment.mapper.WorkAssignmentMapper;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import java.io.BufferedReader;
@@ -54,8 +54,8 @@
@Resource
WorkAssignmentMapper workAssignmentMapper;
- @Resource
- RestTemplate restTemplate;
+
+ private final static String ERP_URL = "http://192.168.2.100:8086";
/**
@@ -97,7 +97,12 @@
reportingWork.setOrderId(damages.get(0).getProcessId().substring(0, 10));
reportingWork.setProductionId(damages.get(0).getProcessId().substring(0, 11));
reportingWork.setProcessId(damages.get(0).getProcessId() + "/" + damages.get(0).getTechnologyNumber());
- reportingWork.setDeviceName(damages.get(0).getDeviceName());
+// reportingWork.setDeviceName(damages.get(0).getDeviceName());
+ if (StringUtils.isBlank(damages.get(0).getDeviceName())){
+ reportingWork.setDeviceName("auto");
+ }else{
+ reportingWork.setDeviceName(damages.get(0).getDeviceName());
+ }
reportingWork.setThisProcess(damages.get(0).getWorkingProcedure());
reportingWork.setThisCompletedQuantity(0);
reportingWork.setThisWornQuantity(0);
@@ -149,9 +154,12 @@
reportingWork.setOrderId(damage.getProcessId().substring(0, 10));
reportingWork.setProductionId(damage.getProcessId().substring(0, 11));
reportingWork.setProcessId(damage.getProcessId() + "/" + damage.getTechnologyNumber());
- reportingWork.setDeviceName(damage.getDeviceName());
+ if (StringUtils.isBlank(damage.getDeviceName())){
+ reportingWork.setDeviceName("auto");
+ }else{
+ reportingWork.setDeviceName(damage.getDeviceName());
+ }
reportingWork.setThisProcess(damage.getWorkingProcedure());
-// reportingWork.setNextProcess("纾ㄨ竟");
reportingWork.setThisCompletedQuantity(1);
reportingWork.setThisWornQuantity(0);
reportingWork.setClasses("鏃╃彮");
@@ -170,7 +178,7 @@
}
@Override
- public void autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark,int type) {
+ public void autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type) {
Damage damage = new Damage();
damage.setGlassId(glassId);
damage.setWorkingProcedure(workingProcedure);
@@ -180,6 +188,7 @@
damage.setStatus(0);
this.insertDamage(damage);
}
+
/**
* 娣诲姞鎶ュ伐淇℃伅
*/
@@ -307,7 +316,8 @@
log.info("鎶ュ伐鏁版嵁reportingWork锛歿}锛宺eportingWorkDetails锛歿}", reportingWork, reportingWorkDetails);
try {
// 鐩爣绯荤粺鐨凙PI URL
- String url = "http://192.168.2.100:8086/reportingWork/mesSaveReportingWorkWorn";
+// String url = ERP_URL + "/reportingWork/mesReportingWork";
+ String url = ERP_URL + "/reportingWork/mesSaveReportingWorkWorn";
URL obj = new URL(url);
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
@@ -369,80 +379,6 @@
return false;
}
}
-
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
- }
-
- public Boolean sendToERPRest(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails) {
- log.info("鎶ュ伐鏁版嵁reportingWork锛歿}锛宺eportingWorkDetails锛歿}", reportingWork, reportingWorkDetails);
- try {
- // 鐩爣绯荤粺鐨凙PI URL
- String url = "http://192.168.2.100:8086/reportingWork/mesSaveReportingWorkWorn";
- URL obj = new URL(url);
- HttpURLConnection con = (HttpURLConnection) obj.openConnection();
-
- // 璁剧疆璇锋眰鏂规硶鍜岃姹傚ご
- con.setRequestMethod("POST");
- con.setRequestProperty("Content-Type", "application/json; utf-8");
- con.setRequestProperty("Accept", "application/json");
- con.setDoOutput(true);
-
- // 鍒涘缓 JSON 瀵硅薄
- JSONObject result = new JSONObject();
-
- ObjectMapper objectMapper = new ObjectMapper();
-
- // 灏� ReportingWork 杞崲涓� JSONObject
- JSONObject reportingWorkJson = new JSONObject(objectMapper.writeValueAsString(reportingWork));
- reportingWorkJson.put("reportingWorkTime", reportingWork.getReportingWorkTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
- // 灏� ReportingWorkDetail 鍒楄〃杞崲涓� JSONArray
- JSONArray detailsJsonArray = new JSONArray(objectMapper.writeValueAsString(reportingWorkDetails));
-
- // 灏� JSON 瀵硅薄鍜屾暟缁勬坊鍔犲埌缁撴灉瀵硅薄涓�
- result.put("title", reportingWorkJson);
- result.put("detail", detailsJsonArray);
- result.put("type", 0);
- result.put("userId", "admin");
- result.put("userName", "admin");
- result.put("qualityInsStatus", 0);
-
- // 灏� result 瀵硅薄杞崲涓哄瓧绗︿覆
- String jsonInputString = result.toString();
- System.out.println("jsonInputString : " + result);
- // 鍙戦�佽姹�
- try (OutputStream os = con.getOutputStream()) {
- byte[] input = jsonInputString.getBytes("utf-8");
- os.write(input, 0, input.length);
- }
-
- // 鑾峰彇鍝嶅簲鐮�
- int responseCode = con.getResponseCode();
- System.out.println("Response Code : " + responseCode);
-
- // 鑾峰彇鍝嶅簲鍐呭
- try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), "utf-8"))) {
- StringBuilder response = new StringBuilder();
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- response.append(inputLine);
- }
- // 瑙ｆ瀽鍝嶅簲鍐呭
- JSONObject jsonResponse = new JSONObject(response.toString());
-
- // 鎻愬彇 code 鍜� message
- int code = jsonResponse.getInt("code");
- String message = jsonResponse.getStr("data");
- log.info("鎶ュ伐澶辫触锛歿},{}", code, message);
- if (code == 200 && message.equals("true")) {
- return true;
- } else {
- return false;
- }
- }
-
} catch (Exception e) {
e.printStackTrace();
return false;
--
Gitblit v1.8.0