chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

轨迹权限

Browse Source
This commit is contained in:
磷叶 2025-04-27 10:39:35 +08:00
parent 6d3df8fc4d
commit 828d8d3de0
6 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-service/src/main/java/com/ruoyi/bst/locationLog/mapper/LocationLogMapper.xml
View File

@ -64,13 +64,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item}
</foreach>
</if>
${@com.ruoyi.framework.util.DataScopeUtil@dataScope(
null,
"su.user_id,su.agent_id,bo.area_user_id,bo.area_agent_id,bod.device_mch_id",
null,
null,
query.scope
)}
${@com.ruoyi.framework.util.DataScopeUtil@create(query.scope)
.userSetAlias("su.user_id,su.agent_id,bo.area_user_id,bo.area_agent_id,bod.device_mch_id")
.areaAlias("bo.area_id", query.areaPermissions)
.areaAlias("bd.area_id", query.areaPermissions)
.build()
}
${query.params.dataScope}
</sql>

3
ruoyi-service/src/main/java/com/ruoyi/bst/locationLog/service/impl/LocationLogServiceImpl.java
View File

@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.github.pagehelper.PageHelper;
import com.ruoyi.bst.areaJoin.domain.enums.AreaJoinPermission;
import com.ruoyi.bst.locationLog.domain.LocationLog;
import com.ruoyi.bst.locationLog.domain.LocationLogQuery;
import com.ruoyi.bst.locationLog.domain.LocationLogVO;
@ -41,6 +42,8 @@ public class LocationLogServiceImpl implements LocationLogService
LocationLogQuery query = new LocationLogQuery();
query.setId(id);
query.setScope(scope);
query.addAreaPermission(AreaJoinPermission.DEVICE_VIEW.getCode());
query.addAreaPermission(AreaJoinPermission.ORDER_VIEW.getCode());
return this.selectOne(query);
}

11
ruoyi-service/src/main/java/com/ruoyi/bst/realName/service/impl/RealNameServiceImpl.java
View File

@ -238,15 +238,6 @@ public class RealNameServiceImpl implements RealNameService
}
private int handleNormalRealName(RealName realName, String cacheKey) {
// 修改实名认证信息（用户表）
UserVO data = new UserVO();
data.setUserId(realName.getUserId());
data.setRealName(realName.getUserName());
data.setRealIdCard(realName.getIdCard());
data.setRealPhone(realName.getMobile());
data.setIsReal(true);
// 数据库操作
Integer result = transactionTemplate.execute(status -> {
// 插入实名认证表
@ -255,7 +246,7 @@ public class RealNameServiceImpl implements RealNameService
if (realName.getStatus().equals(RealNameStatus.REAL.getCode())) {
// 修改用户实名信息
int update = userService.updateUserRealName(data);
int update = userService.updateUserRealName(realName);
ServiceUtil.assertion(update != 1, "更新用户信息失败");
}

3
ruoyi-service/src/main/java/com/ruoyi/system/user/service/UserService.java
View File

@ -4,6 +4,7 @@ import java.math.BigDecimal;
import java.util.List;
import com.ruoyi.bst.balanceLog.domain.enums.BalanceLogBstType;
import com.ruoyi.bst.realName.domain.RealName;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.core.domain.vo.UserVO;
import com.ruoyi.system.user.domain.UserQuery;
@ -277,5 +278,5 @@ public interface UserService
/**
* 更新用户实名信息
*/
int updateUserRealName(User data);
int updateUserRealName(RealName data);
}

18
ruoyi-service/src/main/java/com/ruoyi/system/user/service/impl/UserServiceImpl.java
View File

@ -23,6 +23,7 @@ import com.ruoyi.bst.app.service.impl.AppServiceImpl;
import com.ruoyi.bst.balanceLog.domain.BalanceLog;
import com.ruoyi.bst.balanceLog.domain.enums.BalanceLogBstType;
import com.ruoyi.bst.balanceLog.service.BalanceLogService;
import com.ruoyi.bst.realName.domain.RealName;
import com.ruoyi.bst.userApp.service.UserAppService;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.UserConstants;
@ -855,16 +856,19 @@ public class UserServiceImpl implements UserService
}
@Override
public int updateUserRealName(User user) {
if (user == null || user.getUserId() == null) {
public int updateUserRealName(RealName real) {
if (real == null || real.getUserId() == null) {
return 0;
}
// 修改实名认证信息（用户表）
UserVO data = new UserVO();
data.setUserId(user.getUserId());
data.setRealName(user.getRealName());
data.setRealIdCard(user.getRealIdCard());
data.setRealPhone(user.getRealPhone());
data.setIsReal(user.getIsReal());
data.setUserId(real.getUserId());
data.setNickName(real.getUserName());
data.setRealName(real.getUserName());
data.setRealIdCard(real.getIdCard());
data.setRealPhone(real.getMobile());
data.setIsReal(true);
return userMapper.updateUser(data);
}
}

9
ruoyi-web/src/main/java/com/ruoyi/web/bst/LocationLogController.java
View File

@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.bst.areaJoin.domain.enums.AreaJoinPermission;
import com.ruoyi.bst.locationLog.domain.LocationLogQuery;
import com.ruoyi.bst.locationLog.domain.LocationLogVO;
import com.ruoyi.bst.locationLog.service.LocationLogService;
@ -52,6 +53,8 @@ public class LocationLogController extends BaseController
startPage();
startOrderBy();
query.setScope(true);
query.addAreaPermission(AreaJoinPermission.DEVICE_VIEW.getCode());
query.addAreaPermission(AreaJoinPermission.ORDER_VIEW.getCode());
List<LocationLogVO> list = locationLogService.selectLocationLogList(query);
return getDataTable(list);
}
@ -68,6 +71,8 @@ public class LocationLogController extends BaseController
}
startOrderBy();
query.setScope(true);
query.addAreaPermission(AreaJoinPermission.DEVICE_VIEW.getCode());
query.addAreaPermission(AreaJoinPermission.ORDER_VIEW.getCode());
List<LocationLogVO> list = locationLogService.selectLocationLogList(query);
return success(list);
}
@ -82,6 +87,8 @@ public class LocationLogController extends BaseController
return error("开始时间和结束时间不能为空");
}
query.setScope(true);
query.addAreaPermission(AreaJoinPermission.DEVICE_VIEW.getCode());
query.addAreaPermission(AreaJoinPermission.ORDER_VIEW.getCode());
List<LocationLogVO> list = locationLogService.selectLocationLogList(query);
return success(list);
}
@ -95,6 +102,8 @@ public class LocationLogController extends BaseController
public void export(HttpServletResponse response, LocationLogQuery query)
{
query.setScope(true);
query.addAreaPermission(AreaJoinPermission.DEVICE_VIEW.getCode());
query.addAreaPermission(AreaJoinPermission.ORDER_VIEW.getCode());
List<LocationLogVO> list = locationLogService.selectLocationLogList(query);
ExcelUtil<LocationLogVO> util = new ExcelUtil<LocationLogVO>(LocationLogVO.class);
util.exportExcel(response, list, "定位日志数据");