diff --git a/src/main/java/com/ifish/API/JiGuangPush.java b/src/main/java/com/ifish/API/JiGuangPush.java new file mode 100644 index 0000000..458b977 --- /dev/null +++ b/src/main/java/com/ifish/API/JiGuangPush.java @@ -0,0 +1,86 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.ifish.API; + +import cn.jpush.api.JPushClient; +import cn.jpush.api.push.PushResult; +import cn.jpush.api.push.model.Message; +import cn.jpush.api.push.model.Options; +import cn.jpush.api.push.model.Platform; +import cn.jpush.api.push.model.PushPayload; +import cn.jpush.api.push.model.audience.Audience; +import cn.jpush.api.push.model.notification.IosNotification; +import cn.jpush.api.push.model.notification.Notification; +import java.util.Map; +import org.springframework.stereotype.Component; + +/** + * + * @author Administrator + */ +@Component +public class JiGuangPush { + + private static JPushClient jPushClient = null; + //正式 +// private static final String masterSecret = "60162c8cf195ce9f4dc76629"; +// private static final String appKey = "d970d5e193cb2a0bbe41653c"; + //测试 + private final static String masterSecret = "4f759a0609dcd9d2edb06125"; + private final static String appKey = "6e5e9d757570859b3f274bb8"; + + static { + jPushClient = new JPushClient(masterSecret, appKey); + } + + /** + * 向安卓手机推送一条信息 + * + * @param message + * @return + */ + public boolean pushMessageByAndroid(String title, String message, String userId, Map map) { + try { + PushPayload payload = PushPayload.newBuilder() + .setPlatform(Platform.android()) + .setAudience(Audience.alias(userId)) + .setNotification(Notification.android(title, message, map)) + .setMessage(Message.newBuilder().setTitle(title).setMsgContent(message).addExtras(map).build()) + .build(); + + PushResult result = jPushClient.sendPush(payload); + if (result.msg_id > 0 && result.isResultOK()) { + return true; + } + } catch (Exception e) { + + } + return false; + } + + public boolean pushMessageByIOS(String title, String message, String userId, Map map) { + try { + + PushPayload payload = PushPayload.newBuilder() + .setPlatform(Platform.ios()) + .setAudience(Audience.alias(userId)) + .setNotification(Notification.newBuilder().addPlatformNotification(IosNotification.newBuilder().setSound("happy").setAlert(message).build()).build()) + .setMessage(Message.newBuilder().setTitle(title).setMsgContent(message).addExtras(map).build()) + .setOptions(Options.newBuilder().setApnsProduction(false).build()) + .build(); + + PushResult result = jPushClient.sendPush(payload); + if (result.msg_id > 0 && result.isResultOK()) { + return true; + } + } catch (Exception e) { + String b = e.getMessage(); + String a = ""; + } + return false; + } + +} diff --git a/src/main/java/com/ifish/controller/User.java b/src/main/java/com/ifish/controller/User.java index 6aba672..7dd8acb 100644 --- a/src/main/java/com/ifish/controller/User.java +++ b/src/main/java/com/ifish/controller/User.java @@ -6,6 +6,7 @@ package com.ifish.controller; import com.ifish.helper.UserHelper; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -27,6 +28,7 @@ public class User { public ModelAndView getUserList() { ModelAndView mv = new ModelAndView(); mv.setViewName("userlist"); + mv.addObject("pagetitle", "用户列表"); mv.addObject("myjs", "\n" + " \n" + " \n" @@ -42,13 +44,19 @@ public class User { + " \n" + " \n" + " "); + mv.addObject("title", "用户统计"); return mv; } + @RequestMapping(value = {"/userDetail"}, method = RequestMethod.GET) + public ModelAndView getUserDetail(String userId) { + return (ModelAndView) userHelper.getUserDetail(userId); + } + @RequestMapping(value = "/getUserList", method = RequestMethod.POST) @ResponseBody - public Object getlist(String draw, Integer start, Integer length) { - return userHelper.getlist(draw, start, length); + public Object getlist(String draw, Integer start, Integer length, String userId, String phoneNumber, String userEmail, String phoneType, String isRegisterGwell, String isRegisterJiguang, String sortField, String sortMode, String nickName, String remarks, String loginTime1, String loginTime2, String createTime1, String createTime2) { + return userHelper.getlist(draw, start, length, userId, phoneNumber, userEmail, phoneType, isRegisterGwell, isRegisterJiguang, sortField, sortMode, nickName, remarks, loginTime1, loginTime2, createTime1, createTime2); } @RequestMapping(value = "/updateRemarks", method = RequestMethod.POST) diff --git a/src/main/java/com/ifish/helper/DeviceHelper.java b/src/main/java/com/ifish/helper/DeviceHelper.java new file mode 100644 index 0000000..d33b54f --- /dev/null +++ b/src/main/java/com/ifish/helper/DeviceHelper.java @@ -0,0 +1,132 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.ifish.helper; + +import com.ifish.bean.Tbl_Device; +import com.ifish.bean.Tbl_Device_Statistics; +import com.ifish.bean.Tbl_Device_User; +import java.util.List; + +/** + * + * @author Administrator + */ +public interface DeviceHelper { + + /** + * 根据用户Id获取绑定设备集合 + * + * @param userId + * @return + * @throws java.lang.Exception + */ + List getDeviceUsersByUserId(Integer userId) throws Exception; + + /** + * 根据用户ID和摄像头信息获取用户关联数据 + * + * @return + */ + Tbl_Device_User getDeviceUserByUserId_CameraId(Integer userId, String cameraId) throws Exception; + + /** + * 根据设备Id获取设备详情 + * + * @param deviceId + * @return + * @throws Exception + */ + Tbl_Device getDeviceById(Integer deviceId) throws Exception; + + /** + * 根据设备MacAddress获取设备详情 + * + * @param macAddress + * @param deviceId + * @return + * @throws Exception + */ + Tbl_Device getDeviceByMacAddress(String macAddress) throws Exception; + + /** + * 根据设备ID获取设备统计信息 + * + * @param deviceId + * @return + * @throws Exception + */ + public Tbl_Device_Statistics getDeviceStatisticsByDeviceId(Integer deviceId) throws Exception; + + /** + * 绑定设备 + * + * @param userId + * @param mackAddress + * @return + */ + Object bindDevice(Integer userId, String mackAddress); + + /** + * 激活摄像头 + * + * @param activeCode + * @param cameraId + * @return + */ + Object activeCamera(String activeCode, String cameraId); + + /** + * 绑定摄像头 + * + * @param userId + * @param cameraId + * @return + */ + Object bindCamera(Integer userId, String cameraId); + + /** + * 根据摄像头ID获取设备信息 + * + * @param cameraId + * @return + */ + Tbl_Device getDeviceByCameraId(String cameraId) throws Exception; + + /** + * 修改设备信息 + * + * @param device + * @param userId + * @return + */ + Object updateDeviceUser(Tbl_Device_User device); + + /** + * 修改摄像头信息 + * + * @param cameraId + * @param device_User + * @return + */ + Object updateCameraUser(Integer cameraId, Tbl_Device_User device_User); + + /** + * 删除绑定摄像头 + * + * @param userId + * @param cameraId + * @return + */ + Object deleteCameraUser(Integer userId, String cameraId); + + /** + * 删除绑定的设备 + * + * @param deviceUser + * @return + */ + Object deleteDeviceUser(Tbl_Device_User deviceUser); +} diff --git a/src/main/java/com/ifish/helper/DeviceHelperI.java b/src/main/java/com/ifish/helper/DeviceHelperI.java new file mode 100644 index 0000000..914ad19 --- /dev/null +++ b/src/main/java/com/ifish/helper/DeviceHelperI.java @@ -0,0 +1,643 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.ifish.helper; + +import com.ifish.API.JiGuangPush; +import com.ifish.bean.Tbl_Activa_Code; +import com.ifish.bean.Tbl_Device; +import com.ifish.bean.Tbl_Device_Statistics; +import com.ifish.bean.Tbl_Device_User; +import com.ifish.bean.Tbl_Push_List; +import com.ifish.bean.Tbl_User; +import com.ifish.enums.PushTypeEnum; +import com.ifish.enums.ResultEnum; +import com.ifish.mapper.Tbl_Device_Mapper; +import com.ifish.util.IfishUtil; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * + * @author Administrator + */ +@Component +public class DeviceHelperI implements DeviceHelper { + + @Autowired + private RedisHelperI redisHelperI; + + @Autowired + private RedisKeyHelperI redisKeyHelperI; + + @Autowired + private Tbl_Device_Mapper tbl_Device_Mapper; + + @Autowired + private UserHelperI userHelperI; + + @Autowired + private JiGuangPush jiGuangPush; + + @Autowired + private PushMessageHelperI pushMessageHelperI; + + /** + * 根据用户Id获取绑定设备集合 + * + * @param userId + * @return + */ + @Override + public List getDeviceUsersByUserId(Integer userId) throws Exception { + List deviceUserList = null; + String key = redisKeyHelperI.getListTbl_Device_UserKeyByUserId(userId); + String redisString = redisHelperI.getRedis(key); + if (StringUtils.isNotBlank(redisString)) { + deviceUserList = (List) IfishUtil.JsonToList(redisString, Tbl_Device_User.class); + } else { + deviceUserList = tbl_Device_Mapper.getDeviceUsersByUserId(userId); + if (deviceUserList != null && deviceUserList.size() > 0) { + redisHelperI.setRedis(key, IfishUtil.ObjectToJson(deviceUserList)); + } + } + return deviceUserList; + } + + /** + * 根据用户ID和设备ID获取此设备和此用户的关系 + * + * @param userId + * @param deviceId + * @return + * @throws Exception + */ + public Tbl_Device_User getDeviceUserByUserId_DeviceId(Integer userId, Integer deviceId) throws Exception { + Tbl_Device_User device = null; + String key = redisKeyHelperI.getTbl_Device_UserRedisKeyByDeviceIdAndUserId(userId, deviceId); + String redisString = redisHelperI.getRedis(key); + if (StringUtils.isNotBlank(redisString)) { + device = (Tbl_Device_User) IfishUtil.JsonToBean(redisString, Tbl_Device_User.class); + } else { + device = tbl_Device_Mapper.getDeviceUsersByUserIdAndDeviceId(userId, deviceId); + if (device != null && device.getDeviceId() > 0) { + redisHelperI.setRedis(key, IfishUtil.ObjectToJson(device)); + } + } + return device; + } + + /** + * 根据用户ID和摄像头ID获取此摄像头和用户的关系 + * + * @param userId + * @param deviceId + * @return + * @throws Exception + */ + @Override + public Tbl_Device_User getDeviceUserByUserId_CameraId(Integer userId, String cameraId) throws Exception { + Tbl_Device device = getDeviceByCameraId(cameraId); + if (device == null) { + return null; + } + return getDeviceUserByUserId_DeviceId(userId, device.getDeviceId()); + } + + /** + * 根据设备Id获取设备详情 + * + * @param deviceId + * @return + * @throws Exception + */ + @Override + public Tbl_Device getDeviceById(Integer deviceId) throws Exception { + Tbl_Device device = null; + String key = redisKeyHelperI.getTbl_DeviceRedisKeyByDeviceId(deviceId); + String redisString = redisHelperI.getRedis(key); + if (StringUtils.isNotBlank(redisString)) { + device = (Tbl_Device) IfishUtil.JsonToBean(redisString, Tbl_Device.class); + } else { + device = tbl_Device_Mapper.getDeviceById(deviceId); + if (device != null && device.getDeviceId() > 0) { + redisHelperI.setRedis(key, IfishUtil.ObjectToJson(device)); + } + } + return device; + } + + /** + * 根据摄像头ID从缓存中取得设备信息 + * + * @param cameraId + * @return + * @throws Exception + */ + @Override + public Tbl_Device getDeviceByCameraId(String cameraId) throws Exception { + Tbl_Device device = null; + String key = redisKeyHelperI.getTbl_CameraRedisKeyByCameraId(cameraId); + String redisString = redisHelperI.getRedis(key); + if (StringUtils.isNotBlank(redisString)) { + device = (Tbl_Device) IfishUtil.JsonToBean(redisString, Tbl_Device.class); + } else { + device = tbl_Device_Mapper.getDeviceByCameraId(cameraId); + if (device != null && device.getDeviceId() > 0) { + redisHelperI.setRedis(key, IfishUtil.ObjectToJson(device)); + } + } + return device; + } + + /** + * 根据设备mac地址获取设备详情 + * + * @param macAddress + * @return + * @throws Exception + */ + @Override + public Tbl_Device getDeviceByMacAddress(String macAddress) throws Exception { + Tbl_Device device = null; + String key = redisKeyHelperI.getTbl_DeviceRedisKeyByMacAddress(macAddress); + String redisString = redisHelperI.getRedis(key); + if (StringUtils.isNotBlank(redisString)) { + device = (Tbl_Device) IfishUtil.JsonToBean(redisString, Tbl_Device.class); + } else { + device = tbl_Device_Mapper.getDeviceByMacAddress(macAddress); + if (device != null && device.getDeviceId() > 0) { + redisHelperI.setRedis(key, IfishUtil.ObjectToJson(device)); + } + } + return device; + } + + /** + * 根据设备ID获取设备统计信息 + * + * @param deviceId + * @return + * @throws Exception + */ + @Override + public Tbl_Device_Statistics getDeviceStatisticsByDeviceId(Integer deviceId) throws Exception { + Tbl_Device_Statistics device = null; + String key = redisKeyHelperI.getTbl_Device_StatisticsRedisKeyByDeviceId(deviceId); + String redisString = redisHelperI.getRedis(key); + if (StringUtils.isNotBlank(redisString)) { + device = (Tbl_Device_Statistics) IfishUtil.JsonToBean(redisString, Tbl_Device_Statistics.class); + } else { + device = tbl_Device_Mapper.getDevStatisticsByDeviceId(deviceId); + if (device != null && device.getDeviceId() > 0) { + redisHelperI.setRedis(key, IfishUtil.ObjectToJson(device)); + } + } + return device; + } + + /** + * 绑定设备 + * + * @param userId + * @param user + * @param mackAddress + * @return + */ + @Override + public Object bindDevice(Integer userId, String mackAddress) { + + try { + Tbl_User tmpUser = userHelperI.getUserById(userId); + //用户存在 + if (tmpUser != null) { + //新增用户拥有设备 + Tbl_Device_User deviceUser = new Tbl_Device_User(); + Tbl_Device device = getDeviceByMacAddress(mackAddress); + boolean bln = false; + //设备存在 + if (device != null) { + //关联用户-设备 + deviceUser.setUserId(tmpUser.getUserId()); + deviceUser.setDeviceId(device.getDeviceId()); + //已关联设备的其他用户,这里的用户ID查询条件是不等于<> + List deviceUserList = tbl_Device_Mapper.getOtherDeviceUsersByOtherUserIdAndDeviceId(tmpUser.getUserId(), device.getDeviceId()); + //是否已关联这里的用户ID查询是等于= + Tbl_Device_User tmpDdeviceUser = tbl_Device_Mapper.getDeviceUsersByUserIdAndDeviceId(tmpUser.getUserId(), device.getDeviceId()); + //已关联 + if (tmpDdeviceUser != null) { + //原先不是主控制，则删除其他用户关联关系 + if (!tmpDdeviceUser.getIsMaster().equals("1")) { + + for (Tbl_Device_User du : deviceUserList) { + Integer userid = du.getUserId(); + Integer deviceId = du.getDeviceId(); + Tbl_User tu = userHelperI.getUserById(userid); + if (tu != null) { + String timestamp = IfishUtil.format(new Date()); + //基本参数 + Map baseMap = new HashMap(); + baseMap.put("title", PushTypeEnum.remove_device.getValue()); + baseMap.put("content", "你已于" + timestamp + "失去对“" + du.getShowName() + "”设备的控制权"); + baseMap.put("user_id", tu.getUserId().toString()); + baseMap.put("loginType", tu.getLoginType()); + //推送参数 + Map pushMap = new HashMap(); + pushMap.put("device_id", deviceId.toString()); + pushMap.put("device_name", du.getShowName()); + pushMap.put("timestamp", timestamp); + pushMap.put("msg_type", PushTypeEnum.remove_device.getKey()); + //推送消息 + jPushNotifcation(baseMap, pushMap); + } + tbl_Device_Mapper.deleteDeviceUserById(du.getId()); + redisKeyHelperI.deleteRedisByTbl_Device_User(tmpDdeviceUser); + } + } + //变更为主控 + tmpDdeviceUser.setIsMaster("1"); + Date date = new Date(); + tmpDdeviceUser.setUpdateTime(date); + tmpDdeviceUser.setCreateTime(date); + tbl_Device_Mapper.updateTblDeviceUser(tmpDdeviceUser); + redisKeyHelperI.deleteRedisByTbl_Device_User(tmpDdeviceUser); + deviceUser.setShowName(tmpDdeviceUser.getShowName()); + deviceUser.setIsMaster(tmpDdeviceUser.getIsMaster()); + } //未绑定过 + else { + //删除其他用户控制权 + for (Tbl_Device_User du : deviceUserList) { + Integer userid = du.getUserId(); + Integer deviceId = du.getDeviceId(); + Tbl_User tu = userHelperI.getUserById(userid); + if (tu != null) { + String timestamp = IfishUtil.format(new Date()); + //基本参数 + Map baseMap = new HashMap(); + baseMap.put("title", PushTypeEnum.remove_device.getValue()); + baseMap.put("content", "你已于" + timestamp + "失去对“" + du.getShowName() + "”设备的控制权"); + baseMap.put("user_id", tu.getUserId().toString()); + baseMap.put("loginType", tu.getLoginType()); + //推送参数 + Map pushMap = new HashMap(); + pushMap.put("device_id", deviceId.toString()); + pushMap.put("device_name", du.getShowName()); + pushMap.put("timestamp", timestamp); + pushMap.put("msg_type", PushTypeEnum.remove_device.getKey()); + //推送消息 + jPushNotifcation(baseMap, pushMap); + } + tbl_Device_Mapper.deleteDeviceUserById(du.getId()); + redisKeyHelperI.deleteRedisByTbl_Device_User(du); + } + //需要新增 + bln = true; + //查询设备统计信息 + Tbl_Device_Statistics ds = getDeviceStatisticsByDeviceId(device.getDeviceId()); + //如果设备统计信息为空，新增 + if (ds == null || ds.getId() <= 0) { + ds = new Tbl_Device_Statistics(); + ds.setDeviceId(device.getDeviceId()); + ds.setMacAddress(StringUtils.isBlank(device.getMacAddress()) ? null : device.getMacAddress()); + ds.setLoginCount(1); + ds.setLoginTime(new Date()); + ds.setFirstActivate(new Date()); + ds.setCreateTime(new Date()); + ds.setIsCharge("0"); + ds.setHardwareType(StringUtils.isBlank(device.getHardwareType()) ? null : device.getHardwareType()); + ds.setFactoryCode(StringUtils.isBlank(device.getFactoryCode()) ? null : device.getFactoryCode()); + ds.setBrandCode(StringUtils.isBlank(device.getBrandCode()) ? null : device.getBrandCode()); + tbl_Device_Mapper.insertDeviceStatistics(ds); + } else { + //修改设备统计信息 + if (ds.getFirstActivate() == null) { + ds.setFirstActivate(new Date()); + tbl_Device_Mapper.updateDeviceStatistics(ds); + redisKeyHelperI.deleteRedisByTbl_Device_Statistics(ds); + } + } + } + } //设备不存在 + else { + //新增设备信息 + device = new Tbl_Device(); + device.setIsBlacklist("1"); + device.setMacAddress(mackAddress); + Date date = new Date(); + device.setCreateTime(date); + int i = tbl_Device_Mapper.insertDevice(device); + if (i > 0) { + Tbl_Device_Statistics tds = new Tbl_Device_Statistics(); + tds.setLoginCount(0); + tds.setMacAddress(mackAddress); + tds.setDeviceId(device.getDeviceId()); + tds.setFirstActivate(date); + tds.setCreateDate(date); + tds.setCreateTime(date); + tbl_Device_Mapper.insertDeviceStatistics(tds); + bln = true; + deviceUser.setUserId(tmpUser.getUserId()); + deviceUser.setDeviceId(device.getDeviceId()); + } + } + //需要新增 + if (bln) { + //新增关联关系 + deviceUser.setShowName("鱼缸" + (int) (Math.random() * 9000 + 1000)); + deviceUser.setIsMaster("1"); + Date date = new Date(); + deviceUser.setUpdateTime(date); + deviceUser.setCreateTime(date); + tbl_Device_Mapper.insertDeviceUser(deviceUser); + } + //封装设备返回信息 + return IfishUtil.returnJson(ResultEnum.success.getKey(), ""); + } else { + return IfishUtil.returnJson(ResultEnum.warn202.getKey(), ""); + } + } catch (Exception e) { + return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); + } + } + + /** + * 绑定摄像头 + * + * @param userId + * @param cameraId + * @return + */ + @Override + public Object bindCamera(Integer userId, String cameraId) { + try { + Tbl_User user = userHelperI.getUserById(userId); + Tbl_Device camera = getDeviceByCameraId(cameraId); + //返回数据 + Map dataMap = new HashMap(); + //用户存在 + if (user != null) { + //摄像头存在 + if (camera != null) { + //已关联摄像头的用户 + List CameraUserList = tbl_Device_Mapper.getDeviceUsersByDeviceId(camera.getDeviceId()); + //删除摄像头与用户关系 + for (Tbl_Device_User cu : CameraUserList) { + //删除摄像头和用户的关系 + tbl_Device_Mapper.deleteDeviceUserById(cu.getId()); + } + } else { + //摄像头不存在 + camera = new Tbl_Device(); + camera.setCameraId(cameraId); + camera.setCreateTime(new Date()); + camera.setIsCamera("1"); + tbl_Device_Mapper.insertDevice(camera); + } + //建立关系 + Tbl_Device_User device_User = new Tbl_Device_User(); + device_User.setUserId(userId); + device_User.setIsMaster("1"); + device_User.setIsLook("0"); + device_User.setIsLive("0"); + device_User.setDeviceId(camera.getDeviceId()); + device_User.setShowName("摄像头" + (int) (Math.random() * 900 + 100)); + device_User.setCreateTime(new Date()); + tbl_Device_Mapper.insertDeviceUser(device_User); + //返回数据 + dataMap.put("cameraId", cameraId); + dataMap.put("showName", device_User.getShowName()); + dataMap.put("isMaster", device_User.getIsMaster()); + dataMap.put("isLook", device_User.getIsLook()); + dataMap.put("isLive", device_User.getIsLive()); + dataMap.put("isActive", camera.getActiveCode() != null && !camera.getActiveCode().equals("") ? "1" : "0"); + return IfishUtil.returnJson(ResultEnum.success.getKey(), dataMap); + } else { + return IfishUtil.returnJson(ResultEnum.warn202.getKey(), ""); + } + } catch (Exception e) { + return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); + } + } + + /** + * 激活摄像头 + */ + @Override + public Object activeCamera(String activeCode, String cameraId) { + try { + Tbl_Activa_Code activa_Code = tbl_Device_Mapper.getActiva_CodeByCode(activeCode); + if (activa_Code != null) { + if (activa_Code.getIsUsed().equals("1")) { + return IfishUtil.returnJson(ResultEnum.warn208.getKey(), ""); + } else { + Tbl_Device camera = tbl_Device_Mapper.getDeviceByCameraId(cameraId); + if (camera != null) { + if (StringUtils.isNotBlank(camera.getActiveCode())) { + return IfishUtil.returnJson(ResultEnum.success.getKey(), ""); + } else { + Date date = new Date(); + camera.setActiveCode(activeCode); + camera.setActiveTime(date); + camera.setUpdateTime(date); + int i = tbl_Device_Mapper.updateTbl_Device(camera); + + activa_Code.setIsUsed("1"); + tbl_Device_Mapper.updateTblActivaCodeIsUse(activeCode); + return IfishUtil.returnJson(ResultEnum.success.getKey(), ""); + } + } else { + return IfishUtil.returnJson(ResultEnum.warn210.getKey(), ""); + } + } + } else { + return IfishUtil.returnJson(ResultEnum.warn209.getKey(), ""); + } + } catch (Exception e) { + return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); + } + } + + /** + * 修改设备和用户的关系数据 + * + * @param device + * @param userId + * @return + */ + @Override + public Object updateDeviceUser(Tbl_Device_User device) { + + try { + Tbl_Device_User olDevice_User = getDeviceUserByUserId_DeviceId(device.getUserId(), device.getDeviceId()); + + if (device != null) { + if (olDevice_User != null) { + device.setId(olDevice_User.getId()); + int i = tbl_Device_Mapper.updateTblDeviceUser(device); + if (i > 0) { + redisKeyHelperI.deleteRedisByTbl_Device_User(device); + Tbl_Device device1 = getDeviceById(device.getDeviceId()); + return IfishUtil.returnJson(ResultEnum.success.getKey(), ""); + } + } + return IfishUtil.returnJson(ResultEnum.warn207.getKey(), ""); + } else { + return IfishUtil.returnJson(ResultEnum.warn207.getKey(), ""); + } + } catch (Exception e) { + } + return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); + } + + /** + * 修改摄像头信息 + * + * @param cameraId + * @param device_User + * @return + */ + @Override + public Object updateCameraUser(Integer cameraId, Tbl_Device_User device_User) { + try { + Tbl_Device_User olDevice_User = getDeviceUserByUserId_CameraId(device_User.getUserId(), cameraId.toString()); + if (olDevice_User != null) { + if (olDevice_User != null) { + + device_User.setId(olDevice_User.getId()); + int i = tbl_Device_Mapper.updateTblDeviceUser(device_User); + if (i > 0) { + redisKeyHelperI.deleteRedisByTbl_Device_User(device_User); + Map dataMap = new HashMap(); + dataMap.put("cameraId", cameraId); + dataMap.put("showName", device_User.getShowName()); + dataMap.put("isMaster", device_User.getIsMaster()); + dataMap.put("isLook", device_User.getIsLook()); + dataMap.put("isLive", device_User.getIsLive()); + Tbl_Device camera = getDeviceById(olDevice_User.getDeviceId()); + dataMap.put("isActive", camera.getActiveCode() != null && !camera.getActiveCode().equals("") ? "1" : "0"); + return IfishUtil.returnJson(ResultEnum.success.getKey(), dataMap); + } + } + return IfishUtil.returnJson(ResultEnum.warn207.getKey(), ""); + } else { + return IfishUtil.returnJson(ResultEnum.warn207.getKey(), ""); + } + } catch (Exception e) { + } + return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); + } + + /** + * 解除绑定设备 + * + * @param deviceUser + * @return + */ + @Override + public Object deleteDeviceUser(Tbl_Device_User deviceUser) { + try { + Tbl_Device_User device_User = getDeviceUserByUserId_DeviceId(deviceUser.getUserId(), deviceUser.getDeviceId()); + if (device_User != null) { + int i = tbl_Device_Mapper.deleteDeviceUserById(device_User.getId()); + if (i > 0) { + redisKeyHelperI.deleteRedisByTbl_Device_User(device_User); + return IfishUtil.returnJson(ResultEnum.success.getKey(), ""); + } + } + } catch (Exception e) { + } + return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); + } + + /** + * 删除绑定摄像头 + * + * @param userId + * @param cameraId + * @return + */ + @Override + public Object deleteCameraUser(Integer userId, String cameraId) { + try { + Tbl_Device_User device_User = getDeviceUserByUserId_CameraId(userId, cameraId); + if (device_User != null) { + int i = tbl_Device_Mapper.deleteDeviceUserById(device_User.getId()); + if (i > 0) { + Tbl_Device device = getDeviceByCameraId(cameraId); + redisKeyHelperI.deleteRedisByTbl_Device(device); + redisKeyHelperI.deleteRedisByTbl_Device_User(device_User); + return IfishUtil.returnJson(ResultEnum.success.getKey(), ""); + } + } + } catch (Exception e) { + } + return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); + } + + /** + * 极光推送 + * + * @param userId + */ + public boolean jPushNotifcation(Map baseMap, Map pushMap) { + try { + //登录类型 + String loginType = baseMap.get("loginType"); + if (loginType != null) { + //推送消息类型 + String msgType = pushMap.get("msg_type"); + String userId = baseMap.get("user_id"); + String title = baseMap.get("title"); + String content = baseMap.get("content"); + boolean result = false; + if (loginType.equals("ios")) { + result = jiGuangPush.pushMessageByIOS(title, content, userId, pushMap); + } else if (loginType.equals("android")) { + result = jiGuangPush.pushMessageByAndroid(title, content, userId, pushMap); + } + //推送记录 + Tbl_Push_List pushList = new Tbl_Push_List(); + if (msgType.equals(PushTypeEnum.remove_device.getKey())) { + pushList.setUserId(Integer.valueOf(userId)); + pushList.setDeviceId(Integer.valueOf(pushMap.get("device_id"))); + pushList.setPhoneType(loginType); + pushList.setShowName(pushMap.get("showName")); + pushList.setPushType(msgType); + pushList.setPushTitle(title); + pushList.setPushContext(content); + pushList.setJpushStatus(result ? "1" : "0"); + pushList.setCreateTime(new Date()); + pushMessageHelperI.save(pushList); + return true; + } //发送看护报告推送 + else if (msgType.equals(PushTypeEnum.send_report.getKey())) { + String reportId = baseMap.get("reportId"); + if (reportId != null) { + pushList.setReportId(Integer.valueOf(reportId)); + } + pushList.setUserId(Integer.valueOf(userId)); + pushList.setPhoneType(loginType); + pushList.setPushType(msgType); + pushList.setPushTitle(title); + pushList.setPushContext(content); + pushList.setPushLink(pushMap.get("push_link")); + pushList.setJpushStatus(result ? "1" : "0"); + pushList.setCreateTime(new Date()); + pushMessageHelperI.save(pushList); + return true; + } + } + } catch (Exception e) { + throw new RuntimeException(); + } + return false; + } + +} diff --git a/src/main/java/com/ifish/helper/HardWareTypeHelper.java b/src/main/java/com/ifish/helper/HardWareTypeHelper.java new file mode 100644 index 0000000..e40e214 --- /dev/null +++ b/src/main/java/com/ifish/helper/HardWareTypeHelper.java @@ -0,0 +1,101 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.ifish.helper; + +import com.ifish.bean.Tbl_HardWare_Type; +import com.ifish.bean.Tbl_Vender; +import com.ifish.mapper.Tbl_Hardware_Type_Mapper; +import com.ifish.util.IfishUtil; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * + * @author Administrator + */ +@Component +public class HardWareTypeHelper implements HardWareTypeHelperI { + + /** + * 所有tbl_Hardware_Type表的操作方法接口 + */ + @Autowired + private Tbl_Hardware_Type_Mapper tbl_Hardware_Type_Mapper; + + /** + * redis缓存服务器方法接口 + */ + @Autowired + private RedisHelperI redisHelperI; + + @Autowired + private RedisKeyHelperI redisKeyHelperI; + + /** + * 根据设备型号获取设备类型参数 + * + * @param code + * @return + */ + @Override + public Tbl_HardWare_Type getHardwareTypeByTypeCode(String code) throws Exception { + Tbl_HardWare_Type hardwareType = null; + String key = redisKeyHelperI.getTbl_HardWare_TypeRedisKeyByTypeCode(code); + String redisString = redisHelperI.getRedis(key); + if (StringUtils.isNotBlank(redisString)) { + hardwareType = (Tbl_HardWare_Type) IfishUtil.JsonToBean(redisString, Tbl_HardWare_Type.class); + } else { + hardwareType = tbl_Hardware_Type_Mapper.getHardwareTypeByTypeCode(code); + if (hardwareType != null && StringUtils.isNotBlank(hardwareType.getHardwareType())) { + redisHelperI.setRedis(key, IfishUtil.ObjectToJson(hardwareType)); + } + } + return hardwareType; + } + + /** + * 根据厂家code获取厂家信息 + * + * @param code + * @return + * @throws Exception + */ + @Override + public Tbl_Vender getVenderListByBrandCode(String code) throws Exception { + Tbl_Vender venderList = new Tbl_Vender(); + 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); + } else { + venderList = tbl_Hardware_Type_Mapper.getVenderListByBrandCode(code); + redisHelperI.setRedis(key, IfishUtil.ObjectToJson(venderList)); + } + return venderList; + } + + /** + * 根据设备型号获取厂家信息 + * + * @param code + * @return + * @throws Exception + */ + @Override + public Tbl_Vender getVenderListByHardwareTypeCode(String code) throws Exception { + Tbl_Vender venderList = new Tbl_Vender(); + 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); + } else { + venderList = tbl_Hardware_Type_Mapper.getVenderListByHardwareTypeCode(code); + redisHelperI.setRedis(key, IfishUtil.ObjectToJson(venderList)); + } + return venderList; + } +} diff --git a/src/main/java/com/ifish/helper/HardWareTypeHelperI.java b/src/main/java/com/ifish/helper/HardWareTypeHelperI.java new file mode 100644 index 0000000..ad584de --- /dev/null +++ b/src/main/java/com/ifish/helper/HardWareTypeHelperI.java @@ -0,0 +1,43 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.ifish.helper; + +import com.ifish.bean.Tbl_HardWare_Type; +import com.ifish.bean.Tbl_Vender; + +/** + * + * @author Administrator + */ +public interface HardWareTypeHelperI { + + /** + * 根据设备型号获取设备类型参数 + * + * @param code + * @return + */ + Tbl_HardWare_Type getHardwareTypeByTypeCode(String code) throws Exception; + + /** + * 根据厂家code获取厂家信息 + * + * @param code + * @return + * @throws Exception + */ + Tbl_Vender getVenderListByBrandCode(String code) throws Exception; + + /** + * 根据设备型号获取厂家信息 + * + * @param code + * @return + * @throws Exception + */ + public Tbl_Vender getVenderListByHardwareTypeCode(String code) throws Exception; + +} diff --git a/src/main/java/com/ifish/helper/PushMessageHelper.java b/src/main/java/com/ifish/helper/PushMessageHelper.java new file mode 100644 index 0000000..573c3d6 --- /dev/null +++ b/src/main/java/com/ifish/helper/PushMessageHelper.java @@ -0,0 +1,126 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.ifish.helper; + +import com.ifish.bean.PageResult; +import com.ifish.bean.Tbl_Push_List; +import com.ifish.enums.ResultEnum; +import com.ifish.mapper.Tbl_Push_List_Mapper; +import com.ifish.util.IfishUtil; +import java.util.List; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * + * @author Administrator + */ +@Component +public class PushMessageHelper implements PushMessageHelperI { + + @Autowired + private Tbl_Push_List_Mapper tbl_Push_List_Mapper; + + @Autowired + private RedisHelperI redisHelperI; + + @Autowired + private RedisKeyHelperI redisKeyHelperI; + + /** + * 根据条件获取推送列表 + * + * @param pushId + * @param userId + * @param firstResult + * @param pageSize + * @return + */ + @Override + public Object getPushList(String pushType, Integer userId, Integer firstResult, Integer pageSize) { + try { + if (firstResult == null) { + firstResult = 0; + } + if (pageSize == null) { + pageSize = 10; + } + if (userId == null) { + return IfishUtil.returnJson(ResultEnum.error401.getKey(), ""); + } + List list = tbl_Push_List_Mapper.getPushList(userId, pushType, pageSize, firstResult); + int count = tbl_Push_List_Mapper.getPushListCount(userId, pushType); + PageResult page = new PageResult(); + page.setList(list); + page.setPageNo(firstResult); + page.setPageSize(pageSize); + page.setTotalCount(count); + return IfishUtil.returnPageData(page, ResultEnum.success.getKey()); + } catch (Exception e) { + return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); + } + } + + /** + * 删除推送消息 + * + * @param userId + * @param pushId + * @return + */ + @Override + public Object deletePushList(Integer userId, Integer pushId) { + try { + Tbl_Push_List tpl = getPush_ListById(pushId); + if (tpl.getUserId().equals(userId)) { + int i = tbl_Push_List_Mapper.deletePushListById(pushId); + if (i > 0) { + return IfishUtil.returnJson(ResultEnum.success.getKey(), ""); + } + } + return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); + } catch (Exception e) { + return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); + } + } + + /** + * 根据ID从缓存中获取推送消息对象 + * + * @param pushId + * @return + * @throws Exception + */ + public Tbl_Push_List getPush_ListById(Integer pushId) throws Exception { + Tbl_Push_List list = null; + String key = redisKeyHelperI.getTbl_Push_List_RedisByPushId(pushId); + String redisString = redisHelperI.getRedis(key); + if (StringUtils.isNotBlank(redisString)) { + list = (Tbl_Push_List) IfishUtil.JsonToBean(redisString, Tbl_Push_List.class); + } else { + list = tbl_Push_List_Mapper.getPush_ListById(pushId); + if (list != null && list.getPushId() > 0) { + redisHelperI.setRedis(key, IfishUtil.ObjectToJson(list)); + } + } + return list; + } + + @Override + public Tbl_Push_List save(Tbl_Push_List pushList) { + try { + int i = tbl_Push_List_Mapper.saveTbl_Push_List(pushList); + if (i > 0) { + return pushList; + } else { + return null; + } + } catch (Exception e) { + return null; + } + } +} diff --git a/src/main/java/com/ifish/helper/PushMessageHelperI.java b/src/main/java/com/ifish/helper/PushMessageHelperI.java new file mode 100644 index 0000000..e73cd40 --- /dev/null +++ b/src/main/java/com/ifish/helper/PushMessageHelperI.java @@ -0,0 +1,37 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.ifish.helper; + +import com.ifish.bean.Tbl_Push_List; + +/** + * + * @author Administrator + */ +public interface PushMessageHelperI { + + /** + * 根据条件获取推送列表 + * + * @param pushId + * @param userId + * @param firstResult + * @param pageSize + * @return + */ + Object getPushList(String pushType, Integer userId, Integer firstResult, Integer pageSize); + + /** + * 删除推送消息 + * + * @param userId + * @param pushId + * @return + */ + Object deletePushList(Integer userId, Integer pushId); + + Tbl_Push_List save(Tbl_Push_List pushList); +} diff --git a/src/main/java/com/ifish/helper/RedisKeyHelper.java b/src/main/java/com/ifish/helper/RedisKeyHelper.java index 11da984..64ca4f1 100644 --- a/src/main/java/com/ifish/helper/RedisKeyHelper.java +++ b/src/main/java/com/ifish/helper/RedisKeyHelper.java @@ -21,7 +21,7 @@ import org.springframework.stereotype.Component; */ @Component public class RedisKeyHelper implements RedisKeyHelperI { - + @Autowired private RedisHelperI redisHelperI; @@ -69,6 +69,66 @@ public class RedisKeyHelper implements RedisKeyHelperI { return RedisKey.USER_ID_KEY + userId; } + /** + * 根据条件获取用户列表缓存key + * + * @param start + * @param length + * @param userId + * @param phoneNumber + * @param userEmail + * @param phoneType + * @param isRegisterGwell + * @param isRegisterJiguang + * @param sortField + * @param sortMode + * @param nickName + * @param remarks + * @param loginTime1 + * @param loginTime2 + * @param createTime1 + * @param createTime2 + * @return + */ + @Override + public String getUserListRedisKey(Integer start, Integer length, String userId, String phoneNumber, String userEmail, String phoneType, String isRegisterGwell, String isRegisterJiguang, String sortField, String sortMode, String nickName, String remarks, String loginTime1, String loginTime2, String createTime1, String createTime2) { + return RedisKey.USER_LIST + userId + "_" + phoneNumber + "_" + userEmail + "_" + phoneType + "_" + isRegisterGwell + "_" + isRegisterJiguang + "_" + sortField + "_" + sortMode + "_" + nickName + "_" + remarks + "_" + loginTime1 + "_" + loginTime2 + "_" + createTime1 + "_" + createTime2 + "_" + start + "_" + length; + } + + /** + * 根据条件搜索获取用户列表缓存key + * + * @param userId + * @param phoneNumber + * @param userEmail + * @param phoneType + * @param isRegisterGwell + * @param isRegisterJiguang + * @param sortField + * @param sortMode + * @param nickName + * @param remarks + * @param loginTime1 + * @param loginTime2 + * @param createTime1 + * @param createTime2 + * @return + */ + @Override + public String getUserListCountRedisKey(String userId, String phoneNumber, String userEmail, String phoneType, String isRegisterGwell, String isRegisterJiguang, String sortField, String sortMode, String nickName, String remarks, String loginTime1, String loginTime2, String createTime1, String createTime2) { + return RedisKey.USER_LIST_COUNT + userId + "_" + phoneNumber + "_" + userEmail + "_" + phoneType + "_" + isRegisterGwell + "_" + isRegisterJiguang + "_" + sortField + "_" + sortMode + "_" + nickName + "_" + remarks + "_" + loginTime1 + "_" + loginTime2 + "_" + createTime1 + "_" + createTime2; + } + + /** + * 获取用户列表总数 + * + * @return + */ + @Override + public String getAllUserListCountRedisKey() { + return RedisKey.USER_LIST_COUNT_ALL; + } + /** * 根据userName获取Tbl_Security_User管理用户的redis缓存key键值 * @@ -234,7 +294,7 @@ public class RedisKeyHelper implements RedisKeyHelperI { * @return */ @Override - + public String getTbl_Live_Room_CountRedisKey() { return RedisKey.LIVEROOM_COUNT; } @@ -341,6 +401,9 @@ public class RedisKeyHelper implements RedisKeyHelperI { if (StringUtils.isNotBlank(tbl_User.getToken())) { redisHelperI.deleteRedis(getTbl_UserRedisKeyByToken(tbl_User.getToken())); } + redisHelperI.delRedisByTagKey(RedisKey.USER_LIST); + redisHelperI.delRedisByTagKey(RedisKey.USER_LIST_COUNT); + redisHelperI.delRedisByTagKey(RedisKey.USER_LIST_COUNT_ALL); } /** @@ -367,5 +430,5 @@ public class RedisKeyHelper implements RedisKeyHelperI { public void deleteRedisByLiveRoomListCount() { redisHelperI.deleteRedis(getTbl_Live_Room_CountRedisKey()); } - + } diff --git a/src/main/java/com/ifish/helper/RedisKeyHelperI.java b/src/main/java/com/ifish/helper/RedisKeyHelperI.java index eb738fe..9ca8acf 100644 --- a/src/main/java/com/ifish/helper/RedisKeyHelperI.java +++ b/src/main/java/com/ifish/helper/RedisKeyHelperI.java @@ -49,6 +49,57 @@ public interface RedisKeyHelperI { */ public String getTbl_UserRedisKeyByEmail(String email); + /** + * 根据条件获取用户列表缓存key + * + * @param start + * @param length + * @param userId + * @param phoneNumber + * @param userEmail + * @param phoneType + * @param isRegisterGwell + * @param isRegisterJiguang + * @param sortField + * @param sortMode + * @param nickName + * @param remarks + * @param loginTime1 + * @param loginTime2 + * @param createTime1 + * @param createTime2 + * @return + */ + public String getUserListRedisKey(Integer start, Integer length, String userId, String phoneNumber, String userEmail, String phoneType, String isRegisterGwell, String isRegisterJiguang, String sortField, String sortMode, String nickName, String remarks, String loginTime1, String loginTime2, String createTime1, String createTime2); + + /** + * 根据条件搜索获取用户列表缓存key + * + * @param userId + * @param phoneNumber + * @param userEmail + * @param phoneType + * @param isRegisterGwell + * @param isRegisterJiguang + * @param sortField + * @param sortMode + * @param nickName + * @param remarks + * @param loginTime1 + * @param loginTime2 + * @param createTime1 + * @param createTime2 + * @return + */ + public String getUserListCountRedisKey(String userId, String phoneNumber, String userEmail, String phoneType, String isRegisterGwell, String isRegisterJiguang, String sortField, String sortMode, String nickName, String remarks, String loginTime1, String loginTime2, String createTime1, String createTime2); + + /** + * 获取用户列表总数 + * + * @return + */ + public String getAllUserListCountRedisKey(); + /** * 根据userName获取Tbl_Security_User管理用户的redis缓存key键值 * diff --git a/src/main/java/com/ifish/helper/UserHelper.java b/src/main/java/com/ifish/helper/UserHelper.java index b56e99c..cb3ffce 100644 --- a/src/main/java/com/ifish/helper/UserHelper.java +++ b/src/main/java/com/ifish/helper/UserHelper.java @@ -26,7 +26,7 @@ public interface UserHelper { * * @return */ - public Object getlist(String draw, Integer start, Integer pageSize); + public Object getlist(String draw, Integer start, Integer length, String userId, String phoneNumber, String userEmail, String phoneType, String isRegisterGwell, String isRegisterJiguang, String sortField, String sortMode, String nickName, String remarks, String loginTime1, String loginTime2, String createTime1, String createTime2); /** * 修改备注 @@ -36,4 +36,14 @@ public interface UserHelper { * @return */ public Object updateRemarks(String userId, String remarks); + + /** + * 根据用户ID获取用户详情页 + * + * @param userId + * @return + */ + public Object getUserDetail(String userId); + + } diff --git a/src/main/java/com/ifish/helper/UserHelperI.java b/src/main/java/com/ifish/helper/UserHelperI.java index 6fce316..125a64b 100644 --- a/src/main/java/com/ifish/helper/UserHelperI.java +++ b/src/main/java/com/ifish/helper/UserHelperI.java @@ -5,10 +5,16 @@ */ package com.ifish.helper; +import com.ifish.bean.Tbl_Device; +import com.ifish.bean.Tbl_Device_Statistics; +import com.ifish.bean.Tbl_Device_User; +import com.ifish.bean.Tbl_HardWare_Type; import com.ifish.bean.Tbl_Security_User; import com.ifish.bean.Tbl_User; +import com.ifish.bean.Tbl_Vender; import com.ifish.mapper.Tbl_User_Mapper; import com.ifish.util.IfishUtil; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -16,6 +22,7 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.web.servlet.ModelAndView; /** * @@ -30,6 +37,10 @@ public class UserHelperI implements UserHelper { private RedisKeyHelperI redisKeyHelperI; @Autowired private Tbl_User_Mapper tbl_User_Mapper; + @Autowired + private DeviceHelper deviceHelper; + @Autowired + private HardWareTypeHelperI hardWareTypeHelperI; @Override public Tbl_Security_User getTbl_Security_User(String usernameSring) { @@ -57,25 +68,65 @@ public class UserHelperI implements UserHelper { * @return */ @Override - public Object getlist(String draw, Integer start, Integer pageSize) { - List list = tbl_User_Mapper.getUserList(start, pageSize); - Integer count = tbl_User_Mapper.getUsersCount(); + public Object getlist(String draw, Integer start, Integer length, String userId, String phoneNumber, String userEmail, String phoneType, String isRegisterGwell, String isRegisterJiguang, String sortField, String sortMode, String nickName, String remarks, String loginTime1, String loginTime2, String createTime1, String createTime2) { + List list = null; + String key = redisKeyHelperI.getUserListRedisKey(start, length, userId, phoneNumber, userEmail, phoneType, isRegisterGwell, isRegisterJiguang, sortField, sortMode, nickName, remarks, loginTime1, loginTime2, createTime1, createTime2); + String redisString = redisHelperI.getRedis(key); + try { + if (StringUtils.isNotBlank(redisString)) { + list = (List) IfishUtil.JsonToList(redisString, Map.class); + } else { + list = tbl_User_Mapper.getUserList(start, length, userId, phoneNumber, userEmail, phoneType, isRegisterGwell, isRegisterJiguang, sortField, sortMode, nickName, remarks, loginTime1, loginTime2, createTime1, createTime2); + if (list != null && list.size() > 0) { + for (Map map : list) { + if (map.get("createTime") != null) { + String createTime = IfishUtil.format((Date) map.get("createTime")); + map.put("createTime", createTime); + } + if (map.get("loginTime") != null) { + String loginTime = IfishUtil.format((Date) map.get("loginTime")); + map.put("loginTime", loginTime); + } + } + redisHelperI.setRedis(key, IfishUtil.ObjectToJson(list)); + } + } + } catch (Exception e) { + } + Integer count = 0; + key = redisKeyHelperI.getUserListCountRedisKey(userId, phoneNumber, userEmail, phoneType, isRegisterGwell, isRegisterJiguang, sortField, sortMode, nickName, remarks, loginTime1, loginTime2, createTime1, createTime2); + redisString = redisHelperI.getRedis(key); + try { + if (StringUtils.isNotBlank(redisString)) { + count = Integer.parseInt(redisString); + } else { + count = tbl_User_Mapper.getUsersCount(userId, phoneNumber, userEmail, phoneType, isRegisterGwell, isRegisterJiguang, sortField, sortMode, nickName, remarks, loginTime1, loginTime2, createTime1, createTime2); + if (count != null && count > 0) { + redisHelperI.setRedis(key, count.toString()); + } + } + } catch (Exception e) { + } - for (Map map : list) { - if (map.get("createTime") != null) { - String createTime = IfishUtil.format((Date) map.get("createTime")); - map.put("createTime", createTime); - } - if (map.get("loginTime") != null) { - String loginTime = IfishUtil.format((Date) map.get("loginTime")); - map.put("loginTime", loginTime); + Integer allCount = 0; + key = redisKeyHelperI.getAllUserListCountRedisKey(); + redisString = redisHelperI.getRedis(key); + try { + if (StringUtils.isNotBlank(redisString)) { + allCount = Integer.parseInt(redisString); + } else { + allCount = tbl_User_Mapper.getAllUsersCount(); + if (allCount != null && allCount > 0) { + redisHelperI.setRedis(key, allCount.toString()); + } } + } catch (Exception e) { } Map map = new HashMap(); map.put("data", list); map.put("draw", draw); - map.put("recordsTotal", count); + map.put("recordsTotal", allCount); map.put("recordsFiltered", count); return map; } @@ -99,4 +150,165 @@ public class UserHelperI implements UserHelper { return "false"; } } + + /** + * 根据用户ID获取用户详情页 + * + * @param userId + * @return + */ + public Object getUserDetail(String userId) { + ModelAndView mv = new ModelAndView(); + if (StringUtils.isBlank(userId)) { + mv.setViewName("redirect:/userlist"); + return mv; + } + + try { + //用户信息 + Tbl_User user = getUserById(Integer.parseInt(userId)); + if (user != null) { + mv.addObject("user", user); + //用户性别 + if (StringUtils.isNotBlank(user.getUserSex())) { + String userSex = user.getUserSex().equals("1") ? "男" : "女"; + mv.addObject("userSex", userSex); + } else { + mv.addObject("userSex", "未填写"); + } + //注册时间 + if (user.getCreateTime() != null) { + mv.addObject("createTime", IfishUtil.format(user.getCreateTime())); + } + //极光推送 + if (StringUtils.isNotBlank(user.getJiguangUserid())) { + mv.addObject("jiguang", user.getUserId()); + } else { + mv.addObject("jiguang", "未注册别名"); + } + + List list = deviceHelper.getDeviceUsersByUserId(user.getUserId()); + List deviceMaps = new ArrayList(); + List cameraMaps = new ArrayList(); + for (Tbl_Device_User tbl_Device_User : list) { + Tbl_Device device = deviceHelper.getDeviceById(tbl_Device_User.getDeviceId()); + if (StringUtils.isNotBlank(device.getCameraId())) { + //摄像头信息 + Map map = new HashMap(); + //摄像头ID + map.put("cameraId", device.getCameraId()); + //显示名称 + map.put("cameraName", tbl_Device_User.getShowName()); + //是否主控 + map.put("isMaster", tbl_Device_User.getIsMaster().equals("1") ? "是" : "否"); + //是否直播 + map.put("isLive", tbl_Device_User.getIsLive().equals("1") ? "是" : "否"); + //绑定时间 + map.put("bindTime", IfishUtil.format(tbl_Device_User.getCreateTime())); + //激活时间 + if (device.getActiveTime() != null) { + map.put("firsttime", IfishUtil.format(device.getActiveTime())); + } else { + map.put("firsttime", " "); + } + + cameraMaps.add(map); + } else { + //设备信息 + Tbl_HardWare_Type hardWare_Type = hardWareTypeHelperI.getHardwareTypeByTypeCode(device.getHardwareType()); + Tbl_Vender vender = hardWareTypeHelperI.getVenderListByHardwareTypeCode(hardWare_Type.getHardwareType()); + Tbl_Device_Statistics device_Statistics = deviceHelper.getDeviceStatisticsByDeviceId(device.getDeviceId()); + Map map = new HashMap(); + //设备ID + map.put("deviceId", tbl_Device_User.getDeviceId()); + //设备MAC + map.put("deviceMac", device.getMacAddress()); + //设备类型方案 + map.put("hardwareName", hardWare_Type.getHardwareName()); + //厂家名称 + if (vender != null) { + map.put("brandName", vender.getBrandName()); + } else { + map.put("brandName", " "); + } + //连接次数 + map.put("logincount", device_Statistics.getLoginCount()); + //最后登录时间 + if (device_Statistics.getLoginTime() != null) { + map.put("lastlogintime", IfishUtil.format(device_Statistics.getLoginTime())); + } else { + map.put("lastlogintime", " "); + } + //设备展示名称 + map.put("deviceName", tbl_Device_User.getShowName()); + //是否主控 + map.put("isMaster", tbl_Device_User.getIsMaster().equals("1") ? "是" : "否"); + //绑定时间 + map.put("bindTime", IfishUtil.format(tbl_Device_User.getCreateTime())); + //首次激活时间 + if (device_Statistics.getFirstActivate() != null) { + map.put("firsttime", IfishUtil.format(device_Statistics.getFirstActivate())); + } else { + map.put("firsttime", " "); + } + //出厂时间 + if (device_Statistics.getCreateTime() != null) { + map.put("createTime", IfishUtil.format(device_Statistics.getCreateTime())); + } else { + map.put("createTime", " "); + } + //是否授权 + map.put("isBlacklist", device.getIsBlacklist().equals("1") ? "是" : "否"); + deviceMaps.add(map); + } + } + mv.addObject("listmap", deviceMaps); + mv.addObject("cameraMaps", cameraMaps); + } + + } catch (Exception e) { + } + + mv.addObject("myjs", "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "" + + "" + + " \n" + + " \n" + + " \n" + + " \n" + + " "); + mv.setViewName("userdetail"); + mv.addObject("title", "用户详情"); + return mv; + } + + /** + * 根据用户ID从缓存中获取用户对象 + * + * @param userId + * @return + * @throws Exception + */ + public Tbl_User getUserById(Integer userId) throws Exception { + Tbl_User tmpUser = null; + String userKey = redisKeyHelperI.getTbl_UserRedisKeyByUserId(userId); + String userString = redisHelperI.getRedis(userKey); + //1.从数据库或缓存中读取用户对象 + if (StringUtils.isNotBlank(userString)) { + tmpUser = (Tbl_User) IfishUtil.JsonToBean(userString, Tbl_User.class); + } else { + tmpUser = tbl_User_Mapper.getUserByUserId(userId + ""); + if (tmpUser != null && tmpUser.getUserId() > 0) { + redisHelperI.setRedis(userKey, IfishUtil.ObjectToJson(tmpUser)); + } + } + return tmpUser; + } } 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 47f7bd2..5ac7548 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 @@ -35,4 +35,14 @@ public interface Tbl_Hardware_Type_Mapper { */ @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); + + /** + * 根据设备型号获取厂家信息 + * + * @param code + * @return + * @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); } diff --git a/src/main/java/com/ifish/mapper/Tbl_Push_List_Mapper.java b/src/main/java/com/ifish/mapper/Tbl_Push_List_Mapper.java index 5c5e970..7bc62b5 100644 --- a/src/main/java/com/ifish/mapper/Tbl_Push_List_Mapper.java +++ b/src/main/java/com/ifish/mapper/Tbl_Push_List_Mapper.java @@ -8,6 +8,7 @@ package com.ifish.mapper; import com.ifish.bean.Tbl_Push_List; import java.util.List; import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.SelectProvider; @@ -49,7 +50,7 @@ public interface Tbl_Push_List_Mapper { Integer deletePushListById(@Param("id") Integer pushId); /** - * 分页获取用户推送消息 + * 获取用户推送消息总数 * * @param userId * @param pushType @@ -57,7 +58,17 @@ public interface Tbl_Push_List_Mapper { * @param firstResult * @return */ - @Select("SELECT COUNT(1) FROM TBL_PUSH_LIST WHERE user_id = #{userid} AND push_type = #{pushtype} LIMIT ${first},${pagesize}") - Integer getPushListCount(@Param("userid") Integer userId, @Param("pushtype") String pushType, @Param("pagesize") Integer pageSize, @Param("first") Integer firstResult); + @SelectProvider(type = Tbl_Push_List_MapperSql.class, method = "getPushListCount") + Integer getPushListCount(@Param("userid") Integer userId, @Param("pushtype") String pushType); + + /** + * 插入一条推送信息 + * + * @param tbl_Push_List + * @return + */ + @Insert("INSERT INTO TBL_PUSH_LIST(user_id,device_id,show_name,phone_type,push_type,push_title,push_context,create_time,push_link,jpush_status,google_status,report_id,mcu_count,modular_count,router_count,server_count,server_try_count) VALUES (#{push.userId},#{push.deviceId},#{push.showName},#{push.phoneType}," + + "#{push.pushType},#{push.pushTitle},#{push.pushContext},NOW(),#{push.pushLink},#{push.jpushStatus},#{push.googleStatus},#{push.reportId},#{push.mcuCount},#{push.modularCount},#{push.routerCount},#{push.serverCount},#{push.serverTryCount})") + Integer saveTbl_Push_List(@Param("push") Tbl_Push_List tbl_Push_List); } diff --git a/src/main/java/com/ifish/mapper/Tbl_Push_List_MapperSql.java b/src/main/java/com/ifish/mapper/Tbl_Push_List_MapperSql.java index e4e8e5f..7a58097 100644 --- a/src/main/java/com/ifish/mapper/Tbl_Push_List_MapperSql.java +++ b/src/main/java/com/ifish/mapper/Tbl_Push_List_MapperSql.java @@ -27,4 +27,16 @@ public class Tbl_Push_List_MapperSql { return sb.toString(); } + public String getPushListCount(@Param("userid") Integer userId, @Param("pushtype") String pushType) { + StringBuilder sb = new StringBuilder(); + + sb.append("SELECT count(1) FROM TBL_PUSH_LIST WHERE "); + sb.append("user_id = #{userid} "); + if (StringUtils.isNotBlank(pushType)) { + sb.append("AND push_type = #{pushtype} "); + } + + return sb.toString(); + } + } diff --git a/src/main/java/com/ifish/mapper/Tbl_User_Mapper.java b/src/main/java/com/ifish/mapper/Tbl_User_Mapper.java index f03a85f..551c432 100644 --- a/src/main/java/com/ifish/mapper/Tbl_User_Mapper.java +++ b/src/main/java/com/ifish/mapper/Tbl_User_Mapper.java @@ -120,7 +120,7 @@ public interface Tbl_User_Mapper { * @return */ @SelectProvider(type = Tbl_User_MapperSql.class, method = "getUserList") - List getUserList(@Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize); + List getUserList(@Param("start") Integer start, @Param("length") Integer length, @Param("userid") String userId, @Param("phone") String phoneNumber, @Param("email") String userEmail, @Param("phonetype") String phoneType, @Param("isgwell") String isRegisterGwell, @Param("isjiguang") String isRegisterJiguang, @Param("sortfield") String sortField, @Param("sortmode") String sortMode, @Param("nickname") String nickName, @Param("remarks") String remarks, @Param("logintime1") String loginTime1, @Param("logintime2") String loginTime2, @Param("createtime1") String createTime1, @Param("createtime2") String createTime2); /** * 根据条件查询用户列表总数 @@ -128,5 +128,13 @@ public interface Tbl_User_Mapper { * @return */ @SelectProvider(type = Tbl_User_MapperSql.class, method = "getUsersCount") - Integer getUsersCount(); + Integer getUsersCount(@Param("userid") String userId, @Param("phone") String phoneNumber, @Param("email") String userEmail, @Param("phonetype") String phoneType, @Param("isgwell") String isRegisterGwell, @Param("isjiguang") String isRegisterJiguang, @Param("sortfield") String sortField, @Param("sortmode") String sortMode, @Param("nickname") String nickName, @Param("remarks") String remarks, @Param("logintime1") String loginTime1, @Param("logintime2") String loginTime2, @Param("createtime1") String createTime1, @Param("createtime2") String createTime2); + + /** + * 获取所有用户列表总数 + * + * @return + */ + @Select("SELECT count(1) FROM tbl_user") + Integer getAllUsersCount(); } diff --git a/src/main/java/com/ifish/mapper/Tbl_User_MapperSql.java b/src/main/java/com/ifish/mapper/Tbl_User_MapperSql.java index 2e1d10f..2fcacf0 100644 --- a/src/main/java/com/ifish/mapper/Tbl_User_MapperSql.java +++ b/src/main/java/com/ifish/mapper/Tbl_User_MapperSql.java @@ -98,25 +98,119 @@ public class Tbl_User_MapperSql { * * @return */ - public String getUserList(@Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize) { + public String getUserList(@Param("start") Integer start, @Param("length") Integer length, @Param("userid") String userId, @Param("phone") String phoneNumber, @Param("email") String userEmail, @Param("phonetype") String phoneType, @Param("isgwell") String isRegisterGwell, @Param("isjiguang") String isRegisterJiguang, @Param("sortfield") String sortField, @Param("sortmode") String sortMode, @Param("nickname") String nickName, @Param("remarks") String remarks, @Param("logintime1") String loginTime1, @Param("logintime2") String loginTime2, @Param("createtime1") String createTime1, @Param("createtime2") String createTime2) { StringBuilder sb = new StringBuilder(); - sb.append("SELECT user_id userId,phone_number phoneNumber,user_email userEmail,nick_name nickName,create_time createTime,phone_type phoneType,login_type loginType,login_time loginTime,login_count loginCount,address,is_register_gwell isRegisterGwell,jiguang_userid jiguangUserid,remarks FROM tbl_user \n" - + " ORDER BY user_id DESC " - + "LIMIT " + pageNo + "," + pageSize); + sb.append("SELECT user_id userId,phone_number phoneNumber,user_email userEmail,nick_name nickName,create_time createTime,phone_type phoneType,login_type loginType,login_time loginTime,login_count loginCount,address,is_register_gwell isRegisterGwell,jiguang_userid jiguangUserid,remarks FROM tbl_user "); + sb.append(" WHERE 1 = 1 "); + if (StringUtils.isNotBlank(userId)) { + sb.append("AND user_id = #{userid} "); + } + if (StringUtils.isNotBlank(phoneNumber)) { + sb.append("AND phone_number = #{phone} "); + } + if (StringUtils.isNotBlank(userEmail)) { + sb.append("AND user_email = #{email} "); + } + if (StringUtils.isNotBlank(phoneType)) { + sb.append("AND phone_type = #{phonetype} "); + } + if (StringUtils.isNotBlank(isRegisterGwell)) { + sb.append("AND is_register_gwell = #{isgwell} "); + } + + if (StringUtils.isNotBlank(isRegisterJiguang) && isRegisterJiguang.equals("1")) { + sb.append("AND jiguang_userid is not null AND jiguang_userid <> '' "); + } else if (StringUtils.isNotBlank(isRegisterJiguang) && isRegisterJiguang.equals("0")) { + sb.append("AND ( jiguang_userid is null or jiguang_userid = '') "); + } + + if (StringUtils.isNotBlank(nickName)) { + sb.append("AND nick_name like '%" + nickName + "%'"); + } + if (StringUtils.isNotBlank(remarks)) { + sb.append("AND remarks like '%" + remarks + "%'"); + } + if (StringUtils.isNotBlank(loginTime1) && StringUtils.isNotBlank(loginTime2)) { + sb.append("AND login_time BETWEEN #{logintime1} AND #{logintime2} "); + } else if (StringUtils.isNotBlank(loginTime1)) { + sb.append("AND login_time < #{logintime1} "); + } else if (StringUtils.isNotBlank(loginTime2)) { + sb.append("AND login_time > #{logintime2} "); + } + + if (StringUtils.isNotBlank(createTime1) && StringUtils.isNotBlank(createTime2)) { + sb.append("AND create_time BETWEEN #{createtime1} AND #{createtime2} "); + } else if (StringUtils.isNotBlank(createTime1)) { + sb.append("AND create_time < #{createtime1} "); + } else if (StringUtils.isNotBlank(createTime2)) { + sb.append("AND create_time > #{createtime2} "); + } + + if (StringUtils.isBlank(sortField)) { + sortField = "user_id"; + } + if (StringUtils.isBlank(sortMode)) { + sortMode = "DESC"; + } + + sb.append(" ORDER BY " + sortField + " " + sortMode + " LIMIT " + start + "," + length); return sb.toString(); } - + /** * 注册用户页，获取用户列表总数 * * @return */ - public String getUsersCount() { + public String getUsersCount(@Param("userid") String userId, @Param("phone") String phoneNumber, @Param("email") String userEmail, @Param("phonetype") String phoneType, @Param("isgwell") String isRegisterGwell, @Param("isjiguang") String isRegisterJiguang, @Param("sortfield") String sortField, @Param("sortmode") String sortMode, @Param("nickname") String nickName, @Param("remarks") String remarks, @Param("logintime1") String loginTime1, @Param("logintime2") String loginTime2, @Param("createtime1") String createTime1, @Param("createtime2") String createTime2) { StringBuilder sb = new StringBuilder(); sb.append("SELECT count(1) FROM tbl_user "); + sb.append(" WHERE 1 = 1 "); + if (StringUtils.isNotBlank(userId)) { + sb.append("AND user_id = #{userid} "); + } + if (StringUtils.isNotBlank(phoneNumber)) { + sb.append("AND phone_number = #{phone} "); + } + if (StringUtils.isNotBlank(userEmail)) { + sb.append("AND user_email = #{email} "); + } + if (StringUtils.isNotBlank(phoneType)) { + sb.append("AND phone_type = #{phonetype} "); + } + if (StringUtils.isNotBlank(isRegisterGwell)) { + sb.append("AND is_register_gwell = #{isgwell} "); + } + if (StringUtils.isNotBlank(isRegisterJiguang) && isRegisterJiguang.equals("1")) { + sb.append("AND jiguang_userid is not null AND jiguang_userid <> '' "); + } else if (StringUtils.isNotBlank(isRegisterJiguang) && isRegisterJiguang.equals("0")) { + sb.append("AND ( jiguang_userid is null or jiguang_userid = '') "); + } + + if (StringUtils.isNotBlank(nickName)) { + sb.append("AND nick_name like '%" + nickName + "%'"); + } + if (StringUtils.isNotBlank(remarks)) { + sb.append("AND remarks like '%" + remarks + "%'"); + } + if (StringUtils.isNotBlank(loginTime1) && StringUtils.isNotBlank(loginTime2)) { + sb.append("AND login_time BETWEEN #{logintime1} AND #{logintime2} "); + } else if (StringUtils.isNotBlank(loginTime1)) { + sb.append("AND login_time < #{logintime1} "); + } else if (StringUtils.isNotBlank(loginTime2)) { + sb.append("AND login_time > #{logintime2} "); + } + + if (StringUtils.isNotBlank(createTime1) && StringUtils.isNotBlank(createTime2)) { + sb.append("AND create_time BETWEEN #{createtime1} AND #{createtime2} "); + } else if (StringUtils.isNotBlank(createTime1)) { + sb.append("AND create_time < #{createtime1} "); + } else if (StringUtils.isNotBlank(createTime2)) { + sb.append("AND create_time > #{createtime2} "); + } return sb.toString(); } diff --git a/src/main/java/com/ifish/util/RedisKey.java b/src/main/java/com/ifish/util/RedisKey.java index 2240394..91a7269 100644 --- a/src/main/java/com/ifish/util/RedisKey.java +++ b/src/main/java/com/ifish/util/RedisKey.java @@ -15,7 +15,6 @@ public class RedisKey { * 用户缓存前缀,以id进行存储 */ public static final String USER_ID_KEY = "userE:id_"; - /** * 用户缓存前缀,以手机号进行存储 */ @@ -24,12 +23,22 @@ public class RedisKey { * 用户缓存前缀,以邮箱进行存储 */ public static final String USER_EMAIL = "userE:ema_"; - + /** + * 用户列表缓存前缀 + */ + public static final String USER_LIST = "userlistE:"; + /** + * 用户列表总数缓存前缀(带条件) + */ + public static final String USER_LIST_COUNT = "userlistcountE:"; + /** + * 所有用户列表缓存前缀（不需条件） + */ + public static final String USER_LIST_COUNT_ALL = "alluserlistcountE"; /** * 用户缓存前缀，以token进行存储 */ public static final String USER_TOKEN = "userE:to_"; - /** * 管理用户缓存前缀 */ @@ -90,6 +99,11 @@ public class RedisKey { */ public static final String LIVEROOM_ROOMID = "liveroomE:id_"; + /** + * 直播间详情表缓存前缀，以摄像头ID进行存储 + */ + public static final String LIVEROOM_CAMERAID = "liveroomE:cid_"; + /** * 直播间详情表缓存前缀，以直播间ID进行存储 */ @@ -110,6 +124,11 @@ public class RedisKey { */ public static final String LIVEMESSAGE_ROOMID = "livemessageE:rid_"; + /** + * 指定直播间评论总数 + */ + public static final String LIVEMESSAGE_COUNT = "livemessageCtE:rid_"; + /** * 推送信息表缓存前缀，以推送Id进行存储 */ @@ -119,4 +138,9 @@ public class RedisKey { * 邮箱验证有效缓存key */ public static final String EMAIL_REGIESTER = "emailkeyE:"; + + /** + * 邮箱验证修改密码有效缓存key + */ + public static final String EMAIL_UPDATEPASSWORD = "emialupE:"; } diff --git a/src/main/webapp/WEB-INF/layout/IndexPage.jsp b/src/main/webapp/WEB-INF/layout/IndexPage.jsp index 03342df..c8ec031 100644 --- a/src/main/webapp/WEB-INF/layout/IndexPage.jsp +++ b/src/main/webapp/WEB-INF/layout/IndexPage.jsp @@ -47,12 +47,12 @@ - + - + @@ -66,7 +66,9 @@ - + + + @@ -174,7 +176,28 @@ - +
+ + +
+
+ +
+ +
+

${pagetitle}

+
+
+ +
+
+ +
+ +
+ +
+
diff --git a/src/main/webapp/WEB-INF/layout/tiles.xml b/src/main/webapp/WEB-INF/layout/tiles.xml index 6a9c89c..bd18d00 100644 --- a/src/main/webapp/WEB-INF/layout/tiles.xml +++ b/src/main/webapp/WEB-INF/layout/tiles.xml @@ -26,4 +26,9 @@ + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/user/detail.jsp b/src/main/webapp/WEB-INF/views/user/detail.jsp new file mode 100644 index 0000000..a132de8 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/user/detail.jsp @@ -0,0 +1,147 @@ +<%-- + Document : detail + Created on : 2017-7-31, 14:25:00 + Author : Administrator +--%> + +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@page contentType="text/html" pageEncoding="UTF-8"%> + +

用户信息

+ + + + + + + + + + + + + + + + + + +
ID用户昵称性别手机号累计登陆次数注册时间技威code1技威code2技威用户ID极光推送别名
${user.userId}${user.nickName}${userSex}${user.phoneNumber}${user.loginCount}${createTime}${user.p2pverifyCode1}${user.p2pverifyCode2}${user.gwellUserid}${jiguang}
+

拥有设备

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID硬件mac设备方案厂家名称连接次数最后一次登陆时间显示名称是否主控绑定时间首次激活时间出厂时间授权操作
${item.deviceId}${item.deviceMac}${item.hardwareName}${item.brandName}${item.logincount}${item.lastlogintime}${item.deviceName}${item.isMaster}${item.bindTime}${item.firsttime}${item.createTime}${item.isBlacklist} + 解除绑定 + 取消授权 +
+

拥有摄像头

+ + + + + + + + + + + + + + + + + + + + + + + +
摄像头ID显示名称是否主控是否直播绑定时间激活时间
${item1.cameraId}${item1.cameraName}${item1.isMaster}${item1.isLive}${item1.bindTime}${item1.firsttime}
+
+ +
+ + diff --git a/src/main/webapp/WEB-INF/views/user/list.jsp b/src/main/webapp/WEB-INF/views/user/list.jsp index 40112d2..6bda878 100644 --- a/src/main/webapp/WEB-INF/views/user/list.jsp +++ b/src/main/webapp/WEB-INF/views/user/list.jsp @@ -6,158 +6,138 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -
- - -
-
- -
- -
-

用户列表

-
-
- - - - - - - - - - + +
- - - - - - - - - - - - - - - -
+ + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - - - - + + + + - - - - -
+ + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - -
- - - - - - - -
+ + + + + + + + + + + + + + + +
+ + + + + + + +
- - - ~~ - - - - ~~ - + + + ~~ + + + + ~~ +
- - -
- - - - - - - - - - - - - - - + + + + +
ID用户信息注册信息登陆信息注册地址注册技威注册极光备注操作详情
+ + +
+ + + + + + + + + + + + + + + -
ID用户信息注册信息登陆信息注册地址注册技威注册极光备注操作详情
-
-
- -
- -
- -
- +