优化
This commit is contained in:
parent
94901a0799
commit
aba5531f9b
@ -58,7 +58,7 @@ public class MessageRecordController {
|
|||||||
@GetMapping(value = "/list")
|
@GetMapping(value = "/list")
|
||||||
public Result<List<MessageRecord>> queryListBySelf() {
|
public Result<List<MessageRecord>> queryListBySelf() {
|
||||||
List<MessageRecord> messageRecords = messageRecordService.list(Wrappers.<MessageRecord>lambdaQuery()
|
List<MessageRecord> messageRecords = messageRecordService.list(Wrappers.<MessageRecord>lambdaQuery()
|
||||||
.eq(MessageRecord::getUserId, SecurityUtil.getUser().getUserId()).eq(MessageRecord::getIsRead, 0)
|
.eq(MessageRecord::getUserId, SecurityUtil.getUser().getUserId())
|
||||||
.orderByDesc(MessageRecord::getCreateTime));
|
.orderByDesc(MessageRecord::getCreateTime));
|
||||||
return Result.success(messageRecords);
|
return Result.success(messageRecords);
|
||||||
}
|
}
|
||||||
@ -78,7 +78,7 @@ public class MessageRecordController {
|
|||||||
@PostMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result<MessageRecord> edit(@ApiIgnore @RequestBody MessageRecord messageRecord) {
|
public Result<MessageRecord> edit(@ApiIgnore @RequestBody MessageRecord messageRecord) {
|
||||||
LambdaUpdateWrapper<MessageRecord> wrapper = Wrappers.<MessageRecord>lambdaUpdate();
|
LambdaUpdateWrapper<MessageRecord> wrapper = Wrappers.<MessageRecord>lambdaUpdate();
|
||||||
wrapper.set(MessageRecord::getIsRead, 0);
|
wrapper.set(MessageRecord::getIsRead, 1);
|
||||||
if (messageRecord.getType() != null) {
|
if (messageRecord.getType() != null) {
|
||||||
wrapper.eq(MessageRecord::getType, messageRecord.getType());
|
wrapper.eq(MessageRecord::getType, messageRecord.getType());
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.zhgd.jeecg.common.api.vo.Result;
|
|||||||
import com.zhgd.xmgl.modules.basicdata.api.camera.MonitorApi;
|
import com.zhgd.xmgl.modules.basicdata.api.camera.MonitorApi;
|
||||||
import com.zhgd.xmgl.modules.basicdata.entity.VideoConfig;
|
import com.zhgd.xmgl.modules.basicdata.entity.VideoConfig;
|
||||||
import com.zhgd.xmgl.modules.basicdata.service.IVideoConfigService;
|
import com.zhgd.xmgl.modules.basicdata.service.IVideoConfigService;
|
||||||
|
import com.zhgd.xmgl.util.HttpUtil;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
import io.swagger.annotations.ApiImplicitParams;
|
import io.swagger.annotations.ApiImplicitParams;
|
||||||
@ -140,4 +141,28 @@ public class VideoOpController {
|
|||||||
}
|
}
|
||||||
return Result.success(jsonObject);
|
return Result.success(jsonObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取萤石云播放token
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@OperLog(operModul = "视频操作管理", operType = "查询", operDesc = "获取萤石云播放token")
|
||||||
|
@ApiOperation(value = " 获取萤石云播放token", notes = "获取萤石云播放token", httpMethod = "GET")
|
||||||
|
@GetMapping(value = "/getAccessToken")
|
||||||
|
public Result<Object> AccessToken() {
|
||||||
|
String requestUrl= "https://open.ys7.com/api/lapp/token/get?appKey=8924d9222b79493791470f44ab69726b&appSecret=49721decd9f24ef781585c9703ad3238";
|
||||||
|
try {
|
||||||
|
String result = HttpUtil.doPost(requestUrl, new JSONObject().toString());
|
||||||
|
if (result != null) {
|
||||||
|
JSONObject resultObj = JSONObject.parseObject(result);
|
||||||
|
if (resultObj.getString("code").equals("200")) {
|
||||||
|
return Result.success(resultObj.getJSONObject("data").getString("accessToken"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("获取萤石云播放token失败,请求路径:" + requestUrl);
|
||||||
|
}
|
||||||
|
return Result.error("操作失败!");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.zhgd.annotation.OperLog;
|
import com.zhgd.annotation.OperLog;
|
||||||
@ -24,6 +23,7 @@ import io.swagger.annotations.ApiImplicitParams;
|
|||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.collections.MapUtils;
|
import org.apache.commons.collections.MapUtils;
|
||||||
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user