海沧bug修复及眼科bug修复

svr/svr-cloud-care/pom.xml

@@ -294,7 +294,7 @@
    </dependencies>
    <build>
        <finalName>svr-cloud-care-test</finalName>
        <finalName>svr-cloud-care</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/YsDeviceController.java

@@ -64,7 +64,7 @@ public class YsDeviceController extends BaseController {
    }
    @ApiOperation("海马视频-视频操作指令")
    @RequestMapping(value = "kaixuanSpOperate", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = {RequestMethod.POST,RequestMethod.GET})
    @RequestMapping(value = "kaixuanSpOperate", method = {RequestMethod.POST,RequestMethod.GET})
    public String kaixuanSpOperate(
            @ApiParam(name="deviceSerial",required = true,value="设备序列号")
            @RequestParam(value = "deviceSerial",required = true) String deviceSerial,
@@ -89,7 +89,7 @@ public class YsDeviceController extends BaseController {
    @ApiOperation("海马视频-由于是异步，所以定时查询视频操作执行相应")
    @RequestMapping(value = "selectKxSpOperate", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = {RequestMethod.POST,RequestMethod.GET})
    @RequestMapping(value = "selectKxSpOperate", method = {RequestMethod.POST,RequestMethod.GET})
    public String selectKxSpOperate(
            @ApiParam(name="deviceSerial",required = true,value="设备序列号")
            @RequestParam(value = "deviceSerial",required = true) String deviceSerial,

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/YsDeviceService.java

@@ -363,7 +363,11 @@ public class YsDeviceService {
        BaseMqttCallbackRecordDO baseMqttCallbackRecordDO=kaixuanSpOperate(deviceSerial,"ipcam_video_start");
        if (baseMqttCallbackRecordDO!=null){
            //{"ipcam_video_start":"1","sourceURL":"http://121.40.135.79/live/18183412724e5573_1679361245235/hls.m3u8","retCode":"0","message":"success."}
            JSONObject payloadJson = JSONObject.parseObject(baseMqttCallbackRecordDO.getPayload());
            JSONObject payloadJson = new JSONObject();
            if (StringUtils.isNoneBlank(baseMqttCallbackRecordDO.getPayload())){
                payloadJson = JSONObject.parseObject(baseMqttCallbackRecordDO.getPayload());
                payloadJson.put("deviceSerial",deviceSerial);
            }
            result.put(ResponseContant.resultFlag,ResponseContant.success);
            result.put(ResponseContant.resultMsg,payloadJson);
        }