Commit f6c0d5ab authored by 赵啸非's avatar 赵啸非

添加客户端资源部署

parent db27d992
......@@ -123,7 +123,6 @@ export default {
//进入设备列表页面
this.$router.push({
path: "/device/list",
query: row,
});
},
......@@ -145,7 +144,7 @@ export default {
if (node.id.search(",")) {
//this.query = { siteId: node.id.split(",")[0] ,siteIdList:node.id.split(",")};
this.query = { siteIdList: node.id.split(",") };
this.query = { siteIdList: parseInt(node.id.split(",")) };
} else {
this.query = { siteId: node.id };
}
......
......@@ -608,6 +608,8 @@ public class DeviceApiController {
deviceEntity.setIp(req.getIp());
deviceEntity.setCenternum(req.getCenternum());
deviceEntity.setPort(req.getPort());
deviceEntity.setLeadingOfficial(req.getLeadingOfficial());
deviceEntity.setLeadingOfficialTelephone(req.getLeadingOfficialTelephone());
deviceEntity.setDeviceRemark(req.getDeviceRemark());
deviceEntity.setCreateUserId(1L);
deviceEntity.setCreateTime(new Date());
......
......@@ -8,6 +8,7 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
import lombok.Data;
import org.apache.poi.ss.usermodel.PictureData;
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.List;
/**
......
......@@ -607,19 +607,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
entity.setSiteName(info.getData().getSiteName());
}
}
//默认时,需拼接homeUrl
// if(!ObjectUtils.isEmpty(entity.getSkinName())){
//
// if (!ObjectUtils.isEmpty(entity.getProductCode())) {
//
// entity.setHomeUrl(entity.getProductCode().);
// }
// }
updateDeviceHomeUrl(entity);
super.saveBefore(entity, context);
}
......
......@@ -458,6 +458,8 @@ productCode|String|产品编码|是|见产品编码附录
ip|String|设备访问ip|否|-
port|String|设备端口|否|-
siteId|Long|站点ID,来源基础服务平台|是|-
leadingOfficial|String|负责人|否|-
leadingOfficialTelephone|String|否|联系电话|-
siteCode|String|站点编号,来源基础服务平台|是|-
siteName|String|站点名称|是|-
homeUrl|String|首页地址|否|-
......@@ -558,6 +560,8 @@ data|object|数据对象|是|-
&emsp;productCode|String|产品编码|是|见附录
&emsp;ip|String|设备访问ip|否|-
&emsp;port|String|设备端口|否|-
&emsp;leadingOfficial|String|否|负责人|-
&emsp;leadingOfficialTelephone|String|否|联系电话|-
&emsp;siteId|Long|站点ID,来源基础服务平台|是|-
&emsp;siteCode|String|站点编号,来源基础服务平台|是|-
&emsp;siteName|String|站点名称|是|-
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment