ipad服务器，iPad用户，iPad日志业务

fs-admin/src/main/java/com/fs/qw/controller/QwIpadServerController.java

@@ -0,0 +1,103 @@
+package com.fs.qw.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.qw.domain.QwIpadServer;
+import com.fs.qw.service.IQwIpadServerService;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * ipad服务器Controller
+ *
+ * @author fs
+ * @date 2025-07-23
+ */
+@RestController
+@RequestMapping("/qw/qwIpadServer")
+public class QwIpadServerController extends BaseController
+{
+    @Autowired
+    private IQwIpadServerService qwIpadServerService;
+
+    /**
+     * 查询ipad服务器列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServer:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(QwIpadServer qwIpadServer)
+    {
+        startPage();
+        List<QwIpadServer> list = qwIpadServerService.selectQwIpadServerList(qwIpadServer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出ipad服务器列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServer:export')")
+    @Log(title = "ipad服务器", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(QwIpadServer qwIpadServer)
+    {
+        List<QwIpadServer> list = qwIpadServerService.selectQwIpadServerList(qwIpadServer);
+        ExcelUtil<QwIpadServer> util = new ExcelUtil<QwIpadServer>(QwIpadServer.class);
+        return util.exportExcel(list, "ipad服务器数据");
+    }
+
+    /**
+     * 获取ipad服务器详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServer:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(qwIpadServerService.selectQwIpadServerById(id));
+    }
+
+    /**
+     * 新增ipad服务器
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServer:add')")
+    @Log(title = "ipad服务器", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody QwIpadServer qwIpadServer)
+    {
+        return toAjax(qwIpadServerService.insertQwIpadServer(qwIpadServer));
+    }
+
+    /**
+     * 修改ipad服务器
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServer:edit')")
+    @Log(title = "ipad服务器", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody QwIpadServer qwIpadServer)
+    {
+        return toAjax(qwIpadServerService.updateQwIpadServer(qwIpadServer));
+    }
+
+    /**
+     * 删除ipad服务器
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServer:remove')")
+    @Log(title = "ipad服务器", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(qwIpadServerService.deleteQwIpadServerByIds(ids));
+    }
+}

fs-admin/src/main/java/com/fs/qw/controller/QwIpadServerLogController.java

@@ -0,0 +1,118 @@
+package com.fs.qw.controller;
+
+import java.util.List;
+
+import com.fs.qw.param.IPadServerLogParam;
+import com.fs.qw.vo.QwIPadServerLogVO;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.qw.domain.QwIpadServerLog;
+import com.fs.qw.service.IQwIpadServerLogService;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * ipad服务器日志Controller
+ *
+ * @author fs
+ * @date 2025-07-23
+ */
+@RestController
+@RequestMapping("/qw/qwIpadServerLog")
+public class QwIpadServerLogController extends BaseController
+{
+    @Autowired
+    private IQwIpadServerLogService qwIpadServerLogService;
+
+    /**
+     * 查询ipad服务器日志列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerLog:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(QwIpadServerLog qwIpadServerLog)
+    {
+        startPage();
+        List<QwIpadServerLog> list = qwIpadServerLogService.selectQwIpadServerLogList(qwIpadServerLog);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询ipad服务器日志列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerLog:list')")
+    @GetMapping("/ipadServerLogList")
+    public TableDataInfo ipadServerLogList(IPadServerLogParam iPadServerLogParam)
+    {
+        startPage();
+        List<QwIPadServerLogVO> list = qwIpadServerLogService.selectIpadServerLogList(iPadServerLogParam);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出ipad服务器日志列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerLog:export')")
+    @Log(title = "ipad服务器日志", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(IPadServerLogParam qwIpadServerLog)
+    {
+        List<QwIPadServerLogVO> list = qwIpadServerLogService.selectIpadServerLogList(qwIpadServerLog);
+        ExcelUtil<QwIPadServerLogVO> util = new ExcelUtil<QwIPadServerLogVO>(QwIPadServerLogVO.class);
+        return util.exportExcel(list, "ipad服务器日志数据");
+    }
+
+    /**
+     * 获取ipad服务器日志详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerLog:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(qwIpadServerLogService.selectQwIpadServerLogById(id));
+    }
+
+    /**
+     * 新增ipad服务器日志
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerLog:add')")
+    @Log(title = "ipad服务器日志", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody QwIpadServerLog qwIpadServerLog)
+    {
+        return toAjax(qwIpadServerLogService.insertQwIpadServerLog(qwIpadServerLog));
+    }
+
+    /**
+     * 修改ipad服务器日志
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerLog:edit')")
+    @Log(title = "ipad服务器日志", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody QwIpadServerLog qwIpadServerLog)
+    {
+        return toAjax(qwIpadServerLogService.updateQwIpadServerLog(qwIpadServerLog));
+    }
+
+    /**
+     * 删除ipad服务器日志
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerLog:remove')")
+    @Log(title = "ipad服务器日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(qwIpadServerLogService.deleteQwIpadServerLogByIds(ids));
+    }
+}

fs-admin/src/main/java/com/fs/qw/controller/QwIpadServerUserController.java

@@ -0,0 +1,118 @@
+package com.fs.qw.controller;
+
+import java.util.List;
+
+import com.fs.qw.param.IPadServerUserParam;
+import com.fs.qw.vo.QwIPadServerUserVO;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.qw.domain.QwIpadServerUser;
+import com.fs.qw.service.IQwIpadServerUserService;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * ipad用户Controller
+ *
+ * @author fs
+ * @date 2025-07-23
+ */
+@RestController
+@RequestMapping("/qw/qwIpadServerUser")
+public class QwIpadServerUserController extends BaseController
+{
+    @Autowired
+    private IQwIpadServerUserService qwIpadServerUserService;
+
+    /**
+     * 查询ipad用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerUser:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(QwIpadServerUser qwIpadServerUser)
+    {
+        startPage();
+        List<QwIpadServerUser> list = qwIpadServerUserService.selectQwIpadServerUserList(qwIpadServerUser);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询ipad用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerUser:list')")
+    @GetMapping("/ipadServerUserList")
+    public TableDataInfo list(IPadServerUserParam iPadServerUserParam)
+    {
+        startPage();
+        List<QwIPadServerUserVO> list = qwIpadServerUserService.selectIpadServerUserList(iPadServerUserParam);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出ipad用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerUser:export')")
+    @Log(title = "ipad用户", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(IPadServerUserParam iPadServerUserParam)
+    {
+        List<QwIPadServerUserVO> list = qwIpadServerUserService.selectIpadServerUserList(iPadServerUserParam);
+        ExcelUtil<QwIPadServerUserVO> util = new ExcelUtil<QwIPadServerUserVO>(QwIPadServerUserVO.class);
+        return util.exportExcel(list, "ipad用户数据");
+    }
+
+    /**
+     * 获取ipad用户详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerUser:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(qwIpadServerUserService.selectQwIpadServerUserById(id));
+    }
+
+    /**
+     * 新增ipad用户
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerUser:add')")
+    @Log(title = "ipad用户", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody QwIpadServerUser qwIpadServerUser)
+    {
+        return toAjax(qwIpadServerUserService.insertQwIpadServerUser(qwIpadServerUser));
+    }
+
+    /**
+     * 修改ipad用户
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerUser:edit')")
+    @Log(title = "ipad用户", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody QwIpadServerUser qwIpadServerUser)
+    {
+        return toAjax(qwIpadServerUserService.updateQwIpadServerUser(qwIpadServerUser));
+    }
+
+    /**
+     * 删除ipad用户
+     */
+    @PreAuthorize("@ss.hasPermi('qw:qwIpadServerUser:remove')")
+    @Log(title = "ipad用户", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(qwIpadServerUserService.deleteQwIpadServerUserByIds(ids));
+    }
+}

fs-service/src/main/java/com/fs/qw/mapper/QwIpadServerLogMapper.java

@@ -2,6 +2,8 @@ package com.fs.qw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.qw.domain.QwIpadServerLog;
+import com.fs.qw.param.IPadServerLogParam;
+import com.fs.qw.vo.QwIPadServerLogVO;
 
 import java.util.List;
 
@@ -28,6 +30,13 @@ public interface QwIpadServerLogMapper extends BaseMapper<QwIpadServerLog>{
      */
     List<QwIpadServerLog> selectQwIpadServerLogList(QwIpadServerLog qwIpadServerLog);
 
+    /**
+     * 查询iPad服务器日志列表及其公司名称用户名称
+     * @param iPadServerLogParam 查询参数
+     * @return ipad服务器日志集合
+     */
+    List<QwIPadServerLogVO> selectIpadServerLogList(IPadServerLogParam iPadServerLogParam);
+
     /**
      * 新增ipad服务器日志
      *

fs-service/src/main/java/com/fs/qw/mapper/QwIpadServerUserMapper.java

@@ -2,6 +2,8 @@ package com.fs.qw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.qw.domain.QwIpadServerUser;
+import com.fs.qw.param.IPadServerUserParam;
+import com.fs.qw.vo.QwIPadServerUserVO;
 import org.apache.ibatis.annotations.Delete;
 
 import java.util.List;
@@ -29,6 +31,14 @@ public interface QwIpadServerUserMapper extends BaseMapper<QwIpadServerUser>{
      */
     List<QwIpadServerUser> selectQwIpadServerUserList(QwIpadServerUser qwIpadServerUser);
 
+    /**
+     * 查询ipad用户列表
+     *
+     * @param iPadServerUserParam ipad用户
+     * @return ipad用户集合
+     */
+    List<QwIPadServerUserVO> selectIpadServerUserList(IPadServerUserParam iPadServerUserParam);
+
     /**
      * 新增ipad用户
      *

fs-service/src/main/java/com/fs/qw/param/IPadServerLogParam.java

@@ -0,0 +1,21 @@
+package com.fs.qw.param;
+
+import lombok.Data;
+
+@Data
+public class IPadServerLogParam {
+
+    /** 类别 1 绑定 2 解绑 */
+    private Integer type;
+
+    /** 服务器名称 */
+    private String serverName;
+    /** 企微用户名称 */
+    private String qwUserName;
+    /** 企业名称 */
+    private String companyName;
+    /** 公司用户名称 */
+    private String companyUserName;
+
+
+}

fs-service/src/main/java/com/fs/qw/param/IPadServerUserParam.java

@@ -0,0 +1,15 @@
+package com.fs.qw.param;
+
+import lombok.Data;
+
+@Data
+public class IPadServerUserParam {
+    /** 服务器名称 */
+    private String serverName;
+    /** 企微用户名称 */
+    private String qwUserName;
+    /** 企业名称 */
+    private String companyName;
+    /** 公司用户名称 */
+    private String companyUserName;
+}

fs-service/src/main/java/com/fs/qw/service/IQwIpadServerLogService.java

@@ -2,6 +2,8 @@ package com.fs.qw.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.qw.domain.QwIpadServerLog;
+import com.fs.qw.param.IPadServerLogParam;
+import com.fs.qw.vo.QwIPadServerLogVO;
 
 import java.util.List;
 
@@ -28,6 +30,13 @@ public interface IQwIpadServerLogService extends IService<QwIpadServerLog>{
      */
     List<QwIpadServerLog> selectQwIpadServerLogList(QwIpadServerLog qwIpadServerLog);
 
+    /**
+     * 查询iPad服务器日志列表及其公司名称用户名称
+     * @param iPadServerLogParam 查询参数
+     * @return ipad服务器日志集合
+     */
+    List<QwIPadServerLogVO> selectIpadServerLogList(IPadServerLogParam iPadServerLogParam);
+
     /**
      * 新增ipad服务器日志
      *

fs-service/src/main/java/com/fs/qw/service/IQwIpadServerUserService.java

@@ -2,6 +2,8 @@ package com.fs.qw.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.qw.domain.QwIpadServerUser;
+import com.fs.qw.param.IPadServerUserParam;
+import com.fs.qw.vo.QwIPadServerUserVO;
 
 import java.util.List;
 
@@ -28,6 +30,14 @@ public interface IQwIpadServerUserService extends IService<QwIpadServerUser>{
      */
     List<QwIpadServerUser> selectQwIpadServerUserList(QwIpadServerUser qwIpadServerUser);
 
+    /**
+     * 查询ipad用户列表
+     *
+     * @param iPadServerUserParam ipad用户
+     * @return ipad用户集合
+     */
+    List<QwIPadServerUserVO> selectIpadServerUserList(IPadServerUserParam iPadServerUserParam);
+
     /**
      * 新增ipad用户
      *

fs-service/src/main/java/com/fs/qw/service/impl/QwIpadServerLogServiceImpl.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.common.utils.DateUtils;
 import com.fs.qw.domain.QwIpadServerLog;
 import com.fs.qw.mapper.QwIpadServerLogMapper;
+import com.fs.qw.param.IPadServerLogParam;
 import com.fs.qw.service.IQwIpadServerLogService;
+import com.fs.qw.vo.QwIPadServerLogVO;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -42,6 +45,11 @@ public class QwIpadServerLogServiceImpl extends ServiceImpl<QwIpadServerLogMappe
         return baseMapper.selectQwIpadServerLogList(qwIpadServerLog);
     }
 
+    @Override
+    public List<QwIPadServerLogVO> selectIpadServerLogList(IPadServerLogParam iPadServerLogParam) {
+        return baseMapper.selectIpadServerLogList(iPadServerLogParam);
+    }
+
     /**
      * 新增ipad服务器日志
      *

fs-service/src/main/java/com/fs/qw/service/impl/QwIpadServerUserServiceImpl.java

@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.common.utils.DateUtils;
 import com.fs.qw.domain.QwIpadServerUser;
 import com.fs.qw.mapper.QwIpadServerUserMapper;
+import com.fs.qw.param.IPadServerUserParam;
 import com.fs.qw.service.IQwIpadServerUserService;
+import com.fs.qw.vo.QwIPadServerUserVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -45,6 +48,11 @@ public class QwIpadServerUserServiceImpl extends ServiceImpl<QwIpadServerUserMap
         return baseMapper.selectQwIpadServerUserList(qwIpadServerUser);
     }
 
+    @Override
+    public List<QwIPadServerUserVO> selectIpadServerUserList(IPadServerUserParam iPadServerUserParam) {
+        return baseMapper.selectIpadServerUserList(iPadServerUserParam);
+    }
+
     /**
      * 新增ipad用户
      *

fs-service/src/main/java/com/fs/qw/vo/QwIPadServerLogVO.java

@@ -0,0 +1,43 @@
+package com.fs.qw.vo;
+
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class QwIPadServerLogVO {
+    /** $column.columnComment */
+    private Long id;
+
+    /** 服务器id */
+    private Long serverId;
+
+    /** 企微用户 */
+    private Long qwUserId;
+
+    /** 公司id */
+    private Long companyId;
+
+    /** 公司用户id */
+    private Long companyUserId;
+
+
+
+    /** 服务器名称 */
+    @Excel(name = "服务器")
+    private String serverName;
+    /** 企微用户名称 */
+    @Excel(name = "企微用户")
+    private String qwUserName;
+    /** 企业名称 */
+    @Excel(name = "公司")
+    private String companyName;
+    /** 公司用户名称 */
+    @Excel(name = "公司用户")
+    private String companyUserName;
+    /** 标题 */
+    @Excel(name = "标题")
+    private String tilie;
+    /** 类别 1 绑定 2 解绑 */
+    @Excel(name = "类别",readConverterExp = "1=绑定,2=解绑")
+    private Integer type;
+}

fs-service/src/main/java/com/fs/qw/vo/QwIPadServerUserVO.java

@@ -0,0 +1,38 @@
+package com.fs.qw.vo;
+
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class QwIPadServerUserVO {
+    /** id */
+    private Long id;
+
+    /** 服务器id */
+    private Long serverId;
+
+    /** 企微用户id */
+    private Long qwUserId;
+
+    /** 公司id */
+    private Long companyId;
+
+    /** 公司用户id */
+    private Long companyUserId;
+
+    /** 服务器名称 */
+    @Excel(name = "服务器")
+    private String serverName;
+
+    /** 企微用户名称 */
+    @Excel(name = "企微用户")
+    private String qwUserName;
+
+    /** 企业名称 */
+    @Excel(name = "公司")
+    private String companyName;
+
+    /** 公司用户名称 */
+    @Excel(name = "公司用户")
+    private String companyUserName;
+}

fs-service/src/main/resources/mapper/qw/QwIpadServerLogMapper.xml

@@ -1,7 +1,7 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fs.qw.mapper.QwIpadServerLogMapper">
 
     <resultMap type="QwIpadServerLog" id="QwIpadServerLogResult">
@@ -31,6 +31,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="selectIpadServerLogList"  resultType="com.fs.qw.vo.QwIPadServerLogVO">
+        SELECT sl.id,sl.server_id,sl.qw_user_id,sl.company_id,sl.company_user_id,sl.tilie,sl.type,sl.create_time,s.title server_name,u.qw_user_name,c.company_name,cu.user_name company_user_name FROM qw_ipad_server_log sl
+        JOIN qw_ipad_server s ON sl.server_id = s.id
+        JOIN qw_user u ON sl.qw_user_id = u.id
+        JOIN company c ON sl.company_id = c.company_id
+        JOIN company_user cu ON sl.company_user_id = cu.user_id
+        <where>
+            <if test="serverName != null "> and s.title = #{serverName}</if>
+            <if test="qwUserName != null "> and u.qw_user_name = #{qwUserName}</if>
+            <if test="companyName != null "> and c.company_name = #{companyName}</if>
+            <if test="companyUserName != null "> and cu.user_name = #{companyUserName}</if>
+            <if test="type != null "> and sl.type = #{type}</if>
+        </where>
+        ORDER BY sl.create_time DESC
+    </select>
+
     <select id="selectQwIpadServerLogById" parameterType="Long" resultMap="QwIpadServerLogResult">
         <include refid="selectQwIpadServerLogVo"/>
         where id = #{id}
@@ -47,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tilie != null">tilie,</if>
             <if test="type != null">type,</if>
             <if test="createTime != null">create_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="serverId != null">#{serverId},</if>
@@ -57,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tilie != null">#{tilie},</if>
             <if test="type != null">#{type},</if>
             <if test="createTime != null">#{createTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateQwIpadServerLog" parameterType="QwIpadServerLog">

fs-service/src/main/resources/mapper/qw/QwIpadServerUserMapper.xml

@@ -1,7 +1,7 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fs.qw.mapper.QwIpadServerUserMapper">
 
     <resultMap type="QwIpadServerUser" id="QwIpadServerUserResult">
@@ -27,6 +27,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="selectIpadServerUserList"  resultType="com.fs.qw.vo.QwIPadServerUserVO">
+        SELECT su.id,su.server_id,su.qw_user_id,su.company_id,su.company_user_id,su.create_time,s.title server_name,u.qw_user_name,c.company_name,cu.user_name company_user_name FROM qw_ipad_server_user su
+        JOIN qw_ipad_server s ON su .server_id = s.id
+        JOIN qw_user u ON su .qw_user_id = u.id
+        JOIN company c ON su .company_id = c.company_id
+        JOIN company_user cu ON su.company_user_id = cu.user_id
+        <where>
+            <if test="serverName != null "> and s.title = #{serverName}</if>
+            <if test="qwUserName != null "> and u.qw_user_name = #{qwUserName}</if>
+            <if test="companyName != null "> and c.company_name = #{companyName}</if>
+            <if test="companyUserName != null "> and cu.user_name = #{companyUserName}</if>
+        </where>
+        ORDER BY su.create_time DESC
+    </select>
+
+
     <select id="selectQwIpadServerUserById" parameterType="Long" resultMap="QwIpadServerUserResult">
         <include refid="selectQwIpadServerUserVo"/>
         where id = #{id}
@@ -40,14 +56,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null">company_id,</if>
             <if test="companyUserId != null">company_user_id,</if>
             <if test="createTime != null">create_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="serverId != null">#{serverId},</if>
             <if test="qwUserId != null">#{qwUserId},</if>
             <if test="companyId != null">#{companyId},</if>
             <if test="companyUserId != null">#{companyUserId},</if>
             <if test="createTime != null">#{createTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateQwIpadServerUser" parameterType="QwIpadServerUser">