From a1c465b8f401fb027eda2827de349f589634ba6d Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 18 四月 2024 08:11:09 +0800
Subject: [PATCH] 增加保存工程信息查询
---
UI-Project/config.js | 1
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java | 10 +++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java | 4 +-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java | 15 ++++---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/InitUtil.java | 8 ++--
hangzhoumesParent/common/servicebase/pom.xml | 7 +++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java | 5 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 19 +++++++++
8 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index dc510d3..9f16d6e 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,5 +1,6 @@
export default {
serverUrl: "localhost:8085",
+ //serverUrl: "localhost:88/api/",
serverUrl2: "localhost:8085"
//serverUrl:"res.abeim.cn"
}
\ No newline at end of file
diff --git a/hangzhoumesParent/common/servicebase/pom.xml b/hangzhoumesParent/common/servicebase/pom.xml
index 46c17d9..af93dc5 100644
--- a/hangzhoumesParent/common/servicebase/pom.xml
+++ b/hangzhoumesParent/common/servicebase/pom.xml
@@ -11,6 +11,13 @@
<artifactId>servicebase</artifactId>
+<!-- <dependencies>-->
+<!-- <dependency>-->
+<!-- <groupId>com.github.yulichang</groupId>-->
+<!-- <artifactId>mybatis-plus-join</artifactId>-->
+<!-- <version>1.1.6</version>-->
+<!-- </dependency>-->
+<!-- </dependencies>-->
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
index 448a4d5..4309548 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
@@ -37,12 +37,15 @@
return Result.build(200, "", glass);
}
-// public Result<List<OptimizeProject>> saveProject(@RequestBody OptimizeRequest optimizeRequest) {
-// log.info("灏嗚姹傚弬鏁板皝瑁呭湪璇锋眰绫婚噷闈�");
-// List<OptimizeProject> glass = optimizeProjectService.saveProject(optimizeRequest);
-// log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅:{}", glass);
-// return Result.build(200, "", glass);
-// }
+ @ApiOperation("淇濆瓨宸ョ▼淇℃伅")
+ @PostMapping("/saveProject") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
+ public Result<List<OptimizeProject>> saveProject(@RequestBody OptimizeRequest optimizeRequest) {
+ log.info("鑾峰彇閫夋嫨濂界殑宸ョ▼id杩涜鏌ヨ鏁版嵁鍚庝繚瀛�");
+ List<OptimizeProject> glass = optimizeProjectService.saveProject(optimizeRequest);
+ log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅鍚庤繘琛屼繚瀛�:{}", glass);
+ //void insetProject(glass);
+ return Result.build(200, "", glass);
+ }
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
index 43a8c82..7a2c882 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
@@ -1,7 +1,9 @@
package com.mes.pp.mapper;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.entity.request.OptimizeRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -15,6 +17,7 @@
* @since 2024-04-16
*/
@Mapper
+@DS("pp")
public interface OptimizeProjectMapper extends BaseMapper<OptimizeProject> {
-
+ List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
index c3631d6..93cd685 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
@@ -21,4 +21,14 @@
* @return
*/
List<OptimizeProject> listByState(OptimizeRequest optimizeRequest);
+ /**
+ * 鏌ヨ淇濆瓨鍒板師鐗囦娇鐢ㄨ鎯呰〃鐨勬暟鎹�
+ * @return
+ */
+ List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest);
+ /**
+ * 灏嗗伐绋嬩俊鎭繚瀛樺埌鍘熺墖浣跨敤璇︽儏琛�
+ * @return
+ */
+ void insetProject(OptimizeProject glass);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
index 1e13fdd..e01fd73 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
@@ -11,6 +11,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
/**
@@ -33,8 +34,24 @@
LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OptimizeProject::getState,optimizeRequest.getState())
.like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo())
- .groupBy(OptimizeProject::getProjectNo);
+ //.groupBy(OptimizeProject::getProjectNo)
+ ;
log.info("杩斿洖宸ョ▼淇℃伅");
return this.list(wrapper);
}
+
+
+ @Override
+ public void insetProject(OptimizeProject glass) {
+
+ }
+
+ @Override
+ public List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest) {
+ log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯＄硦鏌ヨ");
+
+ log.info("杩斿洖宸ョ▼淇℃伅");
+ return this.baseMapper.saveProject(optimizeRequest);
+ }
+
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/InitUtil.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/InitUtil.java
index 96b7996..5d4e79e 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/InitUtil.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/InitUtil.java
@@ -105,16 +105,16 @@
// Boolean[] values1 = { false, true, true, true, false, false, true, false,
// false, true ,true };
// List<Boolean> getplcvlues = new ArrayList<>(Arrays.asList(values1));
- List<Boolean> getplcvlues = S7object.getinstance().plccontrol.ReadBits(plcBitObject.getPlcAddressBegin(), plcBitObject.getPlcAddressLength());
- plcBitObject.setPlcBitList(getplcvlues);
+// List<Boolean> getplcvlues = S7object.getinstance().plccontrol.ReadBits(plcBitObject.getPlcAddressBegin(), plcBitObject.getPlcAddressLength());
+// plcBitObject.setPlcBitList(getplcvlues);
}
public static void readAndUpdateWordValues(PlcParameterObject plcParameterObject) {
// byte[] getplcvlues = {0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02};
- byte[] getplcvlues = S7object.getinstance().plccontrol.ReadByte(plcParameterObject.getPlcAddressBegin(), plcParameterObject.getPlcAddressLength());
- plcParameterObject.setPlcParameterList(getplcvlues);
+// byte[] getplcvlues = S7object.getinstance().plccontrol.ReadByte(plcParameterObject.getPlcAddressBegin(), plcParameterObject.getPlcAddressLength());
+// plcParameterObject.setPlcParameterList(getplcvlues);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java
index c4334cb..393d153 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java
@@ -4,7 +4,7 @@
import com.mes.common.PLCAutoMes;
import com.mes.common.PlcParameterObject;
-import com.mes.common.S7object;
+//import com.mes.common.S7object;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.taskcache.mapper.HangzhouMesMapper;
@@ -55,7 +55,7 @@
//2.鍥炲 1杩涚墖
EdgStorageCageDetails item=list.get(0);
hangzhouMesMapper.insertCacheTask(GlassInfo.getId()+"","0",item.getSlot()+"","1");
- S7object.getinstance().plccontrol.WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
+// S7object.getinstance().plccontrol.WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
return true;
}
--
Gitblit v1.8.0