Tenlion/cm-cloud
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整代码

Browse Source
This commit is contained in:
WenG 2020-09-07 12:53:44 +08:00
parent 921021625d
commit 022ecc2c0a
8 changed files with 142 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud-hardware-smart-gate/src/main/java/com/cm/smartgate/TestDemo.java
View File

@ -23,7 +23,7 @@ public class TestDemo {
public static String ry_net_library_name = "netmanager";
public void execute() {
NetLib instance = (NetLib) Native.loadLibrary(PlatUtils.sdk_plat_getLoadLibrary("", ry_net_library_name), NetLib.class);
NetLib instance = (NetLib) Native.loadLibrary(PlatUtils.sdk_plat_getLoadLibrary("D:\\develop\\java_libs\\net_manager_libs\\", ry_net_library_name), NetLib.class);
instance.Net_Init(null, null);
Scanner sc = new Scanner(System.in);

36
cloud-hardware-smart-gate/src/main/java/com/cm/smartgate/pojo/dtos/SmartGateDTO.java
View File

@ -28,6 +28,12 @@ public class SmartGateDTO implements Serializable {
private String smartGateSummary;
@ApiModelProperty(name = "smartGateIpAddress", value = "ip地址")
private String smartGateIpAddress;
@ApiModelProperty(name = "smartGatePort", value = "端口")
private String smartGatePort;
@ApiModelProperty(name = "smartGateUsername", value = "用户名")
private String smartGateUsername;
@ApiModelProperty(name = "smartGatePassword", value = "密码")
private String smartGatePassword;
@ApiModelProperty(name = "gmtCreate", value = "创建时间")
private String gmtCreate;
@ApiModelProperty(name = "onlineState", value = "在线状态")
@ -75,6 +81,30 @@ public class SmartGateDTO implements Serializable {
this.smartGateIpAddress = smartGateIpAddress;
}
public String getSmartGatePort() {
return smartGatePort == null ? "" : smartGatePort.trim();
}
public void setSmartGatePort(String smartGatePort) {
this.smartGatePort = smartGatePort;
}
public String getSmartGateUsername() {
return smartGateUsername == null ? "" : smartGateUsername.trim();
}
public void setSmartGateUsername(String smartGateUsername) {
this.smartGateUsername = smartGateUsername;
}
public String getSmartGatePassword() {
return smartGatePassword == null ? "" : smartGatePassword.trim();
}
public void setSmartGatePassword(String smartGatePassword) {
this.smartGatePassword = smartGatePassword;
}
public String getGmtCreate() {
return gmtCreate == null ? "" : gmtCreate.trim();
}
@ -112,6 +142,12 @@ public class SmartGateDTO implements Serializable {
.append(smartGateSummary).append('\"');
sb.append(",\"smartGateIpAddress\":\"")
.append(smartGateIpAddress).append('\"');
sb.append(",\"smartGatePort\":\"")
.append(smartGatePort).append('\"');
sb.append(",\"smartGateUsername\":\"")
.append(smartGateUsername).append('\"');
sb.append(",\"smartGatePassword\":\"")
.append(smartGatePassword).append('\"');
sb.append(",\"gmtCreate\":\"")
.append(gmtCreate).append('\"');
sb.append(",\"onlineState\":")

36
cloud-hardware-smart-gate/src/main/java/com/cm/smartgate/pojo/vos/SmartGateVO.java
View File

@ -28,6 +28,12 @@ public class SmartGateVO {
@ApiModelProperty(name = "smartGateIpAddress", value = "ip地址")
@CheckEmptyAnnotation(name = "ip地址")
private String smartGateIpAddress;
@ApiModelProperty(name = "smartGatePort", value = "端口")
private String smartGatePort;
@ApiModelProperty(name = "smartGateUsername", value = "用户名")
private String smartGateUsername;
@ApiModelProperty(name = "smartGatePassword", value = "密码")
private String smartGatePassword;
public String getSmartGateSerialNo() {
return smartGateSerialNo == null ? "" : smartGateSerialNo.trim();
@ -61,6 +67,30 @@ public class SmartGateVO {
this.smartGateIpAddress = smartGateIpAddress;
}
public String getSmartGatePort() {
return smartGatePort == null ? "" : smartGatePort.trim();
}
public void setSmartGatePort(String smartGatePort) {
this.smartGatePort = smartGatePort;
}
public String getSmartGateUsername() {
return smartGateUsername == null ? "" : smartGateUsername.trim();
}
public void setSmartGateUsername(String smartGateUsername) {
this.smartGateUsername = smartGateUsername;
}
public String getSmartGatePassword() {
return smartGatePassword == null ? "" : smartGatePassword.trim();
}
public void setSmartGatePassword(String smartGatePassword) {
this.smartGatePassword = smartGatePassword;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("{");
@ -72,6 +102,12 @@ public class SmartGateVO {
.append(smartGateSummary).append('\"');
sb.append(",\"smartGateIpAddress\":\"")
.append(smartGateIpAddress).append('\"');
sb.append(",\"smartGatePort\":\"")
.append(smartGatePort).append('\"');
sb.append(",\"smartGateUsername\":\"")
.append(smartGateUsername).append('\"');
sb.append(",\"smartGatePassword\":\"")
.append(smartGatePassword).append('\"');
sb.append('}');
return sb.toString();
}

4
cloud-hardware-smart-gate/src/main/java/netmanager/lib/PlatUtils.java
View File

@ -68,7 +68,7 @@ public class PlatUtils {
String strRootPath = configPath.replace("\\", "/");
FileInputStream inputStream = null;
try {
inputStream = new FileInputStream(configPath + "/config.properties");
inputStream = new FileInputStream(strRootPath + "/config.properties");
properties.load(inputStream);
} catch (FileNotFoundException e) {
e.printStackTrace();
@ -113,7 +113,7 @@ public class PlatUtils {
strLibraryName = "lib" + strLibrary + ".so";
}
String strResult = strLoadLibraryDir + strLibraryName;
String strResult = configPath + strLoadLibraryDir + strLibraryName;
System.out.println(strResult);
return strResult;
}

22
cloud-hardware-smart-gate/src/main/resources/mybatis/mapper/smartgate/smartgate-mapper.xml
View File

@ -10,6 +10,9 @@
<result column="smartgate_name" property="smartGateName"/>
<result column="smartgate_summary" property="smartGateSummary"/>
<result column="smartgate_ip_address" property="smartGateIpAddress"/>
<result column="smartgate_port" property="smartGatePort"/>
<result column="smartgate_username" property="smartGateUsername"/>
<result column="smartgate_password" property="smartGatePassword"/>
<result column="gmt_create" property="gmtCreate"/>
</resultMap>
@ -21,6 +24,9 @@
smartgate_name,
smartgate_summary,
smartgate_ip_address,
smartgate_port,
smartgate_username,
smartgate_password,
creator,
gmt_create,
modifier,
@ -32,6 +38,9 @@
#{smartGateName},
#{smartGateSummary},
#{smartGateIpAddress},
#{smartGatePort},
#{smartGateUsername},
#{smartGatePassword},
#{creator},
#{gmtCreate},
#{modifier},
@ -82,6 +91,15 @@
</if>
<if test="smartGateIpAddress != null and smartGateIpAddress != ''">
smartgate_ip_address = #{smartGateIpAddress},
</if>
<if test="smartGatePort != null and smartGatePort != ''">
smartgate_port = #{smartGatePort},
</if>
<if test="smartGateUsername != null">
smartgate_username = #{smartGateUsername},
</if>
<if test="smartGatePassword != null">
smartgate_password = #{smartGatePassword},
</if>
modifier = #{modifier},
gmt_modified = #{gmtModified}
@ -97,6 +115,9 @@
smartgate_name,
smartgate_summary,
smartgate_ip_address,
smartgate_port,
smartgate_username,
smartgate_password,
LEFT(gmt_create, 19) gmt_create
FROM
hardware_smartgate
@ -120,6 +141,7 @@
smartgate_name,
smartgate_summary,
smartgate_ip_address,
smartgate_port,
LEFT(gmt_create, 19) gmt_create
FROM
hardware_smartgate

9
cloud-hardware-smart-gate/src/main/resources/templates/smartgate/list-smartgate.html
View File

@ -141,6 +141,15 @@
return rowData;
}
},
{field: 'smartGatePort', width: 200, title: '设备端口', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'onlineState', width: 100, title: '在线状态', align:'center',
templet: function(row) {
var rowData = row[this.field];

18
cloud-hardware-smart-gate/src/main/resources/templates/smartgate/save-smartgate.html
View File

@ -45,6 +45,24 @@
<input type="text" id="smartGateIpAddress" name="smartGateIpAddress" class="layui-input" value="" placeholder="请输入设备IP" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">设备端口</label>
<div class="layui-input-block">
<input type="text" id="smartGatePort" name="smartGatePort" class="layui-input" value="" placeholder="请输入设备端口" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">设备用户名</label>
<div class="layui-input-block">
<input type="text" id="smartGateUsername" name="smartGateUsername" class="layui-input" value="" placeholder="请输入设备用户名" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">设备密码</label>
<div class="layui-input-block">
<input type="text" id="smartGatePassword" name="smartGatePassword" class="layui-input" value="" placeholder="请输入设备密码" lay-verify="required">
</div>
</div>
<div class="layui-form-item layui-layout-admin">
<div class="layui-input-block">
<div class="layui-footer" style="left: 0;">

18
cloud-hardware-smart-gate/src/main/resources/templates/smartgate/update-smartgate.html
View File

@ -45,6 +45,24 @@
<input type="text" id="smartGateIpAddress" name="smartGateIpAddress" class="layui-input" value="" placeholder="请输入设备IP" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">设备端口</label>
<div class="layui-input-block">
<input type="text" id="smartGatePort" name="smartGatePort" class="layui-input" value="" placeholder="请输入设备端口" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">设备用户名</label>
<div class="layui-input-block">
<input type="text" id="smartGateUsername" name="smartGateUsername" class="layui-input" value="" placeholder="请输入设备用户名" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">设备密码</label>
<div class="layui-input-block">
<input type="text" id="smartGatePassword" name="smartGatePassword" class="layui-input" value="" placeholder="请输入设备密码" lay-verify="required">
</div>
</div>
<div class="layui-form-item layui-layout-admin">
<div class="layui-input-block">
<div class="layui-footer" style="left: 0;">