From 269d0db0c285fa05ecc093b7d0579b3bd8057273 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 10 十二月 2025 10:53:51 +0800
Subject: [PATCH] 处理设备消息推送
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java | 17 ++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 7 ++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 18 ++-------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 27 ++++++++++++-
6 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index 72f6c8f..d66c345 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -54,6 +54,8 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private PlatformBroadcastLogMapper platformBroadcastLogMapper;
+ @Autowired
+ private InterfaceLogMapper interfaceLogMapper;
@Override
@@ -279,9 +281,9 @@
String input = "";
model.setSendInfo(param.getSendInfo());
- return sendBroadcaseBobaoHttpBiz(model);
+ return sendBroadcaseBobaoHttpBiz(model,interfaceLogMapper);
}
- public static String sendBroadcaseBobaoHttpBiz(Device model){
+ public static String sendBroadcaseBobaoHttpBiz(Device model,InterfaceLogMapper interfaceLogMapper){
//閲嶆柊涓嬪彂璁″垝
JSONObject jsonObject = new JSONObject();
jsonObject.put("command","start");
@@ -298,8 +300,27 @@
log.error("========娴峰悍骞挎挱鎾斁鍏ュ弬鍐呭 : " + params);
String result = HttpsUtil.doPutHk(model.getIp(),Integer.parseInt(StringUtils.defaultString(model.getPort(),"80")),model.getDoorId(), model.getDoorName()
,"/ISAPI/AccessControl/EventCardLinkageCfg/TTSAudio?format=json",params);
-
log.error("========娴峰悍骞挎挱鎾斁杩斿洖鍐呭 : " + result);
+
+ JSONObject resultJson = JSONObject.parseObject(result);
+ Boolean success = false;
+ if(Constants.equalsInteger(resultJson.getInteger("statusCode"),Constants.ONE)){
+ success = true;
+ }
+ InterfaceLog log = new InterfaceLog();
+ log.setCreateDate(new Date());
+ log.setUrl("/ISAPI/AccessControl/EventCardLinkageCfg/TTSAudio?format=json");
+ log.setEditDate(log.getCreateDate());
+ log.setPlat(Constants.ZERO);
+ log.setName("娴峰悍骞挎挱鎾斁");
+ log.setIsdeleted(Constants.ZERO);
+ log.setRequest(params);
+ log.setType(Constants.ZERO);
+ log.setSuccess(success?Constants.ZERO:Constants.ONE);
+ log.setRepose(result);
+ interfaceLogMapper.insert(log);
+
+
return result;
}
@Override
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index cf3faef..29b9403 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -67,6 +67,9 @@
private DeviceMapper deviceMapper;
@Autowired
+ private InterfaceLogMapper interfaceLogMapper;
+
+ @Autowired
private MemberMapper memberMapper;
@Autowired
@@ -715,9 +718,7 @@
warningEvent.setStatus(Constants.TWO);
warningEventMapper.updateById(warningEvent);
}
-
}
-
}
}
}
@@ -732,7 +733,7 @@
if(CollectionUtils.isNotEmpty(deviceList)){
for (Device device:deviceList) {
device.setSendInfo(warningRule.getDeviceNoticeContent());
- DeviceServiceImpl.sendBroadcaseBobaoHttpBiz(device);
+ DeviceServiceImpl.sendBroadcaseBobaoHttpBiz(device,interfaceLogMapper);
}
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index a9ae43a..7ccca98 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1549,7 +1549,8 @@
.eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
.orderByAsc(Company::getSortnum)
- .orderByAsc(Position::getSortnum);
+ .orderByAsc(Position::getSortnum)
+ .orderByAsc(Member::getId);
// .orderByAsc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getPinyin)
// .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
index f371b8f..cb0dc57 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
@@ -271,7 +271,7 @@
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCarCode()),ParkBook::getCarCode,pageWrap.getModel().getCarCode());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParksName()),Parks::getName,pageWrap.getModel().getParksName());
- queryWrapper.orderByDesc(ParkBook::getCreateDate);
+ queryWrapper.orderByDesc(ParkBook::getCreateDate,ParkBook::getId);
IPage<ParkBook> result = parkBookJoinMapper.selectJoinPage(page, ParkBook.class,queryWrapper);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java
index 5758472..cdf162f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java
@@ -7,6 +7,8 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.dingTalk.DingTalk;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.EventSubRequest;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
@@ -294,7 +296,8 @@
if(Constants.equalsInteger(model.getStatus(),param.getStatus())){
return;
}
- if(StringUtils.isNotBlank(param.getCode())&&Constants.equalsInteger(model.getType(),Constants.ZERO)||Constants.equalsInteger(model.getType(),Constants.ONE)){
+
+ if(StringUtils.isNotBlank(model.getCode())&&(Constants.equalsInteger(model.getType(),Constants.ZERO)||Constants.equalsInteger(model.getType(),Constants.ONE))){
EventSubRequest eventParam = new EventSubRequest();
String path =systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_PUSH_URL).getCode();
eventParam.setEventDest(path+"/notice");
@@ -305,11 +308,17 @@
}
HKService.cancelEventSub(eventParam);//鍏堝彇娑�
if(Constants.equalsInteger(param.getStatus(),Constants.ONE)){
- HKService.eventSub(eventParam);//瀹夐槻浜嬩欢
+ BaseResponse response = HKService.eventSub(eventParam);//瀹夐槻浜嬩欢
+ if(Objects.nonNull(response)&&StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ model.setSubscribeStatus(Constants.ONE);
+ }else{
+ model.setSubscribeStatus(Constants.TWO);
+ model.setSubscribeInfo(response.getMsg());
+ }
+ }else{
+ model.setSubscribeStatus(Constants.ZERO);
}
}
-
-
model.setStatus(param.getStatus());
model.setEditDate(new Date());
model.setEditor(param.getLoginUserInfo().getId());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 4adad16..50a1a94 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -506,7 +506,7 @@
if(Objects.nonNull(warningConfig)){
List<Integer> ruleIdList = impl.processWarnFront(warningConfig);
- Boolean falg = false;
+ Boolean falg = true;
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ruleIdList)){
for (Integer ruleId:ruleIdList) {
WarningRule warningRule = warningRuleMapper.selectById(ruleId);
@@ -544,31 +544,21 @@
// dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),warningConfig.getInfo()));
// warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
}
- warningPushMapper.insert(warningPush);
impl.sendDeviceNotice(warningRule);
+ warningPushMapper.insert(warningPush);
- falg = true;
}catch (Exception e){
+ falg = false;
warningEvent.setStatus(Constants.TWO);
warningEventMapper.updateById(warningEvent);
}
}
}
- if(falg){
+ if(!falg){
warningEvent.setStatus(Constants.ONE);
warningEventMapper.updateById(warningEvent);
}
-
-
-
-
-
-
}
-
-
-
-
}
}
--
Gitblit v1.9.3