From 80d32c14bf506b5d0a6a625f0e122ec4d9609006 Mon Sep 17 00:00:00 2001 From: ccongli <1441652193@qq.com> Date: Mon, 10 Apr 2023 12:58:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E5=8F=B0=E7=A5=A5=E5=92=8C=20?= =?UTF-8?q?=E7=A1=AB=E5=8C=96=E6=9C=BA=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=20rs485=E4=B8=B2=E5=8F=A3=E9=80=9A=E4=BF=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + ant-design-vue/src/utils/request.js | 3 +- ant-design-vue/vue.config.js | 3 +- .../org/jeecg/config/shiro/ShiroConfig.java | 4 + .../jeecg/config/shiro/filters/JwtFilter.java | 4 +- .../controller/TtPouringEquipController.java | 27 +- .../ttpouringequip/entity/TtPouringEquip.java | 48 +- .../mapper/TtPouringEquipMapper.java | 3 + .../mapper/xml/TtPouringEquipMapper.xml | 23 + .../service/ITtPouringEquipService.java | 5 + .../impl/TtPouringEquipServiceImpl.java | 21 +- .../controller/TtSulfEquipController.java | 64 +- .../demo/ttsulfequip/entity/TtSulfEquip.java | 21 +- .../ttsulfequip/mapper/TtSulfEquipMapper.java | 2 + .../mapper/xml/TtSulfEquipMapper.xml | 39 +- .../service/ITtSulfEquipService.java | 4 + .../service/impl/TtSulfEquipServiceImpl.java | 6 + .../linkage-system-start/pom.xml | 6 + .../src/main/java/org/jeecg/CustomRunner.java | 88 + .../java/org/jeecg/rscom/RS485Handler.java | 261 + .../org/jeecg/rscom/enums/DEVICE_TYPE.java | 56 + .../src/main/resources/application-dev.yml | 6 +- .../src/test/java/org/jeecg/SampleTest.java | 146 +- .../modules/system/test/SysUserTest.java | 2 +- logs/jeecgboot-2023-01-23.0.html | 5301 - logs/jeecgboot-2023-01-25.0.html | 0 logs/jeecgboot-2023-02-04.0.html | 2863 - logs/jeecgboot-2023-02-06.0.html | 2144 - logs/jeecgboot-2023-02-14.0.html | 106253 --------------- logs/jeecgboot-2023-02-15.0.html | 31514 ----- logs/jeecgboot-2023-02-16.0.html | 18407 --- logs/jeecgboot-2023-02-17.0.html | 6524 - logs/jeecgboot-2023-02-24.0.html | 65523 --------- logs/jeecgboot-2023-03-07.0.html | 2719 - logs/jeecgboot-2023-03-08.0.html | 6315 - logs/jeecgboot-2023-03-10.0.html | 15444 --- 36 files changed, 675 insertions(+), 263175 deletions(-) create mode 100644 linkage-boot/linkage-module-system/linkage-system-start/src/main/java/org/jeecg/CustomRunner.java create mode 100644 linkage-boot/linkage-module-system/linkage-system-start/src/main/java/org/jeecg/rscom/RS485Handler.java create mode 100644 linkage-boot/linkage-module-system/linkage-system-start/src/main/java/org/jeecg/rscom/enums/DEVICE_TYPE.java delete mode 100644 logs/jeecgboot-2023-01-23.0.html delete mode 100644 logs/jeecgboot-2023-01-25.0.html delete mode 100644 logs/jeecgboot-2023-02-04.0.html delete mode 100644 logs/jeecgboot-2023-02-06.0.html delete mode 100644 logs/jeecgboot-2023-02-14.0.html delete mode 100644 logs/jeecgboot-2023-02-15.0.html delete mode 100644 logs/jeecgboot-2023-02-16.0.html delete mode 100644 logs/jeecgboot-2023-02-17.0.html delete mode 100644 logs/jeecgboot-2023-02-24.0.html delete mode 100644 logs/jeecgboot-2023-03-07.0.html delete mode 100644 logs/jeecgboot-2023-03-08.0.html delete mode 100644 logs/jeecgboot-2023-03-10.0.html diff --git a/.gitignore b/.gitignore index 15fc3f5..6ddbb9f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ # Log file *.log +logs # BlueJ files *.ctxt diff --git a/ant-design-vue/src/utils/request.js b/ant-design-vue/src/utils/request.js index 212447d..18e4a9f 100644 --- a/ant-design-vue/src/utils/request.js +++ b/ant-design-vue/src/utils/request.js @@ -17,7 +17,8 @@ let apiBaseUrl = window._CONFIG['domianURL'] || "/linkage-boot"; const service = axios.create({ //baseURL: '/linkage-boot', baseURL: apiBaseUrl, // api base_url - timeout: 9000 // 请求超时时间 + // timeout: 9000 // 请求超时时间 + timeout: 30000 // 请求超时时间 }) const err = (error) => { diff --git a/ant-design-vue/vue.config.js b/ant-design-vue/vue.config.js index bd20a61..a8475b6 100644 --- a/ant-design-vue/vue.config.js +++ b/ant-design-vue/vue.config.js @@ -108,7 +108,8 @@ module.exports = { /* 注意:jeecgboot前端做了改造,此处不需要配置跨域和后台接口(只需要改.env相关配置文件即可) issues/3462 很多人此处做了配置,导致刷新前端404问题,请一定注意*/ '/linkage-boot': { - target: 'http://222.71.165.188:8091', + // target: 'http://222.71.165.187:8091', + target: 'http://localhost:8091', ws: false, changeOrigin: true }, diff --git a/linkage-boot/linkage-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/linkage-boot/linkage-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 2226924..701bfb9 100644 --- a/linkage-boot/linkage-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/linkage-boot/linkage-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -139,6 +139,10 @@ public class ShiroConfig { //filterChainDefinitionMap.put("/test/jeecgDemo/html", "anon"); //模板页面 //filterChainDefinitionMap.put("/test/jeecgDemo/redis/**", "anon"); //redis测试 + // 大屏看板不需要权限认证 + filterChainDefinitionMap.put("/ttpouringequip/ttPouringEquip/pouringScreen", "anon"); + filterChainDefinitionMap.put("/ttsulfequip/ttSulfEquip/sulfScreen", "anon"); + //websocket排除 filterChainDefinitionMap.put("/websocket/**", "anon");//系统通知和公告 filterChainDefinitionMap.put("/newsWebsocket/**", "anon");//CMS模块 diff --git a/linkage-boot/linkage-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java b/linkage-boot/linkage-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java index c561c0f..f6d5668 100644 --- a/linkage-boot/linkage-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java +++ b/linkage-boot/linkage-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java @@ -61,10 +61,8 @@ public class JwtFilter extends BasicHttpAuthenticationFilter { @Override protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception { HttpServletRequest httpServletRequest = (HttpServletRequest) request; - //modified by 巴卫 - //String token = httpServletRequest.getHeader(CommonConstant.X_ACCESS_TOKEN); + String token = httpServletRequest.getHeader(CommonConstant.X_ACCESS_TOKEN); - String token = CommonConstant.TOKEN; // update-begin--Author:lvdandan Date:20210105 for:JT-355 OA聊天添加token验证,获取token参数 if (oConvertUtils.isEmpty(token)) { token = httpServletRequest.getParameter("token"); diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/controller/TtPouringEquipController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/controller/TtPouringEquipController.java index 757667e..78fe26c 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/controller/TtPouringEquipController.java +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/controller/TtPouringEquipController.java @@ -70,9 +70,9 @@ public class TtPouringEquipController extends JeecgController> queryPageList(TtPouringEquip ttPouringEquip, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(ttPouringEquip, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = ttPouringEquipService.page(page, queryWrapper); @@ -83,27 +83,28 @@ public class TtPouringEquipController extends JeecgController> Pouring(TtPouringEquip ttPouringEquip) { - List list = ttPouringEquipService.queryPouringInfo(ttPouringEquip); + @GetMapping(value = "/pouringScreen") + public Result> pouringScreen() { + List list = ttPouringEquipService.queryLastPouringByGroup(); return Result.OK(list); } + + + @ApiOperation(value = "tt_pouring_equip-浇注机看板温度", notes = "tt_pouring_equip-浇注机看板温度") @GetMapping(value = "/pouringtemperature") public Result> PouringTemperature(TtPouringEquip ttPouringEquip) { @@ -220,7 +221,7 @@ public class TtPouringEquipController extends JeecgController { + + List queryLastPouringByGroup(); + List queryPouring(TtPouringEquip ttPouringEquip); List queryPouringTemperature(TtPouringEquip ttPouringEquip); diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/mapper/xml/TtPouringEquipMapper.xml b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/mapper/xml/TtPouringEquipMapper.xml index f671dd5..6e3853f 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/mapper/xml/TtPouringEquipMapper.xml +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/mapper/xml/TtPouringEquipMapper.xml @@ -1,6 +1,29 @@ + + + + + + SELECT + t1.id, + t1.eqt_no, + t1.sulf_pressure, + t1.sulf_time, + t1.sulf_temp_upper, + t1.sulf_temp_middle, + t1.sulf_temp_lower, + b.eqt_type, + b.eqt_ip, + b.eqt_supplier, + b.location, + b.descr, + b.eqt_status, + b.utilize_rate + FROM + tt_sulf_equip t1 + INNER JOIN ( SELECT MAX(id) AS id FROM tt_sulf_equip GROUP BY eqt_no ) t2 ON t1.id = t2.id + LEFT JOIN tt_eqt_base b ON t1.eqt_no = b.eqt_no AND b.eqt_type = 3; + + + + + + + + + +