历史指令接口调整

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/bean/SysCommandLog.java

 package com.devplatform.admin.modules.sys.bean;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
 @Data
 @ApiModel(value="指令日志表对象",description="指令日志表对象")
 @TableName("sys_command_log")
@@ -45,10 +46,15 @@ public class SysCommandLog implements Serializable {
 	private Integer result;
 	/** 创建时间 */
 	@ApiModelProperty(value="创建时间",name="createTime")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private java.util.Date createTime;
 	/** 创建人 */
 	@ApiModelProperty(value="创建人",name="createUserId")
 	private java.lang.String createUserId;
+	/** 创建人 */
+	@ApiModelProperty(value="创建人",name="createUserName")
+	private java.lang.String createUserName;
 	/** 是否已删除（0未删除，1已删除） */
 	@ApiModelProperty(value="是否已删除（0未删除，1已删除）",name="deleted")
 	private Integer deleted;

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/model/SysCommandLogModel.java

@@ -33,6 +33,8 @@ public class SysCommandLogModel extends BaseModel {
 	private java.util.Date createTime;
 	/** 创建人 */
 	private java.lang.String createUserId;
+	/** 创建人 */
+	private java.lang.String createUserName;
 	/** 是否已删除（0未删除，1已删除） */
 	private Integer deleted;
 	/** 站点id */

microservice-admin/src/main/resources/mapper/sys/SysCommandLogMapper.xml

@@ -14,6 +14,7 @@
 	    <result column="result" property="result"/>
 	    <result column="create_time" property="createTime"/>
 	    <result column="create_user_id" property="createUserId"/>
+	    <result column="create_user_name" property="createUserName"/>
 	    <result column="deleted" property="deleted"/>
 	    <result column="station_id" property="stationId"/>
 	    <result column="byx1" property="byx1"/>
@@ -23,7 +24,7 @@
 
 	<!-- sys_command_log table all fields -->
 	<sql id="Base_Column_List">
-		id,com_source,com_source_ip,com_source_port,com_type,com_mark,resource_type,resource_id,result,create_time,create_user_id,deleted,station_id,byx1,byx2,byx3
+		id,com_source,com_source_ip,com_source_port,com_type,com_mark,resource_type,resource_id,result,create_time,create_user_id,create_user_name,deleted,station_id,byx1,byx2,byx3
 	</sql>
 
 	<!-- 公共查询条件 -->
@@ -40,6 +41,7 @@
 		<if test="result!=null ">and t.result = #{result}</if>
 		<if test="createTime!=null ">and t.create_time = #{createTime}</if>
 		<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
+		<if test="createUserName!=null and createUserName!=''">and t.create_user_name = #{createUserName}</if>
 		<if test="deleted!=null ">and t.deleted = #{deleted}</if>
 		<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
 		<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>