Merge branch 'm33' into 'master'

完善字段注释

See merge request !36

license/src/main/java/iot/sixiang/license/entity/SysOperLog.java

@@ -2,6 +2,7 @@ package iot.sixiang.license.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -24,44 +25,29 @@ public class SysOperLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 日志主键
-     */
     @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty("主键Id")
     private Integer id;
 
-    /**
-     * 模块标题
-     */
+    @ApiModelProperty("模块标题")
     private String title;
-    /**
-     * 参数
-     */
+
+    @ApiModelProperty("参数")
     private String optParam;
 
-    /**
-     * 业务类型（0其它 1新增 2修改 3删除）
-     */
+    @ApiModelProperty("业务类型（0其它 1新增 2修改 3删除）")
     private Integer businessType;
 
-    /**
-     * 路径名称
-     */
+    @ApiModelProperty("路径名称")
     private String uri;
 
-    /**
-     * 操作状态（0正常 1异常）
-     */
+    @ApiModelProperty("操作状态（0正常 1异常）")
     private Integer status;
 
-    /**
-     * 错误消息
-     */
+    @ApiModelProperty("错误消息")
     private String errorMsg;
 
-    /**
-     * 操作时间
-     */
+    @ApiModelProperty("操作时间")
     private Date operTime;
 
 

license/src/main/java/iot/sixiang/license/model/BaseResult.java

 package iot.sixiang.license.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import iot.sixiang.license.consts.ResultCode;
 
 //@Data
 public class BaseResult {
+
+	@ApiModelProperty("状态码")
 	private long code;
+
+	@ApiModelProperty("信息")
 	private String msg;
 
 	public BaseResult(long code, String msg) {

license/src/main/java/iot/sixiang/license/model/Device.java

 package iot.sixiang.license.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -7,8 +8,12 @@ import java.io.Serializable;
 @Data
 public class Device implements Serializable{
 
+	@ApiModelProperty("设备状态码")
 	private String device_code;
+	@ApiModelProperty("设备名")
 	private String device_name;
+	@ApiModelProperty("密码状态码")
 	private String pass_code;
+	@ApiModelProperty("设备状态 0:offline,1:online")
 	private int device_status;//0 offline，1 online
 }

license/src/main/java/iot/sixiang/license/model/PageInfoModel.java

 package iot.sixiang.license.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -7,6 +8,9 @@ import java.util.List;
 
 @Data
 public class PageInfoModel<T> {
+	@ApiModelProperty("总数")
 	private int total;
+
+	@ApiModelProperty("结果")
 	private List<T>  result = new ArrayList<T>();
 }

license/src/main/java/iot/sixiang/license/model/PageResult.java

 package iot.sixiang.license.model;
 
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class PageResult<T> {
 
+    @ApiModelProperty("状态码")
     private int code;
+    @ApiModelProperty("信息")
     private String msg;
+    @ApiModelProperty("当前在第几页")
     private int pageNo;
+    @ApiModelProperty("总页数")
     private int pages;
+    @ApiModelProperty("总条数")
     private int total;
+    @ApiModelProperty("返回结果")
     private T record;
 
 

license/src/main/java/iot/sixiang/license/model/ResResult.java

 package iot.sixiang.license.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import iot.sixiang.license.consts.ResultCode;
 import lombok.Data;
 
@@ -13,8 +14,11 @@ import lombok.Data;
  */
 @Data
 public class ResResult<T> {
+    @ApiModelProperty("状态码")
     private long code;
+    @ApiModelProperty("信息")
     private String msg;
+    @ApiModelProperty("返回结果")
     private T record;
 
     public ResResult(long code, String msg) {

license/src/main/java/iot/sixiang/license/model/SamInfo.java

 package iot.sixiang.license.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -7,7 +8,10 @@ import lombok.Data;
  */
 @Data
 public class SamInfo {
+    @ApiModelProperty("SAM通道序号")
     private int index;
+    @ApiModelProperty("SAM模组唯一识别码")
     private String samid;
+    @ApiModelProperty("SAM模组状态")
     private int status;
 }

license/src/main/java/iot/sixiang/license/model/SamMonitor.java

 package iot.sixiang.license.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -7,7 +8,10 @@ import lombok.Data;
  */
 @Data
 public class SamMonitor {
+    @ApiModelProperty("服务Ip")
     private String serverIp;
+    @ApiModelProperty("sam总数")
     private int samCount;
+    @ApiModelProperty("在线数量")
     private int onlineCount;
 }

license/src/main/java/iot/sixiang/license/model/SessionContext.java

@@ -3,11 +3,10 @@ package iot.sixiang.license.model;
 import io.netty.channel.socket.SocketChannel;
 import lombok.Data;
 
-import java.util.Date;
-
 
 @Data
 public class SessionContext {
+
     private String remoteIp;
     private int remotePort;
     private String appId;