qdintc/intc-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 系统功能大优化，仅可查看自己创建的业务数据。

Browse Source
This commit is contained in:
tianyongbao
2024-05-17 14:09:54 +08:00
parent f4baedacc3
commit d1d02c32ff
48 changed files with 149 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/CoordinateChange.java
View File

@@ -1,80 +0,0 @@
package com.ruoyi.common.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* 自定义地理坐标转换注解
*/
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface CoordinateChange {
/**
* 要转换属性名
*/
String attributeName();
/**
* 原坐标系类型
*/
CoordinateType origin() default CoordinateType.WGS84;
/**
* 目标坐标系类型
*/
CoordinateType target() default CoordinateType.GCJ02;
/**
* 要处理对象类型是否为集合
*/
CollectionFlag isCollection();
public enum CoordinateType{
/**
* WGS84坐标系：即地球坐标系，国际上通用的坐标系。设备一般包含GPS芯片或者北斗芯片获取的经纬度为WGS84地理坐标系,
* 谷歌地图采用的是WGS84地理坐标系（中国范围除外）;
*/
WGS84(0),
/**
* GCJ02坐标系：即火星坐标系，是由中国国家测绘局制订的地理信息系统的坐标系统。由WGS84坐标系经加密后的坐标系。
* 高德地图、腾讯地图、谷歌中国地图和搜搜中国地图采用的是GCJ02地理坐标系;
*/
GCJ02(1),
/**
* 即百度坐标系，GCJ02坐标系经加密后的坐标系;
*/
BD09(2);
private int type;
CoordinateType(int type){
this.type = type;
}
public int type(){
return this.type;
}
}
public enum CollectionFlag{
// 是集合
IS_COLLECTION(1),
// 不是集合
NOT_COLLECTION(0);
private int flag;
CollectionFlag(int flag){
this.flag = flag;
}
public int flag(){
return this.flag;
}
}
}

116
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/aspect/CoordinateAspector.java
View File

@@ -1,116 +0,0 @@
package com.ruoyi.common.core.aspect;
import com.ruoyi.common.core.annotation.CoordinateChange;
import com.ruoyi.common.core.utils.coordinate.Gps;
import com.ruoyi.common.core.utils.coordinate.PositionUtil;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.stereotype.Component;
import java.lang.reflect.Field;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Collection;
/**
* 地理坐标转换AOP
* 坐标格式(经度，纬度)
*/
@Aspect
@Component
public class CoordinateAspector {
private static final String SEPARATOR = ",";
@Around("@annotation(coordinateChange)")
public Object doBefore(ProceedingJoinPoint point, CoordinateChange coordinateChange) throws Throwable {
// 获取查询结果
Object proceed = point.proceed();
// 结果不为null时
if (null != proceed){
MethodSignature signature = (MethodSignature) point.getSignature();
Type type = signature.getMethod().getGenericReturnType();
if (CoordinateChange.CollectionFlag.IS_COLLECTION.equals(coordinateChange.isCollection())){
// 集合
Collection<?> collection = (Collection<?>) proceed;
ParameterizedType parameterizedType = (ParameterizedType) type;
Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
Class<?> clz = null;
for (Type actualTypeArgument : actualTypeArguments) {
clz = Class.forName(actualTypeArgument.getTypeName());
}
// 遍历赋值
Class<?> finalClz = clz;
collection.forEach(c->{
Field field = null;
try {
field = finalClz.getDeclaredField(coordinateChange.attributeName());
field.setAccessible(true);
String coordinateStr = (String)field.get(c);
if (StringUtils.isNotEmpty(coordinateStr)) {
// 坐标转换
String[] split = coordinateStr.split(SEPARATOR);
Gps gps = transformCoordinate(Double.parseDouble(split[0]), Double.parseDouble(split[1]), coordinateChange);
// 重新赋值
String newCoordinateStr = gps.getWgLon() + SEPARATOR + gps.getWgLat();
field.set(c, newCoordinateStr);
}
} catch (Exception e) {
System.out.println(e.getMessage());
}
});
}else if (CoordinateChange.CollectionFlag.NOT_COLLECTION.equals(coordinateChange.isCollection())){
// 单个对象
// 通过反射获取坐标
Class<?> clz = Class.forName(type.getTypeName());
Field field = clz.getDeclaredField(coordinateChange.attributeName());
field.setAccessible(true);
String coordinateStr = (String)field.get(proceed);
if (StringUtils.isNotEmpty(coordinateStr)) {
// 坐标转换
String[] split = coordinateStr.split(SEPARATOR);
Gps gps = transformCoordinate(Double.parseDouble(split[0]), Double.parseDouble(split[1]), coordinateChange);
// 重新赋值
String newCoordinateStr = gps.getWgLon() + SEPARATOR + gps.getWgLat();
field.set(proceed, newCoordinateStr);
}
}
}
return proceed;
}
/**
* 坐标转换
* @param longitude 经度
* @param latitude 纬度
* @param coordinateChange 注解
* @return 转换后坐标
*/
private Gps transformCoordinate(double longitude, double latitude, CoordinateChange coordinateChange){
if (coordinateChange.origin().equals(CoordinateChange.CoordinateType.WGS84)){
if (coordinateChange.target().equals(CoordinateChange.CoordinateType.GCJ02)){
return PositionUtil.gps84_To_Gcj02(latitude,longitude);
}else if (coordinateChange.target().equals(CoordinateChange.CoordinateType.BD09)){
Gps gps = PositionUtil.gps84_To_Gcj02(latitude, longitude);
return PositionUtil.gcj02_To_Bd09(gps.getWgLat(),gps.getWgLon());
}
}else if (coordinateChange.origin().equals(CoordinateChange.CoordinateType.GCJ02)){
if (coordinateChange.target().equals(CoordinateChange.CoordinateType.WGS84)){
return PositionUtil.gcj02_To_Gps84(latitude,longitude);
}else if (coordinateChange.target().equals(CoordinateChange.CoordinateType.BD09)){
return PositionUtil.gcj02_To_Bd09(latitude,longitude);
}
}else if(coordinateChange.origin().equals(CoordinateChange.CoordinateType.BD09)){
if (coordinateChange.target().equals(CoordinateChange.CoordinateType.GCJ02)){
return PositionUtil.bd09_To_Gcj02(latitude,longitude);
}else if (coordinateChange.target().equals(CoordinateChange.CoordinateType.WGS84)){
Gps gps = PositionUtil.bd09_To_Gcj02(latitude,longitude);
return PositionUtil.gcj02_To_Gps84(gps.getWgLat(), gps.getWgLon());
}
}
return new Gps(latitude,longitude);
}
}

5
ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
View File

@@ -26,6 +26,11 @@ public @interface DataScope
*/
public String userAlias() default "";
/**
* 业务表的别名
*/
public String businessAlias() default "";
/**
* 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@RequiresPermissions获取，多个权限用逗号分隔开来
*/

25
ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
View File

@@ -1,11 +1,5 @@
package com.ruoyi.common.datascope.aspect;
import java.util.ArrayList;
import java.util.List;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.context.SecurityContextHolder;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.core.utils.StringUtils;
@@ -15,6 +9,13 @@ import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
/**
* 数据过滤处理
@@ -74,7 +75,8 @@ public class DataScopeAspect
{
String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), SecurityContextHolder.getPermission());
dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
controllerDataScope.userAlias(), permission);
controllerDataScope.userAlias(),
controllerDataScope.businessAlias(), permission);
}
}
}
@@ -88,7 +90,7 @@ public class DataScopeAspect
* @param userAlias 用户别名
* @param permission 权限字符
*/
public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission)
public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String businessAlias, String permission)
{
StringBuilder sqlString = new StringBuilder();
List<String> conditions = new ArrayList<String>();
@@ -137,9 +139,12 @@ public class DataScopeAspect
}
else
{
// 数据权限为仅本人且没有userAlias别名不查询任何数据
sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
if (StringUtils.isNotBlank(businessAlias))
{
sqlString.append(StringUtils.format(" OR {}.create_by ='{}'", businessAlias, user.getUserName()));
}
}
}
conditions.add(dataScope);
}

3
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDealRecordDto.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.invest.domain.dto;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,7 +16,7 @@ import java.util.Date;
*/
@ApiModel("账户交易记录Dto对象")
@Data
public class AccountsDealRecordDto implements Serializable
public class AccountsDealRecordDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

8
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java
View File

@@ -1,9 +1,11 @@
package com.ruoyi.invest.domain.dto;
import lombok.Data;
import java.io.Serializable;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 记账账户Dto对象 accounts
*
@@ -12,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
*/
@ApiModel("记账账户Dto对象")
@Data
public class AccountsDto implements Serializable
public class AccountsDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

3
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsTransferRecordDto.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.invest.domain.dto;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,7 +14,7 @@ import java.io.Serializable;
*/
@ApiModel("账户转账记录Dto对象")
@Data
public class AccountsTransferRecordDto implements Serializable
public class AccountsTransferRecordDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

3
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AnalysisDto.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.invest.domain.dto;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,7 +15,7 @@ import java.io.Serializable;
*/
@ApiModel("统计分析Dto对象")
@Data
public class AnalysisDto implements Serializable
public class AnalysisDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

3
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.invest.domain.dto;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,7 +14,7 @@ import java.io.Serializable;
*/
@ApiModel("银行卡信息Dto对象")
@Data
public class BankCardLendDto implements Serializable
public class BankCardLendDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

3
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditCardBillDto.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.invest.domain.dto;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,7 +14,7 @@ import java.io.Serializable;
*/
@ApiModel("信用卡账单Dto对象")
@Data
public class CreditCardBillDto implements Serializable
public class CreditCardBillDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

3
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditReportQueryRecordDto.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.invest.domain.dto;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,7 +14,7 @@ import java.io.Serializable;
*/
@ApiModel("征信报告查询记录Dto对象")
@Data
public class CreditReportQueryRecordDto implements Serializable
public class CreditReportQueryRecordDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

8
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/DebitInforsDto.java
View File

@@ -1,9 +1,11 @@
package com.ruoyi.invest.domain.dto;
import lombok.Data;
import java.io.Serializable;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 信贷产品管理Dto对象 debit_infors
*
@@ -12,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
*/
@ApiModel("信贷产品管理Dto对象")
@Data
public class DebitInforsDto implements Serializable
public class DebitInforsDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

3
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksBillDto.java
View File

@@ -1,6 +1,7 @@
package com.ruoyi.invest.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,7 +16,7 @@ import java.util.Date;
*/
@ApiModel("期货股票账单Dto对象")
@Data
public class FutureStocksBillDto implements Serializable
public class FutureStocksBillDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

10
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksDto.java
View File

@@ -1,11 +1,11 @@
package com.ruoyi.invest.domain.dto;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 期货股票基本信息Dto对象 future_stocks
*
@@ -14,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
*/
@ApiModel("期货股票基本信息Dto对象")
@Data
public class FutureStocksDto implements Serializable
public class FutureStocksDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

8
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/HeartJourneyDto.java
View File

@@ -1,9 +1,11 @@
package com.ruoyi.invest.domain.dto;
import lombok.Data;
import java.io.Serializable;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 心路历程Dto对象 heart_journey
*
@@ -12,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
*/
@ApiModel("心路历程Dto对象")
@Data
public class HeartJourneyDto implements Serializable
public class HeartJourneyDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

3
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDetailDto.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.invest.domain.dto;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,7 +14,7 @@ import java.io.Serializable;
*/
@ApiModel("分期历史明细Dto对象")
@Data
public class InstallmentHistoryDetailDto implements Serializable
public class InstallmentHistoryDetailDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

3
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDto.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.invest.domain.dto;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,7 +14,7 @@ import java.io.Serializable;
*/
@ApiModel("网贷及分期历史Dto对象")
@Data
public class InstallmentHistoryDto implements Serializable
public class InstallmentHistoryDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

10
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/PosMachineDto.java
View File

@@ -1,11 +1,11 @@
package com.ruoyi.invest.domain.dto;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* pos机信息Dto对象 pos_machine
*
@@ -14,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
*/
@ApiModel("pos机信息Dto对象")
@Data
public class PosMachineDto implements Serializable
public class PosMachineDto extends BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

2
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsDealRecordMapper.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.invest.mapper;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.AccountsDealRecord;
import com.ruoyi.invest.domain.dto.AccountsDealRecordDto;
import com.ruoyi.invest.domain.vo.AccountsDealRecordVo;
@@ -29,6 +30,7 @@ public interface AccountsDealRecordMapper
* @param accountsDealRecordDto 账户交易记录
* @return 账户交易记录集合
*/
@DataScope(businessAlias = "a")
public List<AccountsDealRecordVo> selectAccountsDealRecordList(AccountsDealRecordDto accountsDealRecordDto);
/**

5
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsMapper.java
View File

@@ -1,10 +1,12 @@
package com.ruoyi.invest.mapper;
import java.util.List;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.Accounts;
import com.ruoyi.invest.domain.dto.AccountsDto;
import com.ruoyi.invest.domain.vo.AccountsVo;
import java.util.List;
/**
* 记账账户Mapper接口
*
@@ -27,6 +29,7 @@ public interface AccountsMapper
* @param accountsDto 记账账户
* @return 记账账户集合
*/
@DataScope(businessAlias = "a")
public List<AccountsVo> selectAccountsList(AccountsDto accountsDto);
/**

5
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsTransferRecordMapper.java
View File

@@ -1,10 +1,12 @@
package com.ruoyi.invest.mapper;
import java.util.List;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.AccountsTransferRecord;
import com.ruoyi.invest.domain.dto.AccountsTransferRecordDto;
import com.ruoyi.invest.domain.vo.AccountsTransferRecordVo;
import java.util.List;
/**
* 账户转账记录Mapper接口
*
@@ -27,6 +29,7 @@ public interface AccountsTransferRecordMapper
* @param accountsTransferRecordDto 账户转账记录
* @return 账户转账记录集合
*/
@DataScope(businessAlias = "a")
public List<AccountsTransferRecordVo> selectAccountsTransferRecordList(AccountsTransferRecordDto accountsTransferRecordDto);
/**

2
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/BankCardLendMapper.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.invest.mapper;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.BankCardLend;
import com.ruoyi.invest.domain.dto.BankCardLendDto;
import com.ruoyi.invest.domain.vo.BankCardLendVo;
@@ -28,6 +29,7 @@ public interface BankCardLendMapper
* @param bankCardLendDto 银行卡信息
* @return 银行卡信息集合
*/
@DataScope(businessAlias = "a")
public List<BankCardLendVo> selectBankCardLendList(BankCardLendDto bankCardLendDto);
/**

5
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditCardBillMapper.java
View File

@@ -1,10 +1,12 @@
package com.ruoyi.invest.mapper;
import java.util.List;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.CreditCardBill;
import com.ruoyi.invest.domain.dto.CreditCardBillDto;
import com.ruoyi.invest.domain.vo.CreditCardBillVo;
import java.util.List;
/**
* 信用卡账单Mapper接口
*
@@ -27,6 +29,7 @@ public interface CreditCardBillMapper
* @param creditCardBillDto 信用卡账单
* @return 信用卡账单集合
*/
@DataScope(businessAlias = "a")
public List<CreditCardBillVo> selectCreditCardBillList(CreditCardBillDto creditCardBillDto);
/**

3
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditReportQueryRecordMapper.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.invest.mapper;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.CreditReportQueryRecord;
import com.ruoyi.invest.domain.dto.CreditReportQueryRecordDto;
import com.ruoyi.invest.domain.vo.CreditReportQueryRecordVo;
@@ -28,6 +29,7 @@ public interface CreditReportQueryRecordMapper
* @param creditReportQueryRecordDto 征信报告查询记录
* @return 征信报告查询记录集合
*/
@DataScope(businessAlias = "a")
public List<CreditReportQueryRecordVo> selectCreditReportQueryRecordList(CreditReportQueryRecordDto creditReportQueryRecordDto);
/**
@@ -84,5 +86,6 @@ public interface CreditReportQueryRecordMapper
* @param creditReportQueryRecordDto 征信报告查询记录
* @return 征信报告查询记录集合
*/
@DataScope(businessAlias = "a")
public List<CreditReportQueryRecordVo> selectQueryInstitutionList(CreditReportQueryRecordDto creditReportQueryRecordDto);
}

5
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/DebitInforsMapper.java
View File

@@ -1,10 +1,12 @@
package com.ruoyi.invest.mapper;
import java.util.List;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.DebitInfors;
import com.ruoyi.invest.domain.dto.DebitInforsDto;
import com.ruoyi.invest.domain.vo.DebitInforsVo;
import java.util.List;
/**
* 信贷产品管理Mapper接口
*
@@ -27,6 +29,7 @@ public interface DebitInforsMapper
* @param debitInforsDto 信贷产品管理
* @return 信贷产品管理集合
*/
@DataScope(businessAlias = "a")
public List<DebitInforsVo> selectDebitInforsList(DebitInforsDto debitInforsDto);
/**

5
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksBillMapper.java
View File

@@ -1,10 +1,12 @@
package com.ruoyi.invest.mapper;
import java.util.List;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.FutureStocksBill;
import com.ruoyi.invest.domain.dto.FutureStocksBillDto;
import com.ruoyi.invest.domain.vo.FutureStocksBillVo;
import java.util.List;
/**
* 期货股票账单Mapper接口
*
@@ -27,6 +29,7 @@ public interface FutureStocksBillMapper
* @param futureStocksBillDto 期货股票账单
* @return 期货股票账单集合
*/
@DataScope(businessAlias = "a")
public List<FutureStocksBillVo> selectFutureStocksBillList(FutureStocksBillDto futureStocksBillDto);
/**

5
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksMapper.java
View File

@@ -1,10 +1,12 @@
package com.ruoyi.invest.mapper;
import java.util.List;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.FutureStocks;
import com.ruoyi.invest.domain.dto.FutureStocksDto;
import com.ruoyi.invest.domain.vo.FutureStocksVo;
import java.util.List;
/**
* 期货股票基本信息Mapper接口
*
@@ -27,6 +29,7 @@ public interface FutureStocksMapper
* @param futureStocksDto 期货股票基本信息
* @return 期货股票基本信息集合
*/
@DataScope(businessAlias = "a")
public List<FutureStocksVo> selectFutureStocksList(FutureStocksDto futureStocksDto);
/**

5
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/HeartJourneyMapper.java
View File

@@ -1,10 +1,12 @@
package com.ruoyi.invest.mapper;
import java.util.List;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.HeartJourney;
import com.ruoyi.invest.domain.dto.HeartJourneyDto;
import com.ruoyi.invest.domain.vo.HeartJourneyVo;
import java.util.List;
/**
* 心路历程Mapper接口
*
@@ -27,6 +29,7 @@ public interface HeartJourneyMapper
* @param heartJourneyDto 心路历程
* @return 心路历程集合
*/
@DataScope(businessAlias = "a")
public List<HeartJourneyVo> selectHeartJourneyList(HeartJourneyDto heartJourneyDto);
/**

5
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryDetailMapper.java
View File

@@ -1,10 +1,12 @@
package com.ruoyi.invest.mapper;
import java.util.List;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.InstallmentHistoryDetail;
import com.ruoyi.invest.domain.dto.InstallmentHistoryDetailDto;
import com.ruoyi.invest.domain.vo.InstallmentHistoryDetailVo;
import java.util.List;
/**
* 分期历史明细Mapper接口
*
@@ -27,6 +29,7 @@ public interface InstallmentHistoryDetailMapper
* @param installmentHistoryDetailDto 分期历史明细
* @return 分期历史明细集合
*/
@DataScope(businessAlias = "a")
public List<InstallmentHistoryDetailVo> selectInstallmentHistoryDetailList(InstallmentHistoryDetailDto installmentHistoryDetailDto);
/**

5
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryMapper.java
View File

@@ -1,10 +1,12 @@
package com.ruoyi.invest.mapper;
import java.util.List;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.InstallmentHistory;
import com.ruoyi.invest.domain.dto.InstallmentHistoryDto;
import com.ruoyi.invest.domain.vo.InstallmentHistoryVo;
import java.util.List;
/**
* 网贷及分期历史Mapper接口
*
@@ -27,6 +29,7 @@ public interface InstallmentHistoryMapper
* @param installmentHistoryDto 网贷及分期历史
* @return 网贷及分期历史集合
*/
@DataScope(businessAlias = "a")
public List<InstallmentHistoryVo> selectInstallmentHistoryList(InstallmentHistoryDto installmentHistoryDto);
/**

5
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/PosMachineMapper.java
View File

@@ -1,10 +1,12 @@
package com.ruoyi.invest.mapper;
import java.util.List;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.PosMachine;
import com.ruoyi.invest.domain.dto.PosMachineDto;
import com.ruoyi.invest.domain.vo.PosMachineVo;
import java.util.List;
/**
* pos机信息Mapper接口
*
@@ -27,6 +29,7 @@ public interface PosMachineMapper
* @param posMachineDto pos机信息
* @return pos机信息集合
*/
@DataScope(businessAlias = "a")
public List<PosMachineVo> selectPosMachineList(PosMachineDto posMachineDto);
/**

2
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/StatisticAnalysisMapper.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.invest.mapper;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.invest.domain.dto.BankCardLendDto;
import com.ruoyi.invest.domain.vo.BankCardLendVo;
import org.apache.ibatis.annotations.Mapper;
@@ -15,6 +16,7 @@ public interface StatisticAnalysisMapper {
* @param bankCardLendDto 银行卡信息
* @return 银行卡信息集合
*/
@DataScope(businessAlias = "a")
public List<BankCardLendVo> selectBankCardLendList(BankCardLendDto bankCardLendDto);

4
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IPosMachineService.java
View File

@@ -1,10 +1,12 @@
package com.ruoyi.invest.service;
import java.util.List;
import com.ruoyi.invest.domain.PosMachine;
import com.ruoyi.invest.domain.dto.PosMachineDto;
import com.ruoyi.invest.domain.vo.PosMachineVo;
import java.util.List;
/**
* pos机信息Service接口
*

8
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/service/impl/InvestJobImpl.java
View File

@@ -155,7 +155,7 @@ public class InvestJobImpl implements IInvestJobService
}
creditCardBill.setName(simpleDateFormat.format(creditCardBill.getBillDate()));
creditCardBill.setBillDatePeriod(periodStart+"~"+periodEnd);
creditCardBill.setCreateBy(SecurityUtils.getUsername());
creditCardBill.setCreateBy(bankCard.getCreateBy());
creditCardBill.setCreateTime(DateUtils.getNowDate());
creditCardBill.setId(IdWorker.getId());
creditCardBill.setCreditCardId(bankCard.getId());
@@ -233,7 +233,7 @@ public class InvestJobImpl implements IInvestJobService
creditDeal.setDealCategory("10");
creditDeal.setName(creditAccount.getName()+"（"+ StringUtils.getLastNumberChars(4,creditAccount.getCode()+"）"));
creditDeal.setRemark("分期利息");
creditDeal.setCreateBy(SecurityUtils.getUsername());
creditDeal.setCreateBy(creditAccount.getCreateBy());
creditDeal.setCreateTime(new Date());
// accountsDealRecordMapper.insertAccountsDealRecord(creditDeal);
insertAccountsDealRecord(creditDeal);
@@ -255,7 +255,7 @@ public class InvestJobImpl implements IInvestJobService
creditDealPrinciple.setDealCategory("10");
creditDealPrinciple.setName(creditAccount.getName()+"（"+ StringUtils.getLastNumberChars(4,creditAccount.getCode()+"）"));
creditDealPrinciple.setRemark("应还本金");
creditDealPrinciple.setCreateBy(SecurityUtils.getUsername());
creditDealPrinciple.setCreateBy(creditAccount.getCreateBy());
creditDealPrinciple.setCreateTime(new Date());
// accountsDealRecordMapper.insertAccountsDealRecord(creditDealPrinciple);
insertAccountsDealRecord(creditDealPrinciple);
@@ -269,9 +269,7 @@ public class InvestJobImpl implements IInvestJobService
public int insertAccountsDealRecord(AccountsDealRecord accountsDealRecord)
{
accountsDealRecord.setCreateBy(SecurityUtils.getUsername());
accountsDealRecord.setId(IdWorker.getId());
//获取最新一条记录的数据，计算余额
Map<String, Object> lastMap = new HashMap<>();
lastMap.put("startDateTime", accountsDealRecord.getCreateTime());

2
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsDealRecordMapper.xml
View File

@@ -74,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.create_time desc
</select>

2
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml
View File

@@ -61,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="type != null and type != ''"> and a.type = #{type}</if>
<if test="state != null and state != ''"> and a.state = #{state}</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.type asc,a.update_time desc
</select>

2
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsTransferRecordMapper.xml
View File

@@ -78,6 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and to_char(a.create_time, 'yyyy-MM-dd')>=#{startTime}
</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.create_time desc
</select>

2
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml
View File

@@ -43,6 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="creditCardId != null "> and a.id = #{creditCardId}</if>
<if test="lendType != null and lendType != ''"> and a.lend_type = #{lendType}</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.bill_date asc,a.update_time desc
</select>

4
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml
View File

@@ -59,9 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="billDate!=null and billDate !=''">
and #{billDate}=to_char(a.bill_date, 'yyyy-MM-dd')
</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.bill_date desc
</select>

5
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/CreditReportQueryRecordMapper.xml
View File

@@ -37,6 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and #{queryDateEnd}>=to_char(a.query_date, 'yyyy-MM-dd')
</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.query_date desc
</select>
@@ -120,7 +122,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
credit_report_query_record a
where
a.del_flag = '0'
<!-- 数据范围过滤 -->
${params.dataScope}
order by
a.query_institution desc
</select>
</mapper>

2
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/DebitInforsMapper.xml
View File

@@ -44,6 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="type != null and type != ''"> and a.type = #{type}</if>
<if test="lenders != null and lenders != ''"> and a.lenders = #{lenders}</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.create_time desc
</select>

2
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksBillMapper.xml
View File

@@ -64,6 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and #{endMonth}>=to_char(a.bill_date, 'yyyy-MM')
</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.bill_date_period desc
</select>

2
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksMapper.xml
View File

@@ -62,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="name != null and name != ''"> and a.name like '%'|| #{name}||'%'</if>
<if test="type != null and type != ''"> and a.type = #{type}</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.create_time desc
</select>

2
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/HeartJourneyMapper.xml
View File

@@ -27,6 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="name != null and name != ''"> and a.name like '%'|| #{name}||'%'</if>
<if test="type != null and type != ''"> and a.type = #{type}</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.create_time desc
</select>

2
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml
View File

@@ -78,6 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and #{endDate}>=to_char(a.repayment_date, 'yyyy-MM-dd')
</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.repayment_date desc
</select>

2
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml
View File

@@ -128,6 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and #{endMonth}>=to_char(a.installment_date, 'yyyy-MM')
</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.installment_date desc
</select>

2
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml
View File

@@ -65,6 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="type != null and type != ''"> and a.type = #{type}</if>
<if test="merchantName != null and merchantName != ''"> and a.merchant_name like '%'|| #{merchantName}||'%'</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.create_time desc
</select>

2
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/StatisticAnalysisMapper.xml
View File

@@ -45,6 +45,8 @@
<if test="creditCardId != null "> and a.id = #{creditCardId}</if>
<if test="lendType != null and lendType != ''"> and a.lend_type = #{lendType}</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>
</mapper>