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; + + + + + + + + + +