From b05a741798a02f9731bda6263101f9bc289682f5 Mon Sep 17 00:00:00 2001 From: litao Date: Thu, 23 Nov 2023 15:20:00 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B411=E6=9C=8823=E6=97=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppDataController.java | 152 ++---------------- .../springblade/hospital/entity/AppData.java | 6 + .../springblade/hospital/hik/alarm/Alarm.java | 2 - .../service/impl/AppDataServiceImpl.java | 10 +- .../hospital/utils/CornJobUtil.java | 4 +- src/main/resources/application-dev.yml | 8 +- 6 files changed, 30 insertions(+), 152 deletions(-) diff --git a/src/main/java/org/springblade/hospital/controller/AppDataController.java b/src/main/java/org/springblade/hospital/controller/AppDataController.java index 5b30467..b093c50 100644 --- a/src/main/java/org/springblade/hospital/controller/AppDataController.java +++ b/src/main/java/org/springblade/hospital/controller/AppDataController.java @@ -81,7 +81,6 @@ public class AppDataController extends BladeController { @GetMapping("/list") public R> list(AppData appData, Query query) { - log.info("/appData/list执行了--------------"); return R.data(appDataService.getPage(Condition.getPage(query), appData)); } @@ -106,6 +105,16 @@ public class AppDataController extends BladeController { return R.data(appDataService.putFile(appData, resultList)); } + /** + * 故障上报处理 + */ + @CrossOrigin + @PostMapping("/handle") + public R handle(@RequestBody AppData appData) { + appData.setStatus(2); + return R.data(appDataService.updateById(appData)); + } + /** * 海信上报接口 */ @@ -340,145 +349,4 @@ public class AppDataController extends BladeController { return R.data(new JoysuchCoordinate((double) x, (double) y, lng, lat)); } - @GetMapping("/test") - public R test(String number) { -// HCNetSDK.NET_DVR_ALARMHOST_MAIN_STATUS_V40 status = Alarm.getStatus(number); -// -// Alarm.xiaojing(number, 0); - - externalUtils.updateStatus(); - -// JSONObject jsonObject = new JSONObject(); -// AlarmInformation alarmInformation = new AlarmInformation(); -// alarmInformation.setReportTime(new Date()); -// alarmInformation.setBuildId("111222333"); -// alarmInformation.setFloorNo("11"); -// alarmInformation.setContent("22"); -// jsonObject.put("message", JSONObject.toJSONString(alarmInformation)); -// WebSocketServer.sendInfo(jsonObject); -// WebSocketServer.test(); - return R.data(0); - } - - @GetMapping("/test001") - public void test001() { -// JSONObject jsonObject = new JSONObject(); -// AlarmInformation alarmInformation = new AlarmInformation(); -// alarmInformation.setReportTime(new Date()); -// alarmInformation.setBuildId("111222333"); -// alarmInformation.setFloorNo("11"); -// alarmInformation.setContent("22"); -// alarmInformation.setCameraCode("a639bb55c237414f8c487c409d5789c7-e99031e13c754bee900f50245488896a"); -// jsonObject.put("message", JSONObject.toJSONString(alarmInformation)); -// WebSocketServer.sendInfo(jsonObject); - WebSocketServer.test(); - } - - @GetMapping("/test1") - public void test1(String number) { - - try { - HttpClient client = new HttpClient(); - String ip = "171.16.206.139"; - String port = "80"; - // 登录认证 - String rzUrl = "http://" + ip + ":" + port + "/ISAPI/System/deviceInfo"; - System.out.println("shuchu:" + HTTPClientUtil.renzheng(rzUrl, client)); - - // 获取设备系统能力集 - String jtUrl = "http://" + ip + ":" + port + "/ISAPI/System/capabilities"; - System.out.println("jt:" + HTTPClientUtil.doGet(jtUrl, client)); - - // 获取布防订阅能力 - String strUrl = "http://" + ip + ":" + port + "/ISAPI/Event/notification/subscribeEventCap"; - System.out.println("shuchu:" + HTTPClientUtil.doGet(strUrl, client)); - - // 建立布防订阅连接 - String jlUrl = "http://" + ip + ":" + port + "/ISAPI/Event/notification/subscribeEvent?deployID=1"; - String xml = "\n" + - "\n" + - "\n" + - " 1\n" + - " all\n" + - ""; -// System.out.println("jl:" + HTTPClientUtil.doPost(jlUrl, xml, number, client)); - - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void main(String[] args) { - try { -// RestTemplate restTemplate = new RestTemplate(); -// String url = "http://171.16.8.58:8080/prod-api/api/safeCare/callBack/getDeviceCamera?sn=1918FC32532E"; -// HttpHeaders headers = new HttpHeaders(); -// headers.setContentType(MediaType.parseMediaType("application/json;charset=UTF-8")); -// HttpEntity request = new HttpEntity(headers); -// // 发送get请求，并输出结果 -// ResponseEntity exchange = restTemplate.exchange(url, HttpMethod.GET, request, String.class); -// // 返回数据 -// Map cameraMap = JSONObject.parseObject(exchange.getBody(), Map.class); - -// String rzUrl = "http://" + HTTPClientUtil.strIP + ":" + HTTPClientUtil.iPort + "/ISAPI/System/deviceInfo"; - String rzUrl = "http://171.16.206.140:80/ISAPI/System/deviceInfo"; - String renzheng = HTTPClientUtil.renzheng(rzUrl, HTTPClientUtil.client); -// System.out.println(renzheng.contains("DS-PWA32-H20230524AACHQ25788522WU1")); - -// System.out.println("shuchu:" + HTTPClientUtil.renzheng(rzUrl, HTTPClientUtil.client)); - -// String jtUrl = "http://" + HTTPClientUtil.strIP + ":" + HTTPClientUtil.iPort + "/ISAPI/System/capabilities"; -// System.out.println("jt:" + HTTPClientUtil.doGet(jtUrl, HTTPClientUtil.client)); -// -// String strUrl = "http://" + HTTPClientUtil.strIP + ":" + HTTPClientUtil.iPort + "/ISAPI/Event/notification/subscribeEventCap"; -// System.out.println("shuchu:" + HTTPClientUtil.doGet(strUrl, HTTPClientUtil.client)); -// -// String jlUrl = "http://" + HTTPClientUtil.strIP + ":" + HTTPClientUtil.iPort + "/ISAPI/Event/notification/subscribeEvent?deployID=1"; -// String xml = "\n" + -// "\n" + -// "\n" + -// " 1\n" + -// " all\n" + -// ""; -// System.out.println("jl:" + HTTPClientUtil.doPost(jlUrl, xml)); - -// String bfUrl = "http://" + HTTPClientUtil.strIP + ":" + HTTPClientUtil.iPort + "/ISAPI/SecurityCP/control/arm/1?ways=away&format=json"; -// System.out.println("xj:" + HTTPClientUtil.doPut(bfUrl, "", HTTPClientUtil.client)); - -// String cfUrl = "http://" + HTTPClientUtil.strIP + ":" + HTTPClientUtil.iPort + "/ISAPI/SecurityCP/control/disarm/1"; -// System.out.println("xj:" + HTTPClientUtil.doPut(cfUrl, "", HTTPClientUtil.client)); - -// String xjUrl = "http://" + HTTPClientUtil.strIP + ":" + HTTPClientUtil.iPort + "/ISAPI/SecurityCP/control/clearAlarm/1"; -// System.out.println("xj:" + HTTPClientUtil.doPut(xjUrl, "", HTTPClientUtil.client)); - -// String plUrl = "http://" + HTTPClientUtil.strIP + ":" + HTTPClientUtil.iPort + "/ISAPI/SecurityCP/control/bypass/1"; -// System.out.println("xj:" + HTTPClientUtil.doPut(plUrl, "", HTTPClientUtil.client)); - -// String qxplUrl = "http://" + HTTPClientUtil.strIP + ":" + HTTPClientUtil.iPort + "/ISAPI/SecurityCP/control/bypassRecover/1"; -// System.out.println("xj:" + HTTPClientUtil.doPut(qxplUrl, "", HTTPClientUtil.client)); - -// String status = "http://" + HTTPClientUtil.strIP + ":" + HTTPClientUtil.iPort + "/ISAPI/SecurityCP/status/communication?format=json"; -// System.out.println("防区状态:" + HTTPClientUtil.doGet(status, HTTPClientUtil.client)); - -// String status = "http://" + HTTPClientUtil.strIP + ":" + HTTPClientUtil.iPort + "/ISAPI/SecurityCP/status/host?format=json"; -// String statusData = HTTPClientUtil.doGet(status, HTTPClientUtil.client); -// -// Map tagsMap = JSONObject.parseObject(statusData, Map.class); -// Map alarmHostStatus = JSONObject.parseObject(tagsMap.get("AlarmHostStatus").toString(), Map.class); -// Map CommuniStatus = JSONObject.parseObject(alarmHostStatus.get("CommuniStatus").toString(), Map.class); -//// System.out.println("CommuniStatus" + CommuniStatus); -// List ZoneList = JSONObject.parseObject(alarmHostStatus.get("ZoneList").toString(), List.class); -// System.out.println("ZoneList" + ZoneList); -// for (Map map : ZoneList) { -// Map zone = JSONObject.parseObject(map.get("Zone").toString(), Map.class); -// boolean isArming = (boolean) zone.get("isArming"); -// System.out.println(isArming); -// } -// -// List SubSysList = JSONObject.parseObject(alarmHostStatus.get("SubSysList").toString(), List.class); -// System.out.println("SubSysList" + SubSysList); - } catch (Exception e) { - e.printStackTrace(); - } - } } diff --git a/src/main/java/org/springblade/hospital/entity/AppData.java b/src/main/java/org/springblade/hospital/entity/AppData.java index a9c1f09..ace64e7 100644 --- a/src/main/java/org/springblade/hospital/entity/AppData.java +++ b/src/main/java/org/springblade/hospital/entity/AppData.java @@ -106,5 +106,11 @@ public class AppData extends BaseEntity { @TableField(exist = false) private List attaches; + @TableField(exist = false) + private Date startTime; + + @TableField(exist = false) + private Date endTime; + } diff --git a/src/main/java/org/springblade/hospital/hik/alarm/Alarm.java b/src/main/java/org/springblade/hospital/hik/alarm/Alarm.java index dd15715..c4c0b48 100644 --- a/src/main/java/org/springblade/hospital/hik/alarm/Alarm.java +++ b/src/main/java/org/springblade/hospital/hik/alarm/Alarm.java @@ -565,8 +565,6 @@ public class Alarm implements CommandLineRunner { } } }, 0, 1, TimeUnit.DAYS); - - } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/org/springblade/hospital/service/impl/AppDataServiceImpl.java b/src/main/java/org/springblade/hospital/service/impl/AppDataServiceImpl.java index 2aa270e..a40a914 100644 --- a/src/main/java/org/springblade/hospital/service/impl/AppDataServiceImpl.java +++ b/src/main/java/org/springblade/hospital/service/impl/AppDataServiceImpl.java @@ -100,8 +100,14 @@ public class AppDataServiceImpl extends BaseServiceImpl @Override public IPage getPage(IPage page, AppData appData) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(appData); - wrapper.orderByDesc(AppData::getCreateTime); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(appData.getType() != null, AppData::getType, appData.getType()); + wrapper.eq(appData.getStatus() != null, AppData::getStatus, appData.getStatus()); + wrapper.like(StringUtils.isNotBlank(appData.getDeviceId()), AppData::getDeviceId, appData.getDeviceId()); + if (appData.getStartTime() != null && appData.getEndTime() != null) { + wrapper.between(AppData::getEscalationTime, appData.getStartTime(), appData.getEndTime()); + } + wrapper.orderByDesc(AppData::getEscalationTime); IPage iPage = this.page(page, wrapper); List records = page.getRecords(); if (CollectionUtils.isNotEmpty(records)) { diff --git a/src/main/java/org/springblade/hospital/utils/CornJobUtil.java b/src/main/java/org/springblade/hospital/utils/CornJobUtil.java index 646fb23..99a801f 100644 --- a/src/main/java/org/springblade/hospital/utils/CornJobUtil.java +++ b/src/main/java/org/springblade/hospital/utils/CornJobUtil.java @@ -37,8 +37,8 @@ public class CornJobUtil { /** * 定时更新设备状态，每1分钟执行一次 */ - @Async - @Scheduled(initialDelay = 5000, fixedRate = 60000) +// @Async +// @Scheduled(initialDelay = 5000, fixedRate = 60000) public void updateStatus() { log.info("定时1分钟获取1次设备状态"); externalUtils.updateStatus(); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9fb8a40..65858bc 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,8 +2,8 @@ spring: redis: ##redis 单机环境配置 -# host: 171.16.8.51 - host: 127.0.0.1 + host: 171.16.8.51 +# host: 127.0.0.1 port: 6379 password: database: 0 @@ -14,8 +14,8 @@ spring: # commandTimeout: 5000 datasource: # MySql - url: jdbc:mysql://localhost:3306/hospital?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true -# url: jdbc:mysql://171.16.8.51:3306/hospital?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true +# url: jdbc:mysql://localhost:3306/hospital?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + url: jdbc:mysql://171.16.8.51:3306/hospital?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true username: root password: 123456 # PostgreSQL