|
@@ -23,6 +23,7 @@ import com.ozs.vo.ReqMsgAlarmVo;
|
|
|
import com.ozs.vo.RespGeoHazardMonitorVo;
|
|
|
import com.ozs.vo.RespMsgAlarmVo;
|
|
|
import io.swagger.models.auth.In;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.util.ObjectUtils;
|
|
@@ -46,6 +47,7 @@ import java.util.Map;
|
|
|
* @author Administrator
|
|
|
*/
|
|
|
@RestController
|
|
|
+@Slf4j
|
|
|
public class GeoHazardMonitorTokenController {
|
|
|
|
|
|
@Resource
|
|
@@ -122,12 +124,14 @@ public class GeoHazardMonitorTokenController {
|
|
|
if (StringUtils.isNotEmpty(token)) {
|
|
|
String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
|
|
|
ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
|
|
|
+ log.info("reqMsgAlarmVo:{}", reqMsgAlarmVo);
|
|
|
RespMsgAlarmVo respMsgAlarmVo = new RespMsgAlarmVo();
|
|
|
LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<BaseCameraManagement>();
|
|
|
if (!ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmCamera())) {
|
|
|
wrapper.eq(BaseCameraManagement::getCameraCode, reqMsgAlarmVo.getAlarmCamera());
|
|
|
}
|
|
|
BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
|
|
|
+ log.info("baseCameraManagement:{}", baseCameraManagement);
|
|
|
if (ObjectUtils.isEmpty(reqMsgAlarmVo.getLineDir())) {
|
|
|
reqMsgAlarmVo.setLineDir(baseCameraManagement.getLineDir());
|
|
|
}
|
|
@@ -136,6 +140,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
lw.eq(MsgAlarm::getAlarmId, reqMsgAlarmVo.getAlarmId());
|
|
|
}
|
|
|
MsgAlarm alarm = msgAlarmService.getOne(lw);
|
|
|
+ log.info("alarm:{}", alarm);
|
|
|
if (ObjectUtils.isEmpty(alarm)) {
|
|
|
MsgAlarm msgAlarm = new MsgAlarm();
|
|
|
BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarm);
|
|
@@ -200,6 +205,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
String token = apiTokenUtils.getGeoHazardMonitorToken(request);
|
|
|
if (StringUtils.isNotEmpty(token)) {
|
|
|
ReqDeviceVo reqDeviceVo = JSON.parseObject(SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5"), ReqDeviceVo.class);
|
|
|
+ log.info("reqDeviceVo:{}", reqDeviceVo);
|
|
|
LambdaQueryWrapper<BaseDeviceDynamicManagement> lw = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
|
|
|
if (ObjectUtils.isEmpty(reqDeviceVo.getCameraCode())) {
|
|
|
jsonObject.put("resultCode", 2);
|
|
@@ -211,6 +217,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
|
|
|
baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
|
|
|
baseDynamicManagement.setCameraState(reqDeviceVo.getCameraState());
|
|
|
+ log.info("reqDeviceVo:{}", baseDynamicManagement);
|
|
|
if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
|
|
|
jsonObject.put("resultCode", 1);
|
|
|
jsonObject.put("message", "成功");
|
|
@@ -225,4 +232,4 @@ public class GeoHazardMonitorTokenController {
|
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
|
|
|
}
|
|
|
}
|
|
|
-}
|
|
|
+}
|