Skip to content

Z
znks
Commit 55c094c2 authored by leyboy's avatar leyboy
Browse files
Options

1.开锁记录分页,用户分页,管理员分页完成

parent 141dc28f
Hide whitespace changes
Inline Side-by-side
Showing with 837 additions and 704 deletions
.idea/workspace.xml
View file @ 55c094c2
This source diff could not be displayed because it is too large. You can view the blob instead.
adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java
View file @ 55c094c2
......@@ -14,6 +14,9 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author ley
**/
@RestController
@RequestMapping("/api")
public class AdminController {
......@@ -24,20 +27,33 @@ public class AdminController {
@PostMapping("/admin")
public ResponseEntity saveOne(Admin admin) {
try {
adminService.insertAdmin(admin);
return GenResponse.success();
int result=adminService.insertAdmin(admin);
if(result==1){
return GenResponse.success(String.valueOf(HttpStatus.OK.value()),
"保存成功",true);
}else{
return GenResponse.fail("数据库已有该管理员名,插入失败!");
}
} catch (Exception e) {
e.printStackTrace();
return GenResponse.fail("保存失败");
}
}
@PutMapping("/admin")
public ResponseEntity updateOne(Admin admin) {
public ResponseEntity<Boolean> updateOne(Admin admin) {
try {
adminService.updateAdmin(admin);
return GenResponse.success();
int result=adminService.updateAdmin(admin);
if(result==1){
return GenResponse.success(String.valueOf(HttpStatus.OK.value()),
"更新成功",true);
}else{
return GenResponse.success(String.valueOf(HttpStatus.OK.value()),
"更新失败",false);
}
} catch (Exception e) {
e.printStackTrace();
return GenResponse.fail("更新失败");
}
}
......@@ -46,27 +62,35 @@ public class AdminController {
@DeleteMapping("/admin/{adminId}")
public ResponseEntity deleteOne(@PathVariable String adminId) {
try {
adminService.deleteAdmin(adminId);
return GenResponse.success();
int result = adminService.deleteAdmin(adminId);
if(result==1){
return GenResponse.success(String.valueOf(HttpStatus.OK.value()),
"删除成功",true);
}else{
return GenResponse.success(String.valueOf(HttpStatus.OK.value()),
"删除失败",false);
}
} catch (Exception e) {
e.printStackTrace();
return GenResponse.fail("删除失败");
}
}
@GetMapping("/admin/{adminId}")
public ResponseEntity<Admin> findOne(@PathVariable String adminId) {
@GetMapping("/admin/{adminName}")
public ResponseEntity<Admin> findOne(@PathVariable String adminName) {
try {
Admin admin = adminService.findAdmin(adminId);
Admin admin = adminService.findAdmin(adminName);
return GenResponse.success(String.valueOf(HttpStatus.OK.value()),
"查询成功", admin);
} catch (Exception e) {
e.printStackTrace();
return GenResponse.fail("查询失败");
}
}
@GetMapping("/admin/page")
@GetMapping(value = "/admin/page")
public ResponseEntity<PageInfo> findByPage(AdminSearch adminSearch, @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "8") Integer pageSize) {
try {
PageHelper.startPage(pageNum, pageSize);
......@@ -75,12 +99,14 @@ public class AdminController {
return GenResponse.success(String.valueOf(HttpStatus.OK.value()),
"查询成功", pageInfo);
} catch (Exception e) {
e.printStackTrace();
return GenResponse.fail("查询失败");
}
}
@PostMapping("/admin/login")
@CrossOrigin
@PostMapping(value = "/admin/login",consumes = {"application/x-www-form-urlencoded"})
public ResponseEntity login(@RequestParam String adminName, @RequestParam String password) {
try {
if (adminService.login(adminName, password)) {
......@@ -90,6 +116,7 @@ public class AdminController {
return GenResponse.fail("登录失败");
}
} catch (Exception e) {
e.printStackTrace();
return GenResponse.fail("登录失败");
}
}
......
adc-da-main/src/main/java/com/adc/da/znks/controller/DeviceController.java
View file @ 55c094c2
......@@ -9,7 +9,9 @@ import com.adc.da.znks.service.DeviceService;
import com.adc.da.znks.service.UserService;
import com.adc.da.znks.util.GenResponse;
import com.adc.da.znks.vo.DeviceVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......
adc-da-main/src/main/java/com/adc/da/znks/controller/LockRecordController.java 0 → 100644
View file @ 55c094c2
package com.adc.da.znks.controller;
import com.adc.da.znks.entity.ResponseEntity;
import com.adc.da.znks.service.LockRecordService;
import com.adc.da.znks.util.GenResponse;
import com.adc.da.znks.vo.AdminVO;
import com.adc.da.znks.vo.LockRecordVO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping("/api")
public class LockRecordController {
@Autowired
private LockRecordService lockRecordService;
@ApiOperation("lockRecord|开锁记录查询")
@GetMapping("/lockRecord/page")
public ResponseEntity<PageInfo> listLockRecordsByPage(String phone, String deviceName, @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "8") Integer pageSize) {
try {
PageHelper.startPage(pageNum, pageSize);
List<LockRecordVO> lockRecordVOS = lockRecordService.listLockRecordVOs(phone, deviceName, pageNum, pageSize);
PageInfo<LockRecordVO> pageInfo = new PageInfo<>(lockRecordVOS);
return GenResponse.success(String.valueOf(HttpStatus.OK.value()),
"查询成功", pageInfo);
} catch (Exception e) {
e.printStackTrace();
return GenResponse.fail("没有可分页的锁记录");
}
}
}
adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java
View file @ 55c094c2
......@@ -3,11 +3,16 @@ package com.adc.da.znks.controller;
import com.adc.da.base.web.BaseController;
import com.adc.da.util.http.ResponseMessage;
import com.adc.da.util.http.Result;
import com.adc.da.util.utils.CollectionUtils;
import com.adc.da.znks.entity.ResponseEntity;
import com.adc.da.znks.entity.User;
import com.adc.da.znks.service.LockRecordService;
import com.adc.da.znks.service.UserService;
import com.adc.da.znks.util.GenResponse;
import com.adc.da.znks.vo.UserSearch;
import com.adc.da.znks.vo.UserVO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
......@@ -16,6 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author David
*/
......@@ -33,7 +40,7 @@ public class UserController extends BaseController<User> {
@ApiOperation(value = "|User|登录或者注册用户")
@PostMapping(value = {"/loginOrRegisterUser"})
public ResponseEntity<Boolean> loginOrRegisterUser(String phoneNumber ,String password) {
public ResponseEntity<Boolean> loginOrRegisterUser(String phoneNumber, String password) {
boolean flag = userService.loginOrRegister(phoneNumber, password);
if (flag) {
return GenResponse.success(String.valueOf(HttpStatus.OK.value()), "登录或者注册用户成功", flag);
......@@ -51,7 +58,7 @@ public class UserController extends BaseController<User> {
@ApiOperation(value = "|User|更新密码")
@PostMapping("/updatePassword")
public ResponseEntity<Boolean> update(String phoneNumber,String password) {
public ResponseEntity<Boolean> update(String phoneNumber, String password) {
User user = new User();
user.setTemphone(phoneNumber);
user.setPlainPassword(password);
......@@ -73,8 +80,29 @@ public class UserController extends BaseController<User> {
@ApiOperation(value = "开锁日志")
@GetMapping("/listLockRecord")
public ResponseMessage listLockRecord(String phone,String number) {
return Result.success(lockRecordService.selectLockRecord(phone,number));
public ResponseMessage listLockRecord(String phone, String number) {
return Result.success(lockRecordService.selectLockRecord(phone, number));
}
@ApiOperation(value = "|User|后台用户列表查询(默认第一页,每页8条)")
@GetMapping("/page")
public ResponseEntity<PageInfo> listUserVOs(UserSearch userSearch,
@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "8") Integer pageSize) {
PageHelper.startPage(pageNum, pageSize);
List<UserVO> userVOS = userService.listUserVOsByCondition(userSearch, pageNum, pageSize);
try {
if (CollectionUtils.isNotEmpty(userVOS)) {
PageInfo<UserVO> pageInfo=new PageInfo<>(userVOS);
return GenResponse.success(String.valueOf(HttpStatus.OK.value()),
"分页查询成功", pageInfo);
} else {
return GenResponse.success(String.valueOf(HttpStatus.OK.value()),
"没有记录可以分页", null);
}
} catch (Exception e) {
return GenResponse.fail("分页查询失败");
}
}
}
adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java
View file @ 55c094c2
......@@ -13,8 +13,8 @@ import java.util.List;
@Mapper
public interface AdminDao {
@Insert("insert into tb_admin(admin_id,admin_name,admin_password,create_time) " +
"values(#{id},#{name},#{password},#{createTime})")
@Insert("insert into tb_admin(admin_name,admin_password,create_time) " +
"values(#{name},#{password},#{createTime})")
int insertAdmin(Admin admin);
......@@ -30,21 +30,10 @@ public interface AdminDao {
@Select("select * from tb_admin where admin_name = #{param1}")
@Results({
@Result(column = "admin_id", property = "id"),
@Result(column = "create_time", property = "createTime"),
@Result(column = "admin_name", property = "name"),
@Result(column = "admin_password", property = "password")
}
)
Admin findAdminByAdminName(String adminName);
@Select("select * from tb_admin where admin_id = #{param1}")
@Results({
@Result(column = "admin_id", property = "id"),
@Result(column = "create_time", property = "createTime"),
@Result(column = "admin_name", property = "name")}
)
Admin findAdminByAdminId(String adminId);
}
adc-da-main/src/main/java/com/adc/da/znks/dao/LockRecordDao.java
View file @ 55c094c2
......@@ -3,8 +3,11 @@ package com.adc.da.znks.dao;
import com.adc.da.base.dao.BaseDao;
import com.adc.da.znks.entity.Device;
import com.adc.da.znks.entity.LockRecord;
import com.adc.da.znks.vo.LockRecordVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import java.util.List;
import java.util.Map;
......@@ -19,4 +22,7 @@ public interface LockRecordDao extends BaseDao<LockRecord> {
List<Map<String,Object>> selectLockRecord(@Param("phone") String phone,@Param("deviceCode") String deviceCode);
List<LockRecordVO> getLockRecordVOs(@Param("telphone") String phone,@Param("deviceName")String deviceName,
@Param("pageNum")Integer pageNum,@Param("pageSize")Integer pageSize);
}
adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java
View file @ 55c094c2
......@@ -2,7 +2,9 @@ package com.adc.da.znks.dao;
import com.adc.da.base.dao.BaseDao;
import com.adc.da.znks.entity.Position;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.*;
import java.util.Map;
/**
*
......@@ -11,5 +13,4 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface PositionDao extends BaseDao<Position> {
}
adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java
View file @ 55c094c2
......@@ -3,6 +3,8 @@ package com.adc.da.znks.dao;
;
import com.adc.da.base.dao.BaseDao;
import com.adc.da.znks.entity.User;
import com.adc.da.znks.vo.UserSearch;
import com.adc.da.znks.vo.UserVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
......@@ -33,4 +35,11 @@ public interface UserDao extends BaseDao<User> {
" and ur.temphone = #{phoneNumber}")
List<Map<String,Object>> getGateWayByPhoneNumber(@Param("phoneNumber") String phoneNumber);
/**
* 获取用户列表
* **/
List<UserVO> listUserVOs(@Param("userSearch") UserSearch userSearch,
@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
}
adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java
View file @ 55c094c2
......@@ -19,8 +19,6 @@ public class Admin {
private transient String plainPassword;
private String id;
public Admin() {
}
......@@ -57,13 +55,6 @@ public class Admin {
this.plainPassword = plainPassword;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
@Override
public String toString() {
......@@ -74,8 +65,6 @@ public class Admin {
.append(password).append('\"');
sb.append(",\"createTime\":\"")
.append(createTime).append('\"');
sb.append(",\"id\":\"")
.append(id).append('\"');
sb.append('}');
return sb.toString();
}
......
adc-da-main/src/main/java/com/adc/da/znks/entity/LockRecord.java
View file @ 55c094c2
package com.adc.da.znks.entity;
import com.adc.da.base.entity.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
......@@ -17,6 +18,7 @@ public class LockRecord extends BaseEntity {
private int user;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String deviceId;
private String lockType;
......
adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java
View file @ 55c094c2
......@@ -34,34 +34,45 @@ public class AdminService {
public int insertAdmin(Admin admin) {
admin.setCreateTime(new Date(System.currentTimeMillis()));
admin.setId(UUID.randomUUID());
if(StringUtils.hasText(admin.getPlainPassword())){
admin.setPassword(Base64Utils.encode(admin.getPlainPassword().getBytes(Charset.defaultCharset())));
Admin findAdmin = adminDao.findAdminByAdminName(admin.getName());
if (findAdmin == null) {
admin.setCreateTime(new Date(System.currentTimeMillis()));
if (StringUtils.hasText(admin.getPlainPassword())) {
admin.setPassword(Base64Utils.encode(admin.getPlainPassword().getBytes(Charset.defaultCharset())));
}
return adminDao.insertAdmin(admin);
} else {
//数据库已有该管理员名,不允许插入
return -1;
}
return adminDao.insertAdmin(admin);
}
public int deleteAdmin(String adminId){
public int deleteAdmin(String adminId) {
return adminDao.deleteAdmin(adminId);
}
public int updateAdmin(Admin admin){
if(StringUtils.hasText(admin.getPlainPassword())){
admin.setPassword(Base64Utils.encode(admin.getPlainPassword().getBytes(Charset.defaultCharset())));
public int updateAdmin(Admin admin) {
Admin findAdmin = adminDao.findAdminByAdminName(admin.getName());
if (findAdmin != null) {
if (StringUtils.hasText(admin.getPlainPassword())) {
admin.setPassword(Base64Utils.encode(admin.getPlainPassword().getBytes(Charset.defaultCharset())));
}
return adminDao.updateAdmin(admin);
}
return adminDao.updateAdmin(admin);
//没有查询到,更新失败
return -1;
}
public Admin findAdmin(String adminId){
return adminDao.findAdminByAdminId(adminId);
public Admin findAdmin(String adminName) {
return adminDao.findAdminByAdminName(adminName);
}
public boolean login(String adminName,String plainPassword) throws IOException {
public boolean login(String adminName, String plainPassword) throws IOException {
Admin admin = adminDao.findAdminByAdminName(adminName);
if (admin != null) {
String adminPassword = admin.getPassword();
......
adc-da-main/src/main/java/com/adc/da/znks/service/LockRecordService.java
View file @ 55c094c2
......@@ -6,6 +6,7 @@ import com.adc.da.znks.dao.DeviceDao;
import com.adc.da.znks.dao.LockRecordDao;
import com.adc.da.znks.entity.Device;
import com.adc.da.znks.entity.LockRecord;
import com.adc.da.znks.vo.LockRecordVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -60,4 +61,12 @@ public class LockRecordService extends BaseService<LockRecord, String> {
}
return result;
}
/**
* list lock record vos
* **/
public List<LockRecordVO> listLockRecordVOs(String phone,String deviceName,Integer pageNum,Integer pageSize){
return dao.getLockRecordVOs(phone,deviceName,pageNum,pageSize);
}
}
adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java
View file @ 55c094c2
......@@ -4,10 +4,14 @@ package com.adc.da.znks.service;
import com.adc.da.base.service.BaseService;
import com.adc.da.util.utils.CollectionUtils;
import com.adc.da.util.utils.UUID;
import com.adc.da.znks.dao.PositionDao;
import com.adc.da.znks.dao.UserDao;
import com.adc.da.znks.entity.Position;
import com.adc.da.znks.entity.User;
import com.adc.da.znks.page.UserPage;
import com.adc.da.znks.util.SecurityUtils;
import com.adc.da.znks.vo.UserSearch;
import com.adc.da.znks.vo.UserVO;
import org.apache.http.util.Asserts;
import org.apache.ibatis.annotations.Param;
import org.slf4j.Logger;
......@@ -36,6 +40,10 @@ public class UserService extends BaseService<User, String> {
@Autowired(required = false)
private UserDao dao;
@Autowired(required = false)
private PositionDao positionDao;
@Override
public UserDao getDao() {
return dao;
......@@ -141,4 +149,14 @@ public class UserService extends BaseService<User, String> {
public List<Map<String,Object>> queryClientByIp(@Param("ip") String ip){
return dao.queryClientByIp(ip);
}
/**
* 获取用户列表记录
* **/
public List<UserVO> listUserVOsByCondition(UserSearch userSearch,Integer pageNUm,Integer pageSize){
List<UserVO> userVOS=dao.listUserVOs(userSearch,pageNUm,pageSize);
return userVOS;
}
}
adc-da-main/src/main/java/com/adc/da/znks/vo/AdminSearch.java
View file @ 55c094c2
package com.adc.da.znks.vo;
import com.alibaba.fastjson.annotation.JSONField;
import org.springframework.util.StringUtils;
/**
* @author ley
* **/
**/
public class AdminSearch {
private String createTime1;
@JSONField(format = "yyyy-MM-dd")
private String createTime2;
@JSONField(format = "yyyy-MM-dd")
private String adminName;
public String getCreateTime1() {
......
adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java
View file @ 55c094c2
......@@ -11,9 +11,8 @@ public class AdminVO {
private String adminName;
@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd")
@JSONField(format = "yyyy-MM-dd")
private Date createTime;
private String createTime;
private String adminId;
......@@ -33,11 +32,11 @@ public class AdminVO {
this.adminName = adminName;
}
public Date getCreateTime() {
public String getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
}
adc-da-main/src/main/java/com/adc/da/znks/vo/LockRecordVO.java 0 → 100644
View file @ 55c094c2
package com.adc.da.znks.vo;
import com.alibaba.fastjson.annotation.JSONField;
public class LockRecordVO {
/**
* 设备名
* **/
private String deviceName;
/**
* 锁类型
* **/
private String lockType;
/**
* 手机号
* **/
private String telphone;
/**
* 锁上用户
* **/
private String lockUser;
/**
* 时间
*
* **/
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private String lockTime;
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getLockType() {
return lockType;
}
public void setLockType(String lockType) {
this.lockType = lockType;
}
public String getTelphone() {
return telphone;
}
public void setTelphone(String telphone) {
this.telphone = telphone;
}
public String getLockUser() {
return lockUser;
}
public void setLockUser(String lockUser) {
this.lockUser = lockUser;
}
public String getLockTime() {
return lockTime;
}
public void setLockTime(String lockTime) {
this.lockTime = lockTime;
}
}
adc-da-main/src/main/java/com/adc/da/znks/vo/UserSearch.java 0 → 100644
View file @ 55c094c2
package com.adc.da.znks.vo;
/**
* user search
* **/
public class UserSearch {
private String createTime1;
private String telphone;
private String createTime2;
public String getCreateTime1() {
return createTime1;
}
public void setCreateTime1(String createTime1) {
this.createTime1 = createTime1;
}
public String getTelphone() {
return telphone;
}
public void setTelphone(String telphone) {
this.telphone = telphone;
}
public String getCreateTime2() {
return createTime2;
}
public void setCreateTime2(String createTime2) {
this.createTime2 = createTime2;
}
}
adc-da-main/src/main/java/com/adc/da/znks/vo/UserVO.java 0 → 100644
View file @ 55c094c2
package com.adc.da.znks.vo;
import com.alibaba.fastjson.annotation.JSONField;
/**
*@author ley
* **/
public class UserVO {
/**
* 创建时间
* **/
@JSONField(format = "yyyy-MM-dd")
private String createTime;
/**
* app用户手机号
* **/
private String telphone;
/**
* 设备数量
* **/
private Integer deviceNum;
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getTelphone() {
return telphone;
}
public void setTelphone(String telphone) {
this.telphone = telphone;
}
public Integer getDeviceNum() {
return deviceNum;
}
public void setDeviceNum(Integer deviceNum) {
this.deviceNum = deviceNum;
}
}
adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml
View file @ 55c094c2
......@@ -3,14 +3,13 @@
<mapper namespace="com.adc.da.znks.dao.AdminDao">
<!-- Result Map-->
<resultMap id="BaseResultMap" type="com.adc.da.znks.vo.AdminVO">
<result column="admin_id" property="adminId"/>
<result column="admin_name" property="adminName"/>
<result column="create_time" property="createTime"/>
</resultMap>
<!-- tb_position table all fields -->
<sql id="Base_Column_List">
a.admin_id,a.admin_name,a.create_time
a.admin_name,a.create_time
</sql>
<update id="updateAdmin" parameterType="com.adc.da.znks.entity.Admin">
......@@ -23,24 +22,25 @@
admin_password = #{password},
</if>
</set>
where admin_id = #{id}
</update>
<select id="listAdminsByCondition" parameterType="object" resultMap="BaseResultMap">
select <include refid="Base_Column_List"/>
select
<include refid="Base_Column_List"/>
from tb_admin a
<where>
<trim suffixOverrides="and">
<if test="adminSearch.adminName!=null ">
a.admin_name = #{adminSearch.adminName} and
</if>
<if test="adminSearch.createTime1!=null">
a.create_time >= #{adminSearch.createTime1} and
</if>
<if test="adminSearch.createTime2!=null">
a.create_time &lt;= #{adminSearch.createTime2} and
</if>
</trim>
<trim suffixOverrides="and">
<if test="adminSearch.adminName!=null and adminSearch.adminName!= '' ">
<bind name="nameLike" value="'%'+adminSearch.adminName+'%'"/>
a.admin_name LIKE #{nameLike} and
</if>
<if test="adminSearch.createTime1!=null">
a.create_time >= #{adminSearch.createTime1} and
</if>
<if test="adminSearch.createTime2!=null">
a.create_time &lt;= #{adminSearch.createTime2} and
</if>
</trim>
</where>
</select>
</mapper>
......
adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml
View file @ 55c094c2
......@@ -35,4 +35,32 @@
insert into tb_lock_record(time,user,device_id,lock_type) values(#{time},#{user},#{deviceId},#{lockType})
</insert>
<resultMap id="lockRecordVOMap" type="com.adc.da.znks.vo.LockRecordVO">
<result column="telphone" property="telphone"/>
<result column="deviceName" property="deviceName"/>
<result column="lockType" property="lockType"/>
<result column="lockUser" property="lockUser"/>
<result column="lockTime" property="lockTime"/>
</resultMap>
<select id="getLockRecordVOs" parameterType="object" resultMap="lockRecordVOMap">
select u.temphone as telphone,d.name as deviceName,lr.user as lockUser,
lr.lock_type as lockType,lr.time as lockTime
from tb_lock_record lr,tb_device d,tb_user u
<where>
<trim suffixOverrides="and">
<if test="deviceName!=null">
d.deviceName = #{deviceName} and
</if>
<if test="telphone!=null">
u.telphone = #{telphone} and
</if>
</trim>
u.id = d.user_id and
d.code = lr.device_id
and lr.lock_type != ''
</where>
</select>
</mapper>
adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml
View file @ 55c094c2
......@@ -145,4 +145,32 @@
g.ip = #{ip}
</select>
<resultMap id="userVOMap" type="com.adc.da.znks.vo.UserVO">
<result column="createTime" property="createTime"/>
<result column="telphone" property="telphone"/>
<result column="deviceNum" property="deviceNum"/>
<result column="userId" property="userId"/>
</resultMap>
<select id="listUserVOs" parameterType="object" resultMap="userVOMap">
SELECT u.`create_time` AS createTime,u.`temphone` AS telphone,COUNT(d.`id`) AS deviceNum FROM tb_user u
LEFT JOIN tb_device d ON u.`id` = d.`user_id` GROUP BY u.`id`
<where>
<trim suffixOverrides="and">
<if test="userSearch.telphone != null and userSearch.telphone != ''">
u.`temphone` = #{userSearch.telphone} and
</if>
<if test="userSearch.createTime1!=null">
u.create_time >= #{userSearch.createTime1} and
</if>
<if test="userSearch.createTime2!=null">
u.create_time &lt;= #{userSearch.createTime2} and
</if>
</trim>
</where>
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment