From 1240aae17b00928c4faf759846fbbd37a2b9bd68 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Mon, 21 Aug 2023 15:24:18 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E4=BA=86=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=8E=B7=E5=8F=96IP=E5=92=8C=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/modules/common/utils/StringUtils.java | 5 --- .../nl/modules/logging/aspect/LogAspect.java | 4 ++- .../logging/service/impl/LogServiceImpl.java | 3 ++ .../service/impl/DeviceStatusServiceImpl.java | 3 ++ .../acs/service/impl/AcsToWmsServiceImpl.java | 1 + .../szls/rest/LmsToBigScreenController.java | 32 +++++++++++++++++++ .../szls/service/LmsToBigScreenService.java | 8 +++++ .../impl/LmsToBigScreenServiceImpl.java | 27 ++++++++++++++++ .../nl/wms/sch/manage/AutoQueryBillInfo.java | 4 +-- .../nl/wms/sch/manage/AutoQueryUpload.java | 4 +-- .../nl/wms/sch/service/wql/QSCH_TASK_01.wql | 2 +- .../resources/config/application-prod.yml | 3 +- 12 files changed, 84 insertions(+), 12 deletions(-) create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/LmsToBigScreenService.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java index 269c7f5db..78aff77f4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java @@ -146,11 +146,6 @@ public class StringUtils { * 获取ip地址 */ public static String getIp(HttpServletRequest request) { - // TODO 不解析IP地址 - if(true){ - return "127.0.0.1"; - } - String ip = request.getHeader("x-forwarded-for"); if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java index 820221159..c363223ca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java @@ -15,6 +15,7 @@ */ package org.nl.modules.logging.aspect; +import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; @@ -90,7 +91,8 @@ public class LogAspect { //是否把日志存到日志表 if (logInfo.isAddLogTable()) { Log log = new Log("INFO", System.currentTimeMillis() - comming); - logService.save(getUsername(), StringUtils.getBrowser(request), requestIp, joinPoint, log); + String loginDevice = StpUtil.getLoginDevice(); + logService.save(getUsername(), StringUtils.getBrowser(request)+"---"+loginDevice, requestIp, joinPoint, log); } if (logInfo.isInterfaceLog()) { try { diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LogServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LogServiceImpl.java index caaffddfe..c5ab28214 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LogServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LogServiceImpl.java @@ -15,6 +15,7 @@ */ package org.nl.modules.logging.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -42,6 +43,7 @@ import org.springframework.web.bind.annotation.RequestParam; import java.lang.reflect.Method; import java.lang.reflect.Parameter; +import java.sql.Timestamp; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -103,6 +105,7 @@ public class LogServiceImpl implements LogService { logDto.setUsername(username); logDto.setParams(getParameter(method, joinPoint.getArgs())); logDto.setBrowser(browser); + logDto.setCreateTime(Timestamp.valueOf(DateUtil.now())); logRepository.save(logDto); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/DeviceStatusServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/DeviceStatusServiceImpl.java index 3fe8760e8..ffd33dacd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/DeviceStatusServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/DeviceStatusServiceImpl.java @@ -100,6 +100,9 @@ public class DeviceStatusServiceImpl implements DeviceStatusService { try { if (!jo.containsKey("need_update_flag")){ JSONArray rows = jo.getJSONArray("upload_user"); + if (ObjectUtil.isEmpty(rows)){ + rows = new JSONArray(); + } HashMap map = new HashMap<>(); String msg = ""; for (int i = 0; i < rows.size(); i++) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index ffb33fdda..9bcc5a154 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -808,6 +808,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public JSONObject sendDeviceStatus(JSONObject whereJson) { + log.info("sendDeviceStatus--------------输入为："+whereJson.toString()); WQLObject wo = WQLObject.getWQLObject("em_bi_devicestatus"); String device_code = whereJson.getString("device_code"); String device_name = whereJson.getString("device_name"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java new file mode 100644 index 000000000..6c93e1f2e --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java @@ -0,0 +1,32 @@ +package org.nl.wms.ext.szls.rest; + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.logging.annotation.Log; +import org.nl.wms.ext.szls.service.LmsToBigScreenService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@Api(tags = "lms发送数字孪生") +@RequestMapping("/api/szls") +@Slf4j +public class LmsToBigScreenController { + private final LmsToBigScreenService LmsToBigScreenService; + + @PostMapping("/getDeviceInfo") + @Log("数字孪生请求LMS获取设备信息") + @ApiOperation("数字孪生请求LMS获取设备信息") + public ResponseEntity getDeviceInfo(@RequestBody JSONObject jo) { + return new ResponseEntity<>(LmsToBigScreenService.getDeviceInfo(jo), HttpStatus.OK); + } + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/LmsToBigScreenService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/LmsToBigScreenService.java new file mode 100644 index 000000000..18b912ea9 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/LmsToBigScreenService.java @@ -0,0 +1,8 @@ +package org.nl.wms.ext.szls.service; + +import com.alibaba.fastjson.JSONObject; + +public interface LmsToBigScreenService { + + JSONObject getDeviceInfo(JSONObject jo); +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java new file mode 100644 index 000000000..5b9317d41 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java @@ -0,0 +1,27 @@ +package org.nl.wms.ext.szls.service.impl; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.wql.util.SpringContextHolder; +import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.wms.ext.szls.service.LmsToBigScreenService; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +@Slf4j +public class LmsToBigScreenServiceImpl implements LmsToBigScreenService { + + + @Override + public JSONObject getDeviceInfo(JSONObject jo) { + + return null; + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryBillInfo.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryBillInfo.java index 64e84b940..7edd9d50f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryBillInfo.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryBillInfo.java @@ -25,9 +25,9 @@ public class AutoQueryBillInfo { String nofity_day = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("NOFITY_DAY").getValue(); JSONArray send_rows = new JSONArray(); if (Integer.parseInt(nofity_day) == 0) { - send_rows = wo.query("bill_type = '1001' AND bill_status = '99' AND stor_code = 'CP01' AND upload_sap = '0' AND is_delete = '0' AND (IFNULL(carno,'') = '' OR IFNULL(trans_code,'') = '' OR IFNULL(estimated_freight,'') = '' OR IFNULL(order_number,'') = '' OR IFNULL(car_type,'') = '')").getResultJSONArray(0); + send_rows = wo.query("bill_type = '1001' AND bill_status = '99' AND stor_code = 'AC01' AND upload_sap = '0' AND is_delete = '0' AND (IFNULL(carno,'') = '' OR IFNULL(trans_code,'') = '' OR IFNULL(estimated_freight,'') = '' OR IFNULL(order_number,'') = '' OR IFNULL(car_type,'') = '')").getResultJSONArray(0); } else { - send_rows = wo.query("bill_type = '1001' AND bill_status = '99' AND stor_code = 'CP01' AND upload_sap = '0' AND is_delete = '0' AND (IFNULL(carno,'') = '' OR IFNULL(trans_code,'') = '' OR IFNULL(estimated_freight,'') = '' OR IFNULL(order_number,'') = '' OR IFNULL(car_type,'') = '') AND TIMESTAMPDIFF(DAY,confirm_time,NOW()) = " + nofity_day).getResultJSONArray(0); + send_rows = wo.query("bill_type = '1001' AND bill_status = '99' AND stor_code = 'AC01' AND upload_sap = '0' AND is_delete = '0' AND (IFNULL(carno,'') = '' OR IFNULL(trans_code,'') = '' OR IFNULL(estimated_freight,'') = '' OR IFNULL(order_number,'') = '' OR IFNULL(car_type,'') = '') AND TIMESTAMPDIFF(DAY,confirm_time,NOW()) = " + nofity_day).getResultJSONArray(0); } this.sendInfo(send_rows); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryUpload.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryUpload.java index 281da7a4e..190f9c2c4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryUpload.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryUpload.java @@ -22,7 +22,7 @@ public class AutoQueryUpload { public void run() { //查询已经处于分配中、分配完但还未回传给MES的销售出库单 WQLObject wo = WQLObject.getWQLObject("st_ivt_iostorinv"); - JSONArray send_rows = wo.query("mst.bill_type = '1001' AND mst.bill_status IN ( '30', '40' ) AND mst.stor_code = 'CP01' AND upload_mes = '0' AND is_delete = '0'").getResultJSONArray(0); + JSONArray send_rows = wo.query("bill_type = '1001' AND bill_status IN ( '30', '40' ) AND stor_code = 'AC01' AND upload_mes = '0' AND is_delete = '0'").getResultJSONArray(0); this.sendInfo(send_rows); } @@ -64,7 +64,7 @@ public class AutoQueryUpload { String resultMsg = HttpRequest.post(url) .body(String.valueOf(jo)) .execute().body(); - log.info("飞书输入参数为：-------------------" + jo); + log.info(" " + jo); log.info("飞书输出参数为：-------------------" + resultMsg); HashMap map = new HashMap<>(); map.put("is_upload", "1"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql index dca879609..3373402ea 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql @@ -85,7 +85,7 @@ find_in_set( task.task_status, 输入.task_status) ENDOPTION OPTION 输入.vehicle_code <> "" - (task.vehicle_code like 输入.vehicle_code) + (task.vehicle_code like 输入.vehicle_code OR task.material_code like 输入.vehicle_code OR task.vehicle_code2 like 输入.vehicle_code) ENDOPTION OPTION 输入.task_code <> "" (task.task_code like 输入.task_code) diff --git a/lms/nladmin-system/src/main/resources/config/application-prod.yml b/lms/nladmin-system/src/main/resources/config/application-prod.yml index fc1a5bd14..7eebf35e9 100644 --- a/lms/nladmin-system/src/main/resources/config/application-prod.yml +++ b/lms/nladmin-system/src/main/resources/config/application-prod.yml @@ -83,6 +83,7 @@ spring: singleServerConfig: connectionMinimumIdleSize: 8 connectionPoolSize: 8 + database: 14 address: redis://127.0.0.1:6379 idleConnectionTimeout: 10000 timeout: 3000 @@ -169,7 +170,7 @@ sa-token: # token 临时有效期 (指定时间内无操作就视为token过期) 单位: 秒 activity-timeout: -1 # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) - is-concurrent: true + is-concurrent: false # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) is-share: false # token风格