123
This commit is contained in:
1 parent
7530acde5b
commit
f91140ea33
4 files changed
+116
-4
No files matched your search
@@ -4,6 +4,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import org.springframework.data.annotation.Transient;
|
||||
|
||||
import java.io.Serializable;
|
||||
/**
|
||||
* 大漠代理对象 dm_playerent
|
||||
@@ -69,12 +71,33 @@ public class DmPlayerent extends BaseEntity
|
||||
/** 当前任务 */
|
||||
@Excel(name = "当前任务")
|
||||
private String winOneCurTask;
|
||||
|
||||
/** 当前任务 */
|
||||
@Excel(name = "secret")
|
||||
private String secret;
|
||||
/** 当前任务 */
|
||||
@Excel(name = "当前任务")
|
||||
private String winTwoCurTask;
|
||||
@Excel(name = "mjpeg播放地址")
|
||||
@Transient
|
||||
private transient String mjpegUrl;
|
||||
|
||||
public void setId(Long id)
|
||||
public String getSecret() {
|
||||
return secret;
|
||||
}
|
||||
|
||||
public void setSecret(String secret) {
|
||||
this.secret = secret;
|
||||
}
|
||||
|
||||
public String getMjpegUrl() {
|
||||
return mjpegUrl;
|
||||
}
|
||||
|
||||
public void setMjpegUrl(String mjpegUrl) {
|
||||
this.mjpegUrl = mjpegUrl;
|
||||
}
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
+7
-1
@@ -9,6 +9,7 @@ import com.luqj.util.HttpHelper;
|
||||
import com.ruoyi.common.select.SelectItem;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.common.utils.TokenUtil;
|
||||
import com.ruoyi.system.domain.DmOperateVo;
|
||||
import com.ruoyi.system.domain.DmPlayerConfigPlus;
|
||||
import com.ruoyi.system.domain.DmPlayerent;
|
||||
@@ -154,7 +155,11 @@ public class DmPlayerentServiceImpl extends ServiceImpl<DmPlayerentMapper, DmPla
|
||||
*/
|
||||
@Override
|
||||
public DmPlayerent selectDmPlayerentById(Long id) {
|
||||
return dmPlayerentMapper.selectDmPlayerentById(id);
|
||||
DmPlayerent dmPlayerent = dmPlayerentMapper.selectDmPlayerentById(id);
|
||||
dmPlayerent.setMjpegUrl("http://" + dmPlayerent.getIp()+":8888/stream?token="
|
||||
+ TokenUtil.generateToken(dmPlayerent.getId()+"",dmPlayerent.getSecret()));
|
||||
dmPlayerent.setSecret(null);
|
||||
return dmPlayerent;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -168,6 +173,7 @@ public class DmPlayerentServiceImpl extends ServiceImpl<DmPlayerentMapper, DmPla
|
||||
List<DmPlayerent> list = dmPlayerentMapper.selectDmPlayerentList(dmPlayerent);
|
||||
List<Long> ids = new ArrayList<>();
|
||||
for (DmPlayerent playerent : list) {
|
||||
playerent.setSecret(null);
|
||||
ids.add(playerent.getId());
|
||||
}
|
||||
if (!ids.isEmpty()) {
|
||||
|
||||
Reference in new issue
Block a user