From 27fcef09b5af8d6816babf3cf063a8d62726e1d0 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 19 四月 2024 09:18:01 +0800
Subject: [PATCH] 1、下片模块新增多数据源sqlserver配置 可供其他模块有需要配置的参考 2、 a、需要在各自pom文件中添加sqlserver依赖 b、在对应mapper文件中加入DS注解 c、在配置文件中配置数据源 d、主库不需要要添加DS注解指定数据库
---
LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
index ae21fd0..95514e3 100644
--- a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
+++ b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
@@ -1,21 +1,17 @@
package com.mes.service;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
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.google.common.primitives.Bytes;
-import com.mes.entity.GlassInfo;
+
import com.mes.entity.UpWorkstation;
import com.mes.mapper.LoadGlassMapper;
@Service
public class LoadGlassService {
- @Autowired
- private com.mes.common.PlcTools.S7control s7control;
+
+ private S7control s7control;
private LoadGlassMapper LoadGlassMapper;
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
//鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅
@@ -25,7 +21,7 @@
}
//澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�
public void insertGlass(UpWorkstation upwork) {
- LoadGlassMapper.insertGlass(upwork.getPatternwidth(),upwork.getPatternheigth(),upwork.getPatternthickness(),upwork.getWorkstationid());
+ LoadGlassMapper.insertGlass(upwork);
}
//鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
public void deleteGlass(int id) {
@@ -50,8 +46,8 @@
s7control.WriteWord("DB100.10", (short)2);
}else if(loadid1==loadid2){
//褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
- int glassnum1=plcmes.getPlcParameter("鐜荤拑鏁�").getValue();
- int glassnum2=plcmes.getPlcParameter("鐜荤拑鏁�").getValue();
+ int glassnum1=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
+ int glassnum2=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
if(glassnum1>glassnum2){
s7control.WriteWord("DB100.10", (short)2);
}else{
--
Gitblit v1.8.0