From 60bf0cffa746f986d3669b6ec3da9db3d84e8817 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 11 四月 2024 13:27:29 +0800
Subject: [PATCH] 添加通讯配置
---
/dev/null | 20 ------
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java | 18 ++----
hangzhoumesParent/moduleService/TemperingGlassModule/pom.xml | 17 +++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/mapper/LoadGlassMapper.java | 4
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java | 14 ++--
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java | 22 +++----
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java | 22 +++----
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java | 22 +++---
hangzhoumesParent/moduleService/LoadGlassModule/pom.xml | 17 +++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/controller/LoadGlassController.java | 11 +--
10 files changed, 81 insertions(+), 86 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/pom.xml b/hangzhoumesParent/moduleService/LoadGlassModule/pom.xml
index 6f6eee9..e1ec70c 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/pom.xml
@@ -2,14 +2,27 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
+<parent>
<artifactId>moduleService</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>loadGlass</artifactId>
+ <artifactId>cacheGlass</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.mes</groupId>
+ <artifactId>servicebase</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
<properties>
<maven.compiler.source>8</maven.compiler.source>
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
deleted file mode 100644
index 30648bf..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mes.temperingglass.controller;
-
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-@RestController
-@RequestMapping("/temperingGlassInfo")
-public class TemperingGlassInfoController {
-
- //todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
- @ApiOperation("娴嬭瘯")
- @GetMapping("/index")
- public String index() {
- return "hello world";
- }
-}
-
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
deleted file mode 100644
index 808d6dc..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.mes.temperingglass.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class TemperingGlassInfo implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 閽㈠寲灏忕墖淇℃伅琛╥d
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 娴佺▼鍗�
- */
- private String flowcardId;
-
- /**
- * 娴佺▼鍗＄幓鐠冪被鍨�
- */
- private Integer glassType;
-
- /**
- * 瀹�
- */
- private Double width;
-
- /**
- * 楂�
- */
- private Double height;
-
- /**
- * 鍘氬害
- */
- private Double thickness;
-
- /**
- * 鑶滅郴
- */
- private Integer filmsid;
-
- /**
- * 閽㈠寲鏄惁鎺ュ彈妯斁
- */
- private Integer ishorizontal;
-
- /**
- * 閽㈠寲鐗堝浘id
- */
- private Integer temperingLayoutId;
-
- /**
- * 閽㈠寲鐗堝浘鐗囧簭
- */
- private Integer temperingFeedSequence;
-
- /**
- * x鍧愭爣
- */
- private Integer xCoordinate;
-
- /**
- * y鍧愭爣
- */
- private Integer yCoordinate;
-
- /**
- * 鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
- */
- private Integer angle;
-
- /**
- * 鐘舵��
- */
- private Integer state;
-
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
deleted file mode 100644
index f8d3860..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.temperingglass.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.temperingglass.entity.TemperingGlassInfo;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-public interface TemperingGlassInfoMapper extends BaseMapper<TemperingGlassInfo> {
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
deleted file mode 100644
index 0ce1942..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.temperingglass.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.temperingglass.entity.TemperingGlassInfo;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-public interface TemperingGlassInfoService extends IService<TemperingGlassInfo> {
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
deleted file mode 100644
index d34064a..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mes.temperingglass.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.temperingglass.entity.TemperingGlassInfo;
-import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
-import com.mes.temperingglass.service.TemperingGlassInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-@Service
-public class TemperingGlassInfoServiceImpl extends ServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/controller/LoadGlassController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/controller/LoadGlassController.java
index 94397d5..3988b80 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/controller/LoadGlassController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/controller/LoadGlassController.java
@@ -1,12 +1,11 @@
-package com.mes.controller;
+package com.mes.upworkstation.controller;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import com.mes.common.Result;
-import com.mes.entity.UpWorkstation;
-import com.mes.service.LoadGlassService;
-
+import com.mes.upworkstation.entity.UpWorkstation;
+import com.mes.upworkstation.service.LoadGlassService;
+import com.mes.utils.Result;
@RestController
@RequestMapping("/LoadGlass")
@@ -22,7 +21,7 @@
public Result SelectGlassInfo() {
List<UpWorkstation> glass = loadGlassService.selectAll();
System.out.println(glass);
- return Result.seccess(glass);
+ return Result.build(200,"", glass);
}
@PostMapping("/insertGlass") //淇敼涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/mapper/LoadGlassMapper.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/mapper/LoadGlassMapper.java
index cfcb251..8a47dfa 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/mapper/LoadGlassMapper.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/mapper/LoadGlassMapper.java
@@ -1,8 +1,8 @@
-package com.mes.mapper;
+package com.mes.upworkstation.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import org.apache.ibatis.annotations.*;
-import com.mes.entity.UpWorkstation;
+import com.mes.upworkstation.entity.UpWorkstation;
@Mapper
public interface LoadGlassMapper extends BaseMapper<UpWorkstation> {
//鏄剧ず鐩墠宸ヤ綅鐜荤拑淇℃伅
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java
index 95514e3..ae34d3d 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java
@@ -1,17 +1,15 @@
-package com.mes.service;
+package com.mes.upworkstation.service;
import java.util.List;
import org.springframework.stereotype.Service;
-import com.mes.entity.device.PLCAutoMes;
-import com.mes.common.PlcTools.S7control;
-import com.mes.entity.device.PlcParameterObject;
-
-import com.mes.entity.UpWorkstation;
-import com.mes.mapper.LoadGlassMapper;
+import com.mes.common.PLCAutoMes;
+import com.mes.common.PlcParameterObject;
+import com.mes.upworkstation.entity.UpWorkstation;
+import com.mes.upworkstation.mapper.LoadGlassMapper;
@Service
public class LoadGlassService {
- private S7control s7control;
+
private LoadGlassMapper LoadGlassMapper;
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
//鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅
@@ -43,18 +41,18 @@
int loadid2=LoadGlassMapper.selectPriority(2);
//鍒ゆ柇涓�浜屽彿宸ヤ綅鍝竟鐨勯『搴忔洿鍏�
if(loadid1>loadid2) {
- s7control.WriteWord("DB100.10", (short)2);
+ //s7control.WriteWord("DB100.10", (short)2);
}else if(loadid1==loadid2){
//褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
int glassnum1=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
int glassnum2=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
if(glassnum1>glassnum2){
- s7control.WriteWord("DB100.10", (short)2);
+ // s7control.WriteWord("DB100.10", (short)2);
}else{
- s7control.WriteWord("DB100.10", (short)1);
+ //s7control.WriteWord("DB100.10", (short)1);
}
}else{
- s7control.WriteWord("DB100.10", (short)1);
+ //s7control.WriteWord("DB100.10", (short)1);
}
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/pom.xml b/hangzhoumesParent/moduleService/TemperingGlassModule/pom.xml
index 5820052..3de91ab 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/pom.xml
@@ -3,13 +3,26 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>moduleService</artifactId>
+ <artifactId>moduleService</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>temperingGlass</artifactId>
+ <artifactId>cacheGlass</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.mes</groupId>
+ <artifactId>servicebase</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
<properties>
<maven.compiler.source>8</maven.compiler.source>
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java
index 8fa7876..a0f9941 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java
@@ -1,12 +1,12 @@
-package com.mes.controller;
+package com.mes.temperingglass.controller;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import com.mes.common.Result;
-import com.mes.entity.Tempering;
-import com.mes.service.TemperingOverService;
-import com.mes.service.TemperingService;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.service.TemperingOverService;
+import com.mes.temperingglass.service.TemperingService;
+import com.mes.utils.Result;
@RestController
@@ -24,25 +24,25 @@
@GetMapping("/SelectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
@ResponseBody
public Result SelectWaitingGlass(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
- List<Tempering> glass = temperingService.SelectWaitingGlass();
+ List<TemperingGlassInfo> glass = temperingService.SelectWaitingGlass();
System.out.println(glass);
- return Result.seccess(glass);
+ return Result.build(200,"", glass);
}
@GetMapping("/SelectIntoGlass") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
@ResponseBody
public Result SelectIntoGlass(String ProcessId) {
- List<Tempering> glass = temperingService.SelectIntoGlass();
+ List<TemperingGlassInfo> glass = temperingService.SelectIntoGlass();
System.out.println(glass);
- return Result.seccess(glass);
+ return Result.build(200,"", glass);
}
@GetMapping("/SelectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
@ResponseBody
public Result SelectOutGlass(String ProcessId) {
- List<Tempering> glass = temperingOverService.SelectOutGlass();
+ List<TemperingGlassInfo> glass = temperingOverService.SelectOutGlass();
System.out.println(glass);
- return Result.seccess(glass);
+ return Result.build(200,"", glass);
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java
index 5ec7ed8..6461969 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java
@@ -1,15 +1,15 @@
-package com.mes.mapper;
+package com.mes.temperingglass.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.entity.GlassInfo;
-import com.mes.entity.Tempering;
+import com.mes.temperingglass.entity.GlassInfo;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
import java.util.List;
import org.apache.ibatis.annotations.*;
@Mapper
-public interface TemperingMapper extends BaseMapper<Tempering> {
+public interface TemperingMapper extends BaseMapper<TemperingGlassInfo> {
//鏌ヨ璇ョ幓鐠冪殑灏哄鍜屽潗鏍�
@@ -20,13 +20,13 @@
int SelectTempering(String glassid);
//鏌ヨ绛夊緟涓殑閽㈠寲鐗堝浘鐜荤拑淇℃伅
@Select("select*from tempering_glass_info a left join (select flowcard_id,count(state)state from tempering_glass_info GROUP BY flowcard_id,state)b on a.flowcard_id=b.flowcard_id where b.state=2")
-List<Tempering> SelectWaitingGlass();
+List<TemperingGlassInfo> SelectWaitingGlass();
//鏌ヨ杩涚倝涓殑閽㈠寲鐗堝浘鐜荤拑淇℃伅
@Select("select*from tempering_glass_info a left join (select flowcard_id,min(state)state1 from tempering_glass_info GROUP BY flowcard_id having state1=1)b on a.flowcard_id=b.flowcard_id where b.state1=1")
-List<Tempering> SelectInGlass();
+List<TemperingGlassInfo> SelectInGlass();
//鏌ヨ閽㈠寲鍚庣殑閽㈠寲鐗堝浘淇℃伅
@Select("select*from tempering_glass_info a left join (select flowcard_id,min(state)state1 from tempering_glass_info GROUP BY flowcard_id having state1=2)b on a.flowcard_id=b.flowcard_id where b.state1=2")
-List <Tempering> SelectOutGlass();
+List <TemperingGlassInfo> SelectOutGlass();
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java
index 1cc1983..f6d45f3 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java
@@ -1,16 +1,10 @@
-package com.mes.service;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.common.PlcTools.S7control;
-import com.mes.entity.Tempering;
-import com.mes.entity.device.PLCAutoMes;
-import com.mes.entity.device.PlcParameterObject;
-import com.mes.mapper.TemperingMapper;
+package com.mes.temperingglass.service;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.mapper.TemperingMapper;
import java.util.List;
import org.springframework.stereotype.Service;
@Service
-@DS("glass_info")
public class TemperingOverService {
private final TemperingMapper temperingMapper;
//PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
@@ -20,15 +14,15 @@
//鎺ユ敹鍑虹倝淇″彿鍜岀倝鍙�
public String SelectOutSignal () {
- S7control.getinstance().WriteWord("鍑虹倝淇″彿", (short)1);
+ //S7control.getinstance().WriteWord("鍑虹倝淇″彿", (short)1);
return "GlassInfo";
}
//鍙戦�佺‘璁ゆ敹鍒颁俊鍙�
public void OverSignal () {
- S7control.getinstance().WriteWord("纭瀛�", (short)1);
+ //S7control.getinstance().WriteWord("纭瀛�", (short)1);
}
//鏄剧ず閽㈠寲鍑虹倝鍚庣殑鐗堝浘淇℃伅
- public List <Tempering> SelectOutGlass () {
+ public List <TemperingGlassInfo> SelectOutGlass () {
return temperingMapper.SelectOutGlass();
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
index 362d417..e4b89aa 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
@@ -1,21 +1,19 @@
-package com.mes.service;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.common.PlcTools.S7control;
-import com.mes.entity.GlassInfo;
-import com.mes.entity.Tempering;
-import com.mes.mapper.TemperingMapper;
+package com.mes.temperingglass.service;
+import com.mes.temperingglass.entity.GlassInfo;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.tools.S7control;
+import com.mes.temperingglass.mapper.TemperingMapper;
import java.util.List;
import org.springframework.stereotype.Service;
@Service
-@DS("glass_info")
public class TemperingService {
private final TemperingMapper temperingMapper;
private S7control s7control;
public TemperingService(TemperingMapper temperingMapper) {
- this.temperingMapper = temperingMapper;
+ this.temperingMapper =temperingMapper;
}
//鎺ユ敹id杩斿洖鍧愭爣鍜屾暟鎹�
public GlassInfo SelectOutGlass (String glassid) {
@@ -46,13 +44,13 @@
s7control.WriteWord("DB100.10", (short)1);
}
//鏄剧ず绛夊緟涓殑鐗堝浘
- public List <Tempering> SelectWaitingGlass () {
- List<Tempering> WaitingGlass = temperingMapper.SelectWaitingGlass();
+ public List <TemperingGlassInfo> SelectWaitingGlass () {
+ List<TemperingGlassInfo> WaitingGlass = temperingMapper.SelectWaitingGlass();
return WaitingGlass;
}
//鏄剧ず姝ｅ湪杩涚倝鐨勭増鍥�
- public List<Tempering> SelectIntoGlass () {
- List<Tempering> IntoGlass = temperingMapper.SelectInGlass();
+ public List<TemperingGlassInfo> SelectIntoGlass () {
+ List<TemperingGlassInfo> IntoGlass = temperingMapper.SelectInGlass();
return IntoGlass;
}
}
--
Gitblit v1.8.0