|
@@ -4,11 +4,9 @@ import com.alibaba.fastjson2.JSON;
|
|
|
import com.alibaba.fastjson2.JSONArray;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.ozs.common.annotation.SdkLog;
|
|
|
import com.ozs.common.constant.Constants;
|
|
|
import com.ozs.common.core.redis.RedisCache;
|
|
|
-import com.ozs.common.enums.BusinessType;
|
|
|
import com.ozs.common.enums.BusinessTypeSdk;
|
|
|
import com.ozs.common.utils.ApiTokenUtils;
|
|
|
import com.ozs.common.utils.HttpClientUtil;
|
|
@@ -23,15 +21,15 @@ import com.ozs.service.entity.MsgAlarmFrequency;
|
|
|
import com.ozs.service.entity.SvcAddress;
|
|
|
import com.ozs.service.entity.vo.BaseCameraVO;
|
|
|
import com.ozs.service.service.*;
|
|
|
+import com.ozs.service.utils.PublishClient;
|
|
|
import com.ozs.vo.ReqDeviceVo;
|
|
|
-import com.ozs.vo.ReqMsgAlarmVo;
|
|
|
+import com.ozs.service.entity.vo.ReqMsgAlarmVo;
|
|
|
import com.ozs.vo.RespGeoHazardMonitorVo;
|
|
|
import com.ozs.vo.RespMsgAlarmVo;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
-import org.springframework.data.redis.core.SetOperations;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.ObjectUtils;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
@@ -41,7 +39,6 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
-import java.nio.charset.StandardCharsets;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.time.Instant;
|
|
@@ -52,7 +49,6 @@ import java.time.format.DateTimeFormatter;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 1. 获取身份认证控制层
|
|
@@ -183,6 +179,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
jsonObject.put("data", "你填写的相机编码不存在!!!");
|
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
|
|
|
}
|
|
|
+ PublishClient.alarmPush(reqMsgAlarmVo);
|
|
|
if (ObjectUtils.isEmpty(reqMsgAlarmVo.getLineDir())) {
|
|
|
reqMsgAlarmVo.setLineDir(baseCameraManagement.getLineDir());
|
|
|
}
|