From 60a752c839e241406460899b5ecd536ecf7a7059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=B4=AA=E9=BE=99?= <599179587@qq.com> Date: Wed, 9 Aug 2017 15:11:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ifish/bean/Tbl_Device.java | 26 +------- .../java/com/ifish/bean/Tbl_Device_User.java | 28 +++++++- .../{Tbl_Vender.java => Tbl_Vender_List.java} | 2 +- src/main/java/com/ifish/config/WebConfig.java | 1 + .../java/com/ifish/controller/Device.java | 16 ++++- .../java/com/ifish/helper/DeviceHelper.java | 66 ++++++++++++++++--- .../java/com/ifish/helper/DeviceHelperI.java | 11 +++- .../com/ifish/helper/HardWareTypeHelper.java | 14 ++-- .../com/ifish/helper/HardWareTypeHelperI.java | 6 +- .../java/com/ifish/helper/RedisKeyHelper.java | 19 +++++- .../com/ifish/helper/RedisKeyHelperI.java | 5 ++ .../java/com/ifish/helper/UserHelper.java | 8 +-- .../com/ifish/mapper/Tbl_Device_Mapper.java | 14 ++-- .../ifish/mapper/Tbl_Device_MapperSql.java | 6 +- .../mapper/Tbl_Hardware_Type_Mapper.java | 6 +- 15 files changed, 159 insertions(+), 69 deletions(-) rename src/main/java/com/ifish/bean/{Tbl_Vender.java => Tbl_Vender_List.java} (98%) diff --git a/src/main/java/com/ifish/bean/Tbl_Device.java b/src/main/java/com/ifish/bean/Tbl_Device.java index 112f6a4..71433d8 100644 --- a/src/main/java/com/ifish/bean/Tbl_Device.java +++ b/src/main/java/com/ifish/bean/Tbl_Device.java @@ -23,7 +23,7 @@ public class Tbl_Device implements java.io.Serializable { /** * 版本号 */ - private static final long serialVersionUID = -7095234476683939631L; + private static final long serialVersionUID = 204106348073538365L; /** * 设备Id @@ -80,12 +80,6 @@ public class Tbl_Device implements java.io.Serializable { @Column(name = "on_off", nullable = true, length = 1) private String onOff; - /** - * 是否接收离线通知：1接收，0不接受 - */ - @Column(name = "off_line", nullable = true, length = 1) - private String offLine; - /** * 今天是否提醒：1提醒、0不提醒 */ @@ -314,24 +308,6 @@ public class Tbl_Device implements java.io.Serializable { this.onOff = onOff; } - /** - * 获取是否接收离线通知：1接收，0不接受 - * - * @return 是否接收离线通知：1接收 - */ - public String getOffLine() { - return this.offLine; - } - - /** - * 设置是否接收离线通知：1接收，0不接受 - * - * @param offLine 是否接收离线通知：1接收，0不接受 - */ - public void setOffLine(String offLine) { - this.offLine = offLine; - } - /** * 获取今天是否提醒：1提醒、0不提醒 * diff --git a/src/main/java/com/ifish/bean/Tbl_Device_User.java b/src/main/java/com/ifish/bean/Tbl_Device_User.java index 08184a0..9cd6a89 100644 --- a/src/main/java/com/ifish/bean/Tbl_Device_User.java +++ b/src/main/java/com/ifish/bean/Tbl_Device_User.java @@ -24,7 +24,7 @@ public class Tbl_Device_User implements java.io.Serializable { /** * 版本号 */ - private static final long serialVersionUID = -4018159739383033383L; + private static final long serialVersionUID = 5123379244673522530L; /** * id @@ -36,7 +36,7 @@ public class Tbl_Device_User implements java.io.Serializable { /** * 用户Id */ - @Column(name = "user_id", unique = true, nullable = false, length = 10) + @Column(name = "user_id", nullable = false, length = 10) private Integer userId; /** @@ -93,6 +93,12 @@ public class Tbl_Device_User implements java.io.Serializable { @Column(name = "is_live", nullable = true, length = 1) private String isLive; + /** + * 是否开启离线提醒，1开启，0关闭，默认1 + */ + @Column(name = "off_line", nullable = true, length = 1) + private String offLine; + /** * 获取id * @@ -290,4 +296,22 @@ public class Tbl_Device_User implements java.io.Serializable { public void setIsLive(String isLive) { this.isLive = isLive; } + + /** + * 获取是否开启离线提醒，1开启，0关闭，默认1 + * + * @return 是否开启离线提醒 + */ + public String getOffLine() { + return this.offLine; + } + + /** + * 设置是否开启离线提醒，1开启，0关闭，默认1 + * + * @param offLine 是否开启离线提醒，1开启，0关闭，默认1 + */ + public void setOffLine(String offLine) { + this.offLine = offLine; + } } diff --git a/src/main/java/com/ifish/bean/Tbl_Vender.java b/src/main/java/com/ifish/bean/Tbl_Vender_List.java similarity index 98% rename from src/main/java/com/ifish/bean/Tbl_Vender.java rename to src/main/java/com/ifish/bean/Tbl_Vender_List.java index c0a1010..3c9caf3 100644 --- a/src/main/java/com/ifish/bean/Tbl_Vender.java +++ b/src/main/java/com/ifish/bean/Tbl_Vender_List.java @@ -19,7 +19,7 @@ import javax.persistence.Table; */ @Entity @Table(name = "tbl_vender_list") -public class Tbl_Vender implements java.io.Serializable { +public class Tbl_Vender_List implements java.io.Serializable { /** * 版本号 diff --git a/src/main/java/com/ifish/config/WebConfig.java b/src/main/java/com/ifish/config/WebConfig.java index 0062765..cce02bc 100644 --- a/src/main/java/com/ifish/config/WebConfig.java +++ b/src/main/java/com/ifish/config/WebConfig.java @@ -10,6 +10,7 @@ import com.ifish.util.IfishFilePath; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.web.multipart.commons.CommonsMultipartResolver; import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer; import org.springframework.web.servlet.config.annotation.EnableWebMvc; diff --git a/src/main/java/com/ifish/controller/Device.java b/src/main/java/com/ifish/controller/Device.java index 085c964..5c9007a 100644 --- a/src/main/java/com/ifish/controller/Device.java +++ b/src/main/java/com/ifish/controller/Device.java @@ -44,6 +44,18 @@ public class Device { return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); } + /** + * 分享设备 + * + * @param userId + * @param macAddress + * @return + */ + @RequestMapping(value = "/shareDevice", method = RequestMethod.POST) + public Object shareDevice(Integer userId, Integer deviceId) { + return deviceHelperI.shareDevice(userId, deviceId); + } + /** * 绑定摄像头 * @@ -149,8 +161,8 @@ public class Device { * @return */ @RequestMapping(value = {"/updateDeviceOffLive"}, method = RequestMethod.POST) - public Object updateDeviceOffLive(Integer deviceId, String offLive) { - return deviceHelperI.updateDeviceOffLive(deviceId, offLive); + public Object updateDeviceOffLive(Integer userId, Integer deviceId, String offLive) { + return deviceHelperI.updateDeviceOffLive(userId, deviceId, offLive); } /** diff --git a/src/main/java/com/ifish/helper/DeviceHelper.java b/src/main/java/com/ifish/helper/DeviceHelper.java index 52eeba2..54dd74c 100644 --- a/src/main/java/com/ifish/helper/DeviceHelper.java +++ b/src/main/java/com/ifish/helper/DeviceHelper.java @@ -371,7 +371,7 @@ public class DeviceHelper implements DeviceHelperI { //需要新增 if (bln) { //新增关联关系 - deviceUser.setShowName("鱼缸" + (int) (Math.random() * 9000 + 1000)); + deviceUser.setShowName("Aquarium" + (int) (Math.random() * 9000 + 1000)); deviceUser.setIsMaster("1"); Date date = new Date(); deviceUser.setUpdateTime(date); @@ -388,6 +388,48 @@ public class DeviceHelper implements DeviceHelperI { } } + /** + * 分享设备 + * + * @param userId + * @param macAddress + * @return + */ + @Override + public Object shareDevice(Integer userId, Integer deviceId) { + try { + Tbl_User user = userHelperI.getUserById(userId); + if (user == null) { + return IfishUtil.returnJson(ResultEnum.error401.getKey(), ""); + } + Tbl_Device device = getDeviceById(deviceId); + if (device == null) { + return IfishUtil.returnJson(ResultEnum.error401.getKey(), ""); + } + Tbl_Device_User tbl_Device_User = getDeviceUserByUserId_DeviceId(userId, device.getDeviceId()); + if (tbl_Device_User != null) { + //封装设备返回信息 + return IfishUtil.returnJson(ResultEnum.success.getKey(), userHelperI.getDeviceInfo(device, tbl_Device_User)); + } else { + tbl_Device_User = new Tbl_Device_User(); + tbl_Device_User.setDeviceId(device.getDeviceId()); + tbl_Device_User.setOffLine("1"); + tbl_Device_User.setUserId(userId); + tbl_Device_User.setShowName("Aquarium" + (int) (Math.random() * 9000 + 1000)); + tbl_Device_User.setIsMaster("0"); + Date date = new Date(); + tbl_Device_User.setCreateTime(date); + int i = tbl_Device_Mapper.insertDeviceUser(tbl_Device_User); + if (i > 0) { + //封装设备返回信息 + return IfishUtil.returnJson(ResultEnum.success.getKey(), userHelperI.getDeviceInfo(device, tbl_Device_User)); + } + } + } catch (Exception e) { + } + return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); + } + /** * 绑定摄像头 * @@ -431,6 +473,7 @@ public class DeviceHelper implements DeviceHelperI { device_User.setShowName("摄像头" + (int) (Math.random() * 900 + 100)); device_User.setCreateTime(new Date()); tbl_Device_Mapper.insertDeviceUser(device_User); + redisKeyHelperI.deleteRedisByTbl_Device_User(device_User); //返回数据 dataMap.put("cameraId", cameraId); dataMap.put("showName", device_User.getShowName()); @@ -638,7 +681,7 @@ public class DeviceHelper implements DeviceHelperI { pushList.setUserId(Integer.valueOf(userId)); pushList.setDeviceId(Integer.valueOf(pushMap.get("device_id"))); pushList.setPhoneType(loginType); - pushList.setShowName(pushMap.get("showName")); + pushList.setShowName(pushMap.get("device_name")); pushList.setPushType(msgType); pushList.setPushTitle(title); pushList.setPushContext(content); @@ -678,16 +721,19 @@ public class DeviceHelper implements DeviceHelperI { * @return */ @Override - public Object updateDeviceOffLive(Integer deviceId, String offLive) { + public Object updateDeviceOffLive(Integer userId, Integer deviceId, String offLive) { try { - Tbl_Device device = getDeviceById(deviceId); - if (device != null) { - Tbl_Device tbl_Device = new Tbl_Device(); - tbl_Device.setDeviceId(device.getDeviceId()); - tbl_Device.setOffLine(offLive); - int i = tbl_Device_Mapper.updateTbl_Device(tbl_Device); + + Tbl_Device_User device_User = getDeviceUserByUserId_DeviceId(userId, deviceId); + if (device_User != null) { + Tbl_Device_User tbl_Device_User = new Tbl_Device_User(); + tbl_Device_User.setId(device_User.getId()); + tbl_Device_User.setOffLine(offLive); + int i = tbl_Device_Mapper.updateTblDeviceUser(tbl_Device_User); if (i > 0) { - redisKeyHelperI.deleteRedisByTbl_Device(device); + tbl_Device_User.setUserId(userId); + tbl_Device_User.setDeviceId(deviceId); + redisKeyHelperI.deleteRedisByTbl_Device_User(tbl_Device_User); return IfishUtil.toJson(ResultEnum.success.getKey(), ""); } } diff --git a/src/main/java/com/ifish/helper/DeviceHelperI.java b/src/main/java/com/ifish/helper/DeviceHelperI.java index 401168a..302c84a 100644 --- a/src/main/java/com/ifish/helper/DeviceHelperI.java +++ b/src/main/java/com/ifish/helper/DeviceHelperI.java @@ -88,6 +88,15 @@ public interface DeviceHelperI { */ Object bindDevice(Integer userId, String mackAddress); + /** + * 分享设备 + * + * @param userId + * @param macAddress + * @return + */ + public Object shareDevice(Integer userId, Integer deviceId); + /** * 激活摄像头 * @@ -148,7 +157,7 @@ public interface DeviceHelperI { * @param offLive * @return */ - public Object updateDeviceOffLive(Integer deviceId, String offLive); + public Object updateDeviceOffLive(Integer userId, Integer deviceId, String offLive); /** * 设置换水提醒 diff --git a/src/main/java/com/ifish/helper/HardWareTypeHelper.java b/src/main/java/com/ifish/helper/HardWareTypeHelper.java index e40e214..a8bfc48 100644 --- a/src/main/java/com/ifish/helper/HardWareTypeHelper.java +++ b/src/main/java/com/ifish/helper/HardWareTypeHelper.java @@ -6,7 +6,7 @@ package com.ifish.helper; import com.ifish.bean.Tbl_HardWare_Type; -import com.ifish.bean.Tbl_Vender; +import com.ifish.bean.Tbl_Vender_List; import com.ifish.mapper.Tbl_Hardware_Type_Mapper; import com.ifish.util.IfishUtil; import org.apache.commons.lang3.StringUtils; @@ -65,12 +65,12 @@ public class HardWareTypeHelper implements HardWareTypeHelperI { * @throws Exception */ @Override - public Tbl_Vender getVenderListByBrandCode(String code) throws Exception { - Tbl_Vender venderList = new Tbl_Vender(); + public Tbl_Vender_List getVenderListByBrandCode(String code) throws Exception { + Tbl_Vender_List venderList = new Tbl_Vender_List(); String key = redisKeyHelperI.getTbl_Vender_ListRedisKeyByCode(code); String redisString = redisHelperI.getRedis(key); if (StringUtils.isNotBlank(redisString)) { - venderList = (Tbl_Vender) IfishUtil.JsonToBean(redisString, Tbl_Vender.class); + venderList = (Tbl_Vender_List) IfishUtil.JsonToBean(redisString, Tbl_Vender_List.class); } else { venderList = tbl_Hardware_Type_Mapper.getVenderListByBrandCode(code); redisHelperI.setRedis(key, IfishUtil.ObjectToJson(venderList)); @@ -86,12 +86,12 @@ public class HardWareTypeHelper implements HardWareTypeHelperI { * @throws Exception */ @Override - public Tbl_Vender getVenderListByHardwareTypeCode(String code) throws Exception { - Tbl_Vender venderList = new Tbl_Vender(); + public Tbl_Vender_List getVenderListByHardwareTypeCode(String code) throws Exception { + Tbl_Vender_List venderList = new Tbl_Vender_List(); String key = redisKeyHelperI.getTbl_Vender_ListRedisKeyByCode(code); String redisString = redisHelperI.getRedis(key); if (StringUtils.isNotBlank(redisString)) { - venderList = (Tbl_Vender) IfishUtil.JsonToBean(redisString, Tbl_Vender.class); + venderList = (Tbl_Vender_List) IfishUtil.JsonToBean(redisString, Tbl_Vender_List.class); } else { venderList = tbl_Hardware_Type_Mapper.getVenderListByHardwareTypeCode(code); redisHelperI.setRedis(key, IfishUtil.ObjectToJson(venderList)); diff --git a/src/main/java/com/ifish/helper/HardWareTypeHelperI.java b/src/main/java/com/ifish/helper/HardWareTypeHelperI.java index ad584de..d773f0d 100644 --- a/src/main/java/com/ifish/helper/HardWareTypeHelperI.java +++ b/src/main/java/com/ifish/helper/HardWareTypeHelperI.java @@ -6,7 +6,7 @@ package com.ifish.helper; import com.ifish.bean.Tbl_HardWare_Type; -import com.ifish.bean.Tbl_Vender; +import com.ifish.bean.Tbl_Vender_List; /** * @@ -29,7 +29,7 @@ public interface HardWareTypeHelperI { * @return * @throws Exception */ - Tbl_Vender getVenderListByBrandCode(String code) throws Exception; + Tbl_Vender_List getVenderListByBrandCode(String code) throws Exception; /** * 根据设备型号获取厂家信息 @@ -38,6 +38,6 @@ public interface HardWareTypeHelperI { * @return * @throws Exception */ - public Tbl_Vender getVenderListByHardwareTypeCode(String code) throws Exception; + public Tbl_Vender_List getVenderListByHardwareTypeCode(String code) throws Exception; } diff --git a/src/main/java/com/ifish/helper/RedisKeyHelper.java b/src/main/java/com/ifish/helper/RedisKeyHelper.java index a659f28..879d7a2 100644 --- a/src/main/java/com/ifish/helper/RedisKeyHelper.java +++ b/src/main/java/com/ifish/helper/RedisKeyHelper.java @@ -12,6 +12,7 @@ import com.ifish.bean.Tbl_Live_Message; import com.ifish.bean.Tbl_Live_Room; import com.ifish.bean.Tbl_Push_List; import com.ifish.bean.Tbl_User; +import com.ifish.mapper.Tbl_Live_Room_Mapper; import com.ifish.util.RedisKey; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -30,6 +31,8 @@ public class RedisKeyHelper implements RedisKeyHelperI { private DeviceHelperI deviceHelper; @Autowired private UserHelperI userHelperI; + @Autowired + private Tbl_Live_Room_Mapper tbl_Live_Room_Mapper; /** * 根据phoneNumber获取Tbl_User用户信息的Redis缓存key键值 @@ -507,7 +510,11 @@ public class RedisKeyHelper implements RedisKeyHelperI { */ @Override public void deleteRedisByTbl_Live_Room(Tbl_Live_Room live_Room) { - + if ((live_Room.getRoomId() == null || live_Room.getRoomId() == 0) && StringUtils.isNotBlank(live_Room.getCameraId())) { + live_Room = tbl_Live_Room_Mapper.getTbl_Live_RoomByCameraId(live_Room.getCameraId()); + } else if (StringUtils.isBlank(live_Room.getCameraId()) && (live_Room.getRoomId() != null && live_Room.getRoomId() > 0)) { + live_Room = tbl_Live_Room_Mapper.getTbl_Live_RoomById(live_Room.getRoomId()); + } if (live_Room.getRoomId() != null && live_Room.getRoomId() > 0) { redisHelperI.deleteRedis(getTbl_Live_RoomRedisKeyByRoomId(live_Room.getRoomId())); } @@ -602,6 +609,7 @@ public class RedisKeyHelper implements RedisKeyHelperI { * * @param pushId */ + @Override public void deleteRedisByTbl_Push_List(Tbl_Push_List tbl_Push_List) { if (tbl_Push_List.getPushId() != null) { redisHelperI.deleteRedis(getTbl_Push_List_RedisByPushId(tbl_Push_List.getPushId())); @@ -612,8 +620,17 @@ public class RedisKeyHelper implements RedisKeyHelperI { /** * 删除推送列表类缓存 */ + @Override public void deleteRedisByTbl_Push_ListToAllRedisList() { redisHelperI.delRedisByTagKey(RedisKey.PUSHLIST_SELECT); } + /** + * 删除鱼缸厂信息缓存 + */ + @Override + public void deleteTbl_Vender_List_RedisKey() { + redisHelperI.delRedisByTagKey(RedisKey.VENDER_CODE); + } + } diff --git a/src/main/java/com/ifish/helper/RedisKeyHelperI.java b/src/main/java/com/ifish/helper/RedisKeyHelperI.java index de5cbf0..bb36d7f 100644 --- a/src/main/java/com/ifish/helper/RedisKeyHelperI.java +++ b/src/main/java/com/ifish/helper/RedisKeyHelperI.java @@ -383,4 +383,9 @@ public interface RedisKeyHelperI { */ public void deleteRedisByTbl_Push_ListToAllRedisList(); + /** + * 删除鱼缸厂信息缓存 + */ + public void deleteTbl_Vender_List_RedisKey(); + } diff --git a/src/main/java/com/ifish/helper/UserHelper.java b/src/main/java/com/ifish/helper/UserHelper.java index c4fdc44..d7edd99 100644 --- a/src/main/java/com/ifish/helper/UserHelper.java +++ b/src/main/java/com/ifish/helper/UserHelper.java @@ -12,7 +12,7 @@ import com.ifish.bean.Tbl_Device; import com.ifish.bean.Tbl_Device_User; import com.ifish.bean.Tbl_HardWare_Type; import com.ifish.bean.Tbl_User; -import com.ifish.bean.Tbl_Vender; +import com.ifish.bean.Tbl_Vender_List; import com.ifish.enums.GwellEnum; import com.ifish.enums.ResultEnum; import com.ifish.mapper.Tbl_User_Mapper; @@ -921,18 +921,18 @@ public class UserHelper implements UserHelperI { deviceMap.put("remindDate", device.getRemindDate() != null ? IfishUtil.format1(device.getRemindDate()) : ""); deviceMap.put("remindCycle", device.getRemindCycle() != null ? device.getRemindCycle() : ""); //是否开启离线通知 - deviceMap.put("offLine", device.getOffLine()); + deviceMap.put("offLine", deviceUser.getOffLine()); } } //厂家 if (device.getBrandCode() != null) { //厂家 - Tbl_Vender venderList = new Tbl_Vender(); + Tbl_Vender_List venderList = new Tbl_Vender_List(); venderList = hardWareTypeHelperI.getVenderListByBrandCode(device.getBrandCode()); deviceMap.put("venderList", venderList); } else { //默认爱鱼奇 - Tbl_Vender defaultVenderList = new Tbl_Vender(); + Tbl_Vender_List defaultVenderList = new Tbl_Vender_List(); defaultVenderList = hardWareTypeHelperI.getVenderListByBrandCode("AYQ"); deviceMap.put("venderList", defaultVenderList); } diff --git a/src/main/java/com/ifish/mapper/Tbl_Device_Mapper.java b/src/main/java/com/ifish/mapper/Tbl_Device_Mapper.java index 3575015..9213cc0 100644 --- a/src/main/java/com/ifish/mapper/Tbl_Device_Mapper.java +++ b/src/main/java/com/ifish/mapper/Tbl_Device_Mapper.java @@ -30,7 +30,7 @@ public interface Tbl_Device_Mapper { * @param deviceid * @return */ - @Select("SELECT device_id,server_ip,device_ip,is_camera,mac_address,login_time,is_blacklist,hardware_type,on_off,off_line," + @Select("SELECT device_id,server_ip,device_ip,is_camera,mac_address,login_time,is_blacklist,hardware_type,on_off," + "today_remind,water_remind,remind_cycle,remind_date,factory_code,brand_code,create_time,active_code,active_time,update_time,camera_id from tbl_device WHERE device_id= #{deviceid}") Tbl_Device getDeviceById(@Param("deviceid") Integer deviceid); @@ -40,7 +40,7 @@ public interface Tbl_Device_Mapper { * @param deviceid * @return */ - @Select("SELECT device_id,server_ip,device_ip,is_camera,mac_address,login_time,is_blacklist,hardware_type,on_off,off_line," + @Select("SELECT device_id,server_ip,device_ip,is_camera,mac_address,login_time,is_blacklist,hardware_type,on_off," + "today_remind,water_remind,remind_cycle,remind_date,factory_code,brand_code,create_time,active_code,active_time,update_time,camera_id from tbl_device WHERE camera_id= #{cameraID}") Tbl_Device getDeviceByCameraId(@Param("cameraID") String cameraID); @@ -50,7 +50,7 @@ public interface Tbl_Device_Mapper { * @param deviceid * @return */ - @Select("SELECT device_id,server_ip,device_ip,is_camera,mac_address,login_time,is_blacklist,hardware_type,on_off,off_line," + @Select("SELECT device_id,server_ip,device_ip,is_camera,mac_address,login_time,is_blacklist,hardware_type,on_off," + "today_remind,water_remind,remind_cycle,remind_date,factory_code,brand_code,create_time,active_code,active_time,update_time,camera_id from tbl_device WHERE mac_address= #{mac_address}") Tbl_Device getDeviceByMacAddress(@Param("mac_address") String macAddress); @@ -61,7 +61,7 @@ public interface Tbl_Device_Mapper { * @param deviceId * @return */ - @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live from tbl_device_user WHERE user_id = #{userid}") + @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live,off_line from tbl_device_user WHERE user_id = #{userid}") List getDeviceUsersByUserId(@Param("userid") Integer userid); /** @@ -71,7 +71,7 @@ public interface Tbl_Device_Mapper { * @param deviceId * @return */ - @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live from tbl_device_user WHERE user_id <> ${userid} AND device_id = #{deviceid}") + @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live,off_line from tbl_device_user WHERE user_id <> ${userid} AND device_id = #{deviceid}") List getOtherDeviceUsersByOtherUserIdAndDeviceId(@Param("userid") Integer userid, @Param("deviceid") Integer deviceId); /** @@ -81,7 +81,7 @@ public interface Tbl_Device_Mapper { * @param deviceId * @return */ - @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live from tbl_device_user WHERE user_id = #{userid} AND device_id = #{deviceid}") + @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live,off_line from tbl_device_user WHERE user_id = #{userid} AND device_id = #{deviceid}") Tbl_Device_User getDeviceUsersByUserIdAndDeviceId(@Param("userid") Integer userid, @Param("deviceid") Integer deviceId); /** @@ -90,7 +90,7 @@ public interface Tbl_Device_Mapper { * @param deviceId * @return */ - @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live from tbl_device_user WHERE device_id = #{deviceid}") + @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live,off_line from tbl_device_user WHERE device_id = #{deviceid}") List getDeviceUsersByDeviceId(@Param("deviceid") Integer deviceId); /** diff --git a/src/main/java/com/ifish/mapper/Tbl_Device_MapperSql.java b/src/main/java/com/ifish/mapper/Tbl_Device_MapperSql.java index 35b907d..3728de7 100644 --- a/src/main/java/com/ifish/mapper/Tbl_Device_MapperSql.java +++ b/src/main/java/com/ifish/mapper/Tbl_Device_MapperSql.java @@ -55,6 +55,9 @@ public class Tbl_Device_MapperSql { if (StringUtils.isNotBlank(device_User.getIsLive())) { sb.append("is_live = #{deviceUser.isLive}, "); } + if (StringUtils.isNotBlank(device_User.getOffLine())) { + sb.append("off_line = #{deviceUser.offLine}, "); + } sb.append("update_time = now() "); sb.append(" WHERE id = #{deviceUser.id}"); return sb.toString(); @@ -234,9 +237,6 @@ public class Tbl_Device_MapperSql { if (StringUtils.isNotBlank(device.getOnOff())) { sb.append("on_off = #{device.onOff}, "); } - if (StringUtils.isNotBlank(device.getOffLine())) { - sb.append("off_line = #{device.offLine}, "); - } if (StringUtils.isNotBlank(device.getTodayRemind())) { sb.append("today_remind = #{device.todayRemind}, "); } diff --git a/src/main/java/com/ifish/mapper/Tbl_Hardware_Type_Mapper.java b/src/main/java/com/ifish/mapper/Tbl_Hardware_Type_Mapper.java index 5ac7548..a92a40e 100644 --- a/src/main/java/com/ifish/mapper/Tbl_Hardware_Type_Mapper.java +++ b/src/main/java/com/ifish/mapper/Tbl_Hardware_Type_Mapper.java @@ -6,7 +6,7 @@ package com.ifish.mapper; import com.ifish.bean.Tbl_HardWare_Type; -import com.ifish.bean.Tbl_Vender; +import com.ifish.bean.Tbl_Vender_List; import java.util.Map; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -34,7 +34,7 @@ public interface Tbl_Hardware_Type_Mapper { * @return */ @Select("select brand_code,brand_name,brand_introduce,brand_logo from tbl_vender_list where brand_code=#{code}") - Tbl_Vender getVenderListByBrandCode(@Param("code") String code); + Tbl_Vender_List getVenderListByBrandCode(@Param("code") String code); /** * 根据设备型号获取厂家信息 @@ -44,5 +44,5 @@ public interface Tbl_Hardware_Type_Mapper { * @throws Exception */ @Select("select a.brand_code,brand_name,brand_introduce,brand_logo from tbl_vender_list a LEFT JOIN tbl_vender_hardware b ON a.brand_code = b.brand_code where b.hardware_type=#{code}") - Tbl_Vender getVenderListByHardwareTypeCode(@Param("code") String code); + Tbl_Vender_List getVenderListByHardwareTypeCode(@Param("code") String code); }