ard-work/src/main/java/com/ruoyi/rongcloud/domain/ArdRongGroup.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ard-work/src/main/java/com/ruoyi/rongcloud/domain/ArdRongGroupUser.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ard-work/src/main/java/com/ruoyi/rongcloud/mapper/ArdRongGroupMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ard-work/src/main/java/com/ruoyi/rongcloud/mapper/ArdRongGroupUserMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ard-work/src/main/java/com/ruoyi/sy/param/LockPageParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ard-work/src/main/java/com/ruoyi/rongcloud/domain/ArdRongGroup.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,13 @@ package com.ruoyi.rongcloud.domain; import lombok.Data; import java.util.Date; @Data public class ArdRongGroup { private String groupId; private String groupName; private String createName; private Date createTime; } ard-work/src/main/java/com/ruoyi/rongcloud/domain/ArdRongGroupUser.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,10 @@ package com.ruoyi.rongcloud.domain; import lombok.Data; @Data public class ArdRongGroupUser { private String id; private String groupId; private String userId; } ard-work/src/main/java/com/ruoyi/rongcloud/mapper/ArdRongGroupMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,8 @@ package com.ruoyi.rongcloud.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.rongcloud.domain.ArdRongGroup; public interface ArdRongGroupMapper extends BaseMapper<ArdRongGroup> { } ard-work/src/main/java/com/ruoyi/rongcloud/mapper/ArdRongGroupUserMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,8 @@ package com.ruoyi.rongcloud.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.rongcloud.domain.ArdRongGroupUser; public interface ArdRongGroupUserMapper extends BaseMapper<ArdRongGroupUser> { } ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
@@ -1,11 +1,12 @@ package com.ruoyi.rongcloud.service.Impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.rongcloud.domain.RongCloudGroupDisParam; import com.ruoyi.rongcloud.domain.RongCloudGroupParam; import com.ruoyi.rongcloud.domain.RongCloudParam; import com.ruoyi.rongcloud.mapper.ArdRongGroupMapper; import com.ruoyi.rongcloud.mapper.ArdRongGroupUserMapper; import com.ruoyi.rongcloud.domain.*; import com.ruoyi.rongcloud.service.RongCloudService; import com.ruoyi.utils.forest.RongCloudClient; import lombok.extern.slf4j.Slf4j; @@ -31,6 +32,11 @@ RongCloudClient rongCloudClient; @Resource RedisCache redisCache; @Resource private ArdRongGroupMapper ardRongGroupMapper; @Resource private ArdRongGroupUserMapper ardRongGroupUserMapper; /** * è·åèäºtoken @@ -79,7 +85,24 @@ public AjaxResult groupCreate(RongCloudGroupParam group) { group.setGroupId(String.valueOf(UUID.randomUUID())); Map<String, Object> groupMap = rongCloudClient.groupCreate(getRongCloudHead(),group); groupMap.put("userId",group.getGroupId()); Integer code = (Integer) groupMap.get("code"); if(code.equals(200)){ ArdRongGroup ardRongGroup = new ArdRongGroup(); ardRongGroup.setGroupId(group.getGroupId()); ardRongGroup.setGroupName(group.getGroupName()); ardRongGroup.setCreateName(SecurityUtils.getUserId()); ardRongGroup.setCreateTime(new Date()); ardRongGroupMapper.insert(ardRongGroup); List<String> userList = group.getUserId(); for (int i = 0; i < userList.size(); i++) { ArdRongGroupUser ardRongGroupUser = new ArdRongGroupUser(); ardRongGroupUser.setId(String.valueOf(UUID.randomUUID())); ardRongGroupUser.setGroupId(group.getGroupId()); ardRongGroupUser.setUserId(userList.get(i)); ardRongGroupUserMapper.insert(ardRongGroupUser); } } groupMap.put("userId",group.getUserId()); groupMap.put("groupId",group.getGroupId()); groupMap.put("group",group.getGroupName()); return AjaxResult.success(groupMap); @@ -88,6 +111,13 @@ @Override public AjaxResult groupDismiss(RongCloudGroupDisParam groupDis) { Map<String, Object> groupMap = rongCloudClient.groupDismiss(getRongCloudHead(),groupDis); Integer code = (Integer) groupMap.get("code"); if(code.equals(200)){ ardRongGroupMapper.deleteById(groupDis.getGroupId()); QueryWrapper<ArdRongGroupUser> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("group_id",groupDis.getGroupId()); ardRongGroupUserMapper.delete(queryWrapper); } groupMap.put("groupId",groupDis.getGroupId()); groupMap.put("userId",groupDis.getUserId()); return AjaxResult.success(groupMap); ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
@@ -1,6 +1,8 @@ package com.ruoyi.sy.controller; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.spring.SpringUtils; @@ -9,10 +11,7 @@ import com.ruoyi.sy.domain.ArdSyCarRtu; import com.ruoyi.sy.domain.ArdSyUser; import com.ruoyi.sy.mapper.ArdAccessFenceMapper; import com.ruoyi.sy.param.AddCarParam; import com.ruoyi.sy.param.AddRtuParam; import com.ruoyi.sy.param.LockTypeParam; import com.ruoyi.sy.param.RtuTypeParam; import com.ruoyi.sy.param.*; import com.ruoyi.sy.service.*; import com.ruoyi.sy.service.impl.ArdSyCarRtuServiceImpl; import com.ruoyi.sy.vo.CarLockVo; @@ -106,10 +105,24 @@ @GetMapping("/query") @ApiOperation("æ¥è¯¢æærtuæè½½ç车è¾") public Results query(){ public Results query(LockPageParam lockPageParam){ List<CarVo> list = ardSyCarLockService.carList(); analysis(list); return Results.succeed(list); List<CarVo> newList = new ArrayList<>(); for (int i = 0; i < list.size(); i++) { String plate = list.get(i).getCarPlate(); if(lockPageParam.getCarPlate()!=null){ if(plate.contains(lockPageParam.getCarPlate())){ newList.add(list.get(i)); } } } PageHelper.startPage(lockPageParam.getPageNum(),lockPageParam.getPageSize()); if(lockPageParam.getCarPlate()!=null){ return Results.succeed(new PageInfo<>(newList)); }else { return Results.succeed(new PageInfo<>(list)); } } @PostMapping("/addLock") ard-work/src/main/java/com/ruoyi/sy/param/LockPageParam.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,13 @@ package com.ruoyi.sy.param; import lombok.Data; /** * @author Administrator */ @Data public class LockPageParam { private String carPlate; private Integer pageSize = 10; private Integer pageNum = 1; }