From 5a0724b27b6ca3e5298cbcbc88c8c544c11464fa Mon Sep 17 00:00:00 2001 From: caixiang <939387484@qq.com> Date: Wed, 7 Dec 2022 17:48:28 +0800 Subject: [PATCH] mark for pull --- src/main/java/com/qgs/dc/s7/controller/S7DemoController.java | 3 --- .../com/qgs/dc/s7/my/s7connector/api/utils/ByteUtils.java | 4 ++++ .../com/qgs/dc/s7/my/s7connector/utils/CommonFunctions.java | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/qgs/dc/s7/controller/S7DemoController.java b/src/main/java/com/qgs/dc/s7/controller/S7DemoController.java index cbc5a83..315a2d2 100644 --- a/src/main/java/com/qgs/dc/s7/controller/S7DemoController.java +++ b/src/main/java/com/qgs/dc/s7/controller/S7DemoController.java @@ -15,12 +15,9 @@ import com.qgs.dc.s7.my.s7connector.type.PlcVar; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - import java.io.UnsupportedEncodingException; import java.text.ParseException; -import java.time.Instant; import java.util.Arrays; import java.util.List; import java.util.Random; diff --git a/src/main/java/com/qgs/dc/s7/my/s7connector/api/utils/ByteUtils.java b/src/main/java/com/qgs/dc/s7/my/s7connector/api/utils/ByteUtils.java index 0dc4d6b..6444008 100644 --- a/src/main/java/com/qgs/dc/s7/my/s7connector/api/utils/ByteUtils.java +++ b/src/main/java/com/qgs/dc/s7/my/s7connector/api/utils/ByteUtils.java @@ -18,6 +18,8 @@ import java.util.*; public class ByteUtils { + + public static double bytes2Double(byte[] arr) { long value = 0; for (int i = 0; i < 8; i++) { @@ -869,6 +871,8 @@ public class ByteUtils { res[21] = false; byte[] bytes = toByteArray(res); + + Integer integer = CommonFunctions.exactDivision(7, 8); System.out.println(); diff --git a/src/main/java/com/qgs/dc/s7/my/s7connector/utils/CommonFunctions.java b/src/main/java/com/qgs/dc/s7/my/s7connector/utils/CommonFunctions.java index c29bb4a..84c188b 100644 --- a/src/main/java/com/qgs/dc/s7/my/s7connector/utils/CommonFunctions.java +++ b/src/main/java/com/qgs/dc/s7/my/s7connector/utils/CommonFunctions.java @@ -10,7 +10,10 @@ public class CommonFunctions { * a 整除 b ,如果有余数+1 * */ public static Integer exactDivision(Integer a,Integer b) { - int c = 0; + + + int c = a/b; + if(a%b!=0){ c = a/b+1; }