From 5b9bb0019df41866593c0cc18f45369fa8af6ec8 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 18 十一月 2024 16:19:15 +0800
Subject: [PATCH] 新增查询接口，前端、后端入参格式更改
---
UI-Project/config.js | 8 ++++----
UI-Project/src/views/Returns/upreturns.vue | 5 +++--
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml | 4 +++-
UI-Project/src/views/Returns/upreturns2.vue | 12 +++++++-----
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 7 ++++---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 2 +-
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml | 4 ++--
UI-Project/src/utils/constants.js | 4 ++--
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml | 2 +-
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 3 ++-
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml | 4 ++--
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 2 +-
12 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index 3f97658..e752fc6 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,10 +1,10 @@
export default {
- serverUrl: "10.153.19.150:88/api",
+ // serverUrl: "10.153.19.150:88/api",
// serverUrl: "192.168.1.199:88/api",
- // serverUrl: "127.0.0.1:88/api",
- serverUrl2: "10.153.19.150:88"
+ serverUrl: "127.0.0.1:88/api",
+ // serverUrl2: "10.153.19.150:88"
// serverUrl2: "192.168.1.199:88"
- // serverUrl2: "127.0.0.1:88"
+ serverUrl2: "127.0.0.1:88"
//serverUrl:"res.abeim.cn"
}
\ No newline at end of file
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index b551cfb..69000bc 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,4 +1,4 @@
// export const WebSocketHost = "192.168.1.199";
-export const WebSocketHost = "10.153.19.150";
-// export const WebSocketHost = "127.0.0.1";
+// export const WebSocketHost = "10.153.19.150";
+export const WebSocketHost = "127.0.0.1";
export const host = "88";
\ No newline at end of file
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 1236871..5f4091a 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -179,8 +179,9 @@
}
}
const response = await request.post("/loadGlass/up-patten-usage/setUpPattenRequest", {
- taskState: stateList,
- taskType: 5
+ state: selectValuesa[0],
+ // state: stateList,
+ stationCell: 5
})
if (response.code === 200) {
tableData.value = response.data;
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index 8c4d9c2..bc4cdb7 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -121,7 +121,8 @@
let engineeringId = window.localStorage.getItem('engineeringId')
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
- const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
+ const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
+ // const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
stationCell: 6,
filmRemove: filmRemove,
engineerId: engineeringId,
@@ -149,7 +150,7 @@
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
stationCell: 6,
- engineeringId: engineeringId,
+ engineerId: engineeringId,
state: 0,
})
if (response.code == 200) {
@@ -178,8 +179,9 @@
}
}
const response = await request.post("/loadGlass/up-patten-usage/setUpPattenRequest", {
- taskState: stateList,
- taskType: 6
+ state: selectValuesa[0],
+ // state: stateList,
+ stationCell: 6
})
if (response.code === 200) {
tableData.value = response.data;
@@ -396,7 +398,7 @@
</div>
</template>
</el-dialog>
- </div>
+ </div>
<el-dialog v-model="dialogFormVisible" top="24vh" width="70%">
<div class="flex-container" style="margin-left: 50px;margin-bottom: 10px;">
<el-form-item :label="$t('Mounting.loadingline')" :required="true">
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index b80f6d4..72b79af 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -22,7 +22,6 @@
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
import com.mes.common.S7object;
import com.mes.common.config.Const;
-import com.mes.common.utils.RedisUtil;
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
import com.mes.device.PlcParameterObject;
@@ -33,6 +32,7 @@
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.tools.S7control;
+import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
index 974323a..3097382 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
@@ -17,7 +17,7 @@
cloud:
nacos:
discovery:
- server-addr: 10.153.19.150:8848
+ server-addr: 127.0.0.1:8848
redis:
database: 0
host: 127.0.0.1
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index fe297fd..434a8c5 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -82,7 +82,8 @@
@ApiOperation("璁剧疆涓婄墖鏌ヨ鏉′欢")
@PostMapping("/setUpPattenRequest")
public Result setRawGlassTaskRequest(@RequestBody Engineering request) {
- return Result.build(200, "鏌ヨ鎴愬姛", upPattenUsageService.Engineering(request));
+ log.info("鏌ヨ涓婄墖淇℃伅:{}", request);
+ return Result.build(200, "鏌ヨ鎴愬姛", upPattenUsageService.setRawGlassTaskRequest(request));
}
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
index cc5cd24..377b77e 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -60,6 +60,6 @@
*/
Boolean updateGlassState(UpPattenUsage upPattenUsage);
- Object Engineering(Engineering request);
+ List<Engineering> setRawGlassTaskRequest(Engineering request);
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index 409cfb2..59e226d 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -7,6 +7,7 @@
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.engineering.service.EngineeringService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
@@ -44,10 +45,10 @@
//log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering);
if(engineering!=null){
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(UpPattenUsage::getEngineeringId,engineering.getEngineerId());
+ wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
return this.list(wrapper);
- }else {
- return null;
+ } else {
+ return null;
}
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
index 1e1ef3b..214b3b3 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
@@ -10,12 +10,12 @@
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
pp:
- url: jdbc:mysql://127.0.0.1:3306/pp?serverTimezone=GMT%2b8
+ url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
sd:
- url: jdbc:mysql://127.0.0.1:3306/sd?serverTimezone=GMT%2b8
+ url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
index 71101bf..d8eabe0 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
@@ -34,4 +34,6 @@
database: 0
host: 10.153.19.150
port: 6379
- password: 123456
\ No newline at end of file
+ password: 123456
+ liquibase:
+ change-log: classpath:changelog/changelogBase.xml
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
index 9bf821e..5e4b546 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -2,11 +2,11 @@
port: 8084
spring:
profiles:
- active: cz
+ active: prod
application:
name: temperingGlass
liquibase:
- enabled: false
+ enabled: true
mybatis-plus:
mapper-locations: classpath*:mapper/*.xml
configuration:
--
Gitblit v1.8.0