From 12d0079c3b8d31bdac5f2574efa95f4f587aa22b Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Sat, 6 Jan 2024 10:52:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E5=B0=91=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../zcloud/controller/map/MapController.java | 15 ++- .../java/com/zcloud/util/HttpRequestUtil.java | 90 ++++++++++++++++++ src/main/java/com/zcloud/util/PerLocUtil.java | 16 ++-- .../mybatis/datasource/system/UsersMapper.xml | 15 +++ .../czks/checkStandardTemplates.xls | Bin 0 -> 19968 bytes 6 files changed, 127 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/uploadFiles/czks/checkStandardTemplates.xls diff --git a/pom.xml b/pom.xml index 8f02d4b0..e733d70d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 0.0.1-SNAPSHOT war - qa-prevention-gwj + qa-prevention-czks qa-prevention-czks for Spring Boot diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 37bc5186..6ef58645 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -12,6 +12,7 @@ import com.zcloud.service.gatemachine.GateMachineService; import com.zcloud.service.keyProjects.VideoManagerService; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.UsersService; +import com.zcloud.util.HttpRequestUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.ReturnMap; import com.zcloud.util.Tools; @@ -286,7 +287,7 @@ public class MapController extends BaseController { String errInfo = "success"; PageData pd = this.getPageData(); String corpinfoId = Jurisdiction.getCORPINFO_ID(); - pd.put("CORPINFO_ID",corpinfoId); + pd.put("CORPINFO_ID", corpinfoId); //获取当前人的公司id page.setPd(pd); @@ -325,6 +326,16 @@ public class MapController extends BaseController { return map; } + /** + * 沧州矿石人员定位，告警数据 Alarm data + */ + @RequestMapping(value = "/getAlarmData") + @ResponseBody + public Object getAlarmData() { + return HttpRequestUtil.getPeopleApi("/statistics/alarmStatistics/todayAlarm",""); + } + + /** * 获取人员、车辆进出记录 * @@ -340,7 +351,7 @@ public class MapController extends BaseController { return map; } - // 获取人员定位信息 根据定位卡编码 + // 获取人员定位信息 根据定位卡(身份证)编码 @RequestMapping(value = "/getPersonByCardNo") @ResponseBody public Object getPersonByCardNo() throws Exception { diff --git a/src/main/java/com/zcloud/util/HttpRequestUtil.java b/src/main/java/com/zcloud/util/HttpRequestUtil.java index 2b9058ce..f0032a6b 100644 --- a/src/main/java/com/zcloud/util/HttpRequestUtil.java +++ b/src/main/java/com/zcloud/util/HttpRequestUtil.java @@ -1,5 +1,6 @@ package com.zcloud.util; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import org.springframework.lang.Nullable; @@ -9,6 +10,7 @@ import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; +import java.util.HashMap; /** * description: http请求工具类 @@ -368,4 +370,92 @@ public class HttpRequestUtil { } + public static ReturnMap getPeopleApi(String httpUrl, String param) { + StringBuffer result = new StringBuffer(); + //连接 + HttpURLConnection connection = null; + OutputStream os = null; + InputStream is = null; + BufferedReader br = null; + try { + //创建连接对象 + URL url = new URL(PerLocUtil.perLocUrl + httpUrl); + //创建连接 + connection = (HttpURLConnection) url.openConnection(); + //设置请求方法 + connection.setRequestMethod("POST"); + //设置连接超时时间 + connection.setConnectTimeout(15000); + //设置读取超时时间 + connection.setReadTimeout(15000); + //DoOutput设置是否向httpUrlConnection输出，DoInput设置是否从httpUrlConnection读入，此外发送post请求必须设置这两个 + //设置是否可读取 + connection.setDoOutput(true); + connection.setDoInput(true); + //设置通用的请求属性 +// connection.setRequestProperty("accept", "*/*"); +// connection.setRequestProperty("connection", "Keep-Alive"); +// connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)"); + connection.setRequestProperty("Content-Type", "application/json;charset=utf-8"); + // 必须添加token + connection.setRequestProperty("Authorization", PerLocUtil.getToken()); + //拼装参数 + if (null != param && !param.equals("")) { + //设置参数 + os = connection.getOutputStream(); + //拼装参数 + os.write(param.getBytes()); + } + //设置权限 + //设置请求头等 + //开启连接 + //connection.connect(); + //读取响应 + if (connection.getResponseCode() == 200) { + is = connection.getInputStream(); + if (null != is) { + br = new BufferedReader(new InputStreamReader(is, "UTF-8")); + String temp = null; + while (null != (temp = br.readLine())) { + result.append(temp); + result.append("\r\n"); + } + } + } + + } catch (MalformedURLException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + //关闭连接 + if (br != null) { + try { + br.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (os != null) { + try { + os.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (is != null) { + try { + is.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + //关闭连接 + connection.disconnect(); + } + HashMap o = JSON.parseObject(result.toString(), HashMap.class); + ReturnMap returnMap = new ReturnMap(); + returnMap.putAll(o); + return returnMap; + } } diff --git a/src/main/java/com/zcloud/util/PerLocUtil.java b/src/main/java/com/zcloud/util/PerLocUtil.java index 17a5fcb5..a3cf17e8 100644 --- a/src/main/java/com/zcloud/util/PerLocUtil.java +++ b/src/main/java/com/zcloud/util/PerLocUtil.java @@ -15,8 +15,8 @@ import javax.annotation.Resource; @Component public class PerLocUtil { - @Value("${perLoc.url}") - private String perLocUrl; +// @Value("${perLoc.url}") + public static String perLocUrl = "http://172.16.130.86/gateway-service"; // @Value("${perLoc.userName}") // private String userName; // @Value("${perLoc.pwd}") @@ -33,13 +33,13 @@ public class PerLocUtil { @Resource private PersonLocationTokenMapper personLocationTokenMapper; - public String getToken() throws Exception { + public static String getToken(){ // token 不为空。验证token是否失效 if (Tools.notEmpty(perLocToken)) { JSONObject request = new JSONObject(); request.put("pageNum", 1); request.put("pageSize", 10); - String httpResponseStr = HttpRequestUtil.doPost(perLocToken, this.perLocUrl + "/system/menu/menuTree",request.toJSONString()); + String httpResponseStr = HttpRequestUtil.doPost(perLocToken, perLocUrl + "/system/menu/menuTree",request.toJSONString()); JSONObject httpResponse = JSONObject.parseObject(httpResponseStr); // token 有效 if (Tools.notEmpty(httpResponseStr) && httpResponse != null && httpResponse.get("code") != null && httpResponse.getInteger("code") == 200) { @@ -54,19 +54,19 @@ public class PerLocUtil { } - private String goToLogin() throws Exception{ + private static String goToLogin(){ JSONObject request = new JSONObject(); - request.put("username", userName); + request.put("username", username); request.put("password", password); request.put("userName", userName); request.put("source", source); request.put("code", code); - String loginResStr = HttpRequestUtil.doPost(this.perLocUrl + "/auth/encryptLogin", request.toJSONString()); + String loginResStr = HttpRequestUtil.doPost(perLocUrl + "/auth/encryptLogin", request.toJSONString()); JSONObject loginResponse = JSONObject.parseObject(loginResStr); // 登录成功 if(Tools.notEmpty(loginResStr) && loginResponse != null && loginResponse.get("code") != null && loginResponse.getInteger("code") == 200 - && loginResponse.get("data") != null && loginResponse.getJSONObject("data").getString("access_token") != null){ + && loginResponse.get("data") != null && loginResponse.getJSONObject("data").getString("token") != null){ // personLocationTokenMapper.edit(loginResponse.getJSONObject("data").getString("access_token")); return loginResponse.getJSONObject("data").getString("token"); } else { // 登录失败 diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index ea92fbc2..3d5f116b 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1346,4 +1346,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ISASSESS = #{ISASSESS} + diff --git a/src/main/resources/uploadFiles/czks/checkStandardTemplates.xls b/src/main/resources/uploadFiles/czks/checkStandardTemplates.xls new file mode 100644 index 0000000000000000000000000000000000000000..d72bfc404ef3580299f99176f29b980f73a6848c GIT binary patch literal 19968 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 literal 0 HcmV?d00001