点位维护增加字段

microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/bean/LiResourcePoints.java

@@ -21,6 +21,12 @@ public class LiResourcePoints implements Serializable {
 	/** 资源点id */
 	@ApiModelProperty(value="资源点id",name="resourceId")
 	private java.lang.String resourceId;
+	/** 点位类型（1查询点位，2控制点位） */
+	@ApiModelProperty(value="点位类型（1查询点位，2控制点位）",name="type")
+	private Integer type;
+	/** 点位名称 */
+	@ApiModelProperty(value="点位名称",name="addressIp")
+	private java.lang.String addressIp;
 	/** 点位名称 */
 	@ApiModelProperty(value="点位名称",name="name")
 	private java.lang.String name;
@@ -29,10 +35,10 @@ public class LiResourcePoints implements Serializable {
 	private Integer slaveId;
 	/** 功能码类型（1:读线圈 2:读离散量输入 3:读保持寄存器 4:读输入寄存器） */
 	@ApiModelProperty(value="功能码类型（1:读线圈 2:读离散量输入 3:读保持寄存器 4:读输入寄存器）",name="functionCodeType")
-	private Byte functionCodeType;
+	private Integer functionCodeType;
 	/** 数据类型（1:INTEGER 2:STRING 3:FLOAT 4:DOUBLE） */
 	@ApiModelProperty(value="数据类型（1:INTEGER 2:STRING 3:FLOAT 4:DOUBLE）",name="dataType")
-	private Byte dataType;
+	private Integer dataType;
 	/** 寄存器地址 */
 	@ApiModelProperty(value="寄存器地址",name="registerAddress")
 	private Integer registerAddress;

microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/model/LiResourcePointsModel.java

@@ -15,14 +15,18 @@ public class LiResourcePointsModel extends BaseModel {
 	private java.lang.String id;
 	/** 资源点id */
 	private java.lang.String resourceId;
+	/** 点位类型（1查询点位，2控制点位） */
+	private Integer type;
+	/** 点位名称 */
+	private java.lang.String addressIp;
 	/** 点位名称 */
 	private java.lang.String name;
 	/** slaveID */
 	private Integer slaveId;
 	/** 功能码类型（1:读线圈 2:读离散量输入 3:读保持寄存器 4:读输入寄存器） */
-	private Byte functionCodeType;
+	private Integer functionCodeType;
 	/** 数据类型（1:INTEGER 2:STRING 3:FLOAT 4:DOUBLE） */
-	private Byte dataType;
+	private Integer dataType;
 	/** 寄存器地址 */
 	private Integer registerAddress;
 	/** 创建人 */

microservice-admin/src/main/resources/mapper/liResource/LiResourcePointsMapper.xml

@@ -5,6 +5,8 @@
 	<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.liresource.bean.LiResourcePoints">
 	    <result column="id" property="id"/>
 	    <result column="resource_id" property="resourceId"/>
+	    <result column="type" property="type"/>
+	    <result column="address_ip" property="addressIp"/>
 	    <result column="name" property="name"/>
 	    <result column="slave_id" property="slaveId"/>
 	    <result column="function_code_type" property="functionCodeType"/>
@@ -24,7 +26,7 @@
 
 	<!-- li_resource_points table all fields -->
 	<sql id="Base_Column_List">
-		id,resource_id,name,slave_id,function_code_type,data_type,register_address,create_user_id,create_time,update_user_id,update_time,deleted,sys_sign,station_id,byx1,byx2,byx3
+		id,resource_id,type,address_ip,name,slave_id,function_code_type,data_type,register_address,create_user_id,create_time,update_user_id,update_time,deleted,sys_sign,station_id,byx1,byx2,byx3
 	</sql>
 
 	<!-- 公共查询条件 -->
@@ -32,6 +34,8 @@
 		where t.deleted=0
 		<if test="id!=null and id!=''">and t.id = #{id}</if>
 		<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
+		<if test="type!=null ">and t.type = #{type}</if>
+		<if test="addressIp!=null and addressIp!=''">and t.address_ip = #{addressIp}</if>
 		<if test="name!=null and name!=''">and t.name = #{name}</if>
 		<if test="slaveId!=null ">and t.slave_id = #{slaveId}</if>
 		<if test="functionCodeType!=null ">and t.function_code_type = #{functionCodeType}</if>

microservice-authorization-server/src/main/resources/bootstrap.yml

@@ -35,7 +35,7 @@ suntray:
       jwtSigningKey: suntray
       clients[0]:
         clientId: suntray
-        clientSecret: suntray
+        clientSecret: c3VudHJheQ==
       clients[1]:
         clientId: professional
         clientSecret: professional