历史指令

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/controller/AnalysisController.java

@@ -14,10 +14,10 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 分析
+ * 数据分析
  * @author dxw
  */
-@Api(tags={"分析接口"})
+@Api(tags={"数据分析接口"})
 @RestController
 @RequestMapping("/analysis")
 public class AnalysisController extends AbstractController {

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/controller/KanBanController.java

@@ -20,10 +20,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 看板
+ * 数据看板
  * @author dxw
  */
-@Api(tags={"看板接口"})
+@Api(tags={"数据看板接口"})
 @RestController
 @RequestMapping("/kanban")
 public class KanBanController extends AbstractController {
@@ -50,7 +50,7 @@ public class KanBanController extends AbstractController {
      * @return
      */
     @ApiOperation(value="获取室外气象站数据", notes="获取室外气象站数据")
-    @GetMapping("/getSwqxzInfo")
+    @GetMapping("/getSwqxzInfoTj")
     public R getSwqxzInfoTj() {
         List<SwqxzInfoHour> list = swqxzInfoHourService.list(new LambdaQueryWrapper<SwqxzInfoHour>().orderByAsc(SwqxzInfoHour::getCreateTime));
         //还未写完

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

+package com.devplatform.admin.modules.sys.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+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")
+public class SysCommandLog implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/** 主键 */
+	@ApiModelProperty(value="主键ID",name="id")
+	@TableId
+	private java.lang.String id;
+	/** 指令来源 */
+	@ApiModelProperty(value="指令来源",name="comSource")
+	private Integer comSource;
+	/** 指令来源IP */
+	@ApiModelProperty(value="指令来源IP",name="comSourceIp")
+	private java.lang.String comSourceIp;
+	/** 指令来源端口 */
+	@ApiModelProperty(value="指令来源端口",name="comSourcePort")
+	private java.lang.String comSourcePort;
+	/** 指令类型，1=自动，2=手动 */
+	@ApiModelProperty(value="指令类型，1=自动，2=手动",name="comType")
+	private Integer comType;
+	/** 指令内容 */
+	@ApiModelProperty(value="指令内容",name="comMark")
+	private java.lang.String comMark;
+	/** 资源点类型 */
+	@ApiModelProperty(value="资源点类型",name="resourceType")
+	private java.lang.String resourceType;
+	/** 资源点名称 */
+	@ApiModelProperty(value="资源点名称",name="resourceId")
+	private java.lang.String resourceId;
+	/** 执行结果 */
+	@ApiModelProperty(value="执行结果",name="result")
+	private Integer result;
+	/** 创建时间 */
+	@ApiModelProperty(value="创建时间",name="createTime")
+	private java.util.Date createTime;
+	/** 创建人 */
+	@ApiModelProperty(value="创建人",name="createUserId")
+	private java.lang.String createUserId;
+	/** 是否已删除（0未删除，1已删除） */
+	@ApiModelProperty(value="是否已删除（0未删除，1已删除）",name="deleted")
+	private Integer deleted;
+	/** 站点id */
+	@ApiModelProperty(value="站点id",name="stationId")
+	private java.lang.String stationId;
+	/** 备用项1 */
+	@ApiModelProperty(value="备用项1",name="byx1")
+	private java.lang.String byx1;
+	/** 备用项2 */
+	@ApiModelProperty(value="备用项2",name="byx2")
+	private java.lang.String byx2;
+	/** 备用项3 */
+	@ApiModelProperty(value="备用项3",name="byx3")
+	private java.lang.String byx3;
+}

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/controller/SysCommandLogController.java

+package com.devplatform.admin.modules.sys.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.devplatform.admin.common.utils.AbstractController;
+import com.devplatform.admin.modules.sys.bean.SysCommandLog;
+import com.devplatform.admin.modules.sys.model.SysCommandLogModel;
+import com.devplatform.admin.modules.sys.service.SysCommandLogService;
+import com.devplatform.common.base.annotation.SysLog;
+import com.devplatform.common.base.validator.ValidatorUtils;
+import com.devplatform.common.util.PageUtils;
+import com.devplatform.common.util.R;
+import com.devplatform.common.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <br>
+ * <b>功能：</b>SysCommandLogController<br>
+ * @author 代码生成器产生
+ */
+@Api(tags={"指令日志表接口"})
+@RestController
+@RequestMapping("/sysCommandLog")
+public class SysCommandLogController extends AbstractController{
+	
+	@Autowired
+	private SysCommandLogService sysCommandLogService;
+
+	/**
+	 * 列表页面列表数据获取
+	 * @param params 承接对象
+	 * @return
+	 */
+	@ApiOperation(value="根据条件获取指令日志表分页数据列表", notes="根据条件获取指令日志表分页数据列表")
+	@ApiImplicitParam(name = "params", value = "参数", required = true, dataType = "Map<String, Object>")
+	@PostMapping("/list")
+	public R list(@RequestParam Map<String, Object> params) {
+		//分页查询
+		PageUtils page = sysCommandLogService.queryPage(params,null);
+		//返回分页结果
+		return R.ok().put("page", page);
+	}
+
+	/**
+	 * 列表页面列表数据获取
+	 * @param model 承接对象
+	 * @return
+	 */
+	@ApiOperation(value="根据条件获取指令日志表分页数据列表", notes="根据条件获取指令日志表分页数据列表")
+	@ApiImplicitParam(name = "model", value = "参数", required = true, dataType = "SysCommandLogModel")
+	@PostMapping("/pageList")
+	public R pageList(@RequestBody SysCommandLogModel model) {
+		//如果model参数中没有设置排序方式，则默认以创建时间倒序排列
+		if(StringUtil.isEmpty(model.getSort())){
+			model.setSort("create_time desc");
+		}
+		//按条件查询分页数据
+		List<SysCommandLog> list = sysCommandLogService.queryPageList(model);
+		//将查询结果中数据和数量封装起来做为接口返回值
+		return R.ok().put("page", getMyPage(list,model));
+	}
+	
+	/**
+	 * 添加
+	 * @param bean 指令日志表对象
+	 * @return
+	 */
+	@SysLog("添加指令日志表")
+	@ApiOperation(value="新增指令日志表数据", notes="新增指令日志表数据")
+	@PostMapping("/save")
+	public R save(@RequestBody @ApiParam(value="指令日志表实体对象", required = true)SysCommandLog bean) {
+		ValidatorUtils.validateEntity(bean);
+		bean.setCreateUserId(getUserId());
+		bean.setCreateTime(new Date());
+		sysCommandLogService.save(bean);
+		return R.ok();
+	}
+	
+	/**
+	 * 修改
+	 * @param bean 指令日志表对象
+	 * @return
+	 */
+	@SysLog("修改指令日志表")
+	@ApiOperation(value="修改指令日志表数据", notes="修改指令日志表数据")
+	@PostMapping("/update")
+	public R update(@RequestBody @ApiParam(value="指令日志表实体对象", required = true)SysCommandLog bean) {
+		ValidatorUtils.validateEntity(bean);
+		sysCommandLogService.update(bean,
+				new QueryWrapper<SysCommandLog>().eq(StringUtil.checkNotNull(bean.getId()),"id", bean.getId()));
+		return R.ok();
+	}
+	
+	/**
+	 * 根据ID获取指令日志表对象
+	 * @param id 对象主键
+	 * @return
+	 */
+	@ApiOperation(value="根据ID获取指令日志表对象", notes="根据ID获取指令日志表对象")
+    @ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "String")
+	@GetMapping("/getId/{id}")
+	public R getId(@PathVariable String id) {
+		SysCommandLog bean = sysCommandLogService.getById(id);
+		return R.ok().put("bean", bean);
+	}
+	
+
+	/**
+	 * 根据ID获取指令日志表对象
+	 * @param ids 指令日志表对象主键数组
+	 * @return
+	 */
+	@SysLog("删除指令日志表数据")
+	@ApiOperation(value="根据ID批量删除指令日志表数据", notes="根据ID批量删除指令日志表数据")
+    @ApiImplicitParam(name = "ids", value = "主键数组", required = true, dataType = "String")
+	@PostMapping("/delete")
+	public R delete(@RequestBody String[] ids) {
+		sysCommandLogService.removeByIds(Arrays.asList(ids));
+		return R.ok();
+	}
+
+}

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/dao/SysCommandLogDao.java

+package com.devplatform.admin.modules.sys.dao;
+import org.apache.ibatis.annotations.Mapper;
+
+import com.devplatform.admin.modules.sys.model.SysCommandLogModel;
+import com.devplatform.admin.modules.sys.bean.SysCommandLog;
+import com.devplatform.common.dao.MyBaseMapper;
+
+import java.util.List;
+
+/**
+ * SysCommandLog Mapper
+ * 用于指令日志表的数据库操作
+ * @author Administrator
+ *
+ */
+@Mapper
+public interface SysCommandLogDao extends MyBaseMapper<SysCommandLog> {
+
+    /**
+     * 查询分页数量
+     * @param model
+     * @return
+     */
+    Integer queryPageByCount(SysCommandLogModel model);
+
+    /**
+     * 查询指令日志表分页数据
+     * @param model
+     * @return
+     */
+    List<SysCommandLog> queryPageList(SysCommandLogModel model);
+}

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

+package com.devplatform.admin.modules.sys.model;
+
+import com.devplatform.admin.common.model.BaseModel;
+import lombok.Data;
+
+/**
+ * 指令日志表的Model
+ * <br>
+ * @author 代码生成器产生
+ */
+@Data
+public class SysCommandLogModel extends BaseModel {
+	
+	/** 主键 */
+	private java.lang.String id;
+	/** 指令来源 */
+	private Integer comSource;
+	/** 指令来源IP */
+	private java.lang.String comSourceIp;
+	/** 指令来源端口 */
+	private java.lang.String comSourcePort;
+	/** 指令类型，1=自动，2=手动 */
+	private Integer comType;
+	/** 指令内容 */
+	private java.lang.String comMark;
+	/** 资源点类型 */
+	private java.lang.String resourceType;
+	/** 资源点名称 */
+	private java.lang.String resourceId;
+	/** 执行结果 */
+	private Integer result;
+	/** 创建时间 */
+	private java.util.Date createTime;
+	/** 创建人 */
+	private java.lang.String createUserId;
+	/** 是否已删除（0未删除，1已删除） */
+	private Integer deleted;
+	/** 站点id */
+	private java.lang.String stationId;
+	/** 备用项1 */
+	private java.lang.String byx1;
+	/** 备用项2 */
+	private java.lang.String byx2;
+	/** 备用项3 */
+	private java.lang.String byx3;
+}

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/service/SysCommandLogService.java

+package com.devplatform.admin.modules.sys.service;
+
+import com.devplatform.common.service.MyBaseService;
+
+import com.devplatform.admin.modules.sys.bean.SysCommandLog;
+import com.devplatform.admin.modules.sys.model.SysCommandLogModel;
+
+import java.util.List;
+
+/**
+ * 指令日志表的service接口
+ * <br>
+ * <b>功能：</b>SysCommandLogService<br>
+ * @author 代码生成器产生
+ */
+public interface SysCommandLogService extends MyBaseService<SysCommandLog> {
+
+    /**
+     * 查询指令日志表分页数据
+     * @param model
+     * @return
+     */
+    List<SysCommandLog> queryPageList(SysCommandLogModel model);
+}

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/service/impl/SysCommandLogServiceImpl.java

+package com.devplatform.admin.modules.sys.service.impl;
+
+import com.devplatform.admin.modules.sys.bean.SysCommandLog;
+import com.devplatform.admin.modules.sys.dao.SysCommandLogDao;
+import com.devplatform.admin.modules.sys.model.SysCommandLogModel;
+import com.devplatform.admin.modules.sys.service.SysCommandLogService;
+import com.devplatform.common.service.impl.MyBaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 指令日志表的service接口实现类
+ * <br>
+ * <b>功能：</b>SysCommandLogServiceImpl<br>
+ * @author 代码生成器产生
+ */
+@Service("sysCommandLogService")
+public class SysCommandLogServiceImpl extends MyBaseServiceImpl<SysCommandLogDao, SysCommandLog> implements SysCommandLogService {
+
+    @Override
+    public List<SysCommandLog> queryPageList(SysCommandLogModel model) {
+        Integer rowCount = baseMapper.queryPageByCount(model);
+        model.getPager().setRowCount(rowCount);
+        return baseMapper.queryPageList(model);
+    }
+}

microservice-admin/src/main/resources/mapper/eq/DlsnjInfoMapper.xml

@@ -57,12 +57,13 @@
 	</if>
 	</select>
     <select id="getList" resultType="java.util.Map">
-		SELECT t1.*
+		SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status,li.region as region
 		FROM dlsnj_info AS t1
 		INNER JOIN
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM dlsnj_info AS t2
-		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate;
+		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
+		left join li_resource li on li.id = resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/FlrbInfoMapper.xml

@@ -103,12 +103,13 @@
 	</if>
 	</select>
     <select id="getList" resultType="java.util.Map">
-		SELECT t1.*
+		SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status,li.region as region
 		FROM flrb_info AS t1
 		INNER JOIN
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM flrb_info AS t2
-		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate;
+		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
+		left join li_resource li on li.id = resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/JfktgInfoMapper.xml

@@ -77,12 +77,13 @@
 	</if>
 	</select>
     <select id="getList" resultType="java.util.Map">
-		SELECT t1.*
+		SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status,li.region as region
 		FROM jfktg_info AS t1
 		INNER JOIN
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM jfktg_info AS t2
-		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate;
+		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
+		left join li_resource li on li.id = resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/JfktpInfoMapper.xml

@@ -61,12 +61,13 @@
 	</if>
 	</select>
     <select id="getList" resultType="java.util.Map">
-		SELECT t1.*
+		SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status
 		FROM jfktp_info AS t1
 		INNER JOIN
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM jfktp_info AS t2
-		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate;
+		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
+		left join li_resource li on li.id = resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/PfjInfoMapper.xml

@@ -81,12 +81,13 @@
 	</if>
 	</select>
     <select id="getList" resultType="java.util.Map">
-		SELECT t1.*
+		SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status
 		FROM pfj_info AS t1
 		INNER JOIN
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM pfj_info AS t2
-		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate;
+		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
+		left join li_resource li on li.id = resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/SbInfoMapper.xml

@@ -53,12 +53,13 @@
 	</if>
 	</select>
     <select id="getList" resultType="java.util.Map">
-		SELECT t1.*
+		SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status,li.region as region
 		FROM sb_info AS t1
 		INNER JOIN
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM sb_info AS t2
-		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate;
+		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
+		left join li_resource li on li.id = resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/SljfgInfoMapper.xml

@@ -81,12 +81,13 @@
 	</if>
 	</select>
     <select id="getList" resultType="java.util.Map">
-		SELECT t1.*
+		SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status,li.region as region
 		FROM sljfg_info AS t1
 		INNER JOIN
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM sljfg_info AS t2
-		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate;
+		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
+		left join li_resource li on li.id = resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/SnqxzInfoMapper.xml

@@ -57,12 +57,13 @@
 	</if>
 	</select>
     <select id="getList" resultType="java.util.Map">
-		SELECT t1.*
+		SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status,li.region as region
 		FROM snqxz_info AS t1
 		INNER JOIN
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM snqxz_info AS t2
-		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate;
+		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
+		left join li_resource li on li.id = resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/SwqxzInfoMapper.xml

@@ -67,12 +67,13 @@
 	</if>
 	</select>
     <select id="getList" resultType="java.util.Map">
-		SELECT t1.*
+		SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status,li.region as region
 		FROM swqxz_info AS t1
 		INNER JOIN
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM swqxz_info AS t2
-		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate;
+		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
+		left join li_resource li on li.id = resource_id
 	</select>
 
 </mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.devplatform.admin.modules.sys.dao.SysCommandLogDao">
+	<!-- Result Map -->
+	<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.sys.bean.SysCommandLog">
+	    <result column="id" property="id"/>
+	    <result column="com_source" property="comSource"/>
+	    <result column="com_source_ip" property="comSourceIp"/>
+	    <result column="com_source_port" property="comSourcePort"/>
+	    <result column="com_type" property="comType"/>
+	    <result column="com_mark" property="comMark"/>
+	    <result column="resource_type" property="resourceType"/>
+	    <result column="resource_id" property="resourceId"/>
+	    <result column="result" property="result"/>
+	    <result column="create_time" property="createTime"/>
+	    <result column="create_user_id" property="createUserId"/>
+	    <result column="deleted" property="deleted"/>
+	    <result column="station_id" property="stationId"/>
+	    <result column="byx1" property="byx1"/>
+	    <result column="byx2" property="byx2"/>
+	    <result column="byx3" property="byx3"/>
+	</resultMap>
+
+	<!-- 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
+	</sql>
+
+	<!-- 公共查询条件 -->
+	<sql id="Example_Where_Clause">
+		where t.deleted=0
+		<if test="id!=null and id!=''">and t.id = #{id}</if>
+		<if test="comSource!=null ">and t.com_source = #{comSource}</if>
+		<if test="comSourceIp!=null and comSourceIp!=''">and t.com_source_ip = #{comSourceIp}</if>
+		<if test="comSourcePort!=null and comSourcePort!=''">and t.com_source_port = #{comSourcePort}</if>
+		<if test="comType!=null ">and t.com_type = #{comType}</if>
+		<if test="comMark!=null and comMark!=''">and t.com_mark = #{comMark}</if>
+		<if test="resourceType!=null and resourceType!=''">and t.resource_type = #{resourceType}</if>
+		<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
+		<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="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>
+		<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
+		<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
+	</sql>
+
+	<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">
+	select count(1) from sys_command_log t
+	<include refid="Example_Where_Clause"/>
+	</select>
+
+	<select id="queryPageList" parameterType="Object" resultMap="BaseResultMap">
+	select t.* from sys_command_log t
+	<include refid="Example_Where_Clause"/>
+	<if test="pager.orderCondition != null and pager.orderCondition != ''">
+		${pager.orderCondition}
+	</if>
+	<if test="pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''">
+		${pager.mysqlQueryCondition}
+	</if>
+	</select>
+
+</mapper>
+
+