From 305932e79f19f7c8741d120c95b1ff090d4da044 Mon Sep 17 00:00:00 2001 From: "bbl\\baobl" Date: Wed, 22 May 2024 09:45:22 +0800 Subject: [PATCH] no message --- .../src/main/java/com/youchain/AppRun.java | 2 +- .../businessdata/rest/PlcController.java | 4 +-- .../service/impl/MlsServiceImpl.java | 5 +-- .../modules/quartz/task/configTask.java | 19 +++++++++++ .../java/com/youchain/utils/BaseCode.java | 32 +++++++++++++++++++ .../com/youchain/utils/S7ConnectorUtils.java | 4 +-- .../main/java/com/youchain/utils/UrlApi.java | 5 ++- .../src/main/resources/config/application.yml | 4 +-- 8 files changed, 63 insertions(+), 12 deletions(-) create mode 100644 youchain-system/src/main/java/com/youchain/modules/quartz/task/configTask.java create mode 100644 youchain-system/src/main/java/com/youchain/utils/BaseCode.java diff --git a/youchain-system/src/main/java/com/youchain/AppRun.java b/youchain-system/src/main/java/com/youchain/AppRun.java index 4aa6a42..a519cea 100644 --- a/youchain-system/src/main/java/com/youchain/AppRun.java +++ b/youchain-system/src/main/java/com/youchain/AppRun.java @@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RestController; @Api(hidden = true) @SpringBootApplication @EnableTransactionManagement -@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class}) +//@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class}) @EnableJpaAuditing(auditorAwareRef = "auditorAware") public class AppRun { diff --git a/youchain-system/src/main/java/com/youchain/businessdata/rest/PlcController.java b/youchain-system/src/main/java/com/youchain/businessdata/rest/PlcController.java index 9c9ab1c..ffccffe 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/rest/PlcController.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/rest/PlcController.java @@ -38,10 +38,10 @@ public class PlcController { @Log("PLC扫描容器") @ApiOperation("PLC扫描容器") public ResponseEntity scanMo(@RequestBody String moJson) { - /*S7Connector connector = S7ConnectorUtils.connect(); + S7Connector connector = S7ConnectorUtils.connect(); if (connector == null) { return new ResponseEntity<>(ApiResult.success(BAD_REQUEST.value(), "PLC连接失败", ""), HttpStatus.BAD_REQUEST); - }*/ + } try { JSONObject json = JSONObject.parseObject(moJson); if (json == null) { diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MlsServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MlsServiceImpl.java index 2cc0312..cd5aa87 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MlsServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MlsServiceImpl.java @@ -15,6 +15,7 @@ import com.youchain.businessdata.service.*; import com.youchain.modules.system.domain.Dept; import com.youchain.modules.system.service.DeptService; import com.youchain.utils.*; +import com.youchain.utils.BaseCode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -47,8 +48,8 @@ public class MlsServiceImpl implements MlsService { @Override public String getToKen() { String toKen = ""; - String mlsUser = "WMS"; - String mlsPwd = "EDlsFOvn3xaJm*EH"; + String mlsUser = BaseCode.MLS_UN; + String mlsPwd = BaseCode.MLS_PW; JSONObject jsonObject = new JSONObject(new LinkedHashMap<>()); Map objMap = new LinkedHashMap<>(); objMap.put("mlsUser", mlsUser);//快码代码 diff --git a/youchain-system/src/main/java/com/youchain/modules/quartz/task/configTask.java b/youchain-system/src/main/java/com/youchain/modules/quartz/task/configTask.java new file mode 100644 index 0000000..80f01e3 --- /dev/null +++ b/youchain-system/src/main/java/com/youchain/modules/quartz/task/configTask.java @@ -0,0 +1,19 @@ +package com.youchain.modules.quartz.task; + +import com.alibaba.fastjson.JSONObject; +import com.youchain.utils.BaseCode; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +public class configTask { + public void configBaseCode(String req) { + JSONObject body=JSONObject.parseObject(req); + BaseCode.MLS_PW=body.getString("MLS_PW"); + BaseCode.MLS_UN=body.getString("MLS_UN"); + BaseCode.MLS_IP=body.getString("MLS_IP"); + BaseCode.PLC_PORT=body.getIntValue("PLC_PORT"); + BaseCode.PLC_IP=body.getString("PLC_IP"); + } +} diff --git a/youchain-system/src/main/java/com/youchain/utils/BaseCode.java b/youchain-system/src/main/java/com/youchain/utils/BaseCode.java new file mode 100644 index 0000000..b1552ec --- /dev/null +++ b/youchain-system/src/main/java/com/youchain/utils/BaseCode.java @@ -0,0 +1,32 @@ +package com.youchain.utils; + +import com.youchain.modules.quartz.service.QuartzJobService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +/** + * 加载配置信息 + **/ +@Component +public class BaseCode { + /** PLC IP*/ + public static String PLC_IP = ""; + /** PLC 端口号*/ + public static int PLC_PORT = 0; + public static String MLS_IP = ""; + /** sap 获取token账号*/ + public static String MLS_UN=""; + /** sap 获取token账号*/ + public static String MLS_PW=""; + @Autowired + private QuartzJobService quartzJobService; + public BaseCode() { + System.out.println("加载配置文件"); + } + @PostConstruct + public void getConfigBaseCode(){ + quartzJobService.execution(quartzJobService.findById(1l)); + } +} diff --git a/youchain-system/src/main/java/com/youchain/utils/S7ConnectorUtils.java b/youchain-system/src/main/java/com/youchain/utils/S7ConnectorUtils.java index 54105ed..8bc733a 100644 --- a/youchain-system/src/main/java/com/youchain/utils/S7ConnectorUtils.java +++ b/youchain-system/src/main/java/com/youchain/utils/S7ConnectorUtils.java @@ -25,8 +25,8 @@ public class S7ConnectorUtils { try { s7Connector = S7ConnectorFactory .buildTCPConnector() - .withHost("192.168.56.188")//设置PLC的IP地址 - .withPort(102)//设置PLC的端口号 + .withHost(BaseCode.PLC_IP)//设置PLC的IP地址 + .withPort(BaseCode.PLC_PORT)//设置PLC的端口号 .withTimeout(10000)//设置连接超时时间 .withRack(0)//设置PLC的机架号 .withSlot(2)//设置PLC的插槽号 diff --git a/youchain-system/src/main/java/com/youchain/utils/UrlApi.java b/youchain-system/src/main/java/com/youchain/utils/UrlApi.java index b459eba..2ce4c7e 100644 --- a/youchain-system/src/main/java/com/youchain/utils/UrlApi.java +++ b/youchain-system/src/main/java/com/youchain/utils/UrlApi.java @@ -34,13 +34,12 @@ public class UrlApi { /** * 获取ToKen */ - public static String extSignIn="https://apiuat.midea.com/mls/system/extSignIn"; + public static String extSignIn="https://"+BaseCode.MLS_IP+"/mls/system/extSignIn"; /** * MLS接口 * https://apiuat.midea.com/mls/mlsapi/public/publicApi * https://apisit.midea.com/mls/mlsapi/public/publicApi */ - public static String publicApi="https://apisit.midea.com/mls/mlsapi/public/publicApi"; - + public static String publicApi="https://"+BaseCode.MLS_IP+"/mls/mlsapi/public/publicApi"; } diff --git a/youchain-system/src/main/resources/config/application.yml b/youchain-system/src/main/resources/config/application.yml index 7320443..53f4082 100644 --- a/youchain-system/src/main/resources/config/application.yml +++ b/youchain-system/src/main/resources/config/application.yml @@ -1,12 +1,12 @@ server: - port: 8010 + port: 8000 spring: main: allow-circular-references: true freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: