diff --git a/src/main/java/org/springblade/hospital/agent/service/HikAgentService.java b/src/main/java/org/springblade/hospital/agent/service/HikAgentService.java index d5bbe20..967c213 100644 --- a/src/main/java/org/springblade/hospital/agent/service/HikAgentService.java +++ b/src/main/java/org/springblade/hospital/agent/service/HikAgentService.java @@ -10,6 +10,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springblade.hospital.agent.annotation.GrpcService; import org.springblade.hospital.agent.constant.MemoryCache; import org.springblade.hospital.agent.dto.Constant; @@ -20,6 +22,7 @@ import org.springblade.hospital.agent.hik.utils.HikClient; import org.springblade.hospital.agent.utils.DataTrans; import org.springblade.hospital.agent.utils.QueueUtils; import org.springblade.hospital.hik.alarm.Alarm; +import org.springblade.hospital.newalarm.communicationCom.HTTPClientUtil; import org.springblade.hospital.utils.ExternalUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; @@ -180,7 +183,7 @@ public class HikAgentService extends AgentGrpc.AgentImplBase { int devType = request.getDevType(); List list = externalUtils.getList(page, pagesize, null, String.valueOf(devType), "100", null); - System.out.println("list======" + list); + log.info("list======" + list); // List roadwayVoList = hikService.getTheDeviceInfo(); diff --git a/src/main/java/org/springblade/hospital/agent/utils/QueueUtils.java b/src/main/java/org/springblade/hospital/agent/utils/QueueUtils.java index 26fcf95..96640de 100644 --- a/src/main/java/org/springblade/hospital/agent/utils/QueueUtils.java +++ b/src/main/java/org/springblade/hospital/agent/utils/QueueUtils.java @@ -5,6 +5,9 @@ import com.hisense.device.agent.grpc.DataResponse; import com.hisense.device.agent.grpc.Point; import io.grpc.stub.StreamObserver; import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springblade.hospital.agent.service.HikAgentService; import org.springframework.stereotype.Component; import java.util.Arrays; diff --git a/src/main/java/org/springblade/hospital/controller/AlarmInformationController.java b/src/main/java/org/springblade/hospital/controller/AlarmInformationController.java index 57802ac..69f39bd 100644 --- a/src/main/java/org/springblade/hospital/controller/AlarmInformationController.java +++ b/src/main/java/org/springblade/hospital/controller/AlarmInformationController.java @@ -25,6 +25,7 @@ import com.google.gson.Gson; import com.google.protobuf.ByteString; import com.hisense.device.agent.grpc.Point; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.json.JSONException; import org.springblade.common.cache.DictBizCache; import org.springblade.core.boot.ctrl.BladeController; @@ -46,6 +47,7 @@ import org.springframework.http.*; import org.springframework.web.bind.annotation.*; import org.springframework.web.client.RestTemplate; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.*; @@ -57,6 +59,7 @@ import java.util.*; @NonDS @RestController @AllArgsConstructor +@Slf4j @RequestMapping("/alarmInformation") public class AlarmInformationController extends BladeController { @@ -220,4 +223,15 @@ public class AlarmInformationController extends BladeController { } } + /** + * 获取客户端IP + */ + @GetMapping("/getIp") + @CrossOrigin + public R getIp(HttpServletRequest request) { + String ip = request.getRemoteAddr(); +// log.info("IP:" + ip); + return R.data(ip); + } + } diff --git a/src/main/java/org/springblade/hospital/controller/AppDataController.java b/src/main/java/org/springblade/hospital/controller/AppDataController.java index beb2291..5b30467 100644 --- a/src/main/java/org/springblade/hospital/controller/AppDataController.java +++ b/src/main/java/org/springblade/hospital/controller/AppDataController.java @@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.lang3.RandomStringUtils; @@ -66,6 +67,7 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE; @RestController @AllArgsConstructor @RequestMapping("/appData") +@Slf4j public class AppDataController extends BladeController { private final IAppDataService appDataService; @@ -79,6 +81,7 @@ 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)); } @@ -405,7 +408,6 @@ public class AppDataController extends BladeController { } } - // public static void main(String[] args) { try { // RestTemplate restTemplate = new RestTemplate(); diff --git a/src/main/java/org/springblade/hospital/controller/BfcfLogController.java b/src/main/java/org/springblade/hospital/controller/BfcfLogController.java index 1b990b3..c990b2e 100644 --- a/src/main/java/org/springblade/hospital/controller/BfcfLogController.java +++ b/src/main/java/org/springblade/hospital/controller/BfcfLogController.java @@ -18,6 +18,8 @@ package org.springblade.hospital.controller; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tenant.annotation.NonDS; import org.springframework.web.bind.annotation.RequestMapping; 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 052dfd8..dd15715 100644 --- a/src/main/java/org/springblade/hospital/hik/alarm/Alarm.java +++ b/src/main/java/org/springblade/hospital/hik/alarm/Alarm.java @@ -534,7 +534,7 @@ public class Alarm implements CommandLineRunner { AtomicInteger size = new AtomicInteger(0); List threadList = new ArrayList<>(); ScheduledFuture scheduledFuture = scheduled.scheduleAtFixedRate(() -> { - log.info("我执行了1"); +// log.info("我执行了1"); List list = externalUtils.getList(0, 0, null, null, "105", null); log.info("获取报警主机列表数量为:" + list.size()); if (list.size() != size.get()) { @@ -545,8 +545,24 @@ public class Alarm implements CommandLineRunner { } } threadList.clear(); - // 物联网平台获取的报警主机列表 - getList(list, threadList); + // 51服务器使用:物联网平台获取的报警主机列表 +// getList(list, threadList); + + // 52服务器使用:不需要监听,只获取设备信息:ip、端口号、mac + for (Map map : list) { + String s = JSON.toJSONString(map.get("tags")).replace("\\", ""); + s = s.substring(1, s.length() - 1); + Map tagsMap = JSONObject.parseObject(s, Map.class); + + // 报警主机信息 + String number = tagsMap.get("hostNumber").toString();//序列号 + String ip = tagsMap.get("ip").toString(); + String port = tagsMap.get("port").toString(); + String mac = tagsMap.get("mac").toString(); + ipMap.put(number, ip); + portMap.put(number, port); + macMap.put(mac, number); + } } }, 0, 1, TimeUnit.DAYS); @@ -677,7 +693,7 @@ public class Alarm implements CommandLineRunner { // 登录认证 String rzUrl = "http://" + ip + ":" + port + "/ISAPI/System/deviceInfo"; String renzheng = HTTPClientUtil.renzheng(rzUrl, client); - System.out.println("登录信息:" + renzheng); + log.info("登录信息:" + renzheng); if (renzheng.contains(number)) { // 获取设备系统能力集 @@ -696,7 +712,7 @@ public class Alarm implements CommandLineRunner { " 1\n" + " all\n" + ""; - System.out.println("jl:" + clientUtil.doPost(jlUrl, xml, number, client, mac)); + log.info("jl:" + clientUtil.doPost(jlUrl, xml, number, client, mac)); } }); thread.start(); @@ -704,4 +720,5 @@ public class Alarm implements CommandLineRunner { } } } + } diff --git a/src/main/java/org/springblade/hospital/mapper/AlarmInformationMapper.java b/src/main/java/org/springblade/hospital/mapper/AlarmInformationMapper.java index 0a4c582..44c3a12 100644 --- a/src/main/java/org/springblade/hospital/mapper/AlarmInformationMapper.java +++ b/src/main/java/org/springblade/hospital/mapper/AlarmInformationMapper.java @@ -31,4 +31,5 @@ import java.util.List; public interface AlarmInformationMapper extends BaseMapper { List export(AlarmInformation alarmInformation); + } diff --git a/src/main/java/org/springblade/hospital/newalarm/communicationCom/HTTPClientUtil.java b/src/main/java/org/springblade/hospital/newalarm/communicationCom/HTTPClientUtil.java index b9024c1..a303bd4 100644 --- a/src/main/java/org/springblade/hospital/newalarm/communicationCom/HTTPClientUtil.java +++ b/src/main/java/org/springblade/hospital/newalarm/communicationCom/HTTPClientUtil.java @@ -14,6 +14,8 @@ import org.apache.commons.httpclient.methods.DeleteMethod; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.PutMethod; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springblade.common.cache.DictBizCache; import org.springblade.core.tool.utils.SpringUtil; import org.springblade.hospital.agent.utils.DataTrans; @@ -54,7 +56,7 @@ public class HTTPClientUtil { String strResponseData = null; try { int statusCode = client.executeMethod(method); - System.out.println("认证状态码:" + statusCode); + log.info("认证状态码:" + statusCode); byte[] responseData = method.getResponseBodyAsString().getBytes(method.getResponseCharSet()); strResponseData = new String(responseData, "utf-8"); } catch (IOException e) { 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 8cff562..2aa270e 100644 --- a/src/main/java/org/springblade/hospital/service/impl/AppDataServiceImpl.java +++ b/src/main/java/org/springblade/hospital/service/impl/AppDataServiceImpl.java @@ -77,8 +77,9 @@ public class AppDataServiceImpl extends BaseServiceImpl BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), file.getInputStream()); String link = bladeFile.getLink(); Attach attach = new Attach(); - attach.setLink(link); + attach.setLink("http://192.169.9.252:1883/hospital/" + bladeFile.getName()); attach.setOriginalName(file.getOriginalFilename()); + attach.setName(bladeFile.getName()); attachService.save(attach); url += attach.getId() + ","; diff --git a/src/main/java/org/springblade/hospital/utils/CornJobUtil.java b/src/main/java/org/springblade/hospital/utils/CornJobUtil.java index c1a4fbc..646fb23 100644 --- a/src/main/java/org/springblade/hospital/utils/CornJobUtil.java +++ b/src/main/java/org/springblade/hospital/utils/CornJobUtil.java @@ -1,38 +1,25 @@ package org.springblade.hospital.utils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.google.protobuf.ByteString; -import com.hisense.device.agent.grpc.Point; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.PostMethod; -import org.springblade.common.cache.DictBizCache; -import org.springblade.core.tool.utils.SpringUtil; -import org.springblade.hospital.agent.utils.DataTrans; +import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springblade.hospital.agent.utils.QueueUtils; -import org.springblade.hospital.entity.AlarmInformation; import org.springblade.hospital.entity.CornJob; -import org.springblade.hospital.hik.NetSDKDemo.HCNetSDK; import org.springblade.hospital.hik.alarm.Alarm; import org.springblade.hospital.service.IAlarmInformationService; import org.springblade.hospital.service.ICornJobService; -import org.springblade.hospital.websocket.WebSocketServer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; import java.util.*; @Component +@Slf4j public class CornJobUtil { @Autowired @@ -53,14 +40,14 @@ public class CornJobUtil { @Async @Scheduled(initialDelay = 5000, fixedRate = 60000) public void updateStatus() { - System.out.println("定时1分钟获取1次设备状态"); + log.info("定时1分钟获取1次设备状态"); externalUtils.updateStatus(); } /** * 定时布撤防,每3分钟执行一次 */ - @Async +// @Async // @Scheduled(initialDelay = 6000, fixedRate = 180000) public void task() { // System.out.println("定时任务执行了2"); @@ -106,7 +93,7 @@ public class CornJobUtil { } } - @Async +// @Async // @Scheduled(initialDelay = 7000, fixedRate = 3600000) public void testWebSocket() { // System.out.println("定时任务执行了3"); diff --git a/src/main/java/org/springblade/hospital/utils/ExternalUtils.java b/src/main/java/org/springblade/hospital/utils/ExternalUtils.java index 65ed52d..59fc22d 100644 --- a/src/main/java/org/springblade/hospital/utils/ExternalUtils.java +++ b/src/main/java/org/springblade/hospital/utils/ExternalUtils.java @@ -8,6 +8,8 @@ import com.hisense.device.agent.grpc.Point; import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springblade.common.cache.ParamCache; import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.tool.api.R; diff --git a/src/main/java/org/springblade/hospital/websocket/WebSocketServer.java b/src/main/java/org/springblade/hospital/websocket/WebSocketServer.java index 04fcc45..e2a75b2 100644 --- a/src/main/java/org/springblade/hospital/websocket/WebSocketServer.java +++ b/src/main/java/org/springblade/hospital/websocket/WebSocketServer.java @@ -2,6 +2,9 @@ package org.springblade.hospital.websocket; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springblade.hospital.agent.utils.QueueUtils; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; import javax.websocket.*; @@ -137,7 +140,7 @@ public class WebSocketServer { String message = json.get("message").toString(); log.info("推送内容:" + message); - System.out.println("webSocketSet连接数量:" + webSocketSet.size()); + log.info("webSocketSet连接数量:" + webSocketSet.size()); for (WebSocketServer item : webSocketSet) { try { // System.out.println(item.sid + "===" + item.session); @@ -151,7 +154,7 @@ public class WebSocketServer { public static void test() { // System.out.println("webSocketSet连接数量:" + webSocketSet.size()); for (WebSocketServer item : webSocketSet) { - System.out.println(item.sid + "===" + item.session); + log.info(item.sid + "===" + item.session); } } diff --git a/src/main/resources/log/logback-dev.xml b/src/main/resources/log/logback-dev.xml index dacc4d8..99daa9e 100644 --- a/src/main/resources/log/logback-dev.xml +++ b/src/main/resources/log/logback-dev.xml @@ -1,113 +1,93 @@ - - - - + + + + + - - - - - - - - - ${CONSOLE_LOG_PATTERN} - utf8 + + + ${log.pattern} - - - - - ${DESTINATION} - - - - - UTC - - - - { - "traceId": "%X{traceId}", - "requestId": "%X{requestId}", - "accountId": "%X{accountId}", - "tenantId": "%X{tenantId}", - "logLevel": "%level", - "serviceName": "${springAppName:-SpringApp}", - "pid": "${PID:-}", - "thread": "%thread", - "class": "%logger{40}", - "line":"%L", - "message": "%message" - } - - - - - - - - - - - - - - - - - - + + + ${log.path}/sys-info.log + + + + ${log.path}/sys-info.%d{yyyy-MM-dd}.log + + 2 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + ${log.path}/sys-error.log + + + + ${log.path}/sys-error.%d{yyyy-MM-dd}.log + + 2 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + - - - - - - + + + ${log.path}/sys-user.log + + + ${log.path}/sys-user.%d{yyyy-MM-dd}.log + + 2 + + + ${log.pattern} + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + + + + + + + + + + +