diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 2340aa1..152e255 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -51,6 +51,7 @@ org.projectlombok lombok + true @@ -84,6 +85,14 @@ ${fastjson.version} + + + + + + + + com.google.zxing core @@ -102,14 +111,6 @@ redis.clients jedis - - com.zhehekeji - core - 1.0.0 - system - ${project.basedir}/src/main/resources/lib/core-1.0.0.jar - - com.baomidou mybatis-plus-boot-starter diff --git a/modules/common/src/main/java/com/zhehekeji/common/util/HttpUtil.java b/modules/common/src/main/java/com/zhehekeji/common/util/HttpUtil.java index 2211fc8..0bc5b69 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/util/HttpUtil.java +++ b/modules/common/src/main/java/com/zhehekeji/common/util/HttpUtil.java @@ -1,6 +1,6 @@ package com.zhehekeji.common.util; -import com.zhehekeji.core.util.Assert; +import core.util.Assert; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpStatus; diff --git a/modules/common/src/main/java/com/zhehekeji/common/util/QrUtil.java b/modules/common/src/main/java/com/zhehekeji/common/util/QrUtil.java index 1ca4bf7..ac2e672 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/util/QrUtil.java +++ b/modules/common/src/main/java/com/zhehekeji/common/util/QrUtil.java @@ -6,7 +6,7 @@ import com.google.zxing.MultiFormatWriter; import com.google.zxing.WriterException; import com.google.zxing.client.j2se.MatrixToImageWriter; import com.google.zxing.common.BitMatrix; -import com.zhehekeji.core.util.Assert; +import core.util.Assert; import org.apache.commons.codec.binary.Base64; import org.springframework.util.StringUtils; diff --git a/modules/common/src/main/java/com/zhehekeji/common/util/ValidatorUtil.java b/modules/common/src/main/java/com/zhehekeji/common/util/ValidatorUtil.java index 8a56117..113d57c 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/util/ValidatorUtil.java +++ b/modules/common/src/main/java/com/zhehekeji/common/util/ValidatorUtil.java @@ -1,6 +1,6 @@ package com.zhehekeji.common.util; -import com.zhehekeji.core.util.Assert; +import core.util.Assert; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/modules/common/src/main/java/core/exception/BizException.java b/modules/common/src/main/java/core/exception/BizException.java new file mode 100644 index 0000000..32f3fec --- /dev/null +++ b/modules/common/src/main/java/core/exception/BizException.java @@ -0,0 +1,33 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by FernFlower decompiler) +// + +package core.exception; + +public class BizException extends RuntimeException { + private Integer code; + private String message; + + public BizException() { + } + + public BizException(String message) { + super(message); + this.message = message; + this.code = 500; + } + + public BizException(Integer code, String message) { + this.message = message; + this.code = code; + } + + public Integer getCode() { + return this.code; + } + + public String getMessage() { + return this.message; + } +} diff --git a/modules/common/src/main/java/core/exception/BizExceptionHandler.java b/modules/common/src/main/java/core/exception/BizExceptionHandler.java new file mode 100644 index 0000000..b6507bc --- /dev/null +++ b/modules/common/src/main/java/core/exception/BizExceptionHandler.java @@ -0,0 +1,42 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by FernFlower decompiler) +// + +package core.exception; + +import core.pojo.HttpStatus; +import core.pojo.Result; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; + +@ControllerAdvice +public class BizExceptionHandler { + private static final Logger log = LoggerFactory.getLogger(BizExceptionHandler.class); + + public BizExceptionHandler() { + } + + @ExceptionHandler({BizException.class}) + @ResponseBody + public Result bussException(BizException e) { + log.warn("message:{},{}", e.getMessage(), e); + Result result = new Result(); + result.setMessage(e.getMessage()); + result.setCode(e.getCode()); + return result; + } + + @ExceptionHandler({Exception.class}) + @ResponseBody + public Result exception(Exception e) { + log.error("{}:{}", e.getMessage(), e); + Result result = new Result(); + result.setMessage(HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase()); + result.setCode(HttpStatus.INTERNAL_SERVER_ERROR.getCode()); + return result; + } +} diff --git a/modules/common/src/main/java/core/pojo/HttpStatus.java b/modules/common/src/main/java/core/pojo/HttpStatus.java new file mode 100644 index 0000000..ccf2098 --- /dev/null +++ b/modules/common/src/main/java/core/pojo/HttpStatus.java @@ -0,0 +1,28 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by FernFlower decompiler) +// + +package core.pojo; + +public enum HttpStatus { + SUCCESS(200, "SUCCESS"), + UNAUTHORIZED(401, "未认证"), + INTERNAL_SERVER_ERROR(500, "内部异常，请联系管理员"); + + private final int code; + private final String reasonPhrase; + + public int getCode() { + return this.code; + } + + public String getReasonPhrase() { + return this.reasonPhrase; + } + + private HttpStatus(int code, String reasonPhrase) { + this.code = code; + this.reasonPhrase = reasonPhrase; + } +} diff --git a/modules/common/src/main/java/core/pojo/Result.java b/modules/common/src/main/java/core/pojo/Result.java new file mode 100644 index 0000000..8d321fb --- /dev/null +++ b/modules/common/src/main/java/core/pojo/Result.java @@ -0,0 +1,182 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by FernFlower decompiler) +// + +package core.pojo; + +public class Result { + private Integer code; + private String message; + private T data; + + public Result(T data) { + this.code = HttpStatus.SUCCESS.getCode(); + this.data = data; + } + + public static Result success(T data) { + Result result = new Result(); + result.setData(data); + result.setCode(HttpStatus.SUCCESS.getCode()); + result.setMessage("SUCCESS"); + return result; + } + + public static Result success(T data, String msg) { + Result result = new Result(); + result.setData(data); + result.setCode(HttpStatus.SUCCESS.getCode()); + result.setMessage(msg); + return result; + } + + public static Result success() { + return builder().code(HttpStatus.SUCCESS.getCode()).message("SUCCESS").build(); + } + + public static Result error(Integer code, String message) { + Result result = new Result(); + result.setCode(code); + result.setMessage(message); + return result; + } + + public static ResultBuilder builder() { + return new ResultBuilder(); + } + + public Integer getCode() { + return this.code; + } + + public String getMessage() { + return this.message; + } + + public T getData() { + return this.data; + } + + public void setCode(Integer code) { + this.code = code; + } + + public void setMessage(String message) { + this.message = message; + } + + public void setData(T data) { + this.data = data; + } + + public boolean equals(Object o) { + if (o == this) { + return true; + } else if (!(o instanceof Result)) { + return false; + } else { + Result other = (Result)o; + if (!other.canEqual(this)) { + return false; + } else { + label47: { + Object this$code = this.getCode(); + Object other$code = other.getCode(); + if (this$code == null) { + if (other$code == null) { + break label47; + } + } else if (this$code.equals(other$code)) { + break label47; + } + + return false; + } + + Object this$message = this.getMessage(); + Object other$message = other.getMessage(); + if (this$message == null) { + if (other$message != null) { + return false; + } + } else if (!this$message.equals(other$message)) { + return false; + } + + Object this$data = this.getData(); + Object other$data = other.getData(); + if (this$data == null) { + if (other$data != null) { + return false; + } + } else if (!this$data.equals(other$data)) { + return false; + } + + return true; + } + } + } + + protected boolean canEqual(Object other) { + return other instanceof Result; + } + + public int hashCode() { + + int result = 1; + Object $code = this.getCode(); + result = result * 59 + ($code == null ? 43 : $code.hashCode()); + Object $message = this.getMessage(); + result = result * 59 + ($message == null ? 43 : $message.hashCode()); + Object $data = this.getData(); + result = result * 59 + ($data == null ? 43 : $data.hashCode()); + return result; + } + + public String toString() { + return "Result(code=" + this.getCode() + ", message=" + this.getMessage() + ", data=" + this.getData() + ")"; + } + + public Result(Integer code, String message, T data) { + this.code = code; + this.message = message; + this.data = data; + } + + public Result() { + } + + public static class ResultBuilder { + private Integer code; + private String message; + private T data; + + ResultBuilder() { + } + + public ResultBuilder code(Integer code) { + this.code = code; + return this; + } + + public ResultBuilder message(String message) { + this.message = message; + return this; + } + + public ResultBuilder data(T data) { + this.data = data; + return this; + } + + public Result build() { + return new Result(this.code, this.message, this.data); + } + + public String toString() { + return "Result.ResultBuilder(code=" + this.code + ", message=" + this.message + ", data=" + this.data + ")"; + } + } +} diff --git a/modules/common/src/main/java/core/util/Assert.java b/modules/common/src/main/java/core/util/Assert.java new file mode 100644 index 0000000..bbdc98a --- /dev/null +++ b/modules/common/src/main/java/core/util/Assert.java @@ -0,0 +1,66 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by FernFlower decompiler) +// + +package core.util; + +import java.util.Collection; + +import core.exception.BizException; +import core.pojo.HttpStatus; +import org.springframework.lang.Nullable; +import org.springframework.util.CollectionUtils; + +public class Assert { + public Assert() { + } + + public static void isTrue(boolean expression, String message) { + if (!expression) { + throw new BizException(HttpStatus.INTERNAL_SERVER_ERROR.getCode(), message); + } + } + + public static void notEmpty(@Nullable Collection collection, String message) { + if (CollectionUtils.isEmpty(collection)) { + throw new BizException(HttpStatus.INTERNAL_SERVER_ERROR.getCode(), message); + } + } + + public static void notEmpty(@Nullable Collection collection, Integer code, String message) { + if (CollectionUtils.isEmpty(collection)) { + throw new BizException(code, message); + } + } + + public static void isNull(@Nullable Object object, String message) { + if (object != null) { + throw new BizException(HttpStatus.INTERNAL_SERVER_ERROR.getCode(), message); + } + } + + public static void notNull(@Nullable Object object, String message) { + if (object == null) { + throw new BizException(HttpStatus.INTERNAL_SERVER_ERROR.getCode(), message); + } + } + + public static void isTrue(boolean expression, Integer code, String message) { + if (!expression) { + throw new BizException(code, message); + } + } + + public static void isNull(@Nullable Object object, Integer code, String message) { + if (object != null) { + throw new BizException(code, message); + } + } + + public static void notNull(@Nullable Object object, Integer code, String message) { + if (object == null) { + throw new BizException(code, message); + } + } +} diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml index 068c85d..ae37e89 100644 --- a/modules/filter/pom.xml +++ b/modules/filter/pom.xml @@ -49,6 +49,7 @@ org.projectlombok lombok + true diff --git a/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java b/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java index 8747dd3..d71a8dc 100644 --- a/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java +++ b/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java @@ -2,9 +2,6 @@ package com.zhehekeji.filter.aspect; import com.alibaba.fastjson.JSONObject; import com.zhehekeji.common.util.HttpUtil; -import com.zhehekeji.core.pojo.HttpStatus; -import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.core.util.Assert; import com.zhehekeji.filter.FilterConstance; import com.zhehekeji.filter.pojo.CurrentUser; import com.zhehekeji.filter.pojo.SessionHandler; diff --git a/modules/pom.xml b/modules/pom.xml index da6a14c..6482470 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -37,6 +37,7 @@ org.projectlombok lombok + true diff --git a/pom.xml b/pom.xml index 19d96e6..441f5aa 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,7 @@ org.projectlombok lombok + true diff --git a/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java b/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java index af1c0b9..a6fe313 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java @@ -1,8 +1,8 @@ package com.zhehekeji.web.controller; import com.zhehekeji.common.util.PathUtil; -import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.core.util.Assert; +import core.pojo.Result; +import core.util.Assert; import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.Camera; import com.zhehekeji.web.lib.*; diff --git a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java b/web/src/main/java/com/zhehekeji/web/controller/CameraController.java index 340f29a..f3b4ef7 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/CameraController.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.github.pagehelper.PageInfo; import com.sun.jna.ptr.IntByReference; import com.zhehekeji.common.util.ValidatorUtil; -import com.zhehekeji.core.pojo.Result; +import core.pojo.Result; import com.zhehekeji.web.entity.Camera; import com.zhehekeji.web.entity.CameraIO; import com.zhehekeji.web.entity.CameraIOConfig; diff --git a/web/src/main/java/com/zhehekeji/web/controller/CategoryController.java b/web/src/main/java/com/zhehekeji/web/controller/CategoryController.java index ba8934b..116ca8f 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CategoryController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/CategoryController.java @@ -1,7 +1,7 @@ package com.zhehekeji.web.controller; import com.github.pagehelper.PageInfo; -import com.zhehekeji.core.pojo.Result; +import core.pojo.Result; import com.zhehekeji.web.entity.Category; import com.zhehekeji.web.pojo.category.PageSearch; import com.zhehekeji.web.service.CategoryService; diff --git a/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java b/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java index 4c22b24..5c1db3b 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java @@ -2,7 +2,7 @@ package com.zhehekeji.web.controller; import com.github.pagehelper.PageInfo; import com.zhehekeji.common.util.ValidatorUtil; -import com.zhehekeji.core.pojo.Result; +import core.pojo.Result; import com.zhehekeji.web.entity.CheckLog; import com.zhehekeji.web.entity.StockLog; import com.zhehekeji.web.pojo.stock.CheckLogSearch; diff --git a/web/src/main/java/com/zhehekeji/web/controller/ClientTestController.java b/web/src/main/java/com/zhehekeji/web/controller/ClientTestController.java index 38fec9c..c5b85f7 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/ClientTestController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/ClientTestController.java @@ -1,7 +1,7 @@ package com.zhehekeji.web.controller; import com.github.pagehelper.PageInfo; -import com.zhehekeji.core.pojo.Result; +import core.pojo.Result; import com.zhehekeji.web.entity.CheckLog; import com.zhehekeji.web.entity.Street; import com.zhehekeji.web.pojo.stock.CheckLogSearch; diff --git a/web/src/main/java/com/zhehekeji/web/controller/EmptyCheckController.java b/web/src/main/java/com/zhehekeji/web/controller/EmptyCheckController.java index 6f2a1cb..607b7ac 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/EmptyCheckController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/EmptyCheckController.java @@ -2,7 +2,7 @@ package com.zhehekeji.web.controller; import com.alibaba.excel.EasyExcel; import com.github.pagehelper.PageInfo; -import com.zhehekeji.core.pojo.Result; +import core.pojo.Result; import com.zhehekeji.web.entity.CheckStreetSummary; import com.zhehekeji.web.entity.CheckSummary; import com.zhehekeji.web.pojo.empty.EmptyCheckSearch; diff --git a/web/src/main/java/com/zhehekeji/web/controller/Login.java b/web/src/main/java/com/zhehekeji/web/controller/Login.java index 24dba8b..ab6595c 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/Login.java +++ b/web/src/main/java/com/zhehekeji/web/controller/Login.java @@ -12,4 +12,4 @@ public class Login { private String password; private Integer port; -} +} \ No newline at end of file diff --git a/web/src/main/java/com/zhehekeji/web/controller/OrderController.java b/web/src/main/java/com/zhehekeji/web/controller/OrderController.java index f1d9cea..9ac1707 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/OrderController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/OrderController.java @@ -2,7 +2,7 @@ package com.zhehekeji.web.controller; import com.github.pagehelper.PageInfo; import com.zhehekeji.common.util.ValidatorUtil; -import com.zhehekeji.core.pojo.Result; +import core.pojo.Result; import com.zhehekeji.web.pojo.OrderSaveReq; import com.zhehekeji.web.pojo.OrderSearch; import com.zhehekeji.web.pojo.OrderVO; diff --git a/web/src/main/java/com/zhehekeji/web/controller/PLCController.java b/web/src/main/java/com/zhehekeji/web/controller/PLCController.java index bc95587..2c642a6 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/PLCController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/PLCController.java @@ -1,7 +1,7 @@ package com.zhehekeji.web.controller; -import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.core.util.Assert; +import core.pojo.Result; +import core.util.Assert; import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.Street; import com.zhehekeji.web.mapper.StreetMapper; diff --git a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java index 5fd8d84..44c3c9e 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java @@ -1,6 +1,6 @@ package com.zhehekeji.web.controller; -import com.zhehekeji.core.pojo.Result; +import core.pojo.Result; import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.Camera; import com.zhehekeji.web.pojo.realTime.RealTime; diff --git a/web/src/main/java/com/zhehekeji/web/controller/SensorController.java b/web/src/main/java/com/zhehekeji/web/controller/SensorController.java index d72caca..4f484d5 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/SensorController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/SensorController.java @@ -2,8 +2,8 @@ package com.zhehekeji.web.controller; import com.alibaba.fastjson.JSONObject; import com.zhehekeji.common.util.HttpUtil; -import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.core.util.Assert; +import core.pojo.Result; +import core.util.Assert; import com.zhehekeji.web.pojo.IndexVO; import com.zhehekeji.web.service.sick.SickConnMap; import io.swagger.annotations.Api; diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockController.java b/web/src/main/java/com/zhehekeji/web/controller/StockController.java index f720a7f..6708c62 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StockController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StockController.java @@ -3,7 +3,7 @@ package com.zhehekeji.web.controller; import com.alibaba.excel.EasyExcel; import com.github.pagehelper.PageInfo; import com.zhehekeji.common.util.ValidatorUtil; -import com.zhehekeji.core.pojo.Result; +import core.pojo.Result; import com.zhehekeji.web.entity.Stock; import com.zhehekeji.web.pojo.category.PageSearch; import com.zhehekeji.web.pojo.stock.*; diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockLogController.java b/web/src/main/java/com/zhehekeji/web/controller/StockLogController.java index d8e3dde..9e8da29 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StockLogController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StockLogController.java @@ -2,7 +2,7 @@ package com.zhehekeji.web.controller; import com.github.pagehelper.PageInfo; import com.zhehekeji.common.util.ValidatorUtil; -import com.zhehekeji.core.pojo.Result; +import core.pojo.Result; import com.zhehekeji.web.entity.StockLog; import com.zhehekeji.web.pojo.stock.StockLogSearch; import com.zhehekeji.web.service.StockLogService; diff --git a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java index 7d67a5a..4851f8f 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java @@ -2,7 +2,7 @@ package com.zhehekeji.web.controller; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; -import com.zhehekeji.core.pojo.Result; +import core.pojo.Result; import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.LightSource; import com.zhehekeji.web.entity.Street; diff --git a/web/src/main/java/com/zhehekeji/web/controller/TestController.java b/web/src/main/java/com/zhehekeji/web/controller/TestController.java index ec8c8ed..80b4028 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/TestController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/TestController.java @@ -1,6 +1,6 @@ package com.zhehekeji.web.controller; -import com.zhehekeji.core.pojo.Result; +import core.pojo.Result; import com.zhehekeji.web.service.TestService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/web/src/main/java/com/zhehekeji/web/controller/WarnController.java b/web/src/main/java/com/zhehekeji/web/controller/WarnController.java index f57dde2..1cb4a33 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/WarnController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/WarnController.java @@ -2,7 +2,7 @@ package com.zhehekeji.web.controller; import com.github.pagehelper.PageInfo; import com.zhehekeji.common.util.ValidatorUtil; -import com.zhehekeji.core.pojo.Result; +import core.pojo.Result; import com.zhehekeji.web.pojo.warn.WarnSearch; import com.zhehekeji.web.pojo.warn.WarnVO; import com.zhehekeji.web.service.WarnService; diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java b/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java index f991a80..ac4dc0f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java +++ b/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java @@ -4,7 +4,7 @@ import com.sun.jna.NativeLong; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; import com.zhehekeji.common.util.PathUtil; -import com.zhehekeji.core.util.Assert; +import core.util.Assert; import com.zhehekeji.web.entity.Camera; import com.zhehekeji.web.lib.CameraConnMap; import com.zhehekeji.web.lib.CameraControlModule; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareCameraControlModuleImpl.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareCameraControlModuleImpl.java index 1002cb8..6894ed5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareCameraControlModuleImpl.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareCameraControlModuleImpl.java @@ -2,7 +2,7 @@ package com.zhehekeji.web.lib.joyware; import com.sun.jna.ptr.IntByReference; import com.zhehekeji.common.util.PathUtil; -import com.zhehekeji.core.util.Assert; +import core.util.Assert; import com.zhehekeji.web.lib.CameraConnMap; import com.zhehekeji.web.lib.CameraControlModule; import com.zhehekeji.web.pojo.camera.CameraPtzPojo; diff --git a/web/src/main/java/com/zhehekeji/web/service/CameraService.java b/web/src/main/java/com/zhehekeji/web/service/CameraService.java index 1684943..161d673 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java @@ -4,7 +4,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zhehekeji.core.util.Assert; +import core.util.Assert; import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.Camera; import com.zhehekeji.web.entity.CameraIO; diff --git a/web/src/main/java/com/zhehekeji/web/service/CategoryService.java b/web/src/main/java/com/zhehekeji/web/service/CategoryService.java index 4c3b61b..b690629 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CategoryService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CategoryService.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zhehekeji.core.util.Assert; +import core.util.Assert; import com.zhehekeji.web.entity.Category; import com.zhehekeji.web.mapper.CategoryMapper; import com.zhehekeji.web.pojo.camera.IOImport; diff --git a/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java b/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java index 6a5fa6f..b0f4448 100644 --- a/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java +++ b/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java @@ -7,6 +7,7 @@ import com.zhehekeji.web.mapper.LightSourceMapper; import com.zhehekeji.web.service.damLightSource.JYDAMEquip; import com.zhehekeji.web.service.damLightSource.JYDamHelper; import com.zhehekeji.web.service.hikLightSource.HikControlSocket; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +22,7 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.List; +@Slf4j @Service public class LightSourceService { diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java index c40ceb4..a0ac599 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -3,7 +3,7 @@ package com.zhehekeji.web.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zhehekeji.common.util.PathUtil; -import com.zhehekeji.core.pojo.Result; +import core.pojo.Result; import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.*; import com.zhehekeji.web.lib.*; @@ -675,7 +675,7 @@ public class PlcService { public boolean check(PlcCmdInfo plcCmdInfo, KsecDataInfo dataInfo) { Street street = streetService.getStreetByPlcId(dataInfo.getSRMNumber()); - + dataInfo.setFromSide(plcCmdInfo.getSeparation1()); //开始盘点具体货位 CheckLog checkLog = new CheckLog(); checkLog.setStreetId(street.getId()); @@ -734,6 +734,7 @@ public class PlcService { // 格式化为字符串 String formattedDate = now.format(formatter); + log.info("algorithmPojo:{}", algorithmPojo); if (algorithmPojo!=null ){ if (algorithmPojo.equals(Objects.equals(dataInfo.getTrayCode(), "0"))){ checkLog.setStatus(StockStatus.SUCCESS.getStatus()); @@ -796,6 +797,9 @@ public class PlcService { } + public static void main(String[] args) { + System.out.println(Boolean.TRUE.equals(Objects.equals("1", "0"))); + } public void visualCalculationResults(TransmissionPojo transmissionPojo) { diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index 0e5cdad..adc7f52 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zhehekeji.core.util.Assert; +import core.util.Assert; import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.*; import com.zhehekeji.web.mapper.*; diff --git a/web/src/main/java/com/zhehekeji/web/service/StreetService.java b/web/src/main/java/com/zhehekeji/web/service/StreetService.java index 680291d..60f78fe 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StreetService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StreetService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zhehekeji.core.util.Assert; +import core.util.Assert; import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.LightSource; import com.zhehekeji.web.entity.RFID;