临时提交
This commit is contained in:
@@ -422,12 +422,14 @@ public class CommonGBChannel {
|
||||
// 业务分组
|
||||
channel.setGbName(group.getName());
|
||||
channel.setGbDeviceId(group.getDeviceId());
|
||||
channel.setGbCivilCode(group.getCivilCode());
|
||||
} else {
|
||||
// 虚拟组织
|
||||
channel.setGbName(group.getName());
|
||||
channel.setGbDeviceId(group.getDeviceId());
|
||||
channel.setGbParentId(group.getParentDeviceId());
|
||||
channel.setGbBusinessGroupId(group.getBusinessGroup());
|
||||
channel.setGbCivilCode(group.getCivilCode());
|
||||
}
|
||||
return channel;
|
||||
}
|
||||
|
||||
@@ -58,6 +58,11 @@ public class Group implements Comparable<Group>{
|
||||
*/
|
||||
@Schema(description = "更新时间")
|
||||
private String updateTime;
|
||||
/**
|
||||
* 行政区划
|
||||
*/
|
||||
@Schema(description = "行政区划")
|
||||
private String civilCode;
|
||||
|
||||
public static Group getInstance(DeviceChannel channel) {
|
||||
GbCode gbCode = GbCode.decode(channel.getDeviceId());
|
||||
|
||||
Reference in New Issue
Block a user